@open-mercato/core 0.10.1-develop.7727.1.0b89c4f800 → 0.10.1-develop.7736.1.88e07906bf

package/dist/modules/sales/commands/documents.js

@@ -92,6 +92,7 @@ import {
   reconcileLinePersistedTotals,
   deriveLineNetFromGross,
   enforceSalesDocumentOptimisticLock,
+  lockSalesDocumentRow,
   SALES_RESOURCE_KIND_ORDER,
   SALES_RESOURCE_KIND_QUOTE
 } from "./shared.js";
@@ -525,19 +526,26 @@ async function applyDocumentUpdate({
     entity.quoteNumber = input.quoteNumber;
   }
   if (input.customerEntityId !== void 0) {
-    entity.customerEntityId = input.customerEntityId ?? null;
+    const nextCustomerEntityId = input.customerEntityId ?? null;
+    const customerChanged = (nextCustomerEntityId?.toLowerCase() ?? null) !== (entity.customerEntityId?.toLowerCase() ?? null);
+    const snapshotContactId = input.customerContactId !== void 0 ? input.customerContactId : customerChanged ? null : entity.customerContactId ?? null;
+    if (customerChanged) {
+      entity.customerEntityId = nextCustomerEntityId;
+    }
     entity.customerSnapshot = await resolveCustomerSnapshot(
       em,
       organizationId,
       tenantId,
-      input.customerEntityId,
-      input.customerContactId ?? entity.customerContactId ?? null
+      entity.customerEntityId ?? null,
+      snapshotContactId
     );
-    entity.customerContactId = input.customerContactId ?? null;
-    entity.billingAddressId = null;
-    entity.shippingAddressId = null;
-    entity.billingAddressSnapshot = null;
-    entity.shippingAddressSnapshot = null;
+    if (customerChanged) {
+      entity.customerContactId = input.customerContactId ?? null;
+      entity.billingAddressId = null;
+      entity.shippingAddressId = null;
+      entity.billingAddressSnapshot = null;
+      entity.shippingAddressSnapshot = null;
+    }
   }
   if (input.customerContactId !== void 0) {
     entity.customerContactId = input.customerContactId ?? null;
@@ -3924,6 +3932,165 @@ const deleteQuoteCommand = {
     await undoQuoteGraph(ctx, before, payload?.after);
   }
 };
+const lockedGraphWriteInputs = /* @__PURE__ */ new WeakSet();
+const lockedOrderGraphSnapshots = /* @__PURE__ */ new WeakMap();
+const lockedQuoteGraphSnapshots = /* @__PURE__ */ new WeakMap();
+function resolveRequestDecryptionScope(ctx) {
+  return {
+    tenantId: ctx.auth?.tenantId ?? void 0,
+    organizationId: ctx.selectedOrganizationId ?? ctx.auth?.orgId ?? void 0
+  };
+}
+async function lockOrderForTotalsWrite(em, ctx, orderId, missingOrderMessage) {
+  const existingOrder = await findOneWithDecryption(
+    em,
+    SalesOrder,
+    { id: orderId, deletedAt: null },
+    {},
+    resolveRequestDecryptionScope(ctx)
+  );
+  if (!existingOrder) throw notFound(missingOrderMessage);
+  ensureOrderScope(ctx, existingOrder.organizationId, existingOrder.tenantId);
+  const scope = {
+    tenantId: existingOrder.tenantId,
+    organizationId: existingOrder.organizationId
+  };
+  if (!await lockSalesDocumentRow(em, "sales_orders", orderId, scope)) {
+    throw notFound(missingOrderMessage);
+  }
+  const order = await findOneWithDecryption(
+    em,
+    SalesOrder,
+    { id: orderId, deletedAt: null, ...scope },
+    { refresh: true },
+    scope
+  );
+  if (!order) throw notFound(missingOrderMessage);
+  await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
+  return order;
+}
+async function lockQuoteForTotalsWrite(em, ctx, quoteId, missingQuoteMessage) {
+  const existingQuote = await findOneWithDecryption(
+    em,
+    SalesQuote,
+    { id: quoteId, deletedAt: null },
+    {},
+    resolveRequestDecryptionScope(ctx)
+  );
+  if (!existingQuote) throw notFound(missingQuoteMessage);
+  ensureQuoteScope(ctx, existingQuote.organizationId, existingQuote.tenantId);
+  const scope = {
+    tenantId: existingQuote.tenantId,
+    organizationId: existingQuote.organizationId
+  };
+  if (!await lockSalesDocumentRow(em, "sales_quotes", quoteId, scope)) {
+    throw notFound(missingQuoteMessage);
+  }
+  const quote = await findOneWithDecryption(
+    em,
+    SalesQuote,
+    { id: quoteId, deletedAt: null, ...scope },
+    { refresh: true },
+    scope
+  );
+  if (!quote) throw notFound(missingQuoteMessage);
+  await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
+  return quote;
+}
+function buildTotalsCalculatedPayload(documentKind, document, calculation) {
+  return {
+    documentKind,
+    documentId: document.id,
+    organizationId: document.organizationId,
+    tenantId: document.tenantId,
+    customerId: document.customerEntityId ?? null,
+    totals: calculation.totals,
+    lineCount: calculation.lines.length
+  };
+}
+async function emitCommittedTotalsCalculated(ctx, payload) {
+  if (!payload) return;
+  let eventBus = null;
+  try {
+    eventBus = ctx.container.resolve("eventBus");
+  } catch {
+    eventBus = null;
+  }
+  await emitTotalsCalculated(eventBus, payload);
+}
+const lockedOrderGraphKind = {
+  documentKind: "order",
+  lock: lockOrderForTotalsWrite,
+  loadSnapshot: loadOrderSnapshot,
+  snapshots: lockedOrderGraphSnapshots
+};
+const lockedQuoteGraphKind = {
+  documentKind: "quote",
+  lock: lockQuoteForTotalsWrite,
+  loadSnapshot: loadQuoteSnapshot,
+  snapshots: lockedQuoteGraphSnapshots
+};
+function markLockedGraphWrite(input) {
+  lockedGraphWriteInputs.add(input);
+  return {};
+}
+async function writeLockedDocumentGraph(kind, input, ctx, documentId, missingMessage, write) {
+  const em = ctx.container.resolve("em").fork();
+  const captureSnapshots = lockedGraphWriteInputs.has(input);
+  let written;
+  let totalsEvent;
+  let before = null;
+  let after = null;
+  await withAtomicFlush(
+    em,
+    [
+      async () => {
+        const document = await kind.lock(em, ctx, documentId, missingMessage);
+        if (captureSnapshots) before = await kind.loadSnapshot(em, document.id);
+        written = await write(em, document);
+        totalsEvent = buildTotalsCalculatedPayload(
+          kind.documentKind,
+          document,
+          written.calculation
+        );
+      },
+      ...captureSnapshots ? [
+        async () => {
+          em.clear();
+          after = await kind.loadSnapshot(em, documentId);
+        }
+      ] : []
+    ],
+    { transaction: true }
+  );
+  if (captureSnapshots) kind.snapshots.set(written.result, { before, after });
+  await emitCommittedTotalsCalculated(ctx, totalsEvent);
+  return written.result;
+}
+function writeLockedOrderGraph(input, ctx, orderId, missingOrderMessage, write) {
+  return writeLockedDocumentGraph(lockedOrderGraphKind, input, ctx, orderId, missingOrderMessage, write);
+}
+function writeLockedQuoteGraph(input, ctx, quoteId, missingQuoteMessage, write) {
+  return writeLockedDocumentGraph(lockedQuoteGraphKind, input, ctx, quoteId, missingQuoteMessage, write);
+}
+function resolveLockedOrderGraphBefore(result, preparedBefore) {
+  return lockedOrderGraphSnapshots.get(result)?.before ?? preparedBefore;
+}
+function resolveLockedQuoteGraphBefore(result, preparedBefore) {
+  return lockedQuoteGraphSnapshots.get(result)?.before ?? preparedBefore;
+}
+async function captureLockedOrderGraphAfter(ctx, result, orderId) {
+  const locked = lockedOrderGraphSnapshots.get(result);
+  if (locked) return locked.after;
+  const em = ctx.container.resolve("em").fork();
+  return loadOrderSnapshot(em, orderId);
+}
+async function captureLockedQuoteGraphAfter(ctx, result, quoteId) {
+  const locked = lockedQuoteGraphSnapshots.get(result);
+  if (locked) return locked.after;
+  const em = ctx.container.resolve("em").fork();
+  return loadQuoteSnapshot(em, quoteId);
+}
 const updateQuoteCommand = {
   id: "sales.quotes.update",
   async prepare(input, ctx) {
@@ -3944,20 +4111,15 @@ const updateQuoteCommand = {
     await assertAmountsModeUnsupportedOnQuote([parsed]);
     documentEditSchema.parse(rawInput ?? {});
     const em = ctx.container.resolve("em").fork();
-    const quote = await findOneWithDecryption(em, SalesQuote, {
-      id: parsed.id,
-      deletedAt: null
-    });
-    if (!quote)
-      throw notFound("Sales quote not found");
-    ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
-    const shouldInvalidateSentToken = (quote.status ?? null) === "sent";
+    let quote;
+    let totalsEvent = null;
     const shouldRecalculateTotals = parsed.shippingMethodId !== void 0 || parsed.shippingMethodSnapshot !== void 0 || parsed.shippingMethodCode !== void 0 || parsed.paymentMethodId !== void 0 || parsed.paymentMethodSnapshot !== void 0 || parsed.paymentMethodCode !== void 0 || parsed.currencyCode !== void 0;
     await withAtomicFlush(
       em,
       [
         async () => {
+          quote = await lockQuoteForTotalsWrite(em, ctx, parsed.id, "Sales quote not found");
+          const shouldInvalidateSentToken = (quote.status ?? null) === "sent";
           await applyDocumentUpdate({
             kind: "quote",
             entity: quote,
@@ -4055,27 +4217,14 @@ const updateQuoteCommand = {
               adjustmentInputs
             );
             applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
-            let eventBus = null;
-            try {
-              eventBus = ctx.container.resolve("eventBus");
-            } catch {
-              eventBus = null;
-            }
-            await emitTotalsCalculated(eventBus, {
-              documentKind: "quote",
-              documentId: quote.id,
-              organizationId: quote.organizationId,
-              tenantId: quote.tenantId,
-              customerId: quote.customerEntityId ?? null,
-              totals: calculation.totals,
-              lineCount: calculation.lines.length
-            });
+            totalsEvent = buildTotalsCalculatedPayload("quote", quote, calculation);
           }
           quote.updatedAt = /* @__PURE__ */ new Date();
         }
       ],
       { transaction: true }
     );
+    await emitCommittedTotalsCalculated(ctx, totalsEvent);
     const dataEngine = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
       dataEngine,
@@ -4193,44 +4342,42 @@ const updateOrderCommand = {
   async execute(rawInput, ctx) {
     const parsed = documentUpdateSchema.parse(rawInput ?? {});
     const em = ctx.container.resolve("em").fork();
-    const order = await findOneWithDecryption(em, SalesOrder, {
-      id: parsed.id,
-      deletedAt: null
-    });
-    if (!order)
-      throw notFound("Sales order not found");
-    ensureOrderScope(ctx, order.organizationId, order.tenantId);
-    const currentTotalsMode = order.totalsMode ?? "computed";
-    const nextTotalsMode = parsed.totalsMode ?? currentTotalsMode;
-    const totalsModeChanged = nextTotalsMode !== currentTotalsMode;
-    const externalHeaderSupplied = isExternalAmountsMode(nextTotalsMode) && hasAnySuppliedHeaderTotal(parsed);
-    if (!totalsModeChanged && !externalHeaderSupplied) {
-      documentEditSchema.parse(rawInput ?? {});
-    }
-    if (isExternalAmountsMode(nextTotalsMode) && (totalsModeChanged || externalHeaderSupplied)) {
-      await requireOrderTotalsForExternalWrite(parsed);
-    }
-    await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
-    const previousStatus = normalizeStatusValue(order.status);
-    if (parsed.statusEntryId && !isCancelledOrderStatus(previousStatus)) {
-      const requestedStatus = normalizeStatusValue(
-        await resolveDictionaryEntryValue(em, parsed.statusEntryId, {
-          tenantId: order.tenantId
-        })
-      );
-      if (isCancelledOrderStatus(requestedStatus)) {
-        await assertOrderCanBeCancelled(em, order);
-      }
-    }
+    let order;
+    let previousStatus = null;
+    let nextTotalsMode = "computed";
+    let totalsModeChanged = false;
+    let externalHeaderSupplied = false;
+    let suppliedTotals = null;
     let statusChangeNote = null;
-    const suppliedTotals = isExternalAmountsMode(
-      nextTotalsMode
-    ) ? externalHeaderSupplied ? buildExternalHeaderTotals(parsed) : readPersistedHeaderTotals(order) : null;
-    const shouldRecalculateTotals = parsed.shippingMethodId !== void 0 || parsed.shippingMethodSnapshot !== void 0 || parsed.shippingMethodCode !== void 0 || parsed.paymentMethodId !== void 0 || parsed.paymentMethodSnapshot !== void 0 || parsed.paymentMethodCode !== void 0 || parsed.currencyCode !== void 0 || totalsModeChanged || externalHeaderSupplied;
+    let totalsEvent = null;
+    const shouldRecalculateTotals = parsed.shippingMethodId !== void 0 || parsed.shippingMethodSnapshot !== void 0 || parsed.shippingMethodCode !== void 0 || parsed.paymentMethodId !== void 0 || parsed.paymentMethodSnapshot !== void 0 || parsed.paymentMethodCode !== void 0 || parsed.currencyCode !== void 0;
     await withAtomicFlush(
       em,
       [
         async () => {
+          order = await lockOrderForTotalsWrite(em, ctx, parsed.id, "Sales order not found");
+          const currentTotalsMode = order.totalsMode ?? "computed";
+          nextTotalsMode = parsed.totalsMode ?? currentTotalsMode;
+          totalsModeChanged = nextTotalsMode !== currentTotalsMode;
+          externalHeaderSupplied = isExternalAmountsMode(nextTotalsMode) && hasAnySuppliedHeaderTotal(parsed);
+          if (!totalsModeChanged && !externalHeaderSupplied) {
+            documentEditSchema.parse(rawInput ?? {});
+          }
+          if (isExternalAmountsMode(nextTotalsMode) && (totalsModeChanged || externalHeaderSupplied)) {
+            await requireOrderTotalsForExternalWrite(parsed);
+          }
+          suppliedTotals = isExternalAmountsMode(nextTotalsMode) ? externalHeaderSupplied ? buildExternalHeaderTotals(parsed) : readPersistedHeaderTotals(order) : null;
+          previousStatus = normalizeStatusValue(order.status);
+          if (parsed.statusEntryId && !isCancelledOrderStatus(previousStatus)) {
+            const requestedStatus = normalizeStatusValue(
+              await resolveDictionaryEntryValue(em, parsed.statusEntryId, {
+                tenantId: order.tenantId
+              })
+            );
+            if (isCancelledOrderStatus(requestedStatus)) {
+              await assertOrderCanBeCancelled(em, order);
+            }
+          }
           await applyDocumentUpdate({
             kind: "order",
             entity: order,
@@ -4245,7 +4392,7 @@ const updateOrderCommand = {
         // `em.find` lines/adjustments or appendOrderStatusChangeNote queries
         // reset the changeset (see SPEC-018).
         async () => {
-          if (shouldRecalculateTotals) {
+          if (shouldRecalculateTotals || totalsModeChanged || externalHeaderSupplied) {
             const [existingLines, adjustments] = await Promise.all([
               em.find(
                 SalesOrderLine,
@@ -4334,21 +4481,7 @@ const updateOrderCommand = {
               order.totalsMode = nextTotalsMode;
             }
             applyOrderTotals(order, calculation.totals, calculation.lines.length);
-            let eventBus = null;
-            try {
-              eventBus = ctx.container.resolve("eventBus");
-            } catch {
-              eventBus = null;
-            }
-            await emitTotalsCalculated(eventBus, {
-              documentKind: "order",
-              documentId: order.id,
-              organizationId: order.organizationId,
-              tenantId: order.tenantId,
-              customerId: order.customerEntityId ?? null,
-              totals: calculation.totals,
-              lineCount: calculation.lines.length
-            });
+            totalsEvent = buildTotalsCalculatedPayload("order", order, calculation);
           }
           statusChangeNote = await appendOrderStatusChangeNote({
             em,
@@ -4361,6 +4494,7 @@ const updateOrderCommand = {
       ],
       { transaction: true }
     );
+    await emitCommittedTotalsCalculated(ctx, totalsEvent);
     emitOrderLifecycleEventsForTransition({ order, previousStatus });
     const dataEngine = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
@@ -5575,115 +5709,75 @@ async function assertOrderAcceptsNewLine(order, existingSnapshot) {
 }
 const orderLineUpsertCommand = {
   id: "sales.orders.lines.upsert",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const orderId = typeof raw.orderId === "string" ? raw.orderId : null;
-    if (!orderId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot)
-      ensureOrderScope(
-        ctx,
-        snapshot.order.organizationId,
-        snapshot.order.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
     const rawBody = input?.body ?? {};
     const parsed = orderLineUpsertSchema.parse(rawBody);
-    const em = ctx.container.resolve("em").fork();
-    const order = await findOneWithDecryption(em, SalesOrder, {
-      id: parsed.orderId,
-      deletedAt: null
-    });
-    if (!order)
-      throw notFound("Sales order not found");
-    ensureOrderScope(ctx, order.organizationId, order.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
-    const [existingLines, adjustments] = await Promise.all([
-      em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
-      em.find(
-        SalesOrderAdjustment,
-        { order },
-        { orderBy: { position: "asc" } }
-      )
-    ]);
-    const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
-    const existingSnapshot = parsed.id ? lineSnapshots.find((line) => line.id === parsed.id) ?? null : null;
-    const totalsMode = order.totalsMode ?? "computed";
-    await assertUniformAmountsMode(totalsMode, [parsed]);
-    if (isExternalAmountsMode(totalsMode)) {
-      await requireOrderTotalsForExternalWrite(parsed.orderTotals);
-    }
-    const suppliedTotals = isExternalAmountsMode(totalsMode) ? buildExternalHeaderTotals(parsed.orderTotals) : null;
-    await assertOrderAcceptsNewLine(order, existingSnapshot);
-    await assertShippedOrderLineEditable(em, order, existingSnapshot, parsed);
-    const priceMode = parsed.priceMode === "gross" ? "gross" : parsed.priceMode === "net" ? "net" : null;
-    let unitPriceNet = parsed.unitPriceNet ?? existingSnapshot?.unitPriceNet ?? null;
-    let unitPriceGross = parsed.unitPriceGross ?? existingSnapshot?.unitPriceGross ?? null;
-    let taxRate = parsed.taxRate ?? existingSnapshot?.taxRate ?? null;
-    const unitPriceSupplied = unitPriceNet !== null || unitPriceGross !== null;
-    if (priceMode && (unitPriceNet === null || unitPriceGross === null)) {
-      let taxService = null;
-      try {
-        taxService = ctx.container.resolve(
-          "taxCalculationService"
-        );
-      } catch {
-        taxService = null;
-      }
-      if (taxService) {
-        const taxResult = await taxService.calculateUnitAmounts({
-          amount: priceMode === "gross" ? unitPriceGross ?? unitPriceNet ?? 0 : unitPriceNet ?? unitPriceGross ?? 0,
-          mode: priceMode,
-          organizationId: parsed.organizationId,
-          tenantId: parsed.tenantId,
-          taxRateId: parsed.taxRateId ?? void 0,
-          taxRate: taxRate ?? void 0
-        });
-        unitPriceNet = unitPriceNet ?? taxResult.netAmount;
-        unitPriceGross = unitPriceGross ?? taxResult.grossAmount;
-        taxRate = taxResult.taxRate ?? taxRate;
+    return writeLockedOrderGraph(input, ctx, parsed.orderId, "Sales order not found", async (em, order) => {
+      const [existingLines, adjustments] = await Promise.all([
+        em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
+        em.find(
+          SalesOrderAdjustment,
+          { order },
+          { orderBy: { position: "asc" } }
+        )
+      ]);
+      const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
+      const existingSnapshot = parsed.id ? lineSnapshots.find((line) => line.id === parsed.id) ?? null : null;
+      const totalsMode = order.totalsMode ?? "computed";
+      await assertUniformAmountsMode(totalsMode, [parsed]);
+      if (isExternalAmountsMode(totalsMode)) {
+        await requireOrderTotalsForExternalWrite(parsed.orderTotals);
       }
-    }
-    const metadata = typeof parsed.metadata === "object" && parsed.metadata ? { ...parsed.metadata } : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : {};
-    if (parsed.priceId) metadata.priceId = parsed.priceId;
-    if (priceMode) metadata.priceMode = priceMode;
-    const statusEntryId = parsed.statusEntryId ?? existingSnapshot?.statusEntryId ?? null;
-    const lineId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
-    const lineUomInput = {
-      productId: parsed.productId ?? existingSnapshot?.productId ?? null,
-      productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
-      quantity: parsed.quantity ?? existingSnapshot?.quantity ?? 0,
-      quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
-      normalizedQuantity: existingSnapshot?.normalizedQuantity ?? null,
-      normalizedUnit: existingSnapshot?.normalizedUnit ?? null,
-      uomSnapshot: existingSnapshot?.uomSnapshot ?? null
-    };
-    const uomResolver = createUomResolver();
-    let normalizedUom = await normalizeLineUom({
-      em,
-      resolver: uomResolver,
-      organizationId: order.organizationId,
-      tenantId: order.tenantId,
-      line: {
-        ...lineUomInput,
-        unitPriceNet: unitPriceNet ?? 0,
-        unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+      const suppliedTotals = isExternalAmountsMode(totalsMode) ? buildExternalHeaderTotals(parsed.orderTotals) : null;
+      await assertOrderAcceptsNewLine(order, existingSnapshot);
+      await assertShippedOrderLineEditable(em, order, existingSnapshot, parsed);
+      const priceMode = parsed.priceMode === "gross" ? "gross" : parsed.priceMode === "net" ? "net" : null;
+      let unitPriceNet = parsed.unitPriceNet ?? existingSnapshot?.unitPriceNet ?? null;
+      let unitPriceGross = parsed.unitPriceGross ?? existingSnapshot?.unitPriceGross ?? null;
+      let taxRate = parsed.taxRate ?? existingSnapshot?.taxRate ?? null;
+      const unitPriceSupplied = unitPriceNet !== null || unitPriceGross !== null;
+      if (priceMode && (unitPriceNet === null || unitPriceGross === null)) {
+        let taxService = null;
+        try {
+          taxService = ctx.container.resolve(
+            "taxCalculationService"
+          );
+        } catch {
+          taxService = null;
+        }
+        if (taxService) {
+          const taxResult = await taxService.calculateUnitAmounts({
+            amount: priceMode === "gross" ? unitPriceGross ?? unitPriceNet ?? 0 : unitPriceNet ?? unitPriceGross ?? 0,
+            mode: priceMode,
+            organizationId: parsed.organizationId,
+            tenantId: parsed.tenantId,
+            taxRateId: parsed.taxRateId ?? void 0,
+            taxRate: taxRate ?? void 0
+          });
+          unitPriceNet = unitPriceNet ?? taxResult.netAmount;
+          unitPriceGross = unitPriceGross ?? taxResult.grossAmount;
+          taxRate = taxResult.taxRate ?? taxRate;
+        }
       }
-    });
-    const convertedPrices = convertLineUnitPricesOnUnitChange({
-      existingSnapshot,
-      nextQuantityUnit: normalizedUom.quantityUnit,
-      nextUomSnapshot: normalizedUom.uomSnapshot,
-      unitPriceNet,
-      unitPriceGross
-    });
-    if (convertedPrices.didConvert) {
-      unitPriceNet = convertedPrices.unitPriceNet;
-      unitPriceGross = convertedPrices.unitPriceGross;
-      normalizedUom = await normalizeLineUom({
+      const metadata = typeof parsed.metadata === "object" && parsed.metadata ? { ...parsed.metadata } : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : {};
+      if (parsed.priceId) metadata.priceId = parsed.priceId;
+      if (priceMode) metadata.priceMode = priceMode;
+      const statusEntryId = parsed.statusEntryId ?? existingSnapshot?.statusEntryId ?? null;
+      const lineId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
+      const lineUomInput = {
+        productId: parsed.productId ?? existingSnapshot?.productId ?? null,
+        productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
+        quantity: parsed.quantity ?? existingSnapshot?.quantity ?? 0,
+        quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
+        normalizedQuantity: existingSnapshot?.normalizedQuantity ?? null,
+        normalizedUnit: existingSnapshot?.normalizedUnit ?? null,
+        uomSnapshot: existingSnapshot?.uomSnapshot ?? null
+      };
+      const uomResolver = createUomResolver();
+      let normalizedUom = await normalizeLineUom({
         em,
         resolver: uomResolver,
         organizationId: order.organizationId,
@@ -5694,134 +5788,130 @@ const orderLineUpsertCommand = {
           unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
         }
       });
-    }
-    const updatedSnapshot = {
-      id: lineId,
-      lineNumber: parsed.lineNumber ?? existingSnapshot?.lineNumber ?? lineSnapshots.length + 1,
-      kind: parsed.kind ?? existingSnapshot?.kind ?? "product",
-      productId: parsed.productId ?? existingSnapshot?.productId ?? null,
-      productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
-      name: parsed.name ?? existingSnapshot?.name ?? null,
-      description: parsed.description ?? existingSnapshot?.description ?? null,
-      comment: parsed.comment ?? existingSnapshot?.comment ?? null,
-      quantity: normalizedUom.quantity,
-      quantityUnit: normalizedUom.quantityUnit,
-      normalizedQuantity: normalizedUom.normalizedQuantity,
-      normalizedUnit: normalizedUom.normalizedUnit,
-      uomSnapshot: normalizedUom.uomSnapshot ? cloneJson(normalizedUom.uomSnapshot) : null,
-      currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? order.currencyCode,
-      unitPriceNet: unitPriceNet ?? 0,
-      unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
-      ...resolveUpsertDiscountFields(
-        parsed.discountAmount,
-        parsed.discountAmountBasis,
-        existingSnapshot
-      ),
-      discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
-      taxRate: taxRate ?? 0,
-      totalNetAmount: parsed.totalNetAmount ?? existingSnapshot?.totalNetAmount ?? null,
-      ...resolveUpsertTotalsOrigin(parsed.totalNetAmount, existingSnapshot),
-      configuration: parsed.configuration ?? existingSnapshot?.configuration ?? null,
-      promotionCode: parsed.promotionCode ?? existingSnapshot?.promotionCode ?? null,
-      metadata,
-      customFieldSetId: parsed.customFieldSetId ?? existingSnapshot?.customFieldSetId ?? null,
-      customFields: parsed.customFields && typeof parsed.customFields === "object" ? cloneJson(parsed.customFields) : existingSnapshot?.customFields ?? null,
-      amountsMode: totalsMode
-    };
-    Object.assign(
-      updatedSnapshot,
-      resolveUpsertCalculatedAmounts(parsed, updatedSnapshot, existingSnapshot)
-    );
-    if (isExternalAmountsMode(totalsMode)) {
-      await assertExternalLineComplete(
-        {
-          ...updatedSnapshot,
-          unitPriceNet: unitPriceSupplied ? unitPriceNet : null
-        },
-        updatedSnapshot.lineNumber ?? 1
+      const convertedPrices = convertLineUnitPricesOnUnitChange({
+        existingSnapshot,
+        nextQuantityUnit: normalizedUom.quantityUnit,
+        nextUomSnapshot: normalizedUom.uomSnapshot,
+        unitPriceNet,
+        unitPriceGross
+      });
+      if (convertedPrices.didConvert) {
+        unitPriceNet = convertedPrices.unitPriceNet;
+        unitPriceGross = convertedPrices.unitPriceGross;
+        normalizedUom = await normalizeLineUom({
+          em,
+          resolver: uomResolver,
+          organizationId: order.organizationId,
+          tenantId: order.tenantId,
+          line: {
+            ...lineUomInput,
+            unitPriceNet: unitPriceNet ?? 0,
+            unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+          }
+        });
+      }
+      const updatedSnapshot = {
+        id: lineId,
+        lineNumber: parsed.lineNumber ?? existingSnapshot?.lineNumber ?? lineSnapshots.length + 1,
+        kind: parsed.kind ?? existingSnapshot?.kind ?? "product",
+        productId: parsed.productId ?? existingSnapshot?.productId ?? null,
+        productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
+        name: parsed.name ?? existingSnapshot?.name ?? null,
+        description: parsed.description ?? existingSnapshot?.description ?? null,
+        comment: parsed.comment ?? existingSnapshot?.comment ?? null,
+        quantity: normalizedUom.quantity,
+        quantityUnit: normalizedUom.quantityUnit,
+        normalizedQuantity: normalizedUom.normalizedQuantity,
+        normalizedUnit: normalizedUom.normalizedUnit,
+        uomSnapshot: normalizedUom.uomSnapshot ? cloneJson(normalizedUom.uomSnapshot) : null,
+        currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? order.currencyCode,
+        unitPriceNet: unitPriceNet ?? 0,
+        unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
+        ...resolveUpsertDiscountFields(
+          parsed.discountAmount,
+          parsed.discountAmountBasis,
+          existingSnapshot
+        ),
+        discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
+        taxRate: taxRate ?? 0,
+        totalNetAmount: parsed.totalNetAmount ?? existingSnapshot?.totalNetAmount ?? null,
+        ...resolveUpsertTotalsOrigin(parsed.totalNetAmount, existingSnapshot),
+        configuration: parsed.configuration ?? existingSnapshot?.configuration ?? null,
+        promotionCode: parsed.promotionCode ?? existingSnapshot?.promotionCode ?? null,
+        metadata,
+        customFieldSetId: parsed.customFieldSetId ?? existingSnapshot?.customFieldSetId ?? null,
+        customFields: parsed.customFields && typeof parsed.customFields === "object" ? cloneJson(parsed.customFields) : existingSnapshot?.customFields ?? null,
+        amountsMode: totalsMode
+      };
+      Object.assign(
+        updatedSnapshot,
+        resolveUpsertCalculatedAmounts(parsed, updatedSnapshot, existingSnapshot)
       );
-    }
-    updatedSnapshot.statusEntryId = statusEntryId;
-    updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
-    updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
-    let nextLines = parsed.id ? lineSnapshots.map(
-      (line) => line.id === parsed.id ? updatedSnapshot : line
-    ) : [...lineSnapshots, updatedSnapshot];
-    nextLines = nextLines.sort((a, b) => (a.lineNumber ?? 0) - (b.lineNumber ?? 0)).map((line, index) => ({ ...line, lineNumber: index + 1 }));
-    const sourceInputs = nextLines.map((line, index) => ({
-      ...line,
-      statusEntryId: line.statusEntryId ?? null,
-      catalogSnapshot: line.catalogSnapshot ?? null,
-      promotionSnapshot: line.promotionSnapshot ?? null,
-      organizationId: order.organizationId,
-      tenantId: order.tenantId,
-      orderId: order.id,
-      lineNumber: line.lineNumber ?? index + 1
-    }));
-    const calcLines = sourceInputs.map(
-      (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
-    );
-    const adjustmentDrafts = adjustments.map(mapOrderAdjustmentToDraft);
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: order.tenantId,
-      organizationId: order.organizationId,
-      currencyCode: order.currencyCode,
-      shippingSnapshot: order.shippingMethodSnapshot,
-      paymentSnapshot: order.paymentMethodSnapshot,
-      shippingMethodId: order.shippingMethodId ?? null,
-      paymentMethodId: order.paymentMethodId ?? null,
-      shippingMethodCode: order.shippingMethodCode ?? null,
-      paymentMethodCode: order.paymentMethodCode ?? null
-    });
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "order",
-      lines: calcLines,
-      adjustments: adjustmentDrafts,
-      context: calculationContext,
-      existingTotals: resolveExistingPaymentTotals(order),
-      totalsMode,
-      suppliedTotals
+      if (isExternalAmountsMode(totalsMode)) {
+        await assertExternalLineComplete(
+          {
+            ...updatedSnapshot,
+            unitPriceNet: unitPriceSupplied ? unitPriceNet : null
+          },
+          updatedSnapshot.lineNumber ?? 1
+        );
+      }
+      updatedSnapshot.statusEntryId = statusEntryId;
+      updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
+      updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
+      let nextLines = parsed.id ? lineSnapshots.map(
+        (line) => line.id === parsed.id ? updatedSnapshot : line
+      ) : [...lineSnapshots, updatedSnapshot];
+      nextLines = nextLines.sort((a, b) => (a.lineNumber ?? 0) - (b.lineNumber ?? 0)).map((line, index) => ({ ...line, lineNumber: index + 1 }));
+      const sourceInputs = nextLines.map((line, index) => ({
+        ...line,
+        statusEntryId: line.statusEntryId ?? null,
+        catalogSnapshot: line.catalogSnapshot ?? null,
+        promotionSnapshot: line.promotionSnapshot ?? null,
+        organizationId: order.organizationId,
+        tenantId: order.tenantId,
+        orderId: order.id,
+        lineNumber: line.lineNumber ?? index + 1
+      }));
+      const calcLines = sourceInputs.map(
+        (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
+      );
+      const adjustmentDrafts = adjustments.map(mapOrderAdjustmentToDraft);
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: order.tenantId,
+        organizationId: order.organizationId,
+        currencyCode: order.currencyCode,
+        shippingSnapshot: order.shippingMethodSnapshot,
+        paymentSnapshot: order.paymentMethodSnapshot,
+        shippingMethodId: order.shippingMethodId ?? null,
+        paymentMethodId: order.paymentMethodId ?? null,
+        shippingMethodCode: order.shippingMethodCode ?? null,
+        paymentMethodCode: order.paymentMethodCode ?? null
+      });
+      const calculation = await salesCalculationService.calculateDocumentTotals({
+        documentKind: "order",
+        lines: calcLines,
+        adjustments: adjustmentDrafts,
+        context: calculationContext,
+        existingTotals: resolveExistingPaymentTotals(order),
+        totalsMode,
+        suppliedTotals
+      });
+      await applyOrderLineResults({
+        em,
+        order,
+        calculation,
+        sourceLines: sourceInputs,
+        existingLines
+      });
+      applyOrderTotals(order, calculation.totals, calculation.lines.length);
+      return { result: { orderId: order.id, lineId }, calculation };
     });
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await applyOrderLineResults({
-            em,
-            order,
-            calculation,
-            sourceLines: sourceInputs,
-            existingLines
-          });
-          applyOrderTotals(order, calculation.totals, calculation.lines.length);
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "order",
-            documentId: order.id,
-            organizationId: order.organizationId,
-            tenantId: order.tenantId,
-            customerId: order.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
-          });
-        }
-      ],
-      { transaction: true }
-    );
-    return { orderId: order.id, lineId };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadOrderSnapshot(em, result.orderId);
   },
+  captureAfter: async (_input, result, ctx) => captureLockedOrderGraphAfter(ctx, result, result.orderId),
   buildLog: async ({ result, snapshots }) => {
-    const before = snapshots.before;
+    const before = resolveLockedOrderGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
@@ -5850,153 +5940,109 @@ const orderLineUpsertCommand = {
 };
 const orderLineDeleteCommand = {
   id: "sales.orders.lines.delete",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const orderId = typeof raw.orderId === "string" ? raw.orderId : null;
-    if (!orderId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot)
-      ensureOrderScope(
-        ctx,
-        snapshot.order.organizationId,
-        snapshot.order.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
     const { translate } = await resolveTranslations();
     const parsed = orderLineDeleteSchema.parse(
       input?.body ?? {}
     );
-    const em = ctx.container.resolve("em").fork();
-    const order = await findOneWithDecryption(em, SalesOrder, {
-      id: parsed.orderId,
-      deletedAt: null
-    });
-    if (!order)
-      throw notFound(translate(
-        "sales.documents.detail.error",
-        "Document not found or inaccessible."
-      ));
-    ensureOrderScope(ctx, order.organizationId, order.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
-    const shipmentCount = await em.count(SalesShipmentItem, {
-      orderLine: parsed.id,
-      shipment: { deletedAt: null }
-    });
-    if (shipmentCount > 0) {
-      throw new CrudHttpError(409, {
-        error: translate(
-          "sales.documents.items.errorDeleteShipped",
-          "Cannot delete a line that has shipped items."
-        )
+    return writeLockedOrderGraph(input, ctx, parsed.orderId, translate(
+      "sales.documents.detail.error",
+      "Document not found or inaccessible."
+    ), async (em, order) => {
+      const shipmentCount = await em.count(SalesShipmentItem, {
+        orderLine: parsed.id,
+        shipment: { deletedAt: null }
       });
-    }
-    const existingLines = await em.find(
-      SalesOrderLine,
-      { order },
-      { orderBy: { lineNumber: "asc" } }
-    );
-    const adjustments = await em.find(
-      SalesOrderAdjustment,
-      { order },
-      { orderBy: { position: "asc" } }
-    );
-    const filtered = existingLines.filter((line) => line.id !== parsed.id);
-    if (filtered.length === existingLines.length) {
-      throw notFound(translate(
-        "sales.documents.detail.error",
-        "Document not found or inaccessible."
-      ));
-    }
-    if (filtered.length === 0) {
-      throw new CrudHttpError(409, {
-        error: translate(
-          "sales.documents.items.errorDeleteLast",
-          "An order must contain at least one line item."
-        )
+      if (shipmentCount > 0) {
+        throw new CrudHttpError(409, {
+          error: translate(
+            "sales.documents.items.errorDeleteShipped",
+            "Cannot delete a line that has shipped items."
+          )
+        });
+      }
+      const existingLines = await em.find(
+        SalesOrderLine,
+        { order },
+        { orderBy: { lineNumber: "asc" } }
+      );
+      const adjustments = await em.find(
+        SalesOrderAdjustment,
+        { order },
+        { orderBy: { position: "asc" } }
+      );
+      const filtered = existingLines.filter((line) => line.id !== parsed.id);
+      if (filtered.length === existingLines.length) {
+        throw notFound(translate(
+          "sales.documents.detail.error",
+          "Document not found or inaccessible."
+        ));
+      }
+      if (filtered.length === 0) {
+        throw new CrudHttpError(409, {
+          error: translate(
+            "sales.documents.items.errorDeleteLast",
+            "An order must contain at least one line item."
+          )
+        });
+      }
+      const totalsMode = order.totalsMode ?? "computed";
+      if (isExternalAmountsMode(totalsMode)) {
+        await requireOrderTotalsForExternalWrite(parsed.orderTotals);
+      }
+      const suppliedTotals = isExternalAmountsMode(totalsMode) ? buildExternalHeaderTotals(parsed.orderTotals) : null;
+      const sourceInputs = filtered.map((line, index) => ({
+        ...mapOrderLineEntityToSnapshot(line),
+        statusEntryId: line.statusEntryId ?? null,
+        catalogSnapshot: line.catalogSnapshot ? cloneJson(line.catalogSnapshot) : null,
+        promotionSnapshot: line.promotionSnapshot ? cloneJson(line.promotionSnapshot) : null,
+        organizationId: order.organizationId,
+        tenantId: order.tenantId,
+        orderId: order.id,
+        lineNumber: index + 1
+      }));
+      const calcLines = sourceInputs.map(
+        (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
+      );
+      const adjustmentDrafts = adjustments.map(mapOrderAdjustmentToDraft);
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: order.tenantId,
+        organizationId: order.organizationId,
+        currencyCode: order.currencyCode,
+        shippingSnapshot: order.shippingMethodSnapshot,
+        paymentSnapshot: order.paymentMethodSnapshot,
+        shippingMethodId: order.shippingMethodId ?? null,
+        paymentMethodId: order.paymentMethodId ?? null,
+        shippingMethodCode: order.shippingMethodCode ?? null,
+        paymentMethodCode: order.paymentMethodCode ?? null
       });
-    }
-    const totalsMode = order.totalsMode ?? "computed";
-    if (isExternalAmountsMode(totalsMode)) {
-      await requireOrderTotalsForExternalWrite(parsed.orderTotals);
-    }
-    const suppliedTotals = isExternalAmountsMode(totalsMode) ? buildExternalHeaderTotals(parsed.orderTotals) : null;
-    const sourceInputs = filtered.map((line, index) => ({
-      ...mapOrderLineEntityToSnapshot(line),
-      statusEntryId: line.statusEntryId ?? null,
-      catalogSnapshot: line.catalogSnapshot ? cloneJson(line.catalogSnapshot) : null,
-      promotionSnapshot: line.promotionSnapshot ? cloneJson(line.promotionSnapshot) : null,
-      organizationId: order.organizationId,
-      tenantId: order.tenantId,
-      orderId: order.id,
-      lineNumber: index + 1
-    }));
-    const calcLines = sourceInputs.map(
-      (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
-    );
-    const adjustmentDrafts = adjustments.map(mapOrderAdjustmentToDraft);
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: order.tenantId,
-      organizationId: order.organizationId,
-      currencyCode: order.currencyCode,
-      shippingSnapshot: order.shippingMethodSnapshot,
-      paymentSnapshot: order.paymentMethodSnapshot,
-      shippingMethodId: order.shippingMethodId ?? null,
-      paymentMethodId: order.paymentMethodId ?? null,
-      shippingMethodCode: order.shippingMethodCode ?? null,
-      paymentMethodCode: order.paymentMethodCode ?? null
-    });
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "order",
-      lines: calcLines,
-      adjustments: adjustmentDrafts,
-      context: calculationContext,
-      existingTotals: resolveExistingPaymentTotals(order),
-      totalsMode,
-      suppliedTotals
+      const calculation = await salesCalculationService.calculateDocumentTotals({
+        documentKind: "order",
+        lines: calcLines,
+        adjustments: adjustmentDrafts,
+        context: calculationContext,
+        existingTotals: resolveExistingPaymentTotals(order),
+        totalsMode,
+        suppliedTotals
+      });
+      await applyOrderLineResults({
+        em,
+        order,
+        calculation,
+        sourceLines: sourceInputs,
+        existingLines
+      });
+      applyOrderTotals(order, calculation.totals, calculation.lines.length);
+      return { result: { orderId: order.id, lineId: parsed.id }, calculation };
     });
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await applyOrderLineResults({
-            em,
-            order,
-            calculation,
-            sourceLines: sourceInputs,
-            existingLines
-          });
-          applyOrderTotals(order, calculation.totals, calculation.lines.length);
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "order",
-            documentId: order.id,
-            organizationId: order.organizationId,
-            tenantId: order.tenantId,
-            customerId: order.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
-          });
-        }
-      ],
-      { transaction: true }
-    );
-    return { orderId: order.id, lineId: parsed.id };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadOrderSnapshot(em, result.orderId);
   },
+  captureAfter: async (_input, result, ctx) => captureLockedOrderGraphAfter(ctx, result, result.orderId),
   buildLog: async ({ result, snapshots }) => {
-    const before = snapshots.before;
+    const before = resolveLockedOrderGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
@@ -6025,107 +6071,67 @@ const orderLineDeleteCommand = {
 };
 const quoteLineUpsertCommand = {
   id: "sales.quotes.lines.upsert",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const quoteId = typeof raw.quoteId === "string" ? raw.quoteId : null;
-    if (!quoteId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot)
-      ensureQuoteScope(
-        ctx,
-        snapshot.quote.organizationId,
-        snapshot.quote.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
     const rawBody = input?.body ?? {};
     const parsed = quoteLineUpsertSchema.parse(rawBody);
     await assertAmountsModeUnsupportedOnQuote([parsed]);
-    const em = ctx.container.resolve("em").fork();
-    const quote = await findOneWithDecryption(em, SalesQuote, {
-      id: parsed.quoteId,
-      deletedAt: null
-    });
-    if (!quote)
-      throw notFound("Sales quote not found");
-    ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
-    const [existingLines, adjustments] = await Promise.all([
-      em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
-      em.find(
-        SalesQuoteAdjustment,
-        { quote },
-        { orderBy: { position: "asc" } }
-      )
-    ]);
-    const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
-    const existingSnapshot = parsed.id ? lineSnapshots.find((line) => line.id === parsed.id) ?? null : null;
-    const priceMode = parsed.priceMode === "gross" ? "gross" : parsed.priceMode === "net" ? "net" : null;
-    let unitPriceNet = parsed.unitPriceNet ?? existingSnapshot?.unitPriceNet ?? null;
-    let unitPriceGross = parsed.unitPriceGross ?? existingSnapshot?.unitPriceGross ?? null;
-    let taxRate = parsed.taxRate ?? existingSnapshot?.taxRate ?? null;
-    if (priceMode && (unitPriceNet === null || unitPriceGross === null)) {
-      let taxService = null;
-      try {
-        taxService = ctx.container.resolve(
-          "taxCalculationService"
-        );
-      } catch {
-        taxService = null;
-      }
-      if (taxService) {
-        const taxResult = await taxService.calculateUnitAmounts({
-          amount: priceMode === "gross" ? unitPriceGross ?? unitPriceNet ?? 0 : unitPriceNet ?? unitPriceGross ?? 0,
-          mode: priceMode,
-          organizationId: parsed.organizationId,
-          tenantId: parsed.tenantId,
-          taxRateId: parsed.taxRateId ?? void 0,
-          taxRate: taxRate ?? void 0
-        });
-        unitPriceNet = unitPriceNet ?? taxResult.netAmount;
-        unitPriceGross = unitPriceGross ?? taxResult.grossAmount;
-        taxRate = taxResult.taxRate ?? taxRate;
-      }
-    }
-    const metadata = typeof parsed.metadata === "object" && parsed.metadata ? { ...parsed.metadata } : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : {};
-    if (parsed.priceId) metadata.priceId = parsed.priceId;
-    if (priceMode) metadata.priceMode = priceMode;
-    const statusEntryId = parsed.statusEntryId ?? existingSnapshot?.statusEntryId ?? null;
-    const lineId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
-    const lineUomInput = {
-      productId: parsed.productId ?? existingSnapshot?.productId ?? null,
-      productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
-      quantity: parsed.quantity ?? existingSnapshot?.quantity ?? 0,
-      quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
-      normalizedQuantity: existingSnapshot?.normalizedQuantity ?? null,
-      normalizedUnit: existingSnapshot?.normalizedUnit ?? null,
-      uomSnapshot: existingSnapshot?.uomSnapshot ?? null
-    };
-    const uomResolver = createUomResolver();
-    let normalizedUom = await normalizeLineUom({
-      em,
-      resolver: uomResolver,
-      organizationId: quote.organizationId,
-      tenantId: quote.tenantId,
-      line: {
-        ...lineUomInput,
-        unitPriceNet: unitPriceNet ?? 0,
-        unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+    return writeLockedQuoteGraph(input, ctx, parsed.quoteId, "Sales quote not found", async (em, quote) => {
+      const [existingLines, adjustments] = await Promise.all([
+        em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
+        em.find(
+          SalesQuoteAdjustment,
+          { quote },
+          { orderBy: { position: "asc" } }
+        )
+      ]);
+      const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
+      const existingSnapshot = parsed.id ? lineSnapshots.find((line) => line.id === parsed.id) ?? null : null;
+      const priceMode = parsed.priceMode === "gross" ? "gross" : parsed.priceMode === "net" ? "net" : null;
+      let unitPriceNet = parsed.unitPriceNet ?? existingSnapshot?.unitPriceNet ?? null;
+      let unitPriceGross = parsed.unitPriceGross ?? existingSnapshot?.unitPriceGross ?? null;
+      let taxRate = parsed.taxRate ?? existingSnapshot?.taxRate ?? null;
+      if (priceMode && (unitPriceNet === null || unitPriceGross === null)) {
+        let taxService = null;
+        try {
+          taxService = ctx.container.resolve(
+            "taxCalculationService"
+          );
+        } catch {
+          taxService = null;
+        }
+        if (taxService) {
+          const taxResult = await taxService.calculateUnitAmounts({
+            amount: priceMode === "gross" ? unitPriceGross ?? unitPriceNet ?? 0 : unitPriceNet ?? unitPriceGross ?? 0,
+            mode: priceMode,
+            organizationId: parsed.organizationId,
+            tenantId: parsed.tenantId,
+            taxRateId: parsed.taxRateId ?? void 0,
+            taxRate: taxRate ?? void 0
+          });
+          unitPriceNet = unitPriceNet ?? taxResult.netAmount;
+          unitPriceGross = unitPriceGross ?? taxResult.grossAmount;
+          taxRate = taxResult.taxRate ?? taxRate;
+        }
       }
-    });
-    const convertedPrices = convertLineUnitPricesOnUnitChange({
-      existingSnapshot,
-      nextQuantityUnit: normalizedUom.quantityUnit,
-      nextUomSnapshot: normalizedUom.uomSnapshot,
-      unitPriceNet,
-      unitPriceGross
-    });
-    if (convertedPrices.didConvert) {
-      unitPriceNet = convertedPrices.unitPriceNet;
-      unitPriceGross = convertedPrices.unitPriceGross;
-      normalizedUom = await normalizeLineUom({
+      const metadata = typeof parsed.metadata === "object" && parsed.metadata ? { ...parsed.metadata } : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : {};
+      if (parsed.priceId) metadata.priceId = parsed.priceId;
+      if (priceMode) metadata.priceMode = priceMode;
+      const statusEntryId = parsed.statusEntryId ?? existingSnapshot?.statusEntryId ?? null;
+      const lineId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
+      const lineUomInput = {
+        productId: parsed.productId ?? existingSnapshot?.productId ?? null,
+        productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
+        quantity: parsed.quantity ?? existingSnapshot?.quantity ?? 0,
+        quantityUnit: parsed.quantityUnit ?? existingSnapshot?.quantityUnit ?? null,
+        normalizedQuantity: existingSnapshot?.normalizedQuantity ?? null,
+        normalizedUnit: existingSnapshot?.normalizedUnit ?? null,
+        uomSnapshot: existingSnapshot?.uomSnapshot ?? null
+      };
+      const uomResolver = createUomResolver();
+      let normalizedUom = await normalizeLineUom({
         em,
         resolver: uomResolver,
         organizationId: quote.organizationId,
@@ -6136,121 +6142,117 @@ const quoteLineUpsertCommand = {
           unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
         }
       });
-    }
-    const updatedSnapshot = {
-      id: lineId,
-      lineNumber: parsed.lineNumber ?? existingSnapshot?.lineNumber ?? lineSnapshots.length + 1,
-      kind: parsed.kind ?? existingSnapshot?.kind ?? "product",
-      productId: parsed.productId ?? existingSnapshot?.productId ?? null,
-      productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
-      name: parsed.name ?? existingSnapshot?.name ?? null,
-      description: parsed.description ?? existingSnapshot?.description ?? null,
-      comment: parsed.comment ?? existingSnapshot?.comment ?? null,
-      quantity: normalizedUom.quantity,
-      quantityUnit: normalizedUom.quantityUnit,
-      normalizedQuantity: normalizedUom.normalizedQuantity,
-      normalizedUnit: normalizedUom.normalizedUnit,
-      uomSnapshot: normalizedUom.uomSnapshot ? cloneJson(normalizedUom.uomSnapshot) : null,
-      currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? quote.currencyCode,
-      unitPriceNet: unitPriceNet ?? 0,
-      unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
-      ...resolveUpsertDiscountFields(
-        parsed.discountAmount,
-        parsed.discountAmountBasis,
-        existingSnapshot
-      ),
-      discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
-      taxRate: taxRate ?? 0,
-      totalNetAmount: parsed.totalNetAmount ?? existingSnapshot?.totalNetAmount ?? null,
-      ...resolveUpsertTotalsOrigin(parsed.totalNetAmount, existingSnapshot),
-      configuration: parsed.configuration ?? existingSnapshot?.configuration ?? null,
-      promotionCode: parsed.promotionCode ?? existingSnapshot?.promotionCode ?? null,
-      metadata,
-      customFieldSetId: parsed.customFieldSetId ?? existingSnapshot?.customFieldSetId ?? null,
-      customFields: parsed.customFields && typeof parsed.customFields === "object" ? cloneJson(parsed.customFields) : existingSnapshot?.customFields ?? null
-    };
-    Object.assign(
-      updatedSnapshot,
-      resolveUpsertCalculatedAmounts(parsed, updatedSnapshot, existingSnapshot)
-    );
-    updatedSnapshot.statusEntryId = statusEntryId;
-    updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
-    updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
-    let nextLines = parsed.id ? lineSnapshots.map(
-      (line) => line.id === parsed.id ? updatedSnapshot : line
-    ) : [...lineSnapshots, updatedSnapshot];
-    nextLines = nextLines.sort((a, b) => (a.lineNumber ?? 0) - (b.lineNumber ?? 0)).map((line, index) => ({ ...line, lineNumber: index + 1 }));
-    const sourceInputs = nextLines.map((line, index) => ({
-      ...line,
-      statusEntryId: line.statusEntryId ?? null,
-      catalogSnapshot: line.catalogSnapshot ?? null,
-      promotionSnapshot: line.promotionSnapshot ?? null,
-      organizationId: quote.organizationId,
-      tenantId: quote.tenantId,
-      quoteId: quote.id,
-      lineNumber: line.lineNumber ?? index + 1
-    }));
-    const calcLines = sourceInputs.map(
-      (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
-    );
-    const adjustmentDrafts = adjustments.map(mapQuoteAdjustmentToDraft);
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: quote.tenantId,
-      organizationId: quote.organizationId,
-      currencyCode: quote.currencyCode,
-      shippingSnapshot: quote.shippingMethodSnapshot,
-      paymentSnapshot: quote.paymentMethodSnapshot,
-      shippingMethodId: quote.shippingMethodId ?? null,
-      paymentMethodId: quote.paymentMethodId ?? null,
-      shippingMethodCode: quote.shippingMethodCode ?? null,
-      paymentMethodCode: quote.paymentMethodCode ?? null
-    });
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "quote",
-      lines: calcLines,
-      adjustments: adjustmentDrafts,
-      context: calculationContext
+      const convertedPrices = convertLineUnitPricesOnUnitChange({
+        existingSnapshot,
+        nextQuantityUnit: normalizedUom.quantityUnit,
+        nextUomSnapshot: normalizedUom.uomSnapshot,
+        unitPriceNet,
+        unitPriceGross
+      });
+      if (convertedPrices.didConvert) {
+        unitPriceNet = convertedPrices.unitPriceNet;
+        unitPriceGross = convertedPrices.unitPriceGross;
+        normalizedUom = await normalizeLineUom({
+          em,
+          resolver: uomResolver,
+          organizationId: quote.organizationId,
+          tenantId: quote.tenantId,
+          line: {
+            ...lineUomInput,
+            unitPriceNet: unitPriceNet ?? 0,
+            unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0
+          }
+        });
+      }
+      const updatedSnapshot = {
+        id: lineId,
+        lineNumber: parsed.lineNumber ?? existingSnapshot?.lineNumber ?? lineSnapshots.length + 1,
+        kind: parsed.kind ?? existingSnapshot?.kind ?? "product",
+        productId: parsed.productId ?? existingSnapshot?.productId ?? null,
+        productVariantId: parsed.productVariantId ?? existingSnapshot?.productVariantId ?? null,
+        name: parsed.name ?? existingSnapshot?.name ?? null,
+        description: parsed.description ?? existingSnapshot?.description ?? null,
+        comment: parsed.comment ?? existingSnapshot?.comment ?? null,
+        quantity: normalizedUom.quantity,
+        quantityUnit: normalizedUom.quantityUnit,
+        normalizedQuantity: normalizedUom.normalizedQuantity,
+        normalizedUnit: normalizedUom.normalizedUnit,
+        uomSnapshot: normalizedUom.uomSnapshot ? cloneJson(normalizedUom.uomSnapshot) : null,
+        currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? quote.currencyCode,
+        unitPriceNet: unitPriceNet ?? 0,
+        unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
+        ...resolveUpsertDiscountFields(
+          parsed.discountAmount,
+          parsed.discountAmountBasis,
+          existingSnapshot
+        ),
+        discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
+        taxRate: taxRate ?? 0,
+        totalNetAmount: parsed.totalNetAmount ?? existingSnapshot?.totalNetAmount ?? null,
+        ...resolveUpsertTotalsOrigin(parsed.totalNetAmount, existingSnapshot),
+        configuration: parsed.configuration ?? existingSnapshot?.configuration ?? null,
+        promotionCode: parsed.promotionCode ?? existingSnapshot?.promotionCode ?? null,
+        metadata,
+        customFieldSetId: parsed.customFieldSetId ?? existingSnapshot?.customFieldSetId ?? null,
+        customFields: parsed.customFields && typeof parsed.customFields === "object" ? cloneJson(parsed.customFields) : existingSnapshot?.customFields ?? null
+      };
+      Object.assign(
+        updatedSnapshot,
+        resolveUpsertCalculatedAmounts(parsed, updatedSnapshot, existingSnapshot)
+      );
+      updatedSnapshot.statusEntryId = statusEntryId;
+      updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
+      updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
+      let nextLines = parsed.id ? lineSnapshots.map(
+        (line) => line.id === parsed.id ? updatedSnapshot : line
+      ) : [...lineSnapshots, updatedSnapshot];
+      nextLines = nextLines.sort((a, b) => (a.lineNumber ?? 0) - (b.lineNumber ?? 0)).map((line, index) => ({ ...line, lineNumber: index + 1 }));
+      const sourceInputs = nextLines.map((line, index) => ({
+        ...line,
+        statusEntryId: line.statusEntryId ?? null,
+        catalogSnapshot: line.catalogSnapshot ?? null,
+        promotionSnapshot: line.promotionSnapshot ?? null,
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId,
+        quoteId: quote.id,
+        lineNumber: line.lineNumber ?? index + 1
+      }));
+      const calcLines = sourceInputs.map(
+        (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
+      );
+      const adjustmentDrafts = adjustments.map(mapQuoteAdjustmentToDraft);
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: quote.tenantId,
+        organizationId: quote.organizationId,
+        currencyCode: quote.currencyCode,
+        shippingSnapshot: quote.shippingMethodSnapshot,
+        paymentSnapshot: quote.paymentMethodSnapshot,
+        shippingMethodId: quote.shippingMethodId ?? null,
+        paymentMethodId: quote.paymentMethodId ?? null,
+        shippingMethodCode: quote.shippingMethodCode ?? null,
+        paymentMethodCode: quote.paymentMethodCode ?? null
+      });
+      const calculation = await salesCalculationService.calculateDocumentTotals({
+        documentKind: "quote",
+        lines: calcLines,
+        adjustments: adjustmentDrafts,
+        context: calculationContext
+      });
+      await applyQuoteLineResults({
+        em,
+        quote,
+        calculation,
+        sourceLines: sourceInputs,
+        existingLines
+      });
+      applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
+      return { result: { quoteId: quote.id, lineId }, calculation };
     });
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await applyQuoteLineResults({
-            em,
-            quote,
-            calculation,
-            sourceLines: sourceInputs,
-            existingLines
-          });
-          applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "quote",
-            documentId: quote.id,
-            organizationId: quote.organizationId,
-            tenantId: quote.tenantId,
-            customerId: quote.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
-          });
-        }
-      ],
-      { transaction: true }
-    );
-    return { quoteId: quote.id, lineId };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadQuoteSnapshot(em, result.quoteId);
   },
+  captureAfter: async (_input, result, ctx) => captureLockedQuoteGraphAfter(ctx, result, result.quoteId),
   buildLog: async ({ result, snapshots }) => {
-    const before = snapshots.before;
+    const before = resolveLockedQuoteGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
@@ -6279,118 +6281,74 @@ const quoteLineUpsertCommand = {
 };
 const quoteLineDeleteCommand = {
   id: "sales.quotes.lines.delete",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const quoteId = typeof raw.quoteId === "string" ? raw.quoteId : null;
-    if (!quoteId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot)
-      ensureQuoteScope(
-        ctx,
-        snapshot.quote.organizationId,
-        snapshot.quote.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
     const parsed = quoteLineDeleteSchema.parse(
       input?.body ?? {}
     );
-    const em = ctx.container.resolve("em").fork();
-    const quote = await findOneWithDecryption(em, SalesQuote, {
-      id: parsed.quoteId,
-      deletedAt: null
-    });
-    if (!quote)
-      throw notFound("Sales quote not found");
-    ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
-    const existingLines = await em.find(
-      SalesQuoteLine,
-      { quote },
-      { orderBy: { lineNumber: "asc" } }
-    );
-    const adjustments = await em.find(
-      SalesQuoteAdjustment,
-      { quote },
-      { orderBy: { position: "asc" } }
-    );
-    const filtered = existingLines.filter((line) => line.id !== parsed.id);
-    if (filtered.length === existingLines.length) {
-      throw notFound("Quote line not found");
-    }
-    const sourceInputs = filtered.map((line, index) => ({
-      ...mapQuoteLineEntityToSnapshot(line),
-      statusEntryId: line.statusEntryId ?? null,
-      catalogSnapshot: line.catalogSnapshot ? cloneJson(line.catalogSnapshot) : null,
-      promotionSnapshot: line.promotionSnapshot ? cloneJson(line.promotionSnapshot) : null,
-      organizationId: quote.organizationId,
-      tenantId: quote.tenantId,
-      quoteId: quote.id,
-      lineNumber: index + 1
-    }));
-    const calcLines = sourceInputs.map(
-      (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
-    );
-    const adjustmentDrafts = adjustments.map(mapQuoteAdjustmentToDraft);
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: quote.tenantId,
-      organizationId: quote.organizationId,
-      currencyCode: quote.currencyCode,
-      shippingSnapshot: quote.shippingMethodSnapshot,
-      paymentSnapshot: quote.paymentMethodSnapshot,
-      shippingMethodId: quote.shippingMethodId ?? null,
-      paymentMethodId: quote.paymentMethodId ?? null,
-      shippingMethodCode: quote.shippingMethodCode ?? null,
-      paymentMethodCode: quote.paymentMethodCode ?? null
-    });
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "quote",
-      lines: calcLines,
-      adjustments: adjustmentDrafts,
-      context: calculationContext
+    return writeLockedQuoteGraph(input, ctx, parsed.quoteId, "Sales quote not found", async (em, quote) => {
+      const existingLines = await em.find(
+        SalesQuoteLine,
+        { quote },
+        { orderBy: { lineNumber: "asc" } }
+      );
+      const adjustments = await em.find(
+        SalesQuoteAdjustment,
+        { quote },
+        { orderBy: { position: "asc" } }
+      );
+      const filtered = existingLines.filter((line) => line.id !== parsed.id);
+      if (filtered.length === existingLines.length) {
+        throw notFound("Quote line not found");
+      }
+      const sourceInputs = filtered.map((line, index) => ({
+        ...mapQuoteLineEntityToSnapshot(line),
+        statusEntryId: line.statusEntryId ?? null,
+        catalogSnapshot: line.catalogSnapshot ? cloneJson(line.catalogSnapshot) : null,
+        promotionSnapshot: line.promotionSnapshot ? cloneJson(line.promotionSnapshot) : null,
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId,
+        quoteId: quote.id,
+        lineNumber: index + 1
+      }));
+      const calcLines = sourceInputs.map(
+        (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
+      );
+      const adjustmentDrafts = adjustments.map(mapQuoteAdjustmentToDraft);
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: quote.tenantId,
+        organizationId: quote.organizationId,
+        currencyCode: quote.currencyCode,
+        shippingSnapshot: quote.shippingMethodSnapshot,
+        paymentSnapshot: quote.paymentMethodSnapshot,
+        shippingMethodId: quote.shippingMethodId ?? null,
+        paymentMethodId: quote.paymentMethodId ?? null,
+        shippingMethodCode: quote.shippingMethodCode ?? null,
+        paymentMethodCode: quote.paymentMethodCode ?? null
+      });
+      const calculation = await salesCalculationService.calculateDocumentTotals({
+        documentKind: "quote",
+        lines: calcLines,
+        adjustments: adjustmentDrafts,
+        context: calculationContext
+      });
+      await applyQuoteLineResults({
+        em,
+        quote,
+        calculation,
+        sourceLines: sourceInputs,
+        existingLines
+      });
+      applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
+      return { result: { quoteId: quote.id, lineId: parsed.id }, calculation };
     });
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await applyQuoteLineResults({
-            em,
-            quote,
-            calculation,
-            sourceLines: sourceInputs,
-            existingLines
-          });
-          applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "quote",
-            documentId: quote.id,
-            organizationId: quote.organizationId,
-            tenantId: quote.tenantId,
-            customerId: quote.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
-          });
-        }
-      ],
-      { transaction: true }
-    );
-    return { quoteId: quote.id, lineId: parsed.id };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadQuoteSnapshot(em, result.quoteId);
   },
+  captureAfter: async (_input, result, ctx) => captureLockedQuoteGraphAfter(ctx, result, result.quoteId),
   buildLog: async ({ result, snapshots }) => {
-    const before = snapshots.before;
+    const before = resolveLockedQuoteGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
@@ -6419,229 +6377,185 @@ const quoteLineDeleteCommand = {
 };
 const orderAdjustmentUpsertCommand = {
   id: "sales.orders.adjustments.upsert",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const orderId = typeof raw.orderId === "string" ? raw.orderId : null;
-    if (!orderId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot)
-      ensureOrderScope(
-        ctx,
-        snapshot.order.organizationId,
-        snapshot.order.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
     const parsed = orderAdjustmentUpsertSchema.parse(
       input?.body ?? {}
     );
-    const em = ctx.container.resolve("em").fork();
-    const order = await findOneWithDecryption(em, SalesOrder, {
-      id: parsed.orderId,
-      deletedAt: null
-    });
-    if (!order)
-      throw notFound("Sales order not found");
-    ensureOrderScope(ctx, order.organizationId, order.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
-    if (isExternalAmountsMode(order.totalsMode ?? "computed")) await refuseOnExternalOrder();
-    if (parsed.scope === "line") {
-      throw new CrudHttpError(400, {
-        error: "Line-scoped adjustments are not supported yet."
-      });
-    }
-    const [existingLines, existingAdjustments] = await Promise.all([
-      em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
-      em.find(
-        SalesOrderAdjustment,
-        { order },
-        { orderBy: { position: "asc" } }
-      )
-    ]);
-    const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
-    const adjustmentDrafts = existingAdjustments.map(mapOrderAdjustmentToDraft);
-    const existingSnapshot = parsed.id ? adjustmentDrafts.find((adj) => adj.id === parsed.id) ?? null : null;
-    const adjustmentId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
-    let metadata = typeof parsed.metadata === "object" && parsed.metadata ? cloneJson(parsed.metadata) : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : null;
-    const calculatorKey = parsed.calculatorKey ?? existingSnapshot?.calculatorKey ?? null;
-    if (parsed.id && calculatorKey && (calculatorKey.startsWith("shipping-provider:") || calculatorKey.startsWith("payment-provider:"))) {
-      metadata = { ...metadata ?? {}, manualOverride: true };
-    }
-    let nextAdjustments = parsed.id ? adjustmentDrafts.map(
-      (adj) => adj.id === parsed.id ? {
-        ...adj,
-        id: adjustmentId,
-        scope: parsed.scope ?? adj.scope ?? "order",
-        kind: parsed.kind ?? adj.kind ?? "custom",
-        code: parsed.code ?? adj.code ?? null,
-        label: parsed.label ?? adj.label ?? null,
-        calculatorKey: parsed.calculatorKey ?? adj.calculatorKey ?? null,
-        promotionId: parsed.promotionId ?? adj.promotionId ?? null,
-        rate: parsed.rate ?? adj.rate ?? null,
-        amountNet: parsed.amountNet ?? adj.amountNet ?? null,
-        amountGross: parsed.amountGross ?? adj.amountGross ?? null,
-        currencyCode: parsed.currencyCode ?? adj.currencyCode ?? order.currencyCode,
-        metadata,
-        customFields: parsed.customFields !== void 0 ? parsed.customFields : adj.customFields ?? null,
-        position: parsed.position ?? adj.position ?? adjustmentDrafts.length
-      } : adj
-    ) : [
-      ...adjustmentDrafts,
-      {
-        id: adjustmentId,
-        scope: parsed.scope ?? "order",
-        kind: parsed.kind ?? "custom",
-        code: parsed.code ?? null,
-        label: parsed.label ?? null,
-        calculatorKey: parsed.calculatorKey ?? null,
-        promotionId: parsed.promotionId ?? null,
-        rate: parsed.rate ?? null,
-        amountNet: parsed.amountNet ?? null,
-        amountGross: parsed.amountGross ?? null,
-        currencyCode: parsed.currencyCode ?? order.currencyCode,
-        metadata,
-        customFields: parsed.customFields ?? null,
-        position: parsed.position ?? adjustmentDrafts.length
+    return writeLockedOrderGraph(input, ctx, parsed.orderId, "Sales order not found", async (em, order) => {
+      if (isExternalAmountsMode(order.totalsMode ?? "computed")) await refuseOnExternalOrder();
+      if (parsed.scope === "line") {
+        throw new CrudHttpError(400, {
+          error: "Line-scoped adjustments are not supported yet."
+        });
       }
-    ];
-    nextAdjustments = nextAdjustments.sort((a, b) => (a.position ?? 0) - (b.position ?? 0)).map((adj, index) => ({ ...adj, position: adj.position ?? index }));
-    const sourceLines = lineSnapshots.map((line, index) => ({
-      ...line,
-      statusEntryId: line.statusEntryId ?? null,
-      catalogSnapshot: line.catalogSnapshot ?? null,
-      promotionSnapshot: line.promotionSnapshot ?? null,
-      organizationId: order.organizationId,
-      tenantId: order.tenantId,
-      orderId: order.id,
-      lineNumber: line.lineNumber ?? index + 1
-    }));
-    const calcLines = sourceLines.map(
-      (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
-    );
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: order.tenantId,
-      organizationId: order.organizationId,
-      currencyCode: order.currencyCode,
-      shippingSnapshot: order.shippingMethodSnapshot,
-      paymentSnapshot: order.paymentMethodSnapshot,
-      shippingMethodId: order.shippingMethodId ?? null,
-      paymentMethodId: order.paymentMethodId ?? null,
-      shippingMethodCode: order.shippingMethodCode ?? null,
-      paymentMethodCode: order.paymentMethodCode ?? null
-    });
-    const effectiveAdjustment = nextAdjustments.find(
-      (adj) => adj.id === adjustmentId
-    );
-    if (effectiveAdjustment?.kind === "return") {
-      const baselineAdjustments = nextAdjustments.filter(
-        (adj) => adj.id !== adjustmentId
+      const [existingLines, existingAdjustments] = await Promise.all([
+        em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
+        em.find(
+          SalesOrderAdjustment,
+          { order },
+          { orderBy: { position: "asc" } }
+        )
+      ]);
+      const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
+      const adjustmentDrafts = existingAdjustments.map(mapOrderAdjustmentToDraft);
+      const existingSnapshot = parsed.id ? adjustmentDrafts.find((adj) => adj.id === parsed.id) ?? null : null;
+      const adjustmentId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
+      let metadata = typeof parsed.metadata === "object" && parsed.metadata ? cloneJson(parsed.metadata) : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : null;
+      const calculatorKey = parsed.calculatorKey ?? existingSnapshot?.calculatorKey ?? null;
+      if (parsed.id && calculatorKey && (calculatorKey.startsWith("shipping-provider:") || calculatorKey.startsWith("payment-provider:"))) {
+        metadata = { ...metadata ?? {}, manualOverride: true };
+      }
+      let nextAdjustments = parsed.id ? adjustmentDrafts.map(
+        (adj) => adj.id === parsed.id ? {
+          ...adj,
+          id: adjustmentId,
+          scope: parsed.scope ?? adj.scope ?? "order",
+          kind: parsed.kind ?? adj.kind ?? "custom",
+          code: parsed.code ?? adj.code ?? null,
+          label: parsed.label ?? adj.label ?? null,
+          calculatorKey: parsed.calculatorKey ?? adj.calculatorKey ?? null,
+          promotionId: parsed.promotionId ?? adj.promotionId ?? null,
+          rate: parsed.rate ?? adj.rate ?? null,
+          amountNet: parsed.amountNet ?? adj.amountNet ?? null,
+          amountGross: parsed.amountGross ?? adj.amountGross ?? null,
+          currencyCode: parsed.currencyCode ?? adj.currencyCode ?? order.currencyCode,
+          metadata,
+          customFields: parsed.customFields !== void 0 ? parsed.customFields : adj.customFields ?? null,
+          position: parsed.position ?? adj.position ?? adjustmentDrafts.length
+        } : adj
+      ) : [
+        ...adjustmentDrafts,
+        {
+          id: adjustmentId,
+          scope: parsed.scope ?? "order",
+          kind: parsed.kind ?? "custom",
+          code: parsed.code ?? null,
+          label: parsed.label ?? null,
+          calculatorKey: parsed.calculatorKey ?? null,
+          promotionId: parsed.promotionId ?? null,
+          rate: parsed.rate ?? null,
+          amountNet: parsed.amountNet ?? null,
+          amountGross: parsed.amountGross ?? null,
+          currencyCode: parsed.currencyCode ?? order.currencyCode,
+          metadata,
+          customFields: parsed.customFields ?? null,
+          position: parsed.position ?? adjustmentDrafts.length
+        }
+      ];
+      nextAdjustments = nextAdjustments.sort((a, b) => (a.position ?? 0) - (b.position ?? 0)).map((adj, index) => ({ ...adj, position: adj.position ?? index }));
+      const sourceLines = lineSnapshots.map((line, index) => ({
+        ...line,
+        statusEntryId: line.statusEntryId ?? null,
+        catalogSnapshot: line.catalogSnapshot ?? null,
+        promotionSnapshot: line.promotionSnapshot ?? null,
+        organizationId: order.organizationId,
+        tenantId: order.tenantId,
+        orderId: order.id,
+        lineNumber: line.lineNumber ?? index + 1
+      }));
+      const calcLines = sourceLines.map(
+        (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
+      );
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: order.tenantId,
+        organizationId: order.organizationId,
+        currencyCode: order.currencyCode,
+        shippingSnapshot: order.shippingMethodSnapshot,
+        paymentSnapshot: order.paymentMethodSnapshot,
+        shippingMethodId: order.shippingMethodId ?? null,
+        paymentMethodId: order.paymentMethodId ?? null,
+        shippingMethodCode: order.shippingMethodCode ?? null,
+        paymentMethodCode: order.paymentMethodCode ?? null
+      });
+      const effectiveAdjustment = nextAdjustments.find(
+        (adj) => adj.id === adjustmentId
       );
-      const baselineCalculation = await salesCalculationService.calculateDocumentTotals({
+      if (effectiveAdjustment?.kind === "return") {
+        const baselineAdjustments = nextAdjustments.filter(
+          (adj) => adj.id !== adjustmentId
+        );
+        const baselineCalculation = await salesCalculationService.calculateDocumentTotals({
+          documentKind: "order",
+          lines: calcLines,
+          adjustments: baselineAdjustments,
+          context: calculationContext,
+          existingTotals: resolveExistingPaymentTotals(order)
+        });
+        const issues = validateReturnAdjustmentWithinRemaining({
+          kind: "return",
+          amountNet: effectiveAdjustment.amountNet ?? effectiveAdjustment.amountGross ?? 0,
+          amountGross: effectiveAdjustment.amountGross ?? effectiveAdjustment.amountNet ?? 0,
+          remainingNet: Number(
+            baselineCalculation.totals?.grandTotalNetAmount ?? 0
+          ),
+          remainingGross: Number(
+            baselineCalculation.totals?.grandTotalGrossAmount ?? 0
+          )
+        });
+        if (issues.length > 0) {
+          const { translate } = await resolveTranslations();
+          const grossIssue = issues.find((issue) => issue.path === "amountGross");
+          const netIssue = issues.find((issue) => issue.path === "amountNet");
+          const fieldErrors = {};
+          if (grossIssue) {
+            fieldErrors.amountGross = translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
+            );
+          }
+          if (netIssue) {
+            fieldErrors.amountNet = translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalNet",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE
+            );
+          }
+          throw new CrudHttpError(400, {
+            error: fieldErrors.amountGross ?? fieldErrors.amountNet ?? translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
+            ),
+            fieldErrors
+          });
+        }
+      }
+      const calculation = await salesCalculationService.calculateDocumentTotals({
         documentKind: "order",
         lines: calcLines,
-        adjustments: baselineAdjustments,
+        adjustments: nextAdjustments,
         context: calculationContext,
         existingTotals: resolveExistingPaymentTotals(order)
       });
-      const issues = validateReturnAdjustmentWithinRemaining({
-        kind: "return",
-        amountNet: effectiveAdjustment.amountNet ?? effectiveAdjustment.amountGross ?? 0,
-        amountGross: effectiveAdjustment.amountGross ?? effectiveAdjustment.amountNet ?? 0,
-        remainingNet: Number(
-          baselineCalculation.totals?.grandTotalNetAmount ?? 0
-        ),
-        remainingGross: Number(
-          baselineCalculation.totals?.grandTotalGrossAmount ?? 0
-        )
-      });
-      if (issues.length > 0) {
-        const { translate } = await resolveTranslations();
-        const grossIssue = issues.find((issue) => issue.path === "amountGross");
-        const netIssue = issues.find((issue) => issue.path === "amountNet");
-        const fieldErrors = {};
-        if (grossIssue) {
-          fieldErrors.amountGross = translate(
-            "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
-            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
-          );
-        }
-        if (netIssue) {
-          fieldErrors.amountNet = translate(
-            "sales.adjustments.error.returnExceedsRemainingGrandTotalNet",
-            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE
-          );
-        }
-        throw new CrudHttpError(400, {
-          error: fieldErrors.amountGross ?? fieldErrors.amountNet ?? translate(
-            "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
-            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
-          ),
-          fieldErrors
-        });
-      }
-    }
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "order",
-      lines: calcLines,
-      adjustments: nextAdjustments,
-      context: calculationContext,
-      existingTotals: resolveExistingPaymentTotals(order)
+      const adjustmentInputs = nextAdjustments.map((adj, index) => ({
+        organizationId: order.organizationId,
+        tenantId: order.tenantId,
+        orderId: order.id,
+        scope: adj.scope ?? "order",
+        kind: adj.kind ?? "custom",
+        code: adj.code ?? void 0,
+        label: adj.label ?? void 0,
+        calculatorKey: adj.calculatorKey ?? void 0,
+        promotionId: adj.promotionId ?? void 0,
+        rate: adj.rate ?? void 0,
+        amountNet: adj.amountNet ?? void 0,
+        amountGross: adj.amountGross ?? void 0,
+        currencyCode: adj.currencyCode ?? order.currencyCode,
+        metadata: adj.metadata ?? void 0,
+        customFields: adj.customFields ?? void 0,
+        position: adj.position ?? index
+      }));
+      await replaceOrderAdjustments(em, order, calculation, adjustmentInputs);
+      applyOrderTotals(order, calculation.totals, calculation.lines.length);
+      order.updatedAt = /* @__PURE__ */ new Date();
+      return { result: { orderId: order.id, adjustmentId }, calculation };
     });
-    const adjustmentInputs = nextAdjustments.map((adj, index) => ({
-      organizationId: order.organizationId,
-      tenantId: order.tenantId,
-      orderId: order.id,
-      scope: adj.scope ?? "order",
-      kind: adj.kind ?? "custom",
-      code: adj.code ?? void 0,
-      label: adj.label ?? void 0,
-      calculatorKey: adj.calculatorKey ?? void 0,
-      promotionId: adj.promotionId ?? void 0,
-      rate: adj.rate ?? void 0,
-      amountNet: adj.amountNet ?? void 0,
-      amountGross: adj.amountGross ?? void 0,
-      currencyCode: adj.currencyCode ?? order.currencyCode,
-      metadata: adj.metadata ?? void 0,
-      customFields: adj.customFields ?? void 0,
-      position: adj.position ?? index
-    }));
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await replaceOrderAdjustments(em, order, calculation, adjustmentInputs);
-          applyOrderTotals(order, calculation.totals, calculation.lines.length);
-          order.updatedAt = /* @__PURE__ */ new Date();
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "order",
-            documentId: order.id,
-            organizationId: order.organizationId,
-            tenantId: order.tenantId,
-            customerId: order.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
-          });
-        }
-      ],
-      { transaction: true }
-    );
-    return { orderId: order.id, adjustmentId };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadOrderSnapshot(em, result.orderId);
   },
+  captureAfter: async (_input, result, ctx) => captureLockedOrderGraphAfter(ctx, result, result.orderId),
   buildLog: async ({ snapshots, result }) => {
-    const before = snapshots.before;
+    const before = resolveLockedOrderGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
@@ -6670,133 +6584,89 @@ const orderAdjustmentUpsertCommand = {
 };
 const orderAdjustmentDeleteCommand = {
   id: "sales.orders.adjustments.delete",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const orderId = typeof raw.orderId === "string" ? raw.orderId : null;
-    if (!orderId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadOrderSnapshot(em, orderId);
-    if (snapshot)
-      ensureOrderScope(
-        ctx,
-        snapshot.order.organizationId,
-        snapshot.order.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
-    const parsed = orderAdjustmentDeleteSchema.parse(
-      input?.body ?? {}
-    );
-    const em = ctx.container.resolve("em").fork();
-    const order = await findOneWithDecryption(em, SalesOrder, {
-      id: parsed.orderId,
-      deletedAt: null
-    });
-    if (!order)
-      throw notFound("Sales order not found");
-    ensureOrderScope(ctx, order.organizationId, order.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER);
-    if (isExternalAmountsMode(order.totalsMode ?? "computed")) await refuseOnExternalOrder();
-    const [existingLines, adjustments] = await Promise.all([
-      em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
-      em.find(
-        SalesOrderAdjustment,
-        { order },
-        { orderBy: { position: "asc" } }
-      )
-    ]);
-    const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
-    if (filtered.length === adjustments.length) {
-      throw notFound("Adjustment not found");
-    }
-    const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
-    const calcLines = lineSnapshots.map(
-      (line, index) => createLineSnapshotFromInput(
-        {
-          ...line,
-          organizationId: order.organizationId,
-          tenantId: order.tenantId,
-          orderId: order.id,
-          lineNumber: line.lineNumber ?? index + 1,
-          statusEntryId: line.statusEntryId ?? null,
-          catalogSnapshot: line.catalogSnapshot ?? null,
-          promotionSnapshot: line.promotionSnapshot ?? null
-        },
-        line.lineNumber ?? index + 1
-      )
-    );
-    const adjustmentDrafts = filtered.map(mapOrderAdjustmentToDraft);
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: order.tenantId,
-      organizationId: order.organizationId,
-      currencyCode: order.currencyCode,
-      shippingSnapshot: order.shippingMethodSnapshot,
-      paymentSnapshot: order.paymentMethodSnapshot,
-      shippingMethodId: order.shippingMethodId ?? null,
-      paymentMethodId: order.paymentMethodId ?? null,
-      shippingMethodCode: order.shippingMethodCode ?? null,
-      paymentMethodCode: order.paymentMethodCode ?? null
-    });
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "order",
-      lines: calcLines,
-      adjustments: adjustmentDrafts,
-      context: calculationContext,
-      existingTotals: resolveExistingPaymentTotals(order)
-    });
-    const adjustmentInputs = adjustmentDrafts.map((adj, index) => ({
-      organizationId: order.organizationId,
-      tenantId: order.tenantId,
-      orderId: order.id,
-      scope: adj.scope ?? "order",
-      kind: adj.kind ?? "custom",
-      code: adj.code ?? void 0,
-      label: adj.label ?? void 0,
-      calculatorKey: adj.calculatorKey ?? void 0,
-      promotionId: adj.promotionId ?? void 0,
-      rate: adj.rate ?? void 0,
-      amountNet: adj.amountNet ?? void 0,
-      amountGross: adj.amountGross ?? void 0,
-      currencyCode: adj.currencyCode ?? order.currencyCode,
-      metadata: adj.metadata ?? void 0,
-      position: adj.position ?? index
-    }));
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await replaceOrderAdjustments(em, order, calculation, adjustmentInputs);
-          applyOrderTotals(order, calculation.totals, calculation.lines.length);
-          order.updatedAt = /* @__PURE__ */ new Date();
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "order",
-            documentId: order.id,
-            organizationId: order.organizationId,
-            tenantId: order.tenantId,
-            customerId: order.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
-          });
-        }
-      ],
-      { transaction: true }
-    );
-    return { orderId: order.id, adjustmentId: parsed.id };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadOrderSnapshot(em, result.orderId);
+    const parsed = orderAdjustmentDeleteSchema.parse(
+      input?.body ?? {}
+    );
+    return writeLockedOrderGraph(input, ctx, parsed.orderId, "Sales order not found", async (em, order) => {
+      if (isExternalAmountsMode(order.totalsMode ?? "computed")) await refuseOnExternalOrder();
+      const [existingLines, adjustments] = await Promise.all([
+        em.find(SalesOrderLine, { order }, { orderBy: { lineNumber: "asc" } }),
+        em.find(
+          SalesOrderAdjustment,
+          { order },
+          { orderBy: { position: "asc" } }
+        )
+      ]);
+      const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
+      if (filtered.length === adjustments.length) {
+        throw notFound("Adjustment not found");
+      }
+      const lineSnapshots = existingLines.map(mapOrderLineEntityToSnapshot);
+      const calcLines = lineSnapshots.map(
+        (line, index) => createLineSnapshotFromInput(
+          {
+            ...line,
+            organizationId: order.organizationId,
+            tenantId: order.tenantId,
+            orderId: order.id,
+            lineNumber: line.lineNumber ?? index + 1,
+            statusEntryId: line.statusEntryId ?? null,
+            catalogSnapshot: line.catalogSnapshot ?? null,
+            promotionSnapshot: line.promotionSnapshot ?? null
+          },
+          line.lineNumber ?? index + 1
+        )
+      );
+      const adjustmentDrafts = filtered.map(mapOrderAdjustmentToDraft);
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: order.tenantId,
+        organizationId: order.organizationId,
+        currencyCode: order.currencyCode,
+        shippingSnapshot: order.shippingMethodSnapshot,
+        paymentSnapshot: order.paymentMethodSnapshot,
+        shippingMethodId: order.shippingMethodId ?? null,
+        paymentMethodId: order.paymentMethodId ?? null,
+        shippingMethodCode: order.shippingMethodCode ?? null,
+        paymentMethodCode: order.paymentMethodCode ?? null
+      });
+      const calculation = await salesCalculationService.calculateDocumentTotals({
+        documentKind: "order",
+        lines: calcLines,
+        adjustments: adjustmentDrafts,
+        context: calculationContext,
+        existingTotals: resolveExistingPaymentTotals(order)
+      });
+      const adjustmentInputs = adjustmentDrafts.map((adj, index) => ({
+        organizationId: order.organizationId,
+        tenantId: order.tenantId,
+        orderId: order.id,
+        scope: adj.scope ?? "order",
+        kind: adj.kind ?? "custom",
+        code: adj.code ?? void 0,
+        label: adj.label ?? void 0,
+        calculatorKey: adj.calculatorKey ?? void 0,
+        promotionId: adj.promotionId ?? void 0,
+        rate: adj.rate ?? void 0,
+        amountNet: adj.amountNet ?? void 0,
+        amountGross: adj.amountGross ?? void 0,
+        currencyCode: adj.currencyCode ?? order.currencyCode,
+        metadata: adj.metadata ?? void 0,
+        position: adj.position ?? index
+      }));
+      await replaceOrderAdjustments(em, order, calculation, adjustmentInputs);
+      applyOrderTotals(order, calculation.totals, calculation.lines.length);
+      order.updatedAt = /* @__PURE__ */ new Date();
+      return { result: { orderId: order.id, adjustmentId: parsed.id }, calculation };
+    });
   },
+  captureAfter: async (_input, result, ctx) => captureLockedOrderGraphAfter(ctx, result, result.orderId),
   buildLog: async ({ snapshots, result }) => {
-    const before = snapshots.before;
+    const before = resolveLockedOrderGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
@@ -6825,226 +6695,182 @@ const orderAdjustmentDeleteCommand = {
 };
 const quoteAdjustmentUpsertCommand = {
   id: "sales.quotes.adjustments.upsert",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const quoteId = typeof raw.quoteId === "string" ? raw.quoteId : null;
-    if (!quoteId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot)
-      ensureQuoteScope(
-        ctx,
-        snapshot.quote.organizationId,
-        snapshot.quote.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
     const parsed = quoteAdjustmentUpsertSchema.parse(
       input?.body ?? {}
     );
-    const em = ctx.container.resolve("em").fork();
-    const quote = await findOneWithDecryption(em, SalesQuote, {
-      id: parsed.quoteId,
-      deletedAt: null
-    });
-    if (!quote)
-      throw notFound("Sales quote not found");
-    ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
-    if (parsed.scope === "line") {
-      throw new CrudHttpError(400, {
-        error: "Line-scoped adjustments are not supported yet."
-      });
-    }
-    const [existingLines, existingAdjustments] = await Promise.all([
-      em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
-      em.find(
-        SalesQuoteAdjustment,
-        { quote },
-        { orderBy: { position: "asc" } }
-      )
-    ]);
-    const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
-    const adjustmentDrafts = existingAdjustments.map(mapQuoteAdjustmentToDraft);
-    const existingSnapshot = parsed.id ? adjustmentDrafts.find((adj) => adj.id === parsed.id) ?? null : null;
-    const adjustmentId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
-    let metadata = typeof parsed.metadata === "object" && parsed.metadata ? cloneJson(parsed.metadata) : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : null;
-    const calculatorKey = parsed.calculatorKey ?? existingSnapshot?.calculatorKey ?? null;
-    if (parsed.id && calculatorKey && (calculatorKey.startsWith("shipping-provider:") || calculatorKey.startsWith("payment-provider:"))) {
-      metadata = { ...metadata ?? {}, manualOverride: true };
-    }
-    let nextAdjustments = parsed.id ? adjustmentDrafts.map(
-      (adj) => adj.id === parsed.id ? {
-        ...adj,
-        id: adjustmentId,
-        scope: parsed.scope ?? adj.scope ?? "order",
-        kind: parsed.kind ?? adj.kind ?? "custom",
-        code: parsed.code ?? adj.code ?? null,
-        label: parsed.label ?? adj.label ?? null,
-        calculatorKey: parsed.calculatorKey ?? adj.calculatorKey ?? null,
-        promotionId: parsed.promotionId ?? adj.promotionId ?? null,
-        rate: parsed.rate ?? adj.rate ?? null,
-        amountNet: parsed.amountNet ?? adj.amountNet ?? null,
-        amountGross: parsed.amountGross ?? adj.amountGross ?? null,
-        currencyCode: parsed.currencyCode ?? adj.currencyCode ?? quote.currencyCode,
-        metadata,
-        customFields: parsed.customFields !== void 0 ? parsed.customFields : adj.customFields ?? null,
-        position: parsed.position ?? adj.position ?? adjustmentDrafts.length
-      } : adj
-    ) : [
-      ...adjustmentDrafts,
-      {
-        id: adjustmentId,
-        scope: parsed.scope ?? "order",
-        kind: parsed.kind ?? "custom",
-        code: parsed.code ?? null,
-        label: parsed.label ?? null,
-        calculatorKey: parsed.calculatorKey ?? null,
-        promotionId: parsed.promotionId ?? null,
-        rate: parsed.rate ?? null,
-        amountNet: parsed.amountNet ?? null,
-        amountGross: parsed.amountGross ?? null,
-        currencyCode: parsed.currencyCode ?? quote.currencyCode,
-        metadata,
-        customFields: parsed.customFields ?? null,
-        position: parsed.position ?? adjustmentDrafts.length
+    return writeLockedQuoteGraph(input, ctx, parsed.quoteId, "Sales quote not found", async (em, quote) => {
+      if (parsed.scope === "line") {
+        throw new CrudHttpError(400, {
+          error: "Line-scoped adjustments are not supported yet."
+        });
       }
-    ];
-    nextAdjustments = nextAdjustments.sort((a, b) => (a.position ?? 0) - (b.position ?? 0)).map((adj, index) => ({ ...adj, position: adj.position ?? index }));
-    const sourceLines = lineSnapshots.map((line, index) => ({
-      ...line,
-      statusEntryId: line.statusEntryId ?? null,
-      catalogSnapshot: line.catalogSnapshot ?? null,
-      promotionSnapshot: line.promotionSnapshot ?? null,
-      organizationId: quote.organizationId,
-      tenantId: quote.tenantId,
-      quoteId: quote.id,
-      lineNumber: line.lineNumber ?? index + 1
-    }));
-    const calcLines = sourceLines.map(
-      (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
-    );
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: quote.tenantId,
-      organizationId: quote.organizationId,
-      currencyCode: quote.currencyCode,
-      shippingSnapshot: quote.shippingMethodSnapshot,
-      paymentSnapshot: quote.paymentMethodSnapshot,
-      shippingMethodId: quote.shippingMethodId ?? null,
-      paymentMethodId: quote.paymentMethodId ?? null,
-      shippingMethodCode: quote.shippingMethodCode ?? null,
-      paymentMethodCode: quote.paymentMethodCode ?? null
-    });
-    const effectiveAdjustment = nextAdjustments.find(
-      (adj) => adj.id === adjustmentId
-    );
-    if (effectiveAdjustment?.kind === "return") {
-      const baselineAdjustments = nextAdjustments.filter(
-        (adj) => adj.id !== adjustmentId
-      );
-      const baselineCalculation = await salesCalculationService.calculateDocumentTotals({
-        documentKind: "quote",
-        lines: calcLines,
-        adjustments: baselineAdjustments,
-        context: calculationContext
-      });
-      const issues = validateReturnAdjustmentWithinRemaining({
-        kind: "return",
-        amountNet: effectiveAdjustment.amountNet ?? effectiveAdjustment.amountGross ?? 0,
-        amountGross: effectiveAdjustment.amountGross ?? effectiveAdjustment.amountNet ?? 0,
-        remainingNet: Number(
-          baselineCalculation.totals?.grandTotalNetAmount ?? 0
-        ),
-        remainingGross: Number(
-          baselineCalculation.totals?.grandTotalGrossAmount ?? 0
+      const [existingLines, existingAdjustments] = await Promise.all([
+        em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
+        em.find(
+          SalesQuoteAdjustment,
+          { quote },
+          { orderBy: { position: "asc" } }
         )
-      });
-      if (issues.length > 0) {
-        const { translate } = await resolveTranslations();
-        const grossIssue = issues.find((issue) => issue.path === "amountGross");
-        const netIssue = issues.find((issue) => issue.path === "amountNet");
-        const fieldErrors = {};
-        if (grossIssue) {
-          fieldErrors.amountGross = translate(
-            "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
-            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
-          );
-        }
-        if (netIssue) {
-          fieldErrors.amountNet = translate(
-            "sales.adjustments.error.returnExceedsRemainingGrandTotalNet",
-            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE
-          );
+      ]);
+      const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
+      const adjustmentDrafts = existingAdjustments.map(mapQuoteAdjustmentToDraft);
+      const existingSnapshot = parsed.id ? adjustmentDrafts.find((adj) => adj.id === parsed.id) ?? null : null;
+      const adjustmentId = parsed.id ?? existingSnapshot?.id ?? randomUUID();
+      let metadata = typeof parsed.metadata === "object" && parsed.metadata ? cloneJson(parsed.metadata) : existingSnapshot?.metadata ? cloneJson(existingSnapshot.metadata) : null;
+      const calculatorKey = parsed.calculatorKey ?? existingSnapshot?.calculatorKey ?? null;
+      if (parsed.id && calculatorKey && (calculatorKey.startsWith("shipping-provider:") || calculatorKey.startsWith("payment-provider:"))) {
+        metadata = { ...metadata ?? {}, manualOverride: true };
+      }
+      let nextAdjustments = parsed.id ? adjustmentDrafts.map(
+        (adj) => adj.id === parsed.id ? {
+          ...adj,
+          id: adjustmentId,
+          scope: parsed.scope ?? adj.scope ?? "order",
+          kind: parsed.kind ?? adj.kind ?? "custom",
+          code: parsed.code ?? adj.code ?? null,
+          label: parsed.label ?? adj.label ?? null,
+          calculatorKey: parsed.calculatorKey ?? adj.calculatorKey ?? null,
+          promotionId: parsed.promotionId ?? adj.promotionId ?? null,
+          rate: parsed.rate ?? adj.rate ?? null,
+          amountNet: parsed.amountNet ?? adj.amountNet ?? null,
+          amountGross: parsed.amountGross ?? adj.amountGross ?? null,
+          currencyCode: parsed.currencyCode ?? adj.currencyCode ?? quote.currencyCode,
+          metadata,
+          customFields: parsed.customFields !== void 0 ? parsed.customFields : adj.customFields ?? null,
+          position: parsed.position ?? adj.position ?? adjustmentDrafts.length
+        } : adj
+      ) : [
+        ...adjustmentDrafts,
+        {
+          id: adjustmentId,
+          scope: parsed.scope ?? "order",
+          kind: parsed.kind ?? "custom",
+          code: parsed.code ?? null,
+          label: parsed.label ?? null,
+          calculatorKey: parsed.calculatorKey ?? null,
+          promotionId: parsed.promotionId ?? null,
+          rate: parsed.rate ?? null,
+          amountNet: parsed.amountNet ?? null,
+          amountGross: parsed.amountGross ?? null,
+          currencyCode: parsed.currencyCode ?? quote.currencyCode,
+          metadata,
+          customFields: parsed.customFields ?? null,
+          position: parsed.position ?? adjustmentDrafts.length
         }
-        throw new CrudHttpError(400, {
-          error: fieldErrors.amountGross ?? fieldErrors.amountNet ?? translate(
-            "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
-            RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
+      ];
+      nextAdjustments = nextAdjustments.sort((a, b) => (a.position ?? 0) - (b.position ?? 0)).map((adj, index) => ({ ...adj, position: adj.position ?? index }));
+      const sourceLines = lineSnapshots.map((line, index) => ({
+        ...line,
+        statusEntryId: line.statusEntryId ?? null,
+        catalogSnapshot: line.catalogSnapshot ?? null,
+        promotionSnapshot: line.promotionSnapshot ?? null,
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId,
+        quoteId: quote.id,
+        lineNumber: line.lineNumber ?? index + 1
+      }));
+      const calcLines = sourceLines.map(
+        (line, index) => createLineSnapshotFromInput(line, line.lineNumber ?? index + 1)
+      );
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: quote.tenantId,
+        organizationId: quote.organizationId,
+        currencyCode: quote.currencyCode,
+        shippingSnapshot: quote.shippingMethodSnapshot,
+        paymentSnapshot: quote.paymentMethodSnapshot,
+        shippingMethodId: quote.shippingMethodId ?? null,
+        paymentMethodId: quote.paymentMethodId ?? null,
+        shippingMethodCode: quote.shippingMethodCode ?? null,
+        paymentMethodCode: quote.paymentMethodCode ?? null
+      });
+      const effectiveAdjustment = nextAdjustments.find(
+        (adj) => adj.id === adjustmentId
+      );
+      if (effectiveAdjustment?.kind === "return") {
+        const baselineAdjustments = nextAdjustments.filter(
+          (adj) => adj.id !== adjustmentId
+        );
+        const baselineCalculation = await salesCalculationService.calculateDocumentTotals({
+          documentKind: "quote",
+          lines: calcLines,
+          adjustments: baselineAdjustments,
+          context: calculationContext
+        });
+        const issues = validateReturnAdjustmentWithinRemaining({
+          kind: "return",
+          amountNet: effectiveAdjustment.amountNet ?? effectiveAdjustment.amountGross ?? 0,
+          amountGross: effectiveAdjustment.amountGross ?? effectiveAdjustment.amountNet ?? 0,
+          remainingNet: Number(
+            baselineCalculation.totals?.grandTotalNetAmount ?? 0
           ),
-          fieldErrors
+          remainingGross: Number(
+            baselineCalculation.totals?.grandTotalGrossAmount ?? 0
+          )
         });
-      }
-    }
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "quote",
-      lines: calcLines,
-      adjustments: nextAdjustments,
-      context: calculationContext
-    });
-    const adjustmentInputs = nextAdjustments.map((adj, index) => ({
-      organizationId: quote.organizationId,
-      tenantId: quote.tenantId,
-      quoteId: quote.id,
-      scope: adj.scope ?? "order",
-      kind: adj.kind ?? "custom",
-      code: adj.code ?? void 0,
-      label: adj.label ?? void 0,
-      calculatorKey: adj.calculatorKey ?? void 0,
-      promotionId: adj.promotionId ?? void 0,
-      rate: adj.rate ?? void 0,
-      amountNet: adj.amountNet ?? void 0,
-      amountGross: adj.amountGross ?? void 0,
-      currencyCode: adj.currencyCode ?? quote.currencyCode,
-      metadata: adj.metadata ?? void 0,
-      customFields: adj.customFields ?? void 0,
-      position: adj.position ?? index
-    }));
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await replaceQuoteAdjustments(em, quote, calculation, adjustmentInputs);
-          applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
-          quote.updatedAt = /* @__PURE__ */ new Date();
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "quote",
-            documentId: quote.id,
-            organizationId: quote.organizationId,
-            tenantId: quote.tenantId,
-            customerId: quote.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
+        if (issues.length > 0) {
+          const { translate } = await resolveTranslations();
+          const grossIssue = issues.find((issue) => issue.path === "amountGross");
+          const netIssue = issues.find((issue) => issue.path === "amountNet");
+          const fieldErrors = {};
+          if (grossIssue) {
+            fieldErrors.amountGross = translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
+            );
+          }
+          if (netIssue) {
+            fieldErrors.amountNet = translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalNet",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_NET_MESSAGE
+            );
+          }
+          throw new CrudHttpError(400, {
+            error: fieldErrors.amountGross ?? fieldErrors.amountNet ?? translate(
+              "sales.adjustments.error.returnExceedsRemainingGrandTotalGross",
+              RETURN_ADJUSTMENT_EXCEEDS_REMAINING_GROSS_MESSAGE
+            ),
+            fieldErrors
           });
         }
-      ],
-      { transaction: true }
-    );
-    return { quoteId: quote.id, adjustmentId };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadQuoteSnapshot(em, result.quoteId);
+      }
+      const calculation = await salesCalculationService.calculateDocumentTotals({
+        documentKind: "quote",
+        lines: calcLines,
+        adjustments: nextAdjustments,
+        context: calculationContext
+      });
+      const adjustmentInputs = nextAdjustments.map((adj, index) => ({
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId,
+        quoteId: quote.id,
+        scope: adj.scope ?? "order",
+        kind: adj.kind ?? "custom",
+        code: adj.code ?? void 0,
+        label: adj.label ?? void 0,
+        calculatorKey: adj.calculatorKey ?? void 0,
+        promotionId: adj.promotionId ?? void 0,
+        rate: adj.rate ?? void 0,
+        amountNet: adj.amountNet ?? void 0,
+        amountGross: adj.amountGross ?? void 0,
+        currencyCode: adj.currencyCode ?? quote.currencyCode,
+        metadata: adj.metadata ?? void 0,
+        customFields: adj.customFields ?? void 0,
+        position: adj.position ?? index
+      }));
+      await replaceQuoteAdjustments(em, quote, calculation, adjustmentInputs);
+      applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
+      quote.updatedAt = /* @__PURE__ */ new Date();
+      return { result: { quoteId: quote.id, adjustmentId }, calculation };
+    });
   },
+  captureAfter: async (_input, result, ctx) => captureLockedQuoteGraphAfter(ctx, result, result.quoteId),
   buildLog: async ({ snapshots, result }) => {
-    const before = snapshots.before;
+    const before = resolveLockedQuoteGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
@@ -7073,131 +6899,87 @@ const quoteAdjustmentUpsertCommand = {
 };
 const quoteAdjustmentDeleteCommand = {
   id: "sales.quotes.adjustments.delete",
-  async prepare(input, ctx) {
-    const raw = input?.body ?? {};
-    const quoteId = typeof raw.quoteId === "string" ? raw.quoteId : null;
-    if (!quoteId) return {};
-    const em = ctx.container.resolve("em");
-    const snapshot = await loadQuoteSnapshot(em, quoteId);
-    if (snapshot)
-      ensureQuoteScope(
-        ctx,
-        snapshot.quote.organizationId,
-        snapshot.quote.tenantId
-      );
-    return snapshot ? { before: snapshot } : {};
+  async prepare(input) {
+    return markLockedGraphWrite(input);
   },
   async execute(input, ctx) {
     const parsed = quoteAdjustmentDeleteSchema.parse(
       input?.body ?? {}
     );
-    const em = ctx.container.resolve("em").fork();
-    const quote = await findOneWithDecryption(em, SalesQuote, {
-      id: parsed.quoteId,
-      deletedAt: null
-    });
-    if (!quote)
-      throw notFound("Sales quote not found");
-    ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
-    await enforceSalesDocumentOptimisticLock(ctx, quote, SALES_RESOURCE_KIND_QUOTE);
-    const [existingLines, adjustments] = await Promise.all([
-      em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
-      em.find(
-        SalesQuoteAdjustment,
-        { quote },
-        { orderBy: { position: "asc" } }
-      )
-    ]);
-    const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
-    if (filtered.length === adjustments.length) {
-      throw notFound("Adjustment not found");
-    }
-    const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
-    const calcLines = lineSnapshots.map(
-      (line, index) => createLineSnapshotFromInput(
-        {
-          ...line,
-          organizationId: quote.organizationId,
-          tenantId: quote.tenantId,
-          quoteId: quote.id,
-          lineNumber: line.lineNumber ?? index + 1,
-          statusEntryId: line.statusEntryId ?? null,
-          catalogSnapshot: line.catalogSnapshot ?? null,
-          promotionSnapshot: line.promotionSnapshot ?? null
-        },
-        line.lineNumber ?? index + 1
-      )
-    );
-    const adjustmentDrafts = filtered.map(mapQuoteAdjustmentToDraft);
-    const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const calculationContext = buildCalculationContext({
-      tenantId: quote.tenantId,
-      organizationId: quote.organizationId,
-      currencyCode: quote.currencyCode,
-      shippingSnapshot: quote.shippingMethodSnapshot,
-      paymentSnapshot: quote.paymentMethodSnapshot,
-      shippingMethodId: quote.shippingMethodId ?? null,
-      paymentMethodId: quote.paymentMethodId ?? null,
-      shippingMethodCode: quote.shippingMethodCode ?? null,
-      paymentMethodCode: quote.paymentMethodCode ?? null
-    });
-    const calculation = await salesCalculationService.calculateDocumentTotals({
-      documentKind: "quote",
-      lines: calcLines,
-      adjustments: adjustmentDrafts,
-      context: calculationContext
-    });
-    const adjustmentInputs = adjustmentDrafts.map((adj, index) => ({
-      organizationId: quote.organizationId,
-      tenantId: quote.tenantId,
-      quoteId: quote.id,
-      scope: adj.scope ?? "order",
-      kind: adj.kind ?? "custom",
-      code: adj.code ?? void 0,
-      label: adj.label ?? void 0,
-      calculatorKey: adj.calculatorKey ?? void 0,
-      promotionId: adj.promotionId ?? void 0,
-      rate: adj.rate ?? void 0,
-      amountNet: adj.amountNet ?? void 0,
-      amountGross: adj.amountGross ?? void 0,
-      currencyCode: adj.currencyCode ?? quote.currencyCode,
-      metadata: adj.metadata ?? void 0,
-      position: adj.position ?? index
-    }));
-    let eventBus = null;
-    try {
-      eventBus = ctx.container.resolve("eventBus");
-    } catch {
-      eventBus = null;
-    }
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          await replaceQuoteAdjustments(em, quote, calculation, adjustmentInputs);
-          applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
-          quote.updatedAt = /* @__PURE__ */ new Date();
-          await emitTotalsCalculated(eventBus, {
-            documentKind: "quote",
-            documentId: quote.id,
+    return writeLockedQuoteGraph(input, ctx, parsed.quoteId, "Sales quote not found", async (em, quote) => {
+      const [existingLines, adjustments] = await Promise.all([
+        em.find(SalesQuoteLine, { quote }, { orderBy: { lineNumber: "asc" } }),
+        em.find(
+          SalesQuoteAdjustment,
+          { quote },
+          { orderBy: { position: "asc" } }
+        )
+      ]);
+      const filtered = adjustments.filter((adj) => adj.id !== parsed.id);
+      if (filtered.length === adjustments.length) {
+        throw notFound("Adjustment not found");
+      }
+      const lineSnapshots = existingLines.map(mapQuoteLineEntityToSnapshot);
+      const calcLines = lineSnapshots.map(
+        (line, index) => createLineSnapshotFromInput(
+          {
+            ...line,
             organizationId: quote.organizationId,
             tenantId: quote.tenantId,
-            customerId: quote.customerEntityId ?? null,
-            totals: calculation.totals,
-            lineCount: calculation.lines.length
-          });
-        }
-      ],
-      { transaction: true }
-    );
-    return { quoteId: quote.id, adjustmentId: parsed.id };
-  },
-  captureAfter: async (_input, result, ctx) => {
-    const em = ctx.container.resolve("em").fork();
-    return loadQuoteSnapshot(em, result.quoteId);
+            quoteId: quote.id,
+            lineNumber: line.lineNumber ?? index + 1,
+            statusEntryId: line.statusEntryId ?? null,
+            catalogSnapshot: line.catalogSnapshot ?? null,
+            promotionSnapshot: line.promotionSnapshot ?? null
+          },
+          line.lineNumber ?? index + 1
+        )
+      );
+      const adjustmentDrafts = filtered.map(mapQuoteAdjustmentToDraft);
+      const salesCalculationService = ctx.container.resolve("salesCalculationService");
+      const calculationContext = buildCalculationContext({
+        tenantId: quote.tenantId,
+        organizationId: quote.organizationId,
+        currencyCode: quote.currencyCode,
+        shippingSnapshot: quote.shippingMethodSnapshot,
+        paymentSnapshot: quote.paymentMethodSnapshot,
+        shippingMethodId: quote.shippingMethodId ?? null,
+        paymentMethodId: quote.paymentMethodId ?? null,
+        shippingMethodCode: quote.shippingMethodCode ?? null,
+        paymentMethodCode: quote.paymentMethodCode ?? null
+      });
+      const calculation = await salesCalculationService.calculateDocumentTotals({
+        documentKind: "quote",
+        lines: calcLines,
+        adjustments: adjustmentDrafts,
+        context: calculationContext
+      });
+      const adjustmentInputs = adjustmentDrafts.map((adj, index) => ({
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId,
+        quoteId: quote.id,
+        scope: adj.scope ?? "order",
+        kind: adj.kind ?? "custom",
+        code: adj.code ?? void 0,
+        label: adj.label ?? void 0,
+        calculatorKey: adj.calculatorKey ?? void 0,
+        promotionId: adj.promotionId ?? void 0,
+        rate: adj.rate ?? void 0,
+        amountNet: adj.amountNet ?? void 0,
+        amountGross: adj.amountGross ?? void 0,
+        currencyCode: adj.currencyCode ?? quote.currencyCode,
+        metadata: adj.metadata ?? void 0,
+        position: adj.position ?? index
+      }));
+      await replaceQuoteAdjustments(em, quote, calculation, adjustmentInputs);
+      applyQuoteTotals(quote, calculation.totals, calculation.lines.length);
+      quote.updatedAt = /* @__PURE__ */ new Date();
+      return { result: { quoteId: quote.id, adjustmentId: parsed.id }, calculation };
+    });
   },
+  captureAfter: async (_input, result, ctx) => captureLockedQuoteGraphAfter(ctx, result, result.quoteId),
   buildLog: async ({ snapshots, result }) => {
-    const before = snapshots.before;
+    const before = resolveLockedQuoteGraphBefore(result, snapshots.before);
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();