@overdeck/desktop 0.45.16 → 0.45.19

package/server/{state-home-CEvD_v5F.js → launcher-generator-C-FU4PNT.js}

@@ -1,15 +1,11 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fn as init_projects, Gn as resolveInfraRepo, Jr as init_paths, V as qualifyPiModel, _n as init_project_key, cn as STATE_BRANCH_PATHS, dn as init_state_plane, z as init_providers } from "./config-yaml-cNOZcEww.js";
-import { B as colorFgBgForTheme, H as init_ui_theme, V as getUiThemeSync } from "./tmux-C3g9VFcg.js";
-import { a as getHarnessBehavior } from "./src-B4TTzNSr.js";
-import { t as init_behavior } from "./behavior-BTpYbAv4.js";
-import { l as init_codex, u as toCodexSandboxValue } from "./codex-BbqIRZjd.js";
+import { V as qualifyPiModel, z as init_providers } from "./config-yaml-BQs6GbD_.js";
+import { H as getUiThemeSync, U as init_ui_theme, V as colorFgBgForTheme } from "./tmux-C3X2XmV0.js";
+import { a as getHarnessBehavior } from "./src-By3D85Ry.js";
+import { t as init_behavior } from "./behavior-CWqNMqE5.js";
+import { d as toCodexSandboxValue, l as init_codex } from "./codex-D5RyWzNL.js";
 import { dirname, join } from "node:path";
 import { Data } from "effect";
-import { existsSync } from "node:fs";
-import "node:fs/promises";
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 //#region ../../lib/model-validation.ts
 function normalizeModelOverrideSync(value) {
 	if (value === void 0 || value === null) return void 0;
@@ -369,122 +365,6 @@ var init_launcher_generator = __esmMin((() => {
 	];
 }));
 //#endregion
-//#region ../../lib/state-home.ts
-/**
-* State-home resolver and dedicated overdeck-state worktree manager (PAN-2541).
-*
-* Migration is complete only when the tip of origin/overdeck-state contains a
-* valid migration-complete.json whose stateBranchSha is an ancestor of the tip.
-* An unmarked branch is an in-progress migration and continues using legacy
-* project-root state paths.
-*/
-async function git(repoPath, args) {
-	const { stdout } = await execFileAsync("git", args, {
-		cwd: repoPath,
-		encoding: "utf8",
-		maxBuffer: 16 * 1024 * 1024,
-		timeout: 15e3,
-		killSignal: "SIGTERM"
-	});
-	return stdout.trim();
-}
-function isSha(value) {
-	return typeof value === "string" && /^[0-9a-f]{40}$/i.test(value);
-}
-function parseMigrationCompleteMarker(value) {
-	if (!value || typeof value !== "object") return null;
-	const marker = value;
-	if (!isSha(marker.sourceMainSha) || !isSha(marker.stateBranchSha)) return null;
-	if (typeof marker.completedAt !== "string" || !Number.isFinite(Date.parse(marker.completedAt))) return null;
-	if (!Number.isInteger(marker.version) || (marker.version ?? 0) < 1) return null;
-	return marker;
-}
-async function remoteStateTip(repoPath) {
-	const sha = (await git(repoPath, [
-		"ls-remote",
-		"--heads",
-		"origin",
-		`refs/heads/${STATE_BRANCH}`
-	])).split(/\s+/)[0];
-	return isSha(sha) ? sha : null;
-}
-async function markerAtRemoteTip(repoPath, tip) {
-	await git(repoPath, [
-		"fetch",
-		"--quiet",
-		"origin",
-		`refs/heads/${STATE_BRANCH}:refs/remotes/origin/${STATE_BRANCH}`
-	]);
-	if (await git(repoPath, ["rev-parse", `refs/remotes/origin/overdeck-state`]) !== tip) return null;
-	let raw;
-	try {
-		raw = await git(repoPath, ["show", `${tip}:${MIGRATION_COMPLETE_MARKER}`]);
-	} catch {
-		return null;
-	}
-	let marker;
-	try {
-		marker = parseMigrationCompleteMarker(JSON.parse(raw));
-	} catch {
-		marker = null;
-	}
-	if (!marker) return null;
-	return await git(repoPath, [
-		"merge-base",
-		"--is-ancestor",
-		marker.stateBranchSha,
-		tip
-	]).then(() => true).catch(() => false) ? marker : null;
-}
-async function inspectStateMigration(project) {
-	const { repoPath } = resolveInfraRepo(project);
-	let tip;
-	try {
-		tip = await remoteStateTip(repoPath);
-	} catch {
-		return {
-			migrated: false,
-			migrationInProgress: false,
-			remoteTip: null
-		};
-	}
-	const cached = migrationCache.get(repoPath);
-	if (cached?.remoteTip === tip) return {
-		migrated: cached.migrated,
-		migrationInProgress: tip !== null && !cached.migrated,
-		remoteTip: tip
-	};
-	const migrated = tip !== null && await markerAtRemoteTip(repoPath, tip) !== null;
-	migrationCache.set(repoPath, {
-		remoteTip: tip,
-		migrated
-	});
-	return {
-		migrated,
-		migrationInProgress: tip !== null && !migrated,
-		remoteTip: tip
-	};
-}
-async function isStateMigrated(project) {
-	return (await inspectStateMigration(project)).migrated;
-}
-async function findRecreatedLegacyStatePaths(project) {
-	if (!await isStateMigrated(project)) return [];
-	const legacyStateRoot = project.path;
-	return STATE_BRANCH_PATHS.map((statePath) => statePath === ".beads/" ? join(legacyStateRoot, ".beads") : join(legacyStateRoot, ".pan", statePath.slice(0, -1))).filter(existsSync);
-}
-var execFileAsync, STATE_BRANCH, MIGRATION_COMPLETE_MARKER, migrationCache;
-var init_state_home = __esmMin((() => {
-	init_paths();
-	init_projects();
-	init_project_key();
-	init_state_plane();
-	execFileAsync = promisify(execFile);
-	STATE_BRANCH = "overdeck-state";
-	MIGRATION_COMPLETE_MARKER = "migration-complete.json";
-	migrationCache = /* @__PURE__ */ new Map();
-}));
-//#endregion
-export { init_launcher_generator as a, requireModelOverrideSync as c, generateLauncherScriptSync as i, shellQuoteModelIdSync as l, init_state_home as n, init_model_validation as o, isStateMigrated as r, normalizeModelOverrideSync as s, findRecreatedLegacyStatePaths as t };
+export { requireModelOverrideSync as a, normalizeModelOverrideSync as i, init_launcher_generator as n, shellQuoteModelIdSync as o, init_model_validation as r, generateLauncherScriptSync as t };
 
-//# sourceMappingURL=state-home-CEvD_v5F.js.map
+//# sourceMappingURL=launcher-generator-C-FU4PNT.js.map

package/server/{layers-jjL16At6.js → layers-C-6lBDUE.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Jr as init_paths, qr as getOverdeckHome } from "./config-yaml-cNOZcEww.js";
+import { Jr as getOverdeckHome, Yr as init_paths } from "./config-yaml-BQs6GbD_.js";
 import { existsSync, mkdirSync, writeFileSync } from "fs";
 import { join } from "path";
 //#region ../../lib/context-layers/layers.ts
@@ -90,4 +90,4 @@ This file is committed to the repo; \`workspace.md\` is not.
 //#endregion
 export { globalContextFile as a, legacyWorkspaceContextFile as c, projectContextFile as d, resolveProjectContextFile as f, workspaceContextFile as h, globalContextDir as i, piGlobalContextFile as l, workspaceContextDir as m, codexGlobalContextFile as n, init_layers as o, resolveWorkspaceContextFile as p, ensureProjectLayer as r, legacyProjectContextFile as s, PROJECT_STARTER as t, projectContextDir as u };
 
-//# sourceMappingURL=layers-jjL16At6.js.map
+//# sourceMappingURL=layers-C-6lBDUE.js.map

package/server/lifecycle-Bmw8yU_A.js

@@ -0,0 +1,12 @@
+import { o as init_archive_planning, t as archivePlanning } from "./archive-planning-BW3te5Vw.js";
+import { a as stepSkipped, i as stepOk, n as init_types, r as stepFailed } from "./types-DXBMm4mX.js";
+import { t as closeIssue } from "./close-issue-DEGjxifn.js";
+import { t as teardownWorkspace } from "./teardown-workspace-Ckn7HGhp.js";
+import { a as deepWipe, i as closeOut, n as cancelIssueWorkflow, o as resetToTodo, r as close, t as approve } from "./workflows-BNvk5gbE.js";
+//#region ../../lib/lifecycle/index.ts
+init_types();
+init_archive_planning();
+//#endregion
+export { approve, archivePlanning, cancelIssueWorkflow, close, closeIssue, closeOut, deepWipe, resetToTodo, stepFailed, stepOk, stepSkipped, teardownWorkspace };
+
+//# sourceMappingURL=lifecycle-Bmw8yU_A.js.map

package/server/{lifecycle-io-DXv8Utct.js → lifecycle-io-B150XprC.js}

@@ -1,3 +1,3 @@
-import { a as init_lifecycle_io, s as transitionVBriefOnMain } from "./lifecycle-io-IehcRt2v.js";
+import { a as init_lifecycle_io, s as transitionVBriefOnMain } from "./lifecycle-io-Dcu-_ktz.js";
 init_lifecycle_io();
 export { transitionVBriefOnMain };

package/server/{lifecycle-io-IehcRt2v.js → lifecycle-io-Dcu-_ktz.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Ft as readRecordContinueViewSync, _t as appendSessionEntrySync, an as queueAutoCommit, dr as FsError, ht as appendFeedbackEntrySync, in as init_auto_commit, kt as init_record, rn as flushAutoCommits, xr as init_errors, xt as clearRecordFeedbackSync } from "./config-yaml-cNOZcEww.js";
-import { A as init_vbrief_index, F as generateVBriefFilename, I as init_lifecycle, L as parseVBriefFilename, N as VBRIEF_LIFECYCLE_DIRS, P as ensureVBriefDirsSync, R as resolveVBriefDir, T as init_specs, d as readPlanSync, g as serializeVBriefDocument, j as invalidateVBriefIndex, l as normalizeVBriefEnvelope, o as init_io, w as getProjectPanPaths, z as slugify } from "./io-VEGSAqsd.js";
-import { t as init_pan_dir } from "./pan-dir-CQIfKG8c.js";
+import { Ft as readRecordContinueViewSync, Sr as init_errors, _t as appendSessionEntrySync, fr as FsError, ht as appendFeedbackEntrySync, kt as init_record, nn as init_auto_commit, rn as queueAutoCommit, tn as flushAutoCommits, xt as clearRecordFeedbackSync } from "./config-yaml-BQs6GbD_.js";
+import { A as invalidateVBriefIndex, C as init_specs, F as init_lifecycle, I as parseVBriefFilename, L as resolveVBriefDir, M as VBRIEF_LIFECYCLE_DIRS, N as ensureVBriefDirsSync, P as generateVBriefFilename, R as slugify, S as getProjectPanPaths, d as readPlanSync, g as serializeVBriefDocument, k as init_vbrief_index, l as normalizeVBriefEnvelope, o as init_io } from "./io-Cv9xQTks.js";
+import { t as init_pan_dir } from "./pan-dir-D3vABXMs.js";
 import { Effect } from "effect";
 import { existsSync, mkdirSync, readFileSync, readdirSync, renameSync, unlinkSync, writeFileSync } from "fs";
 import { basename, join } from "path";
@@ -264,4 +264,4 @@ var init_lifecycle_io = __esmMin((() => {
 //#endregion
 export { init_lifecycle_io as a, updatePlanStatus as c, findVBriefByIssueSync as i, appendFeedbackEntryForIssue as n, readContinueStateForIssue as o, clearFeedbackForIssue as r, transitionVBriefOnMain as s, appendContinueSessionEntryForIssue as t };
 
-//# sourceMappingURL=lifecycle-io-IehcRt2v.js.map
+//# sourceMappingURL=lifecycle-io-Dcu-_ktz.js.map

package/server/{linear-client-D9cSQfvD.js → linear-client-BHjs0luk.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { a as init_tracker_config, n as getLinearApiKey } from "./tracker-config-dQxC15vH.js";
-import { c as TrackerNotConfigured, d as init_typed_errors, i as IssueNotFound, o as RateLimited, s as TrackerApiError } from "./typed-errors-sLpGfegz.js";
+import { a as init_tracker_config, n as getLinearApiKey } from "./tracker-config-5Cabf1MU.js";
+import { a as RateLimited, o as TrackerApiError, r as IssueNotFound, s as TrackerNotConfigured, u as init_typed_errors } from "./typed-errors-n_Tnb4Fh.js";
 import { Context, Duration, Effect, Layer, Schedule } from "effect";
 import { LinearClient } from "@linear/sdk";
 //#region services/linear-client.ts
@@ -192,4 +192,4 @@ var init_linear_client = __esmMin((() => {
 //#endregion
 export { init_linear_client as i, LinearClientLive as n, LinearClientOptionalLive as r, LinearClient$1 as t };
 
-//# sourceMappingURL=linear-client-D9cSQfvD.js.map
+//# sourceMappingURL=linear-client-BHjs0luk.js.map

package/server/{linear-client-By7hjwuN.js → linear-client-s65LNmlG.js}

@@ -1,3 +1,3 @@
-import { i as init_linear_client, n as LinearClientLive, r as LinearClientOptionalLive, t as LinearClient } from "./linear-client-D9cSQfvD.js";
+import { i as init_linear_client, n as LinearClientLive, r as LinearClientOptionalLive, t as LinearClient } from "./linear-client-BHjs0luk.js";
 init_linear_client();
 export { LinearClient, LinearClientLive, LinearClientOptionalLive };

package/server/memory-fts-worker.js

@@ -1,4 +1,4 @@
-import { a as runMemoryFtsTransactionSync, i as runMemoryFtsStatementSync, n as getMemoryFtsDatabaseSync, r as init_fts_operations, t as closeMemoryFtsDatabasesInProcess } from "./fts-operations-DvCSimfU.js";
+import { a as runMemoryFtsTransactionSync, i as runMemoryFtsStatementSync, n as getMemoryFtsDatabaseSync, r as init_fts_operations, t as closeMemoryFtsDatabasesInProcess } from "./fts-operations-L5sNLoHl.js";
 import { parentPort } from "node:worker_threads";
 //#region ../../lib/memory/fts-worker.ts
 init_fts_operations();

package/server/{merge-BLcEZNXz.js → merge-CM8swd2V.js}

@@ -1,2 +1,2 @@
-import { A as UatNotPromotable, B as readyForMerge, C as RepoMergeStatus, D as UatMember, E as UatGenerationNotFound, F as enqueueMerge, I as getAllActiveQueues, L as getCurrentMerge, M as UatStatus, N as WorkspaceType, O as UatMemberRole, P as dequeueMerge, R as getQueueForProject, S as RepoKey, T as UatGenerationFilter, _ as NotReadyForMerge, a as ForgeMergeFailed, b as QueueView, c as MergeInProgress, d as MergeSet, f as MergeSetNotFound, g as MergeWriterLive, h as MergeWriter, i as AutoMergeStatus, j as UatResolution, k as UatName, l as MergeResolver, m as MergeSetStatus, n as AutoMergeFilter, o as GateStatus, p as MergeSetRepo, r as AutoMergeNotFound, s as MergeApi, t as AutoMerge, u as MergeResolverLive, v as ProjectKey, w as UatGeneration, x as RebaseStatus, y as QueueEntryStatus, z as markMergeProcessing } from "./merge-BN8FGJ2q.js";
+import { A as UatNotPromotable, B as readyForMerge, C as RepoMergeStatus, D as UatMember, E as UatGenerationNotFound, F as enqueueMerge, I as getAllActiveQueues, L as getCurrentMerge, M as UatStatus, N as WorkspaceType, O as UatMemberRole, P as dequeueMerge, R as getQueueForProject, S as RepoKey, T as UatGenerationFilter, _ as NotReadyForMerge, a as ForgeMergeFailed, b as QueueView, c as MergeInProgress, d as MergeSet, f as MergeSetNotFound, g as MergeWriterLive, h as MergeWriter, i as AutoMergeStatus, j as UatResolution, k as UatName, l as MergeResolver, m as MergeSetStatus, n as AutoMergeFilter, o as GateStatus, p as MergeSetRepo, r as AutoMergeNotFound, s as MergeApi, t as AutoMerge, u as MergeResolverLive, v as ProjectKey, w as UatGeneration, x as RebaseStatus, y as QueueEntryStatus, z as markMergeProcessing } from "./merge-CS0b-E3u.js";
 export { AutoMerge, AutoMergeFilter, AutoMergeNotFound, AutoMergeStatus, ForgeMergeFailed, GateStatus, MergeApi, MergeInProgress, MergeResolver, MergeResolverLive, MergeSet, MergeSetNotFound, MergeSetRepo, MergeSetStatus, MergeWriter, MergeWriterLive, NotReadyForMerge, ProjectKey, QueueEntryStatus, QueueView, RebaseStatus, RepoKey, RepoMergeStatus, UatGeneration, UatGenerationFilter, UatGenerationNotFound, UatMember, UatMemberRole, UatName, UatNotPromotable, UatResolution, UatStatus, WorkspaceType, dequeueMerge, enqueueMerge, getAllActiveQueues, getCurrentMerge, getQueueForProject, markMergeProcessing, readyForMerge };

package/server/{merge-BN8FGJ2q.js → merge-CS0b-E3u.js}

@@ -1,5 +1,5 @@
-import { C as inArray, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, s as Forge, v as init_drizzle_orm, x as eq } from "./infra-Ba9mS6e6.js";
-import { n as init_issues, t as IssueId } from "./issues-CBAsuoAO.js";
+import { C as inArray, _ as integer, a as EventBus, b as and, d as getOverdeckDatabaseSync, f as init_infra, h as text, m as sqliteTable, p as init_sqlite_core, r as Db, s as Forge, v as init_drizzle_orm, x as eq } from "./infra-DYwIXlK5.js";
+import { n as init_issues, t as IssueId } from "./issues-Cr-BLFLO.js";
 import { Context, Effect, Layer, Schema } from "effect";
 import { HttpApiEndpoint, HttpApiGroup } from "effect/unstable/httpapi";
 //#region ../../lib/overdeck/merge.ts
@@ -700,4 +700,4 @@ function getAllActiveQueues() {
 //#endregion
 export { UatNotPromotable as A, readyForMerge as B, RepoMergeStatus as C, UatMember as D, UatGenerationNotFound as E, enqueueMerge as F, getAllActiveQueues as I, getCurrentMerge as L, UatStatus as M, WorkspaceType as N, UatMemberRole as O, dequeueMerge as P, getQueueForProject as R, RepoKey as S, UatGenerationFilter as T, NotReadyForMerge as _, ForgeMergeFailed as a, QueueView as b, MergeInProgress as c, MergeSet as d, MergeSetNotFound as f, MergeWriterLive as g, MergeWriter as h, AutoMergeStatus as i, UatResolution as j, UatName as k, MergeResolver as l, MergeSetStatus as m, AutoMergeFilter as n, GateStatus as o, MergeSetRepo as p, AutoMergeNotFound as r, MergeApi as s, AutoMerge as t, MergeResolverLive as u, ProjectKey as v, UatGeneration as w, RebaseStatus as x, QueueEntryStatus as y, markMergeProcessing as z };
 
-//# sourceMappingURL=merge-BN8FGJ2q.js.map
+//# sourceMappingURL=merge-CS0b-E3u.js.map

package/server/{merge-agent-B3u2szOL.js → merge-agent-Bu1hw9cz.js}

@@ -1,15 +1,14 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fn as init_projects, Jr as init_paths, Vn as loadProjectsConfigSync, br as VcsError, f as loadConfigSync, fr as GitError, jr as OVERDECK_HOME, t as init_config_yaml, xr as init_errors } from "./config-yaml-cNOZcEww.js";
+import { Fn as init_projects, Mr as OVERDECK_HOME, Sr as init_errors, Vn as loadProjectsConfigSync, Yr as init_paths, f as loadConfigSync, pr as GitError, t as init_config_yaml, xr as VcsError } from "./config-yaml-BQs6GbD_.js";
 import { a as init_activity_logger, n as emitActivityEntrySync, r as emitActivityTtsSync } from "./activity-logger-pcbf-e30.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-Ba9mS6e6.js";
-import { L as sessionExists, O as listSessionNames, P as sendKeys, i as capturePane, w as killSession, x as init_tmux } from "./tmux-C3g9VFcg.js";
-import { c as init_review_status, f as markWorkspaceStuck, s as getReviewStatusSync, y as setReviewStatusSync } from "./review-status-Dc1l4dVz.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils--z8FLSWn.js";
-import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-CqZSnqQi.js";
-import { r as verifyMergedBeforeLifecycle, t as init_merge_verification } from "./merge-verification-D4wTChdX.js";
-import { n as restoreTrackedBeadsExport, t as init_beads_restore } from "./beads-restore-BUItPOjI.js";
-import { n as init_validation, r as runQualityGates } from "./validation-CsPVsoA0.js";
-import { i as init_git_utils, t as cleanupStaleLocks } from "./git-utils-Dr0L7mFk.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-DYwIXlK5.js";
+import { F as sendKeys, R as sessionExists, S as init_tmux, T as killSession, i as capturePane, k as listSessionNames } from "./tmux-C3X2XmV0.js";
+import { c as init_review_status, f as markWorkspaceStuck, s as getReviewStatusSync, y as setReviewStatusSync } from "./review-status-By86XA6Z.js";
+import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-Cl-Eaqrv.js";
+import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-xj-J1Wm7.js";
+import { r as verifyMergedBeforeLifecycle, t as init_merge_verification } from "./merge-verification-C4WMP40D.js";
+import { i as runQualityGates, n as init_validation } from "./validation-xAD7y5vW.js";
+import { i as init_git_utils, t as cleanupStaleLocks } from "./git-utils-CP-bg-aM.js";
 import { Data, Effect } from "effect";
 import { appendFileSync, existsSync, mkdirSync } from "fs";
 import { basename, dirname, join, relative } from "path";
@@ -311,8 +310,41 @@ function parseStatusPath(line) {
 * Respects .gitignore (no -f), unstages excluded paths, and leaves excluded
 * paths dirty so the sync can proceed. Returns success=false on git errors.
 */
-async function autoCommitWorkspaceChangesBeforeSync(projectPath) {
+async function autoCommitWorkspaceChangesBeforeSync(projectPath, issueId) {
 	try {
+		for (const operationHead of [
+			"MERGE_HEAD",
+			"REBASE_HEAD",
+			"CHERRY_PICK_HEAD",
+			"REVERT_HEAD"
+		]) try {
+			await execAsync(`git rev-parse -q --verify ${operationHead}`, {
+				cwd: projectPath,
+				encoding: "utf-8"
+			});
+			return {
+				success: false,
+				committed: false,
+				reason: `Refusing to auto-commit while ${operationHead} exists; finish or abort the in-progress Git operation first`
+			};
+		} catch {}
+		try {
+			const { stdout: conflictMarkers } = await execAsync("git grep -n -I -E '^(<<<<<<<( |$)|=======$|>>>>>>>( |$))' -- .", {
+				cwd: projectPath,
+				encoding: "utf-8"
+			});
+			if (conflictMarkers.trim()) return {
+				success: false,
+				committed: false,
+				reason: `Refusing to auto-commit conflict markers in: ${[...new Set(conflictMarkers.trim().split("\n").map((line) => line.split(":", 1)[0]))].join(", ")}`
+			};
+		} catch (error) {
+			if (error?.code !== 1) return {
+				success: false,
+				committed: false,
+				reason: `Failed to scan for conflict markers: ${error.message}`
+			};
+		}
 		const { stdout: statusOut } = await execAsync("git status --porcelain", {
 			cwd: projectPath,
 			encoding: "utf-8"
@@ -339,7 +371,7 @@ async function autoCommitWorkspaceChangesBeforeSync(projectPath) {
 			committed: false,
 			reason: "only excluded/ignored changes remain"
 		};
-		await execAsync("git commit -m \"chore: auto-commit before sync with main\"", {
+		await execAsync(`git commit -m "${issueId ? `chore: auto-commit before sync with main (${issueId})` : "chore: auto-commit before sync with main"}"`, {
 			cwd: projectPath,
 			encoding: "utf-8"
 		});
@@ -394,7 +426,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-CgZQ3jmZ.js");
+		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-BE5rqR90.js");
 		const tldrService = getTldrDaemonServiceSync(projectPath, venvPath);
 		if (!(await tldrService.getStatus()).running) {
 			console.log(`[merge-agent] TLDR daemon not running, skipping notification`);
@@ -424,7 +456,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 	}
 	const run = (async () => {
 		try {
-			const { findSpecByIssue } = await import("./specs-RzcDgozr.js");
+			const { findSpecByIssue } = await import("./specs-DPGNVh51.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`);
@@ -486,7 +518,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-htK6fBRU.js");
+			const { cleanupMergedLabels } = await import("./label-cleanup-BbLy2FZe.js");
 			const ghResolved = resolveGitHubIssueSync(issueId);
 			const labelCtx = ghResolved.isGitHub ? {
 				issueId,
@@ -535,21 +567,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 { compactBeads } = await import("./compact-beads-N00E4EVa.js");
-			const beadsResult = await Effect.runPromise(compactBeads({
-				issueId,
-				projectPath
-			}));
-			if (beadsResult.success && !beadsResult.skipped) {
-				console.log(`[merge-agent] ✓ ${beadsResult.details?.join("; ")}`);
-				logActivity("beads_compaction_complete", beadsResult.details?.join("; ") || "Beads compacted");
-			}
-		} catch (err) {
-			console.warn(`[merge-agent] Beads compaction failed: ${err}`);
-		}
-		try {
-			const { setAgentPaused, getAgentState } = await import("./agents-CEcaxSkR.js");
-			const { killSession, sessionExists } = await import("./tmux-By8E_Yv_.js");
+			const { setAgentPaused, getAgentState } = await import("./agents-DAUyr_Z1.js");
+			const { killSession, sessionExists } = await import("./tmux-DNaD06Gc.js");
 			const issueLower = issueId.toLowerCase();
 			const reason = "awaiting close-out (verify on main)";
 			for (const agentId of [`agent-${issueLower}`, `planning-${issueLower}`]) {
@@ -574,8 +593,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-u5q3ip7H.js");
-			const { resolveProjectFromIssueSync } = await import("./projects-CrBE6IhN.js");
+			const { killAllReviewerSessions } = await import("./review-agent-CUVj54v0.js");
+			const { resolveProjectFromIssueSync } = await import("./projects-DxMUi2eI.js");
 			const projectKey = resolveProjectFromIssueSync(issueId)?.projectKey;
 			if (projectKey) {
 				const { killed } = await Effect.runPromise(killAllReviewerSessions(projectKey, issueId));
@@ -589,7 +608,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		await killPostMergeRoleSessions(issueId);
 		try {
-			const { createResetMarker } = await import("./cli-D9cUTbBr.js");
+			const { createResetMarker } = await import("./cli-BxZHwgRK.js");
 			const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 			const marker = await createResetMarker({
 				projectId: basename(projectPath),
@@ -604,8 +623,8 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			console.warn(`[merge-agent] Memory reset marker creation failed (non-fatal): ${err}`);
 		}
 		try {
-			const { findWorkspacePath } = await import("./archive-planning-CoyIbgGK.js");
-			const { stopWorkspaceDocker } = await import("./workspace-manager-BO-6k3sP.js");
+			const { findWorkspacePath } = await import("./archive-planning-2w8WQaeJ.js");
+			const { stopWorkspaceDocker } = await import("./workspace-manager-DD6PDqV8.js");
 			const issueLower = issueId.toLowerCase();
 			const workspacePath = findWorkspacePath(projectPath, issueLower);
 			if (workspacePath) {
@@ -636,7 +655,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-CrBE6IhN.js");
+	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-DxMUi2eI.js");
 	const resolved = resolveProjectFromIssueSync(issueId);
 	if (!(resolved ? getProjectSync(resolved.projectKey) : null)?.release) {
 		setReviewStatusSync(issueId, {
@@ -646,7 +665,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-CBLQXDlH.js");
+	const { runRelease } = await import("./release-engine-CAai5W0V.js");
 	try {
 		await runRelease(issueId, projectPath);
 	} catch (err) {
@@ -665,11 +684,11 @@ 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-CdMUauyb.js"),
-		import("./github-client-Do3k-N1W.js"),
-		import("./linear-client-By7hjwuN.js"),
-		import("./rally-client-CzFymP7P.js"),
-		import("./typed-errors-CrN1AByg.js")
+		import("./issue-lifecycle-Cm7ydBGK.js"),
+		import("./github-client-DSVv6wX8.js"),
+		import("./linear-client-s65LNmlG.js"),
+		import("./rally-client-B1U5ewpO.js"),
+		import("./typed-errors-CH4roFIj.js")
 	]);
 	const { Effect, Layer } = effectModule;
 	const { IssueLifecycle, IssueLifecycleLive } = issueLifecycleModule;
@@ -1129,10 +1148,9 @@ async function scanForConflictMarkers(projectPath) {
 async function syncMainIntoWorkspace(projectPath, issueId) {
 	console.log(`[sync-main] Starting sync of main into workspace for ${issueId}`);
 	logActivity("sync_main_start", `Starting sync for ${issueId}`);
-	await Effect.runPromise(restoreTrackedBeadsExport(projectPath));
 	console.log(`[sync-main] Checking for uncommitted changes...`);
 	logActivity("sync_main_auto_commit", `Auto-committing uncommitted changes before sync`);
-	const autoCommit = await autoCommitWorkspaceChangesBeforeSync(projectPath);
+	const autoCommit = await autoCommitWorkspaceChangesBeforeSync(projectPath, issueId);
 	if (!autoCommit.success) {
 		const message = autoCommit.reason || "Failed to auto-commit uncommitted changes";
 		console.error(`[sync-main] ${message}`);
@@ -1326,7 +1344,6 @@ var init_merge_agent = __esmMin((() => {
 	init_config_yaml();
 	init_paths();
 	init_tracker_utils();
-	init_beads_restore();
 	init_validation();
 	init_projects();
 	init_git_utils();
@@ -1345,11 +1362,7 @@ var init_merge_agent = __esmMin((() => {
 		".claude/skills/",
 		".overdeck/"
 	];
-	SYNC_MAIN_MAIN_PREFERRED_PATHS = [
-		".pan/continues",
-		".pan/specs",
-		".beads"
-	];
+	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");
@@ -1401,4 +1414,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-B3u2szOL.js.map
+//# sourceMappingURL=merge-agent-Bu1hw9cz.js.map

package/server/{merge-agent-ejC7Wos8.js → merge-agent-D6LRIW63.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-B3u2szOL.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-Bu1hw9cz.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-DyqlgYGp.js → merge-batch-Bv6Z5K2H.js}

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

package/server/{merge-blockers-cq-aS2KG.js → merge-blockers-Dt43hJiW.js}

@@ -1,4 +1,4 @@
-import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-CAr-hfnJ.js";
+import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-DUQmrLkK.js";
 //#region ../../lib/cloister/merge-blockers.ts
 init_review_status_sync();
 /**
@@ -38,4 +38,4 @@ function getMergeBlockersPayload() {
 //#endregion
 export { getMergeBlockersPayload as t };
 
-//# sourceMappingURL=merge-blockers-cq-aS2KG.js.map
+//# sourceMappingURL=merge-blockers-Dt43hJiW.js.map

package/server/merge-ops-DwYi3U_x.js

@@ -0,0 +1,2 @@
+import { c as triggerMerge } from "./workspaces-DiAwBsb9.js";
+export { triggerMerge };

package/server/{merge-rebase-Dl7yIxtV.js → merge-rebase-B3vQcTq1.js}

@@ -1,4 +1,4 @@
-import { fr as GitError, gr as MergeConflictError, xr as init_errors } from "./config-yaml-cNOZcEww.js";
+import { Sr as init_errors, _r as MergeConflictError, pr as GitError } from "./config-yaml-BQs6GbD_.js";
 import { Effect } from "effect";
 import { existsSync } from "fs";
 import { join } from "path";
@@ -131,4 +131,4 @@ function rebaseFeatureBranch(workspacePath, featureBranch, baseBranch, issueId)
 //#endregion
 export { rebaseFeatureBranch };
 
-//# sourceMappingURL=merge-rebase-Dl7yIxtV.js.map
+//# sourceMappingURL=merge-rebase-B3vQcTq1.js.map

package/server/{merge-set-Dy0D0r3i.js → merge-set-BMEGEKQg.js}

@@ -1,3 +1,3 @@
-import { a as upsertMergeSetSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as withRepoArtifactUrlSync, r as getMergeSetSync, s as withRepoStateSync } from "./merge-set-CZ9Nbay0.js";
+import { a as upsertMergeSetSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as withRepoArtifactUrlSync, r as getMergeSetSync, s as withRepoStateSync } from "./merge-set-Pe3spe8k.js";
 init_merge_set();
 export { ensureMergeSetForIssueSync, getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync };

package/server/{merge-set-CZ9Nbay0.js → merge-set-Pe3spe8k.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fn as init_projects, kn as getProjectSync, nr as init_issue_id, or as resolveIssueIdSync, qn as resolveProjectFromIssueSync } from "./config-yaml-cNOZcEww.js";
-import { T as upsertMergeSet, i as getMergeSetFromDb, o as init_merge_sync } from "./merge-sync-D7jWLgCC.js";
+import { Fn as init_projects, kn as getProjectSync, qn as resolveProjectFromIssueSync, rr as init_issue_id, sr as resolveIssueIdSync } from "./config-yaml-BQs6GbD_.js";
+import { T as upsertMergeSet, i as getMergeSetFromDb, o as init_merge_sync } from "./merge-sync-STpg1hk3.js";
 import "effect";
 import { join } from "path";
 //#region ../../lib/project-repos.ts
@@ -136,4 +136,4 @@ var init_merge_set = __esmMin((() => {
 //#endregion
 export { upsertMergeSetSync as a, init_merge_set as i, ensureMergeSetForIssueSync as n, withRepoArtifactUrlSync as o, getMergeSetSync as r, withRepoStateSync as s, buildMergeSetForIssueSync as t };
 
-//# sourceMappingURL=merge-set-CZ9Nbay0.js.map
+//# sourceMappingURL=merge-set-Pe3spe8k.js.map

package/server/{merge-sync-CG9kDCdT.js → merge-sync-CpxFRIQ7.js}

@@ -1,3 +1,3 @@
-import { b as resetProcessingToQueued, o as init_merge_sync } from "./merge-sync-D7jWLgCC.js";
+import { b as resetProcessingToQueued, o as init_merge_sync } from "./merge-sync-STpg1hk3.js";
 init_merge_sync();
 export { resetProcessingToQueued };

package/server/{merge-sync-D7jWLgCC.js → merge-sync-STpg1hk3.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-Ba9mS6e6.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-DYwIXlK5.js";
 //#region ../../lib/overdeck/merge-sync.ts
 function isoFromMillis(value) {
 	return value == null ? void 0 : new Date(value).toISOString();
@@ -401,4 +401,4 @@ var init_merge_sync = __esmMin((() => {
 //#endregion
 export { transitionToMerging as C, setUatGenerationStackStartedAtSync as S, upsertMergeSet as T, markFailed as _, getUatGenerationSync as a, resetProcessingToQueued as b, isFlywheelGloballyPaused as c, listDuePendingAutoMerges as d, listProblemAutoMerges as f, markBlocked as g, listUatGenerationsWithStacksSync as h, getMergeSetFromDb as i, isMergeTrainEnabled as l, listUatGenerationsSync as m, getActionableAutoMerge as n, init_merge_sync as o, listUatGenerationNamesSync as p, getAllActiveQueues as r, insertUatGenerationSync as s, cancelPending as t, listActiveAutoMerges as u, markMerged as v, updateUatGenerationSync as w, scheduleAutoMergeWithResult as x, requeueToPending as y };
 
-//# sourceMappingURL=merge-sync-D7jWLgCC.js.map
+//# sourceMappingURL=merge-sync-STpg1hk3.js.map

package/server/{merge-train-CH33XJOH.js → merge-train-DLw2hDk0.js}

@@ -1,4 +1,4 @@
-import { l as isMergeTrainEnabled, o as init_merge_sync } from "./merge-sync-D7jWLgCC.js";
+import { l as isMergeTrainEnabled, o as init_merge_sync } from "./merge-sync-STpg1hk3.js";
 //#region ../../lib/cloister/merge-train-reconciler.ts
 init_merge_sync();
 /**
@@ -62,9 +62,9 @@ async function reconcileStaleSiblings(mergedIssueId, deps) {
 */
 async function runMergeTrainReconcile(mergedIssueId, opts = {}) {
 	if (!(opts.enabled ?? isMergeTrainEnabled)()) return [];
-	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-JoVdGnOg.js")).buildRealReconcileDeps());
+	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-BlCGLqwy.js")).buildRealReconcileDeps());
 }
 //#endregion
 export { runMergeTrainReconcile };
 
-//# sourceMappingURL=merge-train-CH33XJOH.js.map
+//# sourceMappingURL=merge-train-DLw2hDk0.js.map

package/server/{merge-train-deps-JoVdGnOg.js → merge-train-deps-BlCGLqwy.js}

@@ -1,6 +1,6 @@
-import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-cNOZcEww.js";
-import { W as spawnRun, t as init_agents } from "./agents-B9GwfCyp.js";
-import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-CAr-hfnJ.js";
+import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-BQs6GbD_.js";
+import { X as spawnRun, s as init_agents } from "./queries-srgusoi8.js";
+import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-DUQmrLkK.js";
 import { join } from "path";
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -66,4 +66,4 @@ function buildRealReconcileDeps() {
 //#endregion
 export { buildRealReconcileDeps };
 
-//# sourceMappingURL=merge-train-deps-JoVdGnOg.js.map
+//# sourceMappingURL=merge-train-deps-BlCGLqwy.js.map

package/server/{merge-verification-D4wTChdX.js → merge-verification-C4WMP40D.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-cNOZcEww.js";
-import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils--z8FLSWn.js";
-import { _ as listPullRequestsForHead, f as init_github_app, p as isGitHubAppConfigured } from "./github-app-u9-SX7Gc.js";
+import { Fn as init_projects, qn as resolveProjectFromIssueSync } from "./config-yaml-BQs6GbD_.js";
+import { i as resolveGitHubIssueSync, n as init_tracker_utils } from "./tracker-utils-Cl-Eaqrv.js";
+import { _ as listPullRequestsForHead, f as init_github_app, p as isGitHubAppConfigured } from "./github-app-CRUIvHuM.js";
 import { Effect } from "effect";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
@@ -121,4 +121,4 @@ var init_merge_verification = __esmMin((() => {
 //#endregion
 export { shouldSkipDispatchAsMerged as n, verifyMergedBeforeLifecycle as r, init_merge_verification as t };
 
-//# sourceMappingURL=merge-verification-D4wTChdX.js.map
+//# sourceMappingURL=merge-verification-C4WMP40D.js.map