@deksden-com/dd-flow-cli 0.9.0-beta.63 → 0.9.0-beta.64

package/dist/services/run-recovery.js

@@ -109,7 +109,7 @@ export function beginRunRecovery(context, input) {
     const interruption = parseObject(input.interruption, "interruption");
     const recoveryId = `RCV-${crypto.randomUUID()}`, now = context.now();
     let generation;
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     try {
         const prior = recoveryGuard(context, project.id, run.id);
         const supersedes = prior?.status === "resuming" && interruption.recovery_parent_id === prior.recovery_id;
@@ -206,7 +206,7 @@ export function resumeRunRecovery(context, input) {
     verifyRecoverySnapshot(guard.capture_path, { runId: run.id, recoveryId: guard.recovery_id, projectRoot: run.project_root, workspaceRoot: run.workspace_root });
     const now = context.now();
     let running = [];
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     try {
         const current = recoveryGuard(context, project.id, run.id);
         if (!current || current.recovery_id !== guard.recovery_id || current.generation !== guard.generation || current.status !== "sealed" || current.capture_path !== guard.capture_path)
@@ -261,7 +261,7 @@ export function acceptRunRecovery(context, input) {
     const identity = hookSessionIdentity(context, project.id, eventKey);
     const now = context.now();
     let packetReceipt;
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     try {
         const guard = recoveryGuard(context, project.id, run.id);
         const binding = context.db.get("SELECT * FROM run_recovery_bindings WHERE recovery_id = ?", [input.recoveryId]);

package/dist/services/runs.js

@@ -414,7 +414,7 @@ export function reviseFlowRunFlags(context, input) {
     const run = resolveRun(context, project.id, input.runId);
     assertRunMutationAllowed(context, project.id, run.id);
     const idempotencyKey = requiredPlain(input.idempotencyKey, "idempotency-key");
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     let committed = false;
     try {
         const existingMutation = context.db.get("SELECT result_json FROM flow_run_flag_mutations WHERE project_id = ? AND run_id = ? AND idempotency_key = ?", [project.id, run.id, idempotencyKey]);
@@ -585,19 +585,18 @@ export function attachFlowRunStage(context, input) {
 }
 /** Keep synchronous stage settlement atomic; files are projections, SQLite is authoritative. */
 export function withStageSettlement(context, operation) {
-    context.db.exec("SAVEPOINT stage_settlement");
-    try {
-        const result = operation();
-        if (result instanceof Promise)
-            throw new Error("Stage settlement must be synchronous");
-        context.db.exec("RELEASE stage_settlement");
-        return result;
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK TO stage_settlement");
-        context.db.exec("RELEASE stage_settlement");
-        throw error;
-    }
+    return context.db.writeTransaction(operation);
+}
+/** Capture accepted inputs before asynchronous validation; compare under the
+ * settlement writer reservation instead of accepting a stale read snapshot. */
+export function stageInputGuard(context, projectId, runId, readFiles) {
+    const read = () => JSON.stringify({
+        works: context.db.all("SELECT work_id, parent_work_id, task, status, result, payload_json, depends_on_json FROM works WHERE project_id = ? AND run_id = ? ORDER BY work_id", [projectId, runId]),
+        files: readFiles()
+    });
+    const accepted = read();
+    return () => { if (read() !== accepted)
+        throw new AppError("stage_inputs_changed", "Accepted stage inputs changed during validation; settle only newly validated inputs", 1, { run_id: runId, effect: "no_effect" }); };
 }
 export function completeFlowRunStage(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));

package/dist/services/runtime-budget.js

@@ -69,7 +69,7 @@ export function requestRuntimeScopeControl(context, scopeId, requestId, mode, ma
         throw new AppError("runtime_budget_invalid", "Scope control requires a bounded request identity and pause or stop", 2);
     const db = getResourceDatabase(resourceHome(context));
     const requestKey = digest(JSON.stringify([scopeId, requestId]));
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         if (manifest !== undefined) {
             const declaration = validateRuntimeScopeManifest(manifest, scopeId), payload = JSON.stringify(declaration);
@@ -131,7 +131,7 @@ export function scopeLocalProcessRole(record) {
 /** Local checks and EVAL observers share the scope fence, not provider capacity. */
 export function admitRuntimeCheck(context, id, leaseToken) {
     const db = getResourceDatabase(resourceHome(context));
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         const record = db.get("SELECT * FROM managed_processes WHERE id = ?", [id]);
         if (!record || record.lease_token !== leaseToken || !["eval-baseline", "eval-observer", "check"].includes(record.kind) || record.state !== "running" || !processIsAlive(record))
@@ -189,7 +189,7 @@ export function fenceRuntimeBudget(context, scopeId, requestId) {
     if (!requestId || requestId.length > 256)
         throw new AppError("runtime_budget_invalid", "Scope fence requires a bounded request identity", 2);
     const db = getResourceDatabase(resourceHome(context));
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         const existing = db.get("SELECT metadata_json FROM managed_resources WHERE resource_kind = 'provider-fence' AND resource_key = ?", [scopeId]);
         const now = context.now();
@@ -248,7 +248,7 @@ export function reserveProviderTurn(context, record, input) {
     const db = getResourceDatabase(resourceHome(context));
     const key = digest(JSON.stringify([record.id, input.operationId]));
     const policy = JSON.stringify(budget), now = context.now();
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         const current = db.get("SELECT * FROM managed_processes WHERE id = ?", [record.id]);
         if (current?.lease_token !== record.lease_token || current.state !== "running")

package/dist/services/runtime-scope-control.js

@@ -23,7 +23,7 @@ export function retainScopeDrain(context, control, processes, runs, native, prob
     const registry = getResourceDatabase(resourceHome(context));
     const targets = new Map();
     const captures = [];
-    registry.exec("BEGIN IMMEDIATE");
+    registry.beginWriteTransaction();
     try {
         for (const run of [...runs].sort((a, b) => String(a.runtime_home).localeCompare(String(b.runtime_home)))) {
             const home = String(run.runtime_home);
@@ -31,7 +31,7 @@ export function retainScopeDrain(context, control, processes, runs, native, prob
             if (!target) {
                 target = createContext({ ...context.env, DD_FLOW_HOME: home, DD_FLOW_RESOURCE_HOME: resourceHome(context), DD_FLOW_ENGINE_MODE: "1" });
                 try {
-                    target.db.exec("BEGIN IMMEDIATE");
+                    target.db.beginWriteTransaction();
                 }
                 catch (error) {
                     target.db.close?.();
@@ -157,7 +157,7 @@ export async function controlRuntimeScopeLocalProbes(context, scopeId, generatio
             if (mode === "pause" && processTreeIsAlive(current))
                 return { process_id: record.id, physical_settled: false, reason: "local_probe_running" };
             const operationId = `scope-probe:${crypto.createHash("sha256").update(JSON.stringify([scopeId, generation, record.id, record.lease_token, record.pid_started_at])).digest("hex")}`;
-            registry.exec("BEGIN IMMEDIATE");
+            registry.beginWriteTransaction();
             try {
                 current = validate();
                 registry.run("INSERT OR IGNORE INTO managed_resources (resource_kind,resource_key,owner_id,lease_token,lease_expires_at,process_id,metadata_json,created_at,updated_at) VALUES ('scope-control-operation',?,?,?,?,NULL,?,?,?)", [operationId, scopeId, record.lease_token, context.now(), JSON.stringify({ scope_id: scopeId, generation, process_id: record.id, operation: mode === "stop" ? "probe.stop" : "probe.observe", status: "dispatching" }), context.now(), context.now()]);
@@ -240,7 +240,7 @@ export async function controlRuntimeScopeNativeOwners(context, scopeId, generati
                         const operationId = `scope-cancel:${crypto.createHash("sha256").update(JSON.stringify([scopeId, generation, record.id, state.daemon_id, id])).digest("hex")}`;
                         const now = context.now();
                         let inserted = false;
-                        registry.exec("BEGIN IMMEDIATE");
+                        registry.beginWriteTransaction();
                         try {
                             assertOwner();
                             inserted = registry.run("INSERT OR IGNORE INTO managed_resources (resource_kind,resource_key,owner_id,lease_token,lease_expires_at,process_id,metadata_json,created_at,updated_at) VALUES ('scope-control-operation',?,?,?,?,NULL,?,?,?)", [operationId, scopeId, record.lease_token, now, JSON.stringify({ scope_id: scopeId, generation, process_id: record.id, daemon_id: state.daemon_id, session_id: id, status: "dispatching" }), now, now]).changes === 1;
@@ -331,7 +331,7 @@ export async function controlRuntimeScopeRuns(context, scopeId, requestId, mode,
             let input = { projectRoot: project.root, runId: record.run_id, requestId: runRequestId, action: mode };
             // Lock order is resource registry then RUN database. No provider or await
             // occurs here; a newer scope request cannot interleave RUN intent creation.
-            registry.exec("BEGIN IMMEDIATE");
+            registry.beginWriteTransaction();
             try {
                 const current = registry.get("SELECT metadata_json FROM managed_resources WHERE resource_kind = 'scope-control' AND resource_key = ?", [scopeId]);
                 if (!current || JSON.parse(current.metadata_json).generation !== control.generation || registry.get("SELECT 1 FROM managed_resources WHERE resource_kind = 'provider-fence' AND resource_key = ?", [scopeId]))

package/dist/services/runtime-scope-resume.js

@@ -67,7 +67,7 @@ export async function prepareRuntimeScopeResume(context, scopeId, generation, re
             if (!project || manifest?.budget?.scope_id !== scopeId || manifest.resource_home !== resourceHome(context))
                 throw new AppError("runtime_scope_owner_unknown", "Resume RUN no longer belongs to this retained scope", 1);
             const input = { projectRoot: project.root, runId: source.run_id, requestId: source.resume_request_id, controlId: source.control_id };
-            db.exec("BEGIN IMMEDIATE");
+            db.beginWriteTransaction();
             try {
                 assertCurrent();
                 recordControllerResume(target, input);
@@ -111,10 +111,10 @@ export async function prepareRuntimeScopeResume(context, scopeId, generation, re
     try {
         for (const home of [...new Set(intent.runs.map((source) => source.runtime_home))].sort())
             lockedRuns.set(home, createContext({ ...context.env, DD_FLOW_HOME: home, DD_FLOW_RESOURCE_HOME: resourceHome(context), DD_FLOW_ENGINE_MODE: "1" }));
-        db.exec("BEGIN IMMEDIATE");
+        db.beginWriteTransaction();
         registryHeld = true;
         for (const target of lockedRuns.values()) {
-            target.db.exec("BEGIN IMMEDIATE");
+            target.db.beginWriteTransaction();
             heldRuns.push(target);
         }
         assertCurrent();
@@ -316,7 +316,7 @@ async function restartScopeNative(context, intent, source, assertCurrent) {
     };
     assertRetired();
     let dispatch = false;
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         assertRetired();
         if (operation.status === "retired") {
@@ -370,7 +370,7 @@ async function restartScopeNative(context, intent, source, assertCurrent) {
     for (const session of source.sessions) {
         const operationId = `scope-load:${hash(JSON.stringify([intent.scope_id, intent.generation, source.process_id, session.session_id]))}`;
         let load, dispatchLoad = false;
-        db.exec("BEGIN IMMEDIATE");
+        db.beginWriteTransaction();
         try {
             assertReplacement();
             const row = db.get("SELECT metadata_json FROM managed_resources WHERE resource_kind = 'scope-resume-native-load' AND resource_key = ?", [operationId]);
@@ -439,7 +439,7 @@ async function retireScopeNative(context, intent, source, assertCurrent) {
         throw new AppError("runtime_scope_native_launch_required", "Native recovery requires explicit configuration presence before retiring its owner", 1);
     let operation;
     let dispatch = false;
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         assertOwner();
         const saved = db.get("SELECT metadata_json FROM managed_resources WHERE resource_kind = 'scope-resume-native' AND resource_key = ?", [key]);
@@ -486,7 +486,7 @@ export function recordRuntimeScopeResume(context, input) {
     if (!/^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(input.requestId) || !Number.isSafeInteger(input.generation) || input.generation < 1 || !/^[a-f0-9]{64}$/.test(input.captureKey))
         throw new AppError("runtime_scope_resume_invalid", "Scope resume requires its exact generation, capture and request identity", 2);
     const db = getResourceDatabase(resourceHome(context)), key = hash(JSON.stringify([input.scopeId, input.requestId]));
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         const latest = runtimeBudgetStatus(context, input.scopeId);
         const control = latest.control;

package/dist/services/runtime-scope-worker.js

@@ -40,7 +40,7 @@ export async function reconcileRuntimeScopeControl(context, scopeId, generation,
 export async function launchRuntimeScopeControl(context, scopeId, requestId, mode, manifest, reconcileId, resumeId) {
     const control = requestRuntimeScopeControl(context, scopeId, requestId, mode, manifest), db = getResourceDatabase(resourceHome(context)), key = keyFor(scopeId, control.generation);
     let worker;
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         const current = db.get("SELECT metadata_json FROM managed_resources WHERE resource_kind = 'scope-control' AND resource_key = ?", [scopeId]);
         const prior = db.get("SELECT metadata_json FROM managed_resources WHERE resource_kind = 'scope-control-worker' AND resource_key = ?", [key]);
@@ -108,7 +108,7 @@ export async function serveRuntimeScopeControl(context, scopeId, generation) {
         throw new AppError("runtime_scope_owner_unknown", "Scope worker requires its launch token and generation", 1);
     const db = getResourceDatabase(resourceHome(context)), key = keyFor(scopeId, generation), token = context.env.DD_FLOW_SCOPE_CONTROL_TOKEN;
     let worker;
-    db.exec("BEGIN IMMEDIATE");
+    db.beginWriteTransaction();
     try {
         const row = db.get("SELECT metadata_json FROM managed_resources WHERE resource_kind = 'scope-control-worker' AND resource_key = ? AND lease_token = ?", [key, token]);
         if (!row)

package/dist/services/stage-pause.js

@@ -27,7 +27,7 @@ export function pauseStageForUser(context, input) {
     fs.mkdirSync(pauseRoot, { recursive: true });
     fs.writeFileSync(questionPath, question);
     const now = context.now();
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     try {
         const paused = context.db.run("UPDATE works SET status = 'paused', updated_at = ? WHERE work_id = ? AND status = 'running'", [now, work.work_id]);
         if (paused.changes !== 1)
@@ -78,7 +78,7 @@ export function resumeStageAfterUser(context, input) {
     if (!workSession)
         throw new AppError("runtime_missing", "Paused Work has no open Session link", 1, { work_id: work.work_id });
     const answerPath = path.join(path.dirname(stage.pause.question_path), `answer-${crypto.createHash("sha256").update(`${stage.pause.id}\0${input.answer}`).digest("hex")}.md`);
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     let identity;
     try {
         identity = claimStageResumeHookEvent(context, { projectId: project.id, runId: run.id, stage: stage.stage, workId: work.work_id, projectRoot, eventKey: hookEventId });

package/dist/services/vnext-code-review.js

@@ -14,12 +14,12 @@ import { requireVnextWorkspaceRoute } from "./vnext-workspace-policy.js";
 import { addVnextCodeRepair, resumeAcceptedCodeStage } from "./vnext-code.js";
 import { finalCodeCheckDeclarations, runCodeChecks, validateFailedCheckRetry, workspaceFingerprint } from "./code-checks.js";
 import { addWorkBatch, bindStageCoordinatorWork, finishStageCoordinatorWork, refreshRunWorkProjection } from "./work-registry.js";
-import { withStageSettlement } from "./runs.js";
+import { withStageSettlement, stageInputGuard } from "./runs.js";
 import { vnextStageDirectory } from "../domain/stage-catalog.js";
 import { writeStageReport } from "./stage-report-renderer.js";
 import { applyExternalStageContext } from "./stage-context.js";
 import { readFanoutDescriptor, writeFanoutDescriptor } from "./vnext-fanout.js";
-import { ensureVnextMergeRequest } from "./vnext-merge.js";
+import { prepareVnextMergeRequest } from "./vnext-merge.js";
 import { validateVnextCodeHandoff } from "./vnext-plan.js";
 import { assertRunMutationAllowed } from "./run-recovery.js";
 const stage = "code-review";
@@ -175,6 +175,7 @@ export async function finishVnextCodeReview(context, input) {
         validateDecision(context, { decision: canonical.decision, reviewers: canonical.reviewers, repairs, workspaceRoot: run.workspace_root });
     }
     const outcome = decision.findings.some((item) => item.disposition === "defer") ? "accepted_with_DEF" : "accepted";
+    const assertInputs = stageInputGuard(context, project.id, run.id, () => [workspaceFingerprint(run.workspace_root), sha256File(decisionFile), sha256File(path.join(home, "05-code", "stage-report.json"))]);
     const repairs = reviewRepairWorks(context, project.id, run.id, root, cycle);
     const finalChecks = finalCodeCheckDeclarations(run.workspace_root, codeWorks(context, project.id, run.id).flatMap((work) => { const payload = readJsonString(work.payload_json); return Array.isArray(payload.checks) ? payload.checks : []; }));
     if (input.retryCheckId) {
@@ -200,10 +201,14 @@ export async function finishVnextCodeReview(context, input) {
     // The request must exist before CODE-REVIEW becomes terminal. Otherwise a
     // merge-gate error creates an irrecoverable `done` report with no MRG-*.
     const acceptedPaths = changedPaths(run.workspace_root);
-    const mergeRequest = nextAction === "start_merge" ? ensureVnextMergeRequest(context, { projectRoot, runId: run.id, acceptedPaths }) : null;
-    writeReport(root, report);
+    let mergeRequest = null;
+    assertInputs();
+    const prepareMerge = nextAction === "start_merge" ? prepareVnextMergeRequest(context, { projectRoot, runId: run.id, acceptedPaths }) : null;
     withStageSettlement(context, () => {
         assertRunMutationAllowed(context, project.id, run.id, generation);
+        assertInputs();
+        mergeRequest = prepareMerge?.() ?? null;
+        writeReport(root, report);
         completeFlowRunStage(context, { projectRoot, runId: run.id, stage, status: "done", data: "stage-report.json", dataSchemaId: "dd-flow/stage-report@1", report: "stage-report.md", stageReport: "stage-report.html" });
         appendFlowRunTimelineEvent(context, project.id, run.id, { type: "code_review_completed", work_id: rootWork.work_id, outcome });
         if (nextAction === "start_merge")

package/dist/services/vnext-code.js

@@ -1,5 +1,7 @@
 import { managedLifecycleCommand } from "./lifecycle-invocations.js";
 import crypto from "node:crypto";
+import { stageInputGuard } from "./runs.js";
+import { workspaceFingerprint } from "./code-checks.js";
 import { runWorkspaceBootstrap } from "./workspace-bootstrap.js";
 import fs from "node:fs";
 import path from "node:path";
@@ -16,7 +18,7 @@ import { readVnextSpecifyResult } from "./vnext-specify.js";
 import { addWorkBatch, bindStageCoordinatorWork, codeWorkGraph, finishStageCoordinatorWork, refreshRunWorkProjection, validateWorkBatchFile, workStartCommand } from "./work-registry.js";
 import { vnextStageDirectory } from "../domain/stage-catalog.js";
 import { writeStageReport } from "./stage-report-renderer.js";
-import { ensureVnextMergeRequest } from "./vnext-merge.js";
+import { prepareVnextMergeRequest } from "./vnext-merge.js";
 import { assertStageStartHookEvent } from "./hooks.js";
 import { applyExternalStageContext } from "./stage-context.js";
 import { readFanoutDescriptor, writeFanoutDescriptor } from "./vnext-fanout.js";
@@ -143,6 +145,7 @@ export async function finishVnextCode(context, input) {
         throw new AppError("obligation_coverage_incomplete", "CODE graph does not cover every accepted obligation", 2, { missing });
     }
     // Reject a malformed semantic receipt before running the expensive gate.
+    const assertInputs = stageInputGuard(context, project.id, run.id, () => [workspaceFingerprint(run.workspace_root), crypto.createHash("sha256").update(fs.readFileSync(input.verificationFile)).digest("hex")]);
     const verification = verificationForFinish(context, { file: input.verificationFile, projectRoot: run.workspace_root, runId: run.id, runRoot: home });
     if (verification.verdict === "blocked") {
         return { ok: true, run_id: run.id, stage, outcome: "blocked", verification, instruction: "CODE remains running. Resolve the stated external or user-input blocker in this same coordinator session, update code-verification.json, then invoke this same stage finish command again." };
@@ -233,10 +236,14 @@ export async function finishVnextCode(context, input) {
     // Creating the MERGE request is part of accepting this terminal handoff.
     // Do it before materialising a terminal stage report or changing RUN state,
     // so an invalid merge policy leaves CODE safely running and retryable.
-    const mergeRequest = next === "start_merge" ? ensureVnextMergeRequest(context, { projectRoot, runId: run.id, acceptedPaths: changedPaths }) : null;
-    writeReport(root, report);
+    let mergeRequest = null;
+    assertInputs();
+    const prepareMerge = next === "start_merge" ? prepareVnextMergeRequest(context, { projectRoot, runId: run.id, acceptedPaths: changedPaths }) : null;
     withStageSettlement(context, () => {
         assertRunMutationAllowed(context, project.id, run.id, generation);
+        assertInputs();
+        mergeRequest = prepareMerge?.() ?? null;
+        writeReport(root, report);
         completeFlowRunStage(context, {
             projectRoot,
             runId: run.id,

package/dist/services/vnext-merge.js

@@ -28,13 +28,17 @@ export function isVnextMergeRun(context, input) {
 }
 /** Terminal CODE/CODE-REVIEW calls this once; it freezes source and creates the child MERGE Work. */
 export function ensureVnextMergeRequest(context, input) {
+    return prepareVnextMergeRequest(context, input)();
+}
+/** Freeze filesystem evidence outside the stage writer lock; return only the SQL settlement. */
+export function prepareVnextMergeRequest(context, input) {
     const projectRoot = resolveProjectRoot(input.projectRoot);
     const project = requireProjectByRoot(context, projectRoot);
     const run = requireRun(context, project.id, input.runId);
     assertRunMutationAllowed(context, project.id, run.id);
     const existing = context.db.get("SELECT * FROM merge_requests WHERE project_id = ? AND run_id = ? AND status NOT IN ('completed','failed','cancelled','superseded') ORDER BY created_at DESC LIMIT 1", [project.id, run.id]);
     if (existing)
-        return requestView(context, existing);
+        return () => requestView(context, requireRequest(context, existing.merge_request_id));
     const settings = executionSettings(run);
     const route = settings.merge_mode ?? "same_session";
     const home = requireHome(run);
@@ -88,28 +92,19 @@ export function ensureVnextMergeRequest(context, input) {
     if (!sourceCommit)
         throw new AppError("merge_source_invalid", "MERGE could not freeze source commit", 1, { source_commit: sourceCommit, target_branch: targetBranch });
     const enqueueTarget = gitValue(targetWorkspace, ["rev-parse", targetBranch], true);
-    const root = requireRootWork(context, project.id, run.id);
-    let child;
-    let requestId;
-    const now = context.now();
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
+    return () => context.db.writeTransaction(() => {
+        assertRunMutationAllowed(context, project.id, run.id);
+        const root = requireRootWork(context, project.id, run.id);
+        const now = context.now();
         const raced = context.db.get("SELECT * FROM merge_requests WHERE project_id = ? AND run_id = ? AND status NOT IN ('completed','failed','cancelled','superseded') ORDER BY created_at DESC LIMIT 1", [project.id, run.id]);
-        if (raced) {
-            context.db.exec("COMMIT");
+        if (raced)
             return requestView(context, raced);
-        }
-        child = createChildWork(context, { parentWorkId: root.work_id, slug: "merge", task: `Integrate frozen source ${sourceCommit} into ${targetBranch}, resolve material conflicts, and preserve accepted behavior.`, launchPolicy: route === "server" ? "fresh_agent_required" : "reuse_allowed", resultSchema: "dd-flow/merge-result@1", payload: { kind: "merge", checks: semantic, protocol_ids: protocols } });
-        requestId = nextMergeRequestId(context);
+        const child = createChildWork(context, { parentWorkId: root.work_id, slug: "merge", task: `Integrate frozen source ${sourceCommit} into ${targetBranch}, resolve material conflicts, and preserve accepted behavior.`, launchPolicy: route === "server" ? "fresh_agent_required" : "reuse_allowed", resultSchema: "dd-flow/merge-result@1", payload: { kind: "merge", checks: semantic, protocol_ids: protocols } });
+        const requestId = nextMergeRequestId(context);
         context.db.run("INSERT INTO merge_requests (merge_request_id, project_id, run_id, executor_work_id, protocol_ids_json, source_workspace, source_branch, source_commit, target_workspace, target_branch, enqueue_target_head, execution_target_head, integration_commit, execution_route, status, dispatch_owner, dispatch_lease_token, dispatch_lease_expires_at, lock_acquired_at, checkpoint, profile_hash, replacement_of_merge_request_id, adapter_receipt_json, result_json, last_error_json, created_at, updated_at, completed_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, ?, 'queued', NULL, NULL, NULL, NULL, 'queued', ?, ?, NULL, NULL, NULL, ?, ?, NULL)", [requestId, project.id, run.id, child.work_id, JSON.stringify(protocols), run.workspace_root, sourceBranch, sourceCommit, targetWorkspace, targetBranch, enqueueTarget, route, readCodeCheckProfile(targetWorkspace).hash, replacementOf(run), now, now]);
-        context.db.exec("COMMIT");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
-    }
-    appendFlowRunTimelineEvent(context, project.id, run.id, { type: "merge_request_queued", merge_request_id: requestId, work_id: child.work_id, route, source_commit: sourceCommit, target_branch: targetBranch });
-    return requestView(context, requireRequest(context, requestId));
+        appendFlowRunTimelineEvent(context, project.id, run.id, { type: "merge_request_queued", merge_request_id: requestId, work_id: child.work_id, route, source_commit: sourceCommit, target_branch: targetBranch });
+        return requestView(context, requireRequest(context, requestId));
+    });
 }
 export async function startVnextMerge(context, input) {
     const projectRoot = resolveProjectRoot(input.projectRoot);
@@ -346,7 +341,7 @@ function recoverCompletedMergeRun(context, run, projectRoot, request) {
 }
 export function routeVnextMergeRequest(context, input) {
     const project = requireProjectByRoot(context, resolveProjectRoot(input.projectRoot));
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     let request;
     try {
         request = requireRequest(context, input.requestId);

package/dist/services/vnext-plan-review.js

@@ -1,6 +1,6 @@
 import { managedLifecycleCommand } from "./lifecycle-invocations.js";
 import crypto from "node:crypto";
-import { withStageSettlement } from "./runs.js";
+import { withStageSettlement, stageInputGuard } from "./runs.js";
 import fs from "node:fs";
 import path from "node:path";
 import { AppError } from "../shared/errors.js";
@@ -184,6 +184,7 @@ export function finishVnextPlanReview(context, input) {
     if (!parent || parent.status !== "running")
         throw new AppError("invalid_work_state", "PLAN-REVIEW has no running parent Work", 2);
     const decisionPath = path.resolve(input.decisionFile ?? path.join(root, "decision.json"));
+    const assertInputs = stageInputGuard(context, project.id, run.id, () => [planSetChecksum(home, run.workspace_root), checksum(batch), checksum(decisionPath), checksum(path.join(root, "work-context.json"))]);
     const decision = readDecision(context, projectRoot, run.id, home, decisionPath);
     const children = context.db.all("SELECT work_id, task, status, result, created_at FROM works WHERE project_id = ? AND run_id = ? AND parent_work_id = ?", [project.id, run.id, parent.work_id]);
     const contextFile = readJson(path.join(root, "work-context.json"));
@@ -198,7 +199,7 @@ export function finishVnextPlanReview(context, input) {
     }
     if (["failed", "cancelled"].includes(decision.outcome)) {
         preserveDecisionReceipt(root, decisionPath);
-        return withStageSettlement(context, () => finishTerminalReview(context, { projectRoot, projectId: project.id, run, root, planRoot, batch, parentWorkId: parent.work_id, children, contextFile, decision }));
+        return withStageSettlement(context, () => { assertInputs(); return finishTerminalReview(context, { projectRoot, projectId: project.id, run, root, planRoot, batch, parentWorkId: parent.work_id, children, contextFile, decision }); });
     }
     if (children.some((child) => child.status === "created" || child.status === "running"))
         throw new AppError("worker_jobs_incomplete", "PLAN-REVIEW finish requires all reviewer Works to settle", 1, { works: children.map((child) => ({ work_id: child.work_id, status: child.status })) });
@@ -246,6 +247,7 @@ export function finishVnextPlanReview(context, input) {
     const finalPlanChecksum = planSetChecksum(home, run.workspace_root);
     const finalBatchChecksum = checksum(batch);
     return withStageSettlement(context, () => {
+        assertInputs();
         const registered = registerCode(context, project.id, run.id, batch);
         const now = context.now();
         settleReviewParent(context, { projectRoot, projectId: project.id, runId: run.id, parentWorkId: parent.work_id, status: "completed", result: decision.summary, reason: "plan_review_completed", resultPath: path.join(root, "stage-report.json") });

package/dist/services/vnext-plan.js

@@ -52,7 +52,7 @@ export function startVnextPlan(context, input) {
     if (!context.db.get("SELECT 1 FROM work_sessions WHERE work_id = ? LIMIT 1", [rootWork.work_id])) {
         bindRunningWorkSession(context, { workId: rootWork.work_id, hookEventId: input.hookEventId, promptPath: path.join(root, "fixture-root.prompt.md") });
     }
-    context.db.exec("BEGIN IMMEDIATE");
+    context.db.beginWriteTransaction();
     let planWorkId;
     try {
         planWorkId = nextWorkId(context, project.id, "plan");