@deksden-com/dd-flow-cli 0.9.0-beta.11 → 0.9.0-beta.110

package/dist/services/merge-queue.js

@@ -4,10 +4,42 @@ import { appendAudit } from "./audit.js";
 import { requireProjectByRoot } from "./projects.js";
 import { persistProtocolState, protocolRunDiagnostics, readProtocolRuntimeState, requireProtocol } from "./protocols.js";
 import { resolveProjectRoot } from "../storage/paths.js";
-import { ensureLaneWorkspace, heartbeatLaneLock, releaseLaneLock, requireLaneLockOwner, waitAcquireLaneLock } from "./lanes.js";
+import { ensureLaneWorkspace, heartbeatLaneLock, laneRecord, prepareLaneLock, prepareLaneWaitTiming, prepareLaneWorkspace, releaseLaneLock, requireLaneLockOwner, waitAcquireLaneLock } from "./lanes.js";
 import { stopMergeWorker, stoppedMergeWorkerState } from "./sessions.js";
 import { getProtocolBranchContext, requireClaimableBranchBundle } from "./branch-context.js";
 const mergeLockTtlSeconds = 300;
+/** SQL evidence comes from the same read snapshot as filesystem preparation.
+ * Bundle membership scans only branch metadata; unrelated RUN writes do not
+ * invalidate an individual job's accepted inputs. */
+function prepareMergePublication(context, root, workerId, prepare, protocolIds, mode, requireLock = true) {
+    const project = requireProjectByRoot(context, resolveProjectRoot(root));
+    return context.db.readSnapshot(() => {
+        const value = prepare(), ids = JSON.stringify(protocolIds(value));
+        const observe = () => ({
+            root: context.db.get("SELECT root FROM projects WHERE id = ?", [project.id]),
+            lane: context.db.get("SELECT workspace_path, expected_branch, status FROM lanes WHERE project_id = ? AND name = 'merge'", [project.id]),
+            lock: context.db.get("SELECT id, worker_id, lease_token FROM lane_locks WHERE project_id = ? AND lane = 'merge' AND status = 'active'", [project.id]),
+            worker: workerId ? stoppedMergeWorkerState(context, project.id, workerId) : null,
+            queue: mode === "head" ? context.db.all("SELECT * FROM merge_queue WHERE project_id = ? AND status IN ('ready','requeued') ORDER BY created_at, id LIMIT 1", [project.id])
+                : context.db.all(`SELECT * FROM merge_queue WHERE project_id = ? ${mode === "bundle" ? "" : "AND protocol_id IN (SELECT value FROM json_each(?))"} ORDER BY id`, mode === "bundle" ? [project.id] : [project.id, ids]),
+            protocols: context.db.all("SELECT * FROM protocols WHERE project_id = ? AND id IN (SELECT value FROM json_each(?)) ORDER BY id", [project.id, ids]),
+            states: context.db.all("SELECT protocol_id, payload_json FROM audit_events WHERE id IN (SELECT MAX(id) FROM audit_events WHERE project_id = ? AND event_type = 'protocol.state_projection' AND protocol_id IN (SELECT value FROM json_each(?)) GROUP BY protocol_id) ORDER BY protocol_id", [project.id, ids]),
+            runs: context.db.all("SELECT id, subject_id, status, verdict, next_action, index_json, created_at, updated_at, completed_at FROM runs WHERE project_id = ? AND subject_type = 'protocol' AND subject_id IN (SELECT value FROM json_each(?)) ORDER BY id", [project.id, ids]),
+            ...(mode === "bundle" ? {
+                membership: context.db.all("SELECT id, status, stage, next_action, workspace_json, route_json, active_def_json FROM protocols WHERE project_id = ? ORDER BY id", [project.id]),
+                worktrees: context.db.all("SELECT protocol_id, integration_branch, feature_branch, base_ref, worktree_path, status FROM worktree_records WHERE project_id = ? ORDER BY protocol_id", [project.id]),
+                sessions: context.db.all("SELECT session_id, protocol_id, worker_id, flow_kind, status, current_stage, next_action FROM sessions WHERE project_id = ? AND status IN ('pending','active','waiting_user','blocked','stopping') ORDER BY session_id", [project.id])
+            } : {})
+        });
+        const expected = JSON.stringify(observe());
+        return { value, assertCurrent: () => {
+                if (JSON.stringify(observe()) !== expected)
+                    throw new AppError("merge_preparation_changed", "Merge ownership or input authority changed during preparation", 1, { effect: "no_effect" });
+                if (requireLock && !context.db.get("SELECT 1 FROM lane_locks WHERE project_id = ? AND lane = 'merge' AND status = 'active' AND worker_id = ? AND expires_at > ?", [project.id, workerId, context.now()]))
+                    throw new AppError("lane_lock_not_active", "Prepared merge lost its live lane lease", 1, { effect: "no_effect" });
+            } };
+    });
+}
 export function getMergeQueueStatus(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     return {
@@ -18,7 +50,10 @@ export function getMergeQueueStatus(context, input) {
 export function getMergeBundleStatus(context, input) {
     return getProtocolBranchContext(context, { projectRoot: input.projectRoot, workspacePath: input.workspacePath });
 }
-export function claimNextMergeJob(context, input) {
+export function prepareMergeClaim(context, input) {
+    requireMergeText(input.workerId, "worker-id");
+    if (input.protocolId !== undefined)
+        requireMergeText(input.protocolId, "protocol-id");
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     const stopState = stoppedMergeWorkerState(context, project.id, input.workerId);
     if (stopState.stopped) {
@@ -34,23 +69,29 @@ export function claimNextMergeJob(context, input) {
         workerId: input.workerId,
         workspacePath: input.workspacePath
     });
+    const job = input.protocolId !== undefined
+        ? queueJobByProtocol(context, project.id, input.protocolId)
+        : context.db.get("SELECT * FROM merge_queue WHERE project_id = ? AND status IN ('ready', 'requeued') ORDER BY created_at ASC, id ASC LIMIT 1", [project.id]);
+    if (input.protocolId !== undefined && (!job || !["ready", "requeued"].includes(job.status))) {
+        throw new AppError("merge_job_not_claimable", "Requested merge job is not ready to claim", 1, { protocol_id: input.protocolId, status: job?.status ?? "missing", allowed: ["ready", "requeued"] });
+    }
+    const transition = job ? prepareClaimedProtocolTransition(context, project.id, job.protocol_id) : null;
+    return { project, job, transition };
+}
+export function claimNextMergeJob(context, input) {
+    const prepared = prepareMergePublication(context, input.projectRoot, input.workerId, () => prepareMergeClaim(context, input), value => value.job ? [value.job.protocol_id] : [], "head");
+    const { project, job, transition } = prepared.value;
     const now = context.now();
     let claimedProtocolId = null;
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
-        const job = context.db.get(`SELECT * FROM merge_queue
-       WHERE project_id = ? AND status IN ('ready', 'requeued')
-       ORDER BY created_at ASC, id ASC
-       LIMIT 1`, [project.id]);
+    const early = context.db.writeTransaction(() => {
+        prepared.assertCurrent();
         if (!job) {
-            context.db.exec("COMMIT");
             return mergeQueueResult(null, { ok: true, outcome: "empty", claimed: false });
         }
         const update = context.db.run(`UPDATE merge_queue
        SET status = 'claimed', claimed_by_session_id = ?, claimed_at = ?, updated_at = ?
        WHERE id = ? AND status IN ('ready', 'requeued')`, [input.workerId, now, now, job.id]);
         if (update.changes !== 1) {
-            context.db.exec("COMMIT");
             return mergeQueueResult(null, { ok: true, outcome: "empty", claimed: false });
         }
         appendAudit(context, {
@@ -59,14 +100,12 @@ export function claimNextMergeJob(context, input) {
             eventType: "merge_queue.claimed",
             payload: { protocol_id: job.protocol_id, worker_id: input.workerId }
         });
-        transitionClaimedProtocolToIntegration(context, project.id, job.protocol_id, input.workerId, now);
+        transitionClaimedProtocolToIntegration(context, transition, input.workerId, now);
         claimedProtocolId = job.protocol_id;
-        context.db.exec("COMMIT");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
-    }
+        return null;
+    });
+    if (early)
+        return early;
     return mergeQueueResult(claimedProtocolId ? queueJobByProtocol(context, project.id, claimedProtocolId) : null, {
         ok: true,
         outcome: claimedProtocolId ? "claimed" : "empty",
@@ -74,32 +113,13 @@ export function claimNextMergeJob(context, input) {
     });
 }
 export function claimMergeJob(context, input) {
-    const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
-    const stopState = stoppedMergeWorkerState(context, project.id, input.workerId);
-    if (stopState.stopped) {
-        throw new AppError("merge_worker_stopped", "Stopped or stopping merge worker cannot claim another merge job", 1, {
-            worker_id: input.workerId,
-            status: stopState.status,
-            reason: stopState.reason
-        });
-    }
-    requireLaneLockOwner(context, {
-        projectRoot: project.root,
-        lane: "merge",
-        workerId: input.workerId,
-        workspacePath: input.workspacePath
-    });
+    requireMergeText(input.protocolId, "protocol-id");
+    const prepared = prepareMergePublication(context, input.projectRoot, input.workerId, () => prepareMergeClaim(context, input), () => [input.protocolId], "target");
+    const { project, job: selectedJob, transition: selectedTransition } = prepared.value;
     const now = context.now();
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
-        const job = queueJobByProtocol(context, project.id, input.protocolId);
-        if (!job || !["ready", "requeued"].includes(job.status)) {
-            throw new AppError("merge_job_not_claimable", "Requested merge job is not ready to claim", 1, {
-                protocol_id: input.protocolId,
-                status: job?.status ?? "missing",
-                allowed: ["ready", "requeued"]
-            });
-        }
+    return context.db.writeTransaction(() => {
+        prepared.assertCurrent();
+        const job = selectedJob, transition = selectedTransition;
         const update = context.db.run(`UPDATE merge_queue
        SET status = 'claimed', claimed_by_session_id = ?, claimed_at = ?, updated_at = ?
        WHERE id = ? AND status IN ('ready', 'requeued')`, [input.workerId, now, now, job.id]);
@@ -112,16 +132,12 @@ export function claimMergeJob(context, input) {
             eventType: "merge_queue.claimed",
             payload: { protocol_id: job.protocol_id, worker_id: input.workerId, targeted: true }
         });
-        transitionClaimedProtocolToIntegration(context, project.id, job.protocol_id, input.workerId, now);
-        context.db.exec("COMMIT");
+        transitionClaimedProtocolToIntegration(context, transition, input.workerId, now);
         return mergeQueueResult(queueJobByProtocol(context, project.id, job.protocol_id), { ok: true, outcome: "claimed", claimed: true, targeted: true });
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
-    }
+    });
 }
-export function claimMergeBundle(context, input) {
+export function prepareMergeBundleClaim(context, input) {
+    requireMergeText(input.workerId, "worker-id");
     const { project, protocolIds } = requireClaimableBranchBundle(context, {
         projectRoot: input.projectRoot,
         workspacePath: input.workspacePath
@@ -140,9 +156,16 @@ export function claimMergeBundle(context, input) {
         workerId: input.workerId,
         workspacePath: input.workspacePath
     });
+    const transitions = protocolIds.map((protocolId) => prepareClaimedProtocolTransition(context, project.id, protocolId));
+    return { project, protocolIds, transitions };
+}
+export function claimMergeBundle(context, input) {
+    const prepared = prepareMergePublication(context, input.projectRoot, input.workerId, () => prepareMergeBundleClaim(context, input), value => value.protocolIds, "bundle");
+    const { project, protocolIds, transitions } = prepared.value;
     const now = context.now();
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
+    context.db.writeTransaction(() => {
+        prepared.assertCurrent();
+        // Claim every queue row before publishing any filesystem state.
         for (const protocolId of protocolIds) {
             const update = context.db.run(`UPDATE merge_queue
          SET status = 'claimed', claimed_by_session_id = ?, claimed_at = ?, updated_at = ?
@@ -153,7 +176,10 @@ export function claimMergeBundle(context, input) {
                     protocol_ids: protocolIds
                 });
             }
-            transitionClaimedProtocolToIntegration(context, project.id, protocolId, input.workerId, now);
+        }
+        for (const transition of transitions) {
+            const protocolId = transition.protocol.id;
+            transitionClaimedProtocolToIntegration(context, transition, input.workerId, now);
             appendAudit(context, {
                 protocolId,
                 projectId: project.id,
@@ -166,12 +192,7 @@ export function claimMergeBundle(context, input) {
             eventType: "merge_bundle.claimed",
             payload: { project_id: project.id, worker_id: input.workerId, protocol_ids: protocolIds, workspace_path: input.workspacePath }
         });
-        context.db.exec("COMMIT");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
-    }
+    });
     return mergeBundleResult(context, {
         ok: true,
         outcome: "claimed",
@@ -182,22 +203,38 @@ export function claimMergeBundle(context, input) {
         protocolIds
     });
 }
-export async function waitNextMergeJob(context, input) {
+export function prepareMergeQueueWait(context, input) {
+    requireMergeText(input.workerId, "worker-id");
+    if (typeof input.acquireLock !== "boolean")
+        throw new AppError("validation", "acquire-lock must be boolean", 2);
+    const { timeoutSeconds, pollIntervalSeconds } = prepareLaneWaitTiming(input);
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
-    const timeoutSeconds = input.timeoutSeconds ?? 0;
-    const pollIntervalSeconds = input.pollIntervalSeconds ?? 10;
-    if (!Number.isFinite(timeoutSeconds) || timeoutSeconds < 0) {
-        throw new AppError("validation", "--timeout must be zero or a positive number", 2);
-    }
-    if (!Number.isFinite(pollIntervalSeconds) || pollIntervalSeconds <= 0) {
-        throw new AppError("validation", "--poll-interval must be a positive number", 2);
-    }
     if (input.acquireLock && pollIntervalSeconds >= mergeLockTtlSeconds) {
         throw new AppError("validation", "--poll-interval must be lower than the merge lock TTL when --acquire-lock true", 2, {
             lock_ttl_seconds: mergeLockTtlSeconds
         });
     }
     const initialStopState = stoppedMergeWorkerState(context, project.id, input.workerId);
+    if (!initialStopState.stopped) {
+        const next = context.db.get("SELECT * FROM merge_queue WHERE project_id = ? AND status IN ('ready', 'requeued') ORDER BY created_at ASC, id ASC LIMIT 1", [project.id]);
+        if (next)
+            prepareClaimedProtocolTransition(context, project.id, next.protocol_id);
+        if (input.acquireLock) {
+            if (laneRecord(context, project.id, "merge")) {
+                prepareLaneLock(context, { ...input, lane: "merge", reason: "merge queue wait-next", ttlSeconds: mergeLockTtlSeconds }, "wait-acquire");
+            }
+            else {
+                prepareLaneWorkspace(context, { ...input, lane: "merge" });
+            }
+        }
+        else {
+            requireLaneLockOwner(context, { ...input, lane: "merge" });
+        }
+    }
+    return { project, timeoutSeconds, pollIntervalSeconds, initialStopState };
+}
+export async function waitNextMergeJob(context, input) {
+    const { project, timeoutSeconds, pollIntervalSeconds, initialStopState } = prepareMergeQueueWait(context, input);
     if (initialStopState.stopped) {
         return mergeQueueResult(null, {
             ok: true,
@@ -325,7 +362,9 @@ export async function waitNextMergeJob(context, input) {
         await delay(pollIntervalSeconds * 1000);
     }
 }
-export function completeMergeJob(context, input) {
+export function prepareMergeJobCompletion(context, input) {
+    requireMergeText(input.summary, "summary");
+    requireMergeText(input.workerId, "worker-id");
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     const protocol = requireProtocol(context, input.protocolId, project.id);
     const job = requireClaimedJob(context, protocol.project_id, input.protocolId, input.workerId);
@@ -335,14 +374,18 @@ export function completeMergeJob(context, input) {
         workerId: input.workerId,
         workspacePath: input.workspacePath
     });
-    const now = context.now();
-    context.db.run(`UPDATE merge_queue
-     SET status = 'merged', last_reason = ?, completed_at = ?, updated_at = ?
-     WHERE id = ?`, [input.summary, now, now, job.id]);
     const state = readProtocolRuntimeState(context, protocol).state;
     const flowContract = flowContractForState(state);
     const targetStage = flowContract.merge_queue.complete.target_stage;
     const targetStatus = flowContract.stages[targetStage]?.terminal ? targetStage : "running";
+    return { protocol, job, state, flowContract, targetStage, targetStatus };
+}
+export function completeMergeJob(context, input) {
+    const { protocol, job, state, flowContract, targetStage, targetStatus } = prepareMergeJobCompletion(context, input);
+    const now = context.now();
+    context.db.run(`UPDATE merge_queue
+     SET status = 'merged', last_reason = ?, completed_at = ?, updated_at = ?
+     WHERE id = ?`, [input.summary, now, now, job.id]);
     persistProtocolState(context, protocol, {
         ...state,
         stage: targetStage,
@@ -365,7 +408,9 @@ export function completeMergeJob(context, input) {
         stop_after_current
     });
 }
-export function completeMergeBundle(context, input) {
+export function prepareMergeBundleCompletion(context, input) {
+    requireMergeText(input.summary, "summary");
+    requireMergeText(input.workerId, "worker-id");
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     requireLaneLockOwner(context, {
         projectRoot: project.root,
@@ -380,19 +425,21 @@ export function completeMergeBundle(context, input) {
             workspace_path: input.workspacePath
         });
     }
+    const jobs = protocolIds.map((protocolId) => prepareMergeJobCompletion(context, { ...input, protocolId }));
+    return { project, protocolIds, jobs };
+}
+export function completeMergeBundle(context, input) {
+    const publication = prepareMergePublication(context, input.projectRoot, input.workerId, () => prepareMergeBundleCompletion(context, input), value => value.protocolIds, "bundle");
+    const prepared = publication.value;
     const now = context.now();
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
-        for (const protocolId of protocolIds) {
-            const protocol = requireProtocol(context, protocolId, project.id);
-            const job = requireClaimedJob(context, project.id, protocolId, input.workerId);
+    context.db.writeTransaction(() => {
+        publication.assertCurrent();
+        const { project, protocolIds, jobs } = prepared;
+        for (const { protocol, job, state, flowContract, targetStage, targetStatus } of jobs) {
+            const protocolId = protocol.id;
             context.db.run(`UPDATE merge_queue
          SET status = 'merged', last_reason = ?, completed_at = ?, updated_at = ?
          WHERE id = ?`, [input.summary, now, now, job.id]);
-            const state = readProtocolRuntimeState(context, protocol).state;
-            const flowContract = flowContractForState(state);
-            const targetStage = flowContract.merge_queue.complete.target_stage;
-            const targetStatus = flowContract.stages[targetStage]?.terminal ? targetStage : "running";
             persistProtocolState(context, protocol, {
                 ...state,
                 stage: targetStage,
@@ -412,12 +459,8 @@ export function completeMergeBundle(context, input) {
             eventType: "merge_bundle.completed",
             payload: { project_id: project.id, worker_id: input.workerId, summary: input.summary, protocol_ids: protocolIds }
         });
-        context.db.exec("COMMIT");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
-    }
+    });
+    const { project, protocolIds } = prepared;
     const stop_after_current = stopAfterCurrentIfRequested(context, project.id, project.root, input.workerId, "merge bundle complete after stop request");
     return mergeBundleResult(context, {
         ok: true,
@@ -430,7 +473,9 @@ export function completeMergeBundle(context, input) {
         stop_after_current
     });
 }
-export function noteMergeJob(context, input) {
+export function prepareMergeJobNote(context, input) {
+    requireMergeText(input.summary, "summary");
+    requireMergeText(input.workerId, "worker-id");
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     const protocol = requireProtocol(context, input.protocolId, project.id);
     const job = queueJobByProtocol(context, protocol.project_id, protocol.id);
@@ -449,6 +494,10 @@ export function noteMergeJob(context, input) {
             claimed_by_session_id: job.claimed_by_session_id
         });
     }
+    return { protocol, job };
+}
+export function noteMergeJob(context, input) {
+    const { protocol, job } = prepareMergeJobNote(context, input);
     const now = context.now();
     context.db.run(`UPDATE merge_queue
      SET last_reason = ?, updated_at = ?
@@ -461,7 +510,11 @@ export function noteMergeJob(context, input) {
     });
     return mergeQueueResult(queueJobByProtocol(context, protocol.project_id, protocol.id), { ok: true, outcome: "noted" });
 }
-export function failMergeJob(context, input) {
+export function prepareMergeJobFailure(context, input) {
+    requireMergeText(input.reason, "reason");
+    requireMergeText(input.workerId, "worker-id");
+    if (typeof input.requeue !== "boolean")
+        throw new AppError("validation", "requeue must be boolean", 2);
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     const protocol = requireProtocol(context, input.protocolId, project.id);
     const job = requireClaimedJob(context, protocol.project_id, input.protocolId, input.workerId);
@@ -471,13 +524,17 @@ export function failMergeJob(context, input) {
         workerId: input.workerId,
         workspacePath: input.workspacePath
     });
+    const state = input.requeue ? readProtocolRuntimeState(context, protocol).state : null;
+    return { protocol, job, state };
+}
+export function failMergeJob(context, input) {
+    const { protocol, job, state } = prepareMergeJobFailure(context, input);
     const now = context.now();
     const status = input.requeue ? "requeued" : "failed";
     context.db.run(`UPDATE merge_queue
      SET status = ?, attempts_count = attempts_count + 1, last_reason = ?, updated_at = ?
      WHERE id = ?`, [status, input.reason, now, job.id]);
-    if (input.requeue) {
-        const state = readProtocolRuntimeState(context, protocol).state;
+    if (state) {
         persistProtocolState(context, protocol, {
             ...state,
             stage: "ready_for_merge",
@@ -500,7 +557,11 @@ export function failMergeJob(context, input) {
         stop_after_current
     });
 }
-export function failMergeBundle(context, input) {
+export function prepareMergeBundleFailure(context, input) {
+    requireMergeText(input.reason, "reason");
+    requireMergeText(input.workerId, "worker-id");
+    if (typeof input.requeue !== "boolean")
+        throw new AppError("validation", "requeue must be boolean", 2);
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     requireLaneLockOwner(context, {
         projectRoot: project.root,
@@ -515,18 +576,23 @@ export function failMergeBundle(context, input) {
             workspace_path: input.workspacePath
         });
     }
+    const jobs = protocolIds.map((protocolId) => prepareMergeJobFailure(context, { ...input, protocolId }));
+    return { project, protocolIds, jobs };
+}
+export function failMergeBundle(context, input) {
+    const publication = prepareMergePublication(context, input.projectRoot, input.workerId, () => prepareMergeBundleFailure(context, input), value => value.protocolIds, "bundle");
+    const prepared = publication.value;
     const now = context.now();
     const status = input.requeue ? "requeued" : "failed";
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
-        for (const protocolId of protocolIds) {
-            const protocol = requireProtocol(context, protocolId, project.id);
-            const job = requireClaimedJob(context, project.id, protocolId, input.workerId);
+    context.db.writeTransaction(() => {
+        publication.assertCurrent();
+        const { project, protocolIds, jobs } = prepared;
+        for (const { protocol, job, state } of jobs) {
+            const protocolId = protocol.id;
             context.db.run(`UPDATE merge_queue
          SET status = ?, attempts_count = attempts_count + 1, last_reason = ?, updated_at = ?
          WHERE id = ?`, [status, input.reason, now, job.id]);
-            if (input.requeue) {
-                const state = readProtocolRuntimeState(context, protocol).state;
+            if (state) {
                 persistProtocolState(context, protocol, {
                     ...state,
                     stage: "ready_for_merge",
@@ -549,12 +615,8 @@ export function failMergeBundle(context, input) {
             reason: input.reason,
             payload: { project_id: project.id, worker_id: input.workerId, requeue: input.requeue, protocol_ids: protocolIds }
         });
-        context.db.exec("COMMIT");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
-    }
+    });
+    const { project, protocolIds } = prepared;
     const stop_after_current = stopAfterCurrentIfRequested(context, project.id, project.root, input.workerId, "merge bundle fail after stop request");
     return mergeBundleResult(context, {
         ok: true,
@@ -566,47 +628,58 @@ export function failMergeBundle(context, input) {
         stop_after_current
     });
 }
-export function cancelMergeQueueJob(context, input) {
+export function prepareMergeQueueCancellation(context, input) {
+    requireMergeText(input.reason, "reason");
+    if (input.workerId !== undefined)
+        requireMergeText(input.workerId, "worker-id");
+    if (typeof input.force !== "boolean")
+        throw new AppError("validation", "force must be boolean", 2);
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
     const protocol = requireProtocol(context, input.protocolId, project.id);
     const reason = input.reason.trim();
-    if (!reason) {
-        throw new AppError("validation", "merge-queue cancel requires --reason", 2);
+    const job = queueJobByProtocol(context, protocol.project_id, protocol.id);
+    if (!job) {
+        throw new AppError("not_found", "Merge queue job is not found", 1, { protocol_id: protocol.id });
     }
-    const now = context.now();
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
-        const job = queueJobByProtocol(context, protocol.project_id, protocol.id);
-        if (!job) {
-            throw new AppError("not_found", "Merge queue job is not found", 1, { protocol_id: protocol.id });
-        }
-        if (job.status === "cancelled") {
-            context.db.exec("COMMIT");
-            return mergeQueueResult(job, { ok: true, outcome: "cancelled", cancelled: false, reason: "already_cancelled" });
-        }
-        if (job.status === "claimed" && !input.force) {
-            if (!input.workerId) {
-                throw new AppError("merge_job_claimed", "Claimed jobs require --worker-id or --force", 1, { protocol_id: protocol.id });
-            }
-            if (job.claimed_by_session_id !== input.workerId) {
-                throw new AppError("merge_job_claimed_by_other_session", "Merge job is claimed by another worker", 1, {
-                    protocol_id: protocol.id,
-                    claimed_by_session_id: job.claimed_by_session_id
-                });
-            }
-            requireLaneLockOwner(context, {
-                projectRoot: protocol.project_root,
-                lane: "merge",
-                workerId: input.workerId,
-                workspacePath: input.workspacePath
-            });
+    if (job.status === "cancelled") {
+        return { protocol, job, reason };
+    }
+    if (job.status === "claimed" && !input.force) {
+        if (!input.workerId) {
+            throw new AppError("merge_job_claimed", "Claimed jobs require --worker-id or --force", 1, { protocol_id: protocol.id });
         }
-        if (["merged", "failed"].includes(job.status) && !input.force) {
-            throw new AppError("merge_job_terminal", `Merge job is ${job.status}; cancellation requires --force --reason`, 1, {
+        if (job.claimed_by_session_id !== input.workerId) {
+            throw new AppError("merge_job_claimed_by_other_session", "Merge job is claimed by another worker", 1, {
                 protocol_id: protocol.id,
-                status: job.status
+                claimed_by_session_id: job.claimed_by_session_id
             });
         }
+        requireLaneLockOwner(context, {
+            projectRoot: protocol.project_root,
+            lane: "merge",
+            workerId: input.workerId,
+            workspacePath: input.workspacePath
+        });
+    }
+    if (["merged", "failed"].includes(job.status) && !input.force) {
+        throw new AppError("merge_job_terminal", `Merge job is ${job.status}; cancellation requires --force --reason`, 1, {
+            protocol_id: protocol.id,
+            status: job.status
+        });
+    }
+    return { protocol, job, reason };
+}
+export function cancelMergeQueueJob(context, input) {
+    const prepared = prepareMergePublication(context, input.projectRoot, input.workerId, () => prepareMergeQueueCancellation(context, input), value => [value.protocol.id], "target", false);
+    const { protocol, job, reason } = prepared.value;
+    const now = context.now();
+    const early = context.db.writeTransaction(() => {
+        prepared.assertCurrent();
+        if (job.status === "claimed" && !input.force && !context.db.get("SELECT 1 FROM lane_locks WHERE project_id = ? AND lane = 'merge' AND status = 'active' AND worker_id = ? AND expires_at > ?", [protocol.project_id, input.workerId, context.now()]))
+            throw new AppError("lane_lock_not_active", "Prepared cancellation lost its live lane lease", 1);
+        if (job.status === "cancelled") {
+            return mergeQueueResult(job, { ok: true, outcome: "cancelled", cancelled: false, reason: "already_cancelled" });
+        }
         context.db.run(`UPDATE merge_queue
        SET status = 'cancelled', last_reason = ?, updated_at = ?
        WHERE id = ?`, [reason, now, job.id]);
@@ -618,17 +691,19 @@ export function cancelMergeQueueJob(context, input) {
             forced: input.force,
             payload: { protocol_id: protocol.id, from: job.status, worker_id: input.workerId ?? null }
         });
-        context.db.exec("COMMIT");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
-    }
+        return null;
+    });
+    if (early)
+        return early;
     return mergeQueueResult(queueJobByProtocol(context, protocol.project_id, protocol.id), { ok: true, outcome: "cancelled", cancelled: true });
 }
 export function queueForProject(context, projectId) {
     return context.db.all(`SELECT * FROM merge_queue WHERE project_id = ? ORDER BY created_at ASC, id ASC`, [projectId]);
 }
+function requireMergeText(value, parameter) {
+    if (typeof value !== "string" || !value.trim())
+        throw new AppError("validation", `--${parameter} must be nonempty text`, 2, { phase: "prepare", effect: "no_effect", recoverable: true, parameter });
+}
 function queueJobByProtocol(context, projectId, protocolId) {
     return context.db.get("SELECT * FROM merge_queue WHERE project_id = ? AND protocol_id = ?", [projectId, protocolId]);
 }
@@ -688,7 +763,7 @@ function requireClaimedJob(context, projectId, protocolId, sessionId) {
     }
     return job;
 }
-function transitionClaimedProtocolToIntegration(context, projectId, protocolId, workerId, now) {
+function prepareClaimedProtocolTransition(context, projectId, protocolId) {
     const protocol = requireProtocol(context, protocolId, projectId);
     const state = readProtocolRuntimeState(context, protocol).state;
     const flowContract = flowContractForState(state);
@@ -707,6 +782,10 @@ function transitionClaimedProtocolToIntegration(context, projectId, protocolId,
             diagnostics: blockingDiagnostics
         });
     }
+    return { protocol, state, flowContract };
+}
+function transitionClaimedProtocolToIntegration(context, prepared, workerId, now) {
+    const { protocol, state, flowContract } = prepared;
     persistProtocolState(context, protocol, {
         ...state,
         stage: "integration",
@@ -715,10 +794,10 @@ function transitionClaimedProtocolToIntegration(context, projectId, protocolId,
         updated_at: now
     });
     appendAudit(context, {
-        protocolId,
+        protocolId: protocol.id,
         projectId: protocol.project_id,
         eventType: "protocol.integration_claimed",
-        payload: { protocol_id: protocolId, worker_id: workerId, flow_contract_id: flowContract.id }
+        payload: { protocol_id: protocol.id, worker_id: workerId, flow_contract_id: flowContract.id }
     });
 }
 function releaseLaneLockIfOwned(context, input) {