@overdeck/desktop 0.46.0 → 0.47.0

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

@@ -1,16 +1,16 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.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 { Er as GitError, Fr as init_errors, Gn as init_projects, Gr as OVERDECK_HOME, Pr as VcsError, Zn as loadProjectsConfigSync, f as loadConfigSync, gr as init_issue_id, li as init_paths, t as init_config_yaml, vr as parseIssueIdSync } from "./config-yaml-CxdwhAIA.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 { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BDQDRopn.js";
+import { D as killSession, H as sessionExists, M as listSessionNames, i as capturePane, w as init_tmux, z as sendKeys } from "./tmux-CfDHob9M.js";
+import { C as setReviewStatusSync, E as init_pipeline, T as capturePipelineStageForIssue, _ as markWorkspaceStuck, d as getReviewStatusSync, p as init_review_status } from "./review-status-CGvlA4o_.js";
+import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-CJ6BHjcD.js";
+import { l as resolveWorkspaceRepoRootsSync, r as init_project_repos } from "./project-repos-B5pIphKg.js";
+import { n as recordFeatureRegistryLifecycle, t as init_feature_registry_population } from "./feature-registry-population-B6HpNWRy.js";
+import { a as init_git_utils, t as cleanupStaleLocks } from "./git-utils-CsvYfJU3.js";
+import { i as verifyMergedBeforeLifecycle, n as init_merge_verification } from "./merge-verification-NvaAd8CZ.js";
+import { n as init_merged_docker_cleanup_worker, t as enqueueMergedDockerCleanup } from "./merged-docker-cleanup-worker-Y1R06TEl.js";
+import { i as runQualityGates, n as init_validation } from "./validation-B_kIRfNe.js";
 import { dirname, resolve } from "node:path";
 import { Data, Effect } from "effect";
 import { appendFileSync, existsSync, mkdirSync } from "fs";
@@ -23,7 +23,7 @@ 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-BP160gU7.js"), import("./staleness-BQ-0gMYK.js")]);
+		const [{ getBuildInfo }, { computeBuildStaleness }] = await Promise.all([import("./build-info-CpG__c63.js"), import("./staleness-CGTZyp6V.js")]);
 		return computeBuildStaleness({
 			repoRoot,
 			buildCommit: getBuildInfo().buildCommit
@@ -32,9 +32,9 @@ async function shouldRestartForPostMerge(repoRoot, dependencies = {}) {
 		(dependencies.log ?? console.log)("Running build already contains origin/main build inputs — skipping deploy restart");
 		return false;
 	}
-	const assessment = await (dependencies.getWindowAssessment ?? (async () => (await import("./deploy-window-jOiPRHL0.js")).getDeployWindowAssessment()))();
+	const assessment = await (dependencies.getWindowAssessment ?? (async () => (await import("./deploy-window-CFRZ0-kt.js")).getDeployWindowAssessment()))();
 	if (assessment.reason) {
-		await (dependencies.recordIntent ?? (await import("./deploy-queue-9SrhZR63.js")).recordDeployIntent)({
+		await (dependencies.recordIntent ?? (await import("./deploy-queue-gHJBycaF.js")).recordDeployIntent)({
 			requestedBy: "merge-step0",
 			reason: assessment.reason,
 			blockedBy: assessment.verifyingIssues
@@ -730,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-BKOYB616.js");
+		const { getTldrDaemonServiceSync } = await import("./tldr-daemon-CvWXBhX1.js");
 		const tldrService = getTldrDaemonServiceSync(projectPath, venvPath);
 		if (!(await tldrService.getStatus()).running) {
 			console.log(`[merge-agent] TLDR daemon not running, skipping notification`);
@@ -766,7 +766,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 			return;
 		}
 		try {
-			const { findSpecByIssue } = await import("./specs-Bt7WJDoC.js");
+			const { findSpecByIssue } = await import("./specs--enInima.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`);
@@ -793,7 +793,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		let dockerRetryReason = null;
 		try {
-			const { teardownWorkspaceDockerByNamePromise } = await import("./docker-BMVTSFL5.js");
+			const { teardownWorkspaceDockerByNamePromise } = await import("./docker-Y3PElJb0.js");
 			const teardown = await teardownWorkspaceDockerByNamePromise(issueId.toLowerCase());
 			if (teardown.networkRemoved) {
 				console.log(`[merge-agent] ✓ Removed Docker stack/network: ${teardown.steps.join("; ")}`);
@@ -844,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-Dv7AV_R1.js");
+			const { cleanupMergedLabels } = await import("./label-cleanup-Dwnky8FG.js");
 			const ghResolved = resolveGitHubIssueSync(issueId);
 			const labelCtx = ghResolved.isGitHub ? {
 				issueId,
@@ -894,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-BKKkxKgK.js");
-			const { killSession, sessionExists } = await import("./tmux-DQ6jB76i.js");
+			const { setAgentPaused, getAgentState } = await import("./agents-ePFVoZbu.js");
+			const { killSession, sessionExists } = await import("./tmux-Ctk6RV5l.js");
 			const issueLower = issueId.toLowerCase();
 			const reason = "awaiting close-out (verify on main)";
 			for (const agentId of [`agent-${issueLower}`, `planning-${issueLower}`]) {
@@ -920,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-CD4RCI0Y.js");
-			const { resolveProjectFromIssueSync } = await import("./projects-B03Wr-xc.js");
+			const { killAllReviewerSessions } = await import("./review-agent-BTCNkq2h.js");
+			const { resolveProjectFromIssueSync } = await import("./projects-_n3Zui6K.js");
 			const projectKey = resolveProjectFromIssueSync(issueId)?.projectKey;
 			if (projectKey) {
 				const { killed } = await Effect.runPromise(killAllReviewerSessions(projectKey, issueId));
@@ -935,7 +935,7 @@ async function postMergeLifecycle(issueId, projectPath, sourceBranch, options) {
 		}
 		await killPostMergeRoleSessions(issueId);
 		try {
-			const { createResetMarker } = await import("./cli-DmXETsw-.js");
+			const { createResetMarker } = await import("./cli-CjOCSnfj.js");
 			const timestamp = (/* @__PURE__ */ new Date()).toISOString();
 			const marker = await createResetMarker({
 				projectId: basename$1(projectPath),
@@ -973,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-B03Wr-xc.js");
+	const { resolveProjectFromIssueSync, getProjectSync } = await import("./projects-_n3Zui6K.js");
 	const resolved = resolveProjectFromIssueSync(issueId);
 	if (!(resolved ? getProjectSync(resolved.projectKey) : null)?.release) {
 		setReviewStatusSync(issueId, {
@@ -983,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-lPUp-MTd.js");
+	const { runRelease } = await import("./release-engine-B2X9AfFC.js");
 	try {
 		await runRelease(issueId, projectPath);
 	} catch (err) {
@@ -1002,11 +1002,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-9gk3fnXN.js"),
-		import("./github-client-Cj0yl_07.js"),
-		import("./linear-client-CY4O_Tu3.js"),
-		import("./rally-client-CxsA6ExK.js"),
-		import("./typed-errors-BHhE85Ul.js")
+		import("./issue-lifecycle-BqSuQvbn.js"),
+		import("./github-client-B6KM9_wA.js"),
+		import("./linear-client-CnbtHiic.js"),
+		import("./rally-client-CCX0hADj.js"),
+		import("./typed-errors-CKeoDdU3.js")
 	]);
 	const { Effect, Layer } = effectModule;
 	const { IssueLifecycle, IssueLifecycleLive } = issueLifecycleModule;
@@ -1742,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-DdMVSV2Y.js.map
+//# sourceMappingURL=merge-agent-BLUgRsz3.js.map

package/server/{merge-agent-DrXa1CpW.js → merge-agent-DQTXZk8z.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-DdMVSV2Y.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-BLUgRsz3.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-C5q1c1GX.js → merge-batch-Cp_j9BGk.js}

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

package/server/{merge-completeness-BMm8tMyZ.js → merge-completeness-B46KqhtY.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { r as init_project_repos, s as resolveProjectReposForIssueSync } from "./project-repos-C0nuoBGv.js";
-import { a as patchMergeSetRepoSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as patchMergeSetReposSync, r as getMergeSetSync } from "./merge-set-DH7ot3yz.js";
-import { n as getForgeAdapter, r as init_forge } from "./forge-CZbSg6Ds.js";
+import { r as init_project_repos, s as resolveProjectReposForIssueSync } from "./project-repos-B5pIphKg.js";
+import { a as patchMergeSetRepoSync, i as init_merge_set, n as ensureMergeSetForIssueSync, o as patchMergeSetReposSync, r as getMergeSetSync } from "./merge-set-CBgHfwM0.js";
+import { n as getForgeAdapter, r as init_forge } from "./forge-BaKGCya6.js";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
 //#region ../../lib/cloister/merge-completeness.ts
@@ -274,4 +274,4 @@ var init_merge_completeness = __esmMin((() => {
 //#endregion
 export { observeForgeMergeState as a, init_merge_completeness as i, assessRepoMergeCompleteness as n, reconcileStrandedRepos as o, hasPositiveMergedEvidence as r, assessMergeCompleteness as t };
 
-//# sourceMappingURL=merge-completeness-BMm8tMyZ.js.map
+//# sourceMappingURL=merge-completeness-B46KqhtY.js.map

package/server/{merge-completeness-D0ljXbk3.js → merge-completeness-BLbB5-6n.js}

@@ -1,3 +1,3 @@
-import { a as observeForgeMergeState, i as init_merge_completeness, n as assessRepoMergeCompleteness, o as reconcileStrandedRepos } from "./merge-completeness-BMm8tMyZ.js";
+import { a as observeForgeMergeState, i as init_merge_completeness, n as assessRepoMergeCompleteness, o as reconcileStrandedRepos } from "./merge-completeness-B46KqhtY.js";
 init_merge_completeness();
 export { assessRepoMergeCompleteness, observeForgeMergeState, reconcileStrandedRepos };

package/server/merge-ops-1abz6O_P.js

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

package/server/merge-rebase-CJJVAJuz.js

@@ -0,0 +1,2 @@
+import { t as rebaseFeatureBranch } from "./merge-rebase-DIkBjgwq.js";
+export { rebaseFeatureBranch };

package/server/{merge-rebase-xLnMlw5h.js → merge-rebase-DIkBjgwq.js}

@@ -1,4 +1,4 @@
-import { Ar as MergeConflictError, Er as GitError, Fr as init_errors } from "./config-yaml-CmOPzmBb.js";
+import { Ar as MergeConflictError, Er as GitError, Fr as init_errors } from "./config-yaml-CxdwhAIA.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 as t };
 
-//# sourceMappingURL=merge-rebase-xLnMlw5h.js.map
+//# sourceMappingURL=merge-rebase-DIkBjgwq.js.map

package/server/{merge-set-DH7ot3yz.js → merge-set-CBgHfwM0.js}

@@ -1,7 +1,7 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Gn as init_projects, ar as resolveProjectFromIssueSync, br as resolveIssueIdSync, gr as init_issue_id } from "./config-yaml-CmOPzmBb.js";
-import { o as getMergeSetFromDb, s as init_merge_sync, v as patchMergeSetRepo, w as upsertMergeSet, y as patchMergeSetRepos } from "./merge-sync-CQ-LgZ1_.js";
-import { c as resolveProjectReposFromResolvedIssueSync, r as init_project_repos } from "./project-repos-C0nuoBGv.js";
+import { Gn as init_projects, ar as resolveProjectFromIssueSync, br as resolveIssueIdSync, gr as init_issue_id } from "./config-yaml-CxdwhAIA.js";
+import { T as upsertMergeSet, b as patchMergeSetRepos, c as init_merge_sync, s as getMergeSetFromDb, y as patchMergeSetRepo } from "./merge-sync-kr4vqyjM.js";
+import { c as resolveProjectReposFromResolvedIssueSync, r as init_project_repos } from "./project-repos-B5pIphKg.js";
 import "effect";
 //#region ../../lib/merge-set.ts
 function upsertMergeSetSync(mergeSet) {
@@ -86,4 +86,4 @@ var init_merge_set = __esmMin((() => {
 //#endregion
 export { patchMergeSetRepoSync as a, withRepoArtifactUrlSync as c, init_merge_set as i, withRepoStateSync as l, ensureMergeSetForIssueSync as n, patchMergeSetReposSync as o, getMergeSetSync as r, upsertMergeSetSync as s, buildMergeSetForIssueSync as t };
 
-//# sourceMappingURL=merge-set-DH7ot3yz.js.map
+//# sourceMappingURL=merge-set-CBgHfwM0.js.map

package/server/{merge-set-DzsOTBg5.js → merge-set-DeUxFsC3.js}

@@ -1,3 +1,3 @@
-import { c as withRepoArtifactUrlSync, i as init_merge_set, l as withRepoStateSync, n as ensureMergeSetForIssueSync, r as getMergeSetSync, s as upsertMergeSetSync } from "./merge-set-DH7ot3yz.js";
+import { c as withRepoArtifactUrlSync, i as init_merge_set, l as withRepoStateSync, n as ensureMergeSetForIssueSync, r as getMergeSetSync, s as upsertMergeSetSync } from "./merge-set-CBgHfwM0.js";
 init_merge_set();
 export { ensureMergeSetForIssueSync, getMergeSetSync, upsertMergeSetSync, withRepoArtifactUrlSync, withRepoStateSync };

package/server/{merge-idOG--29.js → merge-sr8Nrnmi.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-Bpx4jjht.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-DiW9RdSB.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-sync-CpGmk6Ch.js

@@ -0,0 +1,3 @@
+import { A as listUatGenerationsSync, C as scheduleAutoMergeWithResult, D as hasUncleanedTerminalUatGenerationSync, E as getUatGenerationSync, F as updateUatGenerationSync, M as markUatGenerationRepoPromotedSync, N as setUatGenerationStackStartedAtSync, O as insertUatGenerationSync, P as updateUatGenerationStatusSync, S as resetProcessingToQueued, T as upsertMergeSet, _ as markMerged, a as getAllActiveQueues, b as patchMergeSetRepos, c as init_merge_sync, d as isMergeTrainEnabledForProject, f as listActiveAutoMerges, g as markFailed, h as markBlocked, i as getActionableAutoMerge, j as listUatGenerationsWithStacksSync, k as listUatGenerationNamesSync, l as isFlywheelGloballyPaused, m as listProblemAutoMerges, n as countActionableAutoMerges, o as getAllMergeSetsFromDb, p as listDuePendingAutoMerges, r as deleteMergeSet, s as getMergeSetFromDb, t as cancelPending, u as isMergeTrainEnabled, v as markMergingBlocked, w as transitionToMerging, x as requeueToPending, y as patchMergeSetRepo } from "./merge-sync-kr4vqyjM.js";
+init_merge_sync();
+export { cancelPending, countActionableAutoMerges, deleteMergeSet, getActionableAutoMerge, getAllActiveQueues, getAllMergeSetsFromDb, getMergeSetFromDb, getUatGenerationSync, hasUncleanedTerminalUatGenerationSync, insertUatGenerationSync, isFlywheelGloballyPaused, isMergeTrainEnabled, isMergeTrainEnabledForProject, listActiveAutoMerges, listDuePendingAutoMerges, listProblemAutoMerges, listUatGenerationNamesSync, listUatGenerationsSync, listUatGenerationsWithStacksSync, markBlocked, markFailed, markMerged, markMergingBlocked, markUatGenerationRepoPromotedSync, patchMergeSetRepo, patchMergeSetRepos, requeueToPending, resetProcessingToQueued, scheduleAutoMergeWithResult, setUatGenerationStackStartedAtSync, transitionToMerging, updateUatGenerationStatusSync, updateUatGenerationSync, upsertMergeSet };

package/server/{merge-sync-CQ-LgZ1_.js → merge-sync-kr4vqyjM.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BjuxvjdS.js";
+import { d as getOverdeckDatabaseSync, f as init_infra } from "./infra-BDQDRopn.js";
 //#region ../../lib/overdeck/merge-sync-time.ts
 /**
 * merge-sync-time.ts — timestamp conversion shared by the merge-domain sync
@@ -444,7 +444,7 @@ function markMergingBlocked(id, reason) {
 }
 /** Drop-in for markMerged() from pending-auto-merges-db.ts. */
 function markMerged(id) {
-	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'merged', merged_at = ? WHERE id = ? AND status = 'merging'").run(nowMillis(), id).changes === 1;
+	return getOverdeckDatabaseSync().prepare("UPDATE pending_auto_merges SET status = 'merged', merged_at = ? WHERE id = ? AND status IN ('pending','blocked','failed','merging')").run(nowMillis(), id).changes === 1;
 }
 /** Drop-in for cancelPending() from pending-auto-merges-db.ts. */
 function cancelPending(id, cancelledBy) {
@@ -455,6 +455,9 @@ function getActionableAutoMerge(issueId) {
 	const row = getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging','blocked','failed') ORDER BY id DESC LIMIT 1").get(issueId);
 	return row ? rowToPendingAutoMerge(row) : null;
 }
+function countActionableAutoMerges(issueId) {
+	return getOverdeckDatabaseSync().prepare("SELECT COUNT(*) AS n FROM pending_auto_merges WHERE issue_id = ? AND status IN ('pending','merging','blocked','failed')").get(issueId)?.n ?? 0;
+}
 /** Drop-in for listActiveAutoMerges() from pending-auto-merges-db.ts. */
 function listActiveAutoMerges(limit = 100) {
 	return getOverdeckDatabaseSync().prepare("SELECT * FROM pending_auto_merges WHERE status IN ('pending','merging') ORDER BY scheduled_merge_at ASC, id ASC LIMIT ?").all(limit).map(rowToPendingAutoMerge);
@@ -652,6 +655,6 @@ var init_merge_sync = __esmMin((() => {
 	MERGE_SET_REPO_CAS_FAILED = /* @__PURE__ */ new Error("merge-set-repo-cas-failed");
 }));
 //#endregion
-export { listUatGenerationsWithStacksSync as A, transitionToMerging as C, insertUatGenerationSync as D, hasUncleanedTerminalUatGenerationSync as E, setUatGenerationStackStartedAtSync as M, updateUatGenerationStatusSync as N, listUatGenerationNamesSync as O, updateUatGenerationSync as P, scheduleAutoMergeWithResult as S, getUatGenerationSync as T, markMergingBlocked as _, getAllMergeSetsFromDb as a, requeueToPending as b, isFlywheelGloballyPaused as c, listActiveAutoMerges as d, listDuePendingAutoMerges as f, markMerged as g, markFailed as h, getAllActiveQueues as i, markUatGenerationRepoPromotedSync as j, listUatGenerationsSync as k, isMergeTrainEnabled as l, markBlocked as m, deleteMergeSet as n, getMergeSetFromDb as o, listProblemAutoMerges as p, getActionableAutoMerge as r, init_merge_sync as s, cancelPending as t, isMergeTrainEnabledForProject as u, patchMergeSetRepo as v, upsertMergeSet as w, resetProcessingToQueued as x, patchMergeSetRepos as y };
+export { listUatGenerationsSync as A, scheduleAutoMergeWithResult as C, hasUncleanedTerminalUatGenerationSync as D, getUatGenerationSync as E, updateUatGenerationSync as F, markUatGenerationRepoPromotedSync as M, setUatGenerationStackStartedAtSync as N, insertUatGenerationSync as O, updateUatGenerationStatusSync as P, resetProcessingToQueued as S, upsertMergeSet as T, markMerged as _, getAllActiveQueues as a, patchMergeSetRepos as b, init_merge_sync as c, isMergeTrainEnabledForProject as d, listActiveAutoMerges as f, markFailed as g, markBlocked as h, getActionableAutoMerge as i, listUatGenerationsWithStacksSync as j, listUatGenerationNamesSync as k, isFlywheelGloballyPaused as l, listProblemAutoMerges as m, countActionableAutoMerges as n, getAllMergeSetsFromDb as o, listDuePendingAutoMerges as p, deleteMergeSet as r, getMergeSetFromDb as s, cancelPending as t, isMergeTrainEnabled as u, markMergingBlocked as v, transitionToMerging as w, requeueToPending as x, patchMergeSetRepo as y };
 
-//# sourceMappingURL=merge-sync-CQ-LgZ1_.js.map
+//# sourceMappingURL=merge-sync-kr4vqyjM.js.map

package/server/{merge-train-DTEMyIu4.js → merge-train-Dmrcus12.js}

@@ -1,5 +1,5 @@
-import { Gn as init_projects, ar as resolveProjectFromIssueSync, zn as getProjectSync } from "./config-yaml-CmOPzmBb.js";
-import { s as init_merge_sync, u as isMergeTrainEnabledForProject } from "./merge-sync-CQ-LgZ1_.js";
+import { Gn as init_projects, ar as resolveProjectFromIssueSync, zn as getProjectSync } from "./config-yaml-CxdwhAIA.js";
+import { c as init_merge_sync, d as isMergeTrainEnabledForProject } from "./merge-sync-kr4vqyjM.js";
 //#region ../../lib/cloister/merge-train-reconciler.ts
 init_projects();
 init_merge_sync();
@@ -72,9 +72,9 @@ async function runMergeTrainReconcile(mergedIssueId, opts = {}) {
 		if (!config) return false;
 		return isMergeTrainEnabledForProject(config);
 	}))()) return [];
-	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-CNPJzepw.js")).buildRealReconcileDeps());
+	return reconcileStaleSiblings(mergedIssueId, opts.deps ?? (await import("./merge-train-deps-D_uGX91G.js")).buildRealReconcileDeps());
 }
 //#endregion
 export { runMergeTrainReconcile };
 
-//# sourceMappingURL=merge-train-DTEMyIu4.js.map
+//# sourceMappingURL=merge-train-Dmrcus12.js.map

package/server/{merge-train-deps-CNPJzepw.js → merge-train-deps-D_uGX91G.js}

@@ -1,6 +1,6 @@
-import { Gn as init_projects, ar as resolveProjectFromIssueSync } from "./config-yaml-CmOPzmBb.js";
-import { b as init_agents, dt as spawnRun } from "./queries-DHJm7bTd.js";
-import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-483sujRo.js";
+import { Gn as init_projects, ar as resolveProjectFromIssueSync } from "./config-yaml-CxdwhAIA.js";
+import { b as init_agents, dt as spawnRun } from "./queries-C-MUZaIy.js";
+import { c as init_review_status_sync, r as getAllReviewStatusesFromDb } from "./review-status-sync-0GxOqeqF.js";
 import { join } from "path";
 import { exec } from "child_process";
 import { promisify } from "util";
@@ -47,23 +47,29 @@ function buildRealReconcileDeps() {
 			}
 		},
 		reDispatchVerification: async (issueId) => {
-			await spawnRun(issueId, "review", { prompt: "Your branch was automatically rebased onto the latest main after another feature merged. Re-review on the new HEAD and confirm the issue is still correct and ready to merge." });
+			await spawnRun(issueId, "review", {
+				prompt: "Your branch was automatically rebased onto the latest main after another feature merged. Re-review on the new HEAD and confirm the issue is still correct and ready to merge.",
+				startedBy: "merge-train:verification"
+			});
 		},
 		dispatchConflictResolver: async (issueId, mergedIssueId) => {
-			await spawnRun(issueId, "work", { prompt: [
-				`Your feature branch could not be cleanly rebased onto the latest main because ${mergedIssueId} just merged and conflicts with your changes.`,
-				"",
-				`Resolve the rebase conflict WITHOUT degrading either feature:`,
-				`1. Read what ${mergedIssueId} changed (git log/diff on origin/main) AND what your issue (${issueId}) intended.`,
-				`2. Rebase your branch onto origin/main and resolve each conflict so BOTH features' intent is preserved.`,
-				`3. Build, run tests, commit, and push, then re-request review.`,
-				"",
-				`Do not blindly accept one side of a conflict — understand both changesets first.`
-			].join("\n") });
+			await spawnRun(issueId, "work", {
+				prompt: [
+					`Your feature branch could not be cleanly rebased onto the latest main because ${mergedIssueId} just merged and conflicts with your changes.`,
+					"",
+					`Resolve the rebase conflict WITHOUT degrading either feature:`,
+					`1. Read what ${mergedIssueId} changed (git log/diff on origin/main) AND what your issue (${issueId}) intended.`,
+					`2. Rebase your branch onto origin/main and resolve each conflict so BOTH features' intent is preserved.`,
+					`3. Build, run tests, commit, and push, then re-request review.`,
+					"",
+					`Do not blindly accept one side of a conflict — understand both changesets first.`
+				].join("\n"),
+				startedBy: "merge-train:conflict-resolver"
+			});
 		}
 	};
 }
 //#endregion
 export { buildRealReconcileDeps };
 
-//# sourceMappingURL=merge-train-deps-CNPJzepw.js.map
+//# sourceMappingURL=merge-train-deps-D_uGX91G.js.map

package/server/{merge-verification-x3JO8Dtz.js → merge-verification-NvaAd8CZ.js}

@@ -1,9 +1,9 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { Gn as init_projects, ar as resolveProjectFromIssueSync } from "./config-yaml-CmOPzmBb.js";
-import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-L0FKtjq2.js";
-import { i as init_merge_set, r as getMergeSetSync } from "./merge-set-DH7ot3yz.js";
-import { f as init_github_app, p as isGitHubAppConfigured, v as listPullRequestsForHead } from "./github-app-CQ1Lo6LA.js";
-import { i as init_merge_completeness, r as hasPositiveMergedEvidence, t as assessMergeCompleteness } from "./merge-completeness-BMm8tMyZ.js";
+import { Gn as init_projects, ar as resolveProjectFromIssueSync } from "./config-yaml-CxdwhAIA.js";
+import { n as resolveGitHubIssueSync, t as init_tracker_utils } from "./tracker-utils-CJ6BHjcD.js";
+import { i as init_merge_set, r as getMergeSetSync } from "./merge-set-CBgHfwM0.js";
+import { f as init_github_app, p as isGitHubAppConfigured, v as listPullRequestsForHead } from "./github-app-CmNk0zLU.js";
+import { i as init_merge_completeness, r as hasPositiveMergedEvidence, t as assessMergeCompleteness } from "./merge-completeness-B46KqhtY.js";
 import { Effect } from "effect";
 import { exec } from "node:child_process";
 import { promisify } from "node:util";
@@ -217,4 +217,4 @@ var init_merge_verification = __esmMin((() => {
 //#endregion
 export { verifyMergedBeforeLifecycle as i, init_merge_verification as n, shouldSkipDispatchAsMerged as r, handlePostRebaseVerificationDeferral as t };
 
-//# sourceMappingURL=merge-verification-x3JO8Dtz.js.map
+//# sourceMappingURL=merge-verification-NvaAd8CZ.js.map

package/server/{merged-docker-cleanup-worker-Cdi9apm-.js → merged-docker-cleanup-worker-DH_hrGPI.js}

@@ -1,3 +1,3 @@
-import { n as init_merged_docker_cleanup_worker, r as reconcileMergedDockerCleanupQueue } from "./merged-docker-cleanup-worker-CTpC27Bs.js";
+import { n as init_merged_docker_cleanup_worker, r as reconcileMergedDockerCleanupQueue } from "./merged-docker-cleanup-worker-Y1R06TEl.js";
 init_merged_docker_cleanup_worker();
 export { reconcileMergedDockerCleanupQueue };

package/server/{merged-docker-cleanup-worker-CTpC27Bs.js → merged-docker-cleanup-worker-Y1R06TEl.js}

@@ -1,6 +1,6 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
 import { o as init_activity_logger, r as emitActivityEntrySync } from "./activity-logger-CyteR4JO.js";
-import { n as init_review_status_source, s as resolveCanonicalReviewStatus } from "./review-status-source-CpvJnvnQ.js";
+import { n as init_review_status_source, s as resolveCanonicalReviewStatus } from "./review-status-source-DIk1JSow.js";
 //#region ../../lib/cloister/merged-docker-cleanup-worker.ts
 function retryDelayMs(attempts) {
 	return Math.min(RETRY_BASE_MS * 2 ** Math.max(0, attempts - 1), RETRY_MAX_MS);
@@ -30,7 +30,7 @@ function recordFailure(entry, reason) {
 	console.warn(`[deacon] Merged-issue Docker cleanup failed for ${entry.issueId}; retry ${entry.attempts} after ${new Date(entry.nextAttemptAt).toISOString()}: ${reason}`);
 }
 async function drainQueue() {
-	const { teardownWorkspaceDockerByNamePromise } = await import("./docker-BMVTSFL5.js");
+	const { teardownWorkspaceDockerByNamePromise } = await import("./docker-Y3PElJb0.js");
 	for (let entry = nextEligibleEntry(); entry; entry = nextEligibleEntry()) {
 		entry.running = true;
 		const eligibility = resolveCanonicalReviewStatus(entry.issueId);
@@ -104,4 +104,4 @@ var init_merged_docker_cleanup_worker = __esmMin((() => {
 //#endregion
 export { init_merged_docker_cleanup_worker as n, reconcileMergedDockerCleanupQueue as r, enqueueMergedDockerCleanup as t };
 
-//# sourceMappingURL=merged-docker-cleanup-worker-CTpC27Bs.js.map
+//# sourceMappingURL=merged-docker-cleanup-worker-Y1R06TEl.js.map

package/server/{multipart-parser-IMSBfePV.js → multipart-parser-R-oC8dQg.js}

@@ -1,5 +1,5 @@
 import { n as __esmMin } from "./rolldown-runtime-DNCzzKnI.js";
-import { a as File, i as init_esm_min, n as FormData, t as init_from } from "./from-D_4_dk7i.js";
+import { a as File, i as init_esm_min, n as FormData, t as init_from } from "./from-B3tZbB55.js";
 //#region ../../../node_modules/.bun/node-fetch@3.3.2/node_modules/node-fetch/src/utils/multipart-parser.js
 function _fileName(headerValue) {
 	const m = headerValue.match(/\bfilename=("(.*?)"|([^()<>@,;:\\"/[\]?={}\s\t]+))($|;\s)/i);
@@ -293,4 +293,4 @@ __esmMin((() => {
 }))();
 export { toFormData };
 
-//# sourceMappingURL=multipart-parser-IMSBfePV.js.map
+//# sourceMappingURL=multipart-parser-R-oC8dQg.js.map

package/server/{no-resume-mode-C5ULAXwO.js → no-resume-mode-BgD0JUmM.js}

@@ -89,4 +89,4 @@ var init_no_resume_mode = __esmMin((() => {
 //#endregion
 export { init_boot_gates as a, formatBootGateState as i, isExplicitNoResumeRequest as n, resolveBootGates as o, isNoResumeValueEnabled as r, init_no_resume_mode as t };
 
-//# sourceMappingURL=no-resume-mode-C5ULAXwO.js.map
+//# sourceMappingURL=no-resume-mode-BgD0JUmM.js.map

package/server/node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@overdeck/desktop-server",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
@@ -302,9 +302,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "26.1.1",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.1.tgz",
-      "integrity": "sha512-nxAkRSVkN1Y0JC1W8ky/fTfkGsMmcrRsbx+3XoZE+rMOX71kLYTV7fLXpqud1GpbpP5TuffXFqfX7fH2GgZREw==",
+      "version": "26.1.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.2.tgz",
+      "integrity": "sha512-Vu4a5UFA9rIIFJ7rB/Vaafh9lrCQszopTCx6KjFboXTGQbPNasehVR5TEiithSDGyd1DEiUByggTZsg8jukeIg==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~8.3.0"

package/server/node_modules/@types/node/README.md

@@ -8,7 +8,7 @@ This package contains type definitions for node (https://nodejs.org/).
 Files were exported from https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node.
 
 ### Additional Details
- * Last updated: Wed, 08 Jul 2026 06:47:45 GMT
+ * Last updated: Mon, 27 Jul 2026 17:32:10 GMT
  * Dependencies: [undici-types](https://npmjs.com/package/undici-types)
 
 # Credits

package/server/node_modules/@types/node/crypto.d.ts

@@ -1185,7 +1185,7 @@ declare module "node:crypto" {
      * and it will be impossible to extract the private key from the returned object.
      * @since v11.6.0
      */
-    function createPublicKey(key: PublicKeyInput | RawPublicKeyInput | JsonWebKeyInput | BinaryLike): KeyObject;
+    function createPublicKey(key: PublicKeyInput | RawPublicKeyInput | JsonWebKeyInput | KeyLike): KeyObject;
     /**
      * Creates and returns a new key object containing a secret key for symmetric
      * encryption or `Hmac`.

package/server/node_modules/@types/node/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@types/node",
-    "version": "26.1.1",
+    "version": "26.1.2",
     "description": "TypeScript definitions for node",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/node",
     "license": "MIT",
@@ -150,6 +150,6 @@
         "undici-types": "~8.3.0"
     },
     "peerDependencies": {},
-    "typesPublisherContentHash": "a59119b073061829bc67a5bf6bc2b8ecb0a5a6196058e3c73172a00440f4e16d",
+    "typesPublisherContentHash": "359a01a58cecf5a30fb7b7a7b10c4f5c332339421ef5cbc9932fc492f472a5b4",
     "typeScriptVersion": "5.6"
 }