@open-mercato/core 0.6.4-develop.4210.1.d412061cfe → 0.6.4-develop.4236.1.9fa6806b34

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

@@ -1,6 +1,7 @@
 import { randomUUID } from "crypto";
 import { z } from "zod";
 import { registerCommand } from "@open-mercato/shared/lib/commands";
+import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
 import {
   buildChanges,
   emitCrudSideEffects,
@@ -3161,7 +3162,6 @@ const createQuoteCommand = {
       createdAt: /* @__PURE__ */ new Date(),
       updatedAt: /* @__PURE__ */ new Date()
     });
-    em.persist(quote);
     const lineInputs = (parsed.lines ?? []).map(
       (line, index) => quoteLineCreateSchema.parse({
         ...line,
@@ -3221,32 +3221,45 @@ const createQuoteCommand = {
       adjustments: adjustmentDrafts,
       context: calculationContext
     });
-    await replaceQuoteLines(em, quote, calculation, normalizedLineInputs);
-    await replaceQuoteAdjustments(em, quote, calculation, 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
-    });
-    await syncSalesDocumentTags(em, {
-      documentId: quote.id,
-      kind: "quote",
-      organizationId: quote.organizationId,
-      tenantId: quote.tenantId,
-      tagIds: parsed.tags
-    });
-    await em.flush();
+    await withAtomicFlush(
+      em,
+      [
+        async () => {
+          em.persist(quote);
+          await replaceQuoteLines(em, quote, calculation, normalizedLineInputs);
+          await replaceQuoteAdjustments(
+            em,
+            quote,
+            calculation,
+            adjustmentInputs
+          );
+          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
+          });
+          await syncSalesDocumentTags(em, {
+            documentId: quote.id,
+            kind: "quote",
+            organizationId: quote.organizationId,
+            tenantId: quote.tenantId,
+            tagIds: parsed.tags
+          });
+        }
+      ],
+      { transaction: true }
+    );
     try {
       const notificationService = resolveNotificationService(ctx.container);
       const typeDef = notificationTypes.find(
@@ -3387,22 +3400,29 @@ const deleteQuoteCommand = {
       em.find(SalesQuoteAdjustment, { quote: quote.id }),
       em.find(SalesQuoteLine, { quote: quote.id })
     ]);
-    await em.nativeDelete(SalesDocumentAddress, {
-      documentId: quote.id,
-      documentKind: "quote"
-    });
-    await em.nativeDelete(SalesNote, {
-      contextType: "quote",
-      contextId: quote.id
-    });
-    await em.nativeDelete(SalesDocumentTagAssignment, {
-      documentId: quote.id,
-      documentKind: "quote"
-    });
-    await em.nativeDelete(SalesQuoteAdjustment, { quote: quote.id });
-    await em.nativeDelete(SalesQuoteLine, { quote: quote.id });
-    em.remove(quote);
-    await em.flush();
+    await withAtomicFlush(
+      em,
+      [
+        async () => {
+          await em.nativeDelete(SalesDocumentAddress, {
+            documentId: quote.id,
+            documentKind: "quote"
+          });
+          await em.nativeDelete(SalesNote, {
+            contextType: "quote",
+            contextId: quote.id
+          });
+          await em.nativeDelete(SalesDocumentTagAssignment, {
+            documentId: quote.id,
+            documentKind: "quote"
+          });
+          await em.nativeDelete(SalesQuoteAdjustment, { quote: quote.id });
+          await em.nativeDelete(SalesQuoteLine, { quote: quote.id });
+          em.remove(quote);
+        }
+      ],
+      { transaction: true }
+    );
     const dataEngine = ctx.container.resolve("dataEngine");
     await Promise.all([
       queueDeletionSideEffects(dataEngine, quote, E.sales.sales_quote),
@@ -3485,106 +3505,119 @@ const updateQuoteCommand = {
       quote.sentAt = 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 applyDocumentUpdate({
-      kind: "quote",
-      entity: quote,
-      input: parsed,
-      em
-    });
-    await em.flush();
-    if (shouldInvalidateSentToken) {
-      quote.status = "draft";
-      quote.statusEntryId = await resolveStatusEntryIdByValue(em, {
-        tenantId: quote.tenantId,
-        organizationId: quote.organizationId,
-        value: "draft"
-      });
-    }
-    if (shouldRecalculateTotals) {
-      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 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 = 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 withAtomicFlush(
+      em,
+      [
+        async () => {
+          await applyDocumentUpdate({
+            kind: "quote",
+            entity: quote,
+            input: parsed,
+            em
+          });
+          if (shouldInvalidateSentToken) {
+            quote.status = "draft";
+            quote.statusEntryId = await resolveStatusEntryIdByValue(em, {
+              tenantId: quote.tenantId,
+              organizationId: quote.organizationId,
+              value: "draft"
+            });
+          }
+          if (shouldRecalculateTotals) {
+            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 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 = 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 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);
+            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
+            });
+          }
+          quote.updatedAt = /* @__PURE__ */ new Date();
         }
-      );
-      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);
-      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
-      });
-    }
-    quote.updatedAt = /* @__PURE__ */ new Date();
-    await em.flush();
+      ],
+      { transaction: true }
+    );
     const resourceKind = deriveResourceFromCommandId(updateQuoteCommand.id) ?? "sales.quote";
     await invalidateCrudCache(
       ctx.container,
@@ -3673,105 +3706,118 @@ const updateOrderCommand = {
     const previousStatus = normalizeStatusValue(order.status);
     let statusChangeNote = 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 applyDocumentUpdate({
-      kind: "order",
-      entity: order,
-      input: parsed,
-      em
-    });
-    await em.flush();
-    if (shouldRecalculateTotals) {
-      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 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 = 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)
-        }
-      );
-      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);
-      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
-      });
-    }
-    statusChangeNote = await appendOrderStatusChangeNote({
+    await withAtomicFlush(
       em,
-      order,
-      previousStatus,
-      auth: ctx.auth ?? null
-    });
-    order.updatedAt = /* @__PURE__ */ new Date();
-    await em.flush();
+      [
+        async () => {
+          await applyDocumentUpdate({
+            kind: "order",
+            entity: order,
+            input: parsed,
+            em
+          });
+          if (shouldRecalculateTotals) {
+            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 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 = 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)
+            });
+            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);
+            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
+            });
+          }
+          statusChangeNote = await appendOrderStatusChangeNote({
+            em,
+            order,
+            previousStatus,
+            auth: ctx.auth ?? null
+          });
+          order.updatedAt = /* @__PURE__ */ new Date();
+        }
+      ],
+      { transaction: true }
+    );
     if (statusChangeNote) {
       const dataEngine = ctx.container.resolve("dataEngine");
       await emitCrudSideEffects({
@@ -3975,7 +4021,6 @@ const createOrderCommand = {
       createdAt: /* @__PURE__ */ new Date(),
       updatedAt: /* @__PURE__ */ new Date()
     });
-    em.persist(order);
     const lineInputs = (parsed.lines ?? []).map(
       (line, index) => orderLineCreateSchema.parse({
         ...line,
@@ -4036,32 +4081,45 @@ const createOrderCommand = {
       context: calculationContext,
       existingTotals: resolveExistingPaymentTotals(order)
     });
-    await replaceOrderLines(em, order, calculation, normalizedLineInputs);
-    await replaceOrderAdjustments(em, order, calculation, adjustmentInputs);
-    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
-    });
-    await syncSalesDocumentTags(em, {
-      documentId: order.id,
-      kind: "order",
-      organizationId: order.organizationId,
-      tenantId: order.tenantId,
-      tagIds: parsed.tags
-    });
-    await em.flush();
+    await withAtomicFlush(
+      em,
+      [
+        async () => {
+          em.persist(order);
+          await replaceOrderLines(em, order, calculation, normalizedLineInputs);
+          await replaceOrderAdjustments(
+            em,
+            order,
+            calculation,
+            adjustmentInputs
+          );
+          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
+          });
+          await syncSalesDocumentTags(em, {
+            documentId: order.id,
+            kind: "order",
+            organizationId: order.organizationId,
+            tenantId: order.tenantId,
+            tagIds: parsed.tags
+          });
+        }
+      ],
+      { transaction: true }
+    );
     try {
       const notificationService = resolveNotificationService(ctx.container);
       const typeDef = notificationTypes.find(
@@ -4216,30 +4274,37 @@ const deleteOrderCommand = {
       em.find(SalesOrderAdjustment, { order: order.id }),
       em.find(SalesOrderLine, { order: order.id })
     ]);
-    if (shipmentIds.length) {
-      await em.nativeDelete(SalesShipmentItem, {
-        shipment: { $in: shipmentIds }
-      });
-      await em.nativeDelete(SalesShipment, { id: { $in: shipmentIds } });
-    }
-    await em.nativeDelete(SalesPaymentAllocation, { order: order.id });
-    await em.nativeDelete(SalesPayment, { order: order.id });
-    await em.nativeDelete(SalesDocumentAddress, {
-      documentId: order.id,
-      documentKind: "order"
-    });
-    await em.nativeDelete(SalesNote, {
-      contextType: "order",
-      contextId: order.id
-    });
-    await em.nativeDelete(SalesDocumentTagAssignment, {
-      documentId: order.id,
-      documentKind: "order"
-    });
-    await em.nativeDelete(SalesOrderAdjustment, { order: order.id });
-    await em.nativeDelete(SalesOrderLine, { order: order.id });
-    em.remove(order);
-    await em.flush();
+    await withAtomicFlush(
+      em,
+      [
+        async () => {
+          if (shipmentIds.length) {
+            await em.nativeDelete(SalesShipmentItem, {
+              shipment: { $in: shipmentIds }
+            });
+            await em.nativeDelete(SalesShipment, { id: { $in: shipmentIds } });
+          }
+          await em.nativeDelete(SalesPaymentAllocation, { order: order.id });
+          await em.nativeDelete(SalesPayment, { order: order.id });
+          await em.nativeDelete(SalesDocumentAddress, {
+            documentId: order.id,
+            documentKind: "order"
+          });
+          await em.nativeDelete(SalesNote, {
+            contextType: "order",
+            contextId: order.id
+          });
+          await em.nativeDelete(SalesDocumentTagAssignment, {
+            documentId: order.id,
+            documentKind: "order"
+          });
+          await em.nativeDelete(SalesOrderAdjustment, { order: order.id });
+          await em.nativeDelete(SalesOrderLine, { order: order.id });
+          em.remove(order);
+        }
+      ],
+      { transaction: true }
+    );
     const dataEngine = ctx.container.resolve("dataEngine");
     await Promise.all([
       queueDeletionSideEffects(dataEngine, order, E.sales.sales_order),
@@ -4897,30 +4962,37 @@ const orderLineUpsertCommand = {
       context: calculationContext,
       existingTotals: resolveExistingPaymentTotals(order)
     });
-    await applyOrderLineResults({
-      em,
-      order,
-      calculation,
-      sourceLines: sourceInputs,
-      existingLines
-    });
-    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
-    });
-    await em.flush();
+    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) => {
@@ -5056,30 +5128,37 @@ const orderLineDeleteCommand = {
       context: calculationContext,
       existingTotals: resolveExistingPaymentTotals(order)
     });
-    await applyOrderLineResults({
-      em,
-      order,
-      calculation,
-      sourceLines: sourceInputs,
-      existingLines
-    });
-    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
-    });
-    await em.flush();
+    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) => {
@@ -5297,30 +5376,37 @@ const quoteLineUpsertCommand = {
       adjustments: adjustmentDrafts,
       context: calculationContext
     });
-    await applyQuoteLineResults({
-      em,
-      quote,
-      calculation,
-      sourceLines: sourceInputs,
-      existingLines
-    });
-    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
-    });
-    await em.flush();
+    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) => {
@@ -5432,30 +5518,37 @@ const quoteLineDeleteCommand = {
       adjustments: adjustmentDrafts,
       context: calculationContext
     });
-    await applyQuoteLineResults({
-      em,
-      quote,
-      calculation,
-      sourceLines: sourceInputs,
-      existingLines
-    });
-    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
-    });
-    await em.flush();
+    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) => {
@@ -5682,25 +5775,32 @@ const orderAdjustmentUpsertCommand = {
       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();
     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
-    });
-    await em.flush();
+    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) => {
@@ -5831,25 +5931,32 @@ const orderAdjustmentDeleteCommand = {
       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();
     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
-    });
-    await em.flush();
+    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) => {
@@ -6074,25 +6181,32 @@ const quoteAdjustmentUpsertCommand = {
       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();
     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
-    });
-    await em.flush();
+    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
+          });
+        }
+      ],
+      { transaction: true }
+    );
     return { quoteId: quote.id, adjustmentId };
   },
   captureAfter: async (_input, result, ctx) => {
@@ -6222,25 +6336,32 @@ const quoteAdjustmentDeleteCommand = {
       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();
     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
-    });
-    await em.flush();
+    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
+          });
+        }
+      ],
+      { transaction: true }
+    );
     return { quoteId: quote.id, adjustmentId: parsed.id };
   },
   captureAfter: async (_input, result, ctx) => {
@@ -6348,45 +6469,60 @@ const createInvoiceCommand = {
       createdAt: /* @__PURE__ */ new Date(),
       updatedAt: /* @__PURE__ */ new Date()
     });
-    em.persist(invoice);
-    if (parsed.lines?.length) {
-      for (let i = 0; i < parsed.lines.length; i++) {
-        const line = parsed.lines[i];
-        em.persist(
-          em.create(SalesInvoiceLine, {
-            id: randomUUID(),
-            invoice,
-            orderLineId: line.orderLineId ?? null,
-            organizationId: parsed.organizationId,
-            tenantId: parsed.tenantId,
-            lineNumber: line.lineNumber ?? i + 1,
-            kind: line.kind ?? "product",
-            name: line.name ?? null,
-            sku: line.sku ?? null,
-            description: line.description ?? null,
-            quantity: toNumericString(line.quantity ?? 0),
-            quantityUnit: line.quantityUnit ?? null,
-            normalizedQuantity: toNumericString(line.normalizedQuantity ?? 0),
-            normalizedUnit: line.normalizedUnit ?? null,
-            uomSnapshot: line.uomSnapshot ?? null,
-            currencyCode: line.currencyCode ?? parsed.currencyCode,
-            unitPriceNet: toNumericString(line.unitPriceNet ?? 0),
-            unitPriceGross: toNumericString(line.unitPriceGross ?? 0),
-            discountAmount: toNumericString(line.discountAmount ?? 0),
-            discountPercent: toNumericString(line.discountPercent ?? 0),
-            taxRate: toNumericString(line.taxRate ?? 0),
-            taxAmount: toNumericString(line.taxAmount ?? 0),
-            totalNetAmount: toNumericString(line.totalNetAmount ?? 0),
-            totalGrossAmount: toNumericString(line.totalGrossAmount ?? 0),
-            metadata: line.metadata ?? null
-          })
-        );
-      }
-    }
-    if (parsed.customFieldSetId) {
-      await setRecordCustomFields(em, invoiceId, parsed.customFieldSetId, parsed);
-    }
-    await em.flush();
+    await withAtomicFlush(
+      em,
+      [
+        async () => {
+          em.persist(invoice);
+          if (parsed.lines?.length) {
+            for (let i = 0; i < parsed.lines.length; i++) {
+              const line = parsed.lines[i];
+              em.persist(
+                em.create(SalesInvoiceLine, {
+                  id: randomUUID(),
+                  invoice,
+                  orderLineId: line.orderLineId ?? null,
+                  organizationId: parsed.organizationId,
+                  tenantId: parsed.tenantId,
+                  lineNumber: line.lineNumber ?? i + 1,
+                  kind: line.kind ?? "product",
+                  name: line.name ?? null,
+                  sku: line.sku ?? null,
+                  description: line.description ?? null,
+                  quantity: toNumericString(line.quantity ?? 0),
+                  quantityUnit: line.quantityUnit ?? null,
+                  normalizedQuantity: toNumericString(line.normalizedQuantity ?? 0),
+                  normalizedUnit: line.normalizedUnit ?? null,
+                  uomSnapshot: line.uomSnapshot ?? null,
+                  currencyCode: line.currencyCode ?? parsed.currencyCode,
+                  unitPriceNet: toNumericString(line.unitPriceNet ?? 0),
+                  unitPriceGross: toNumericString(line.unitPriceGross ?? 0),
+                  discountAmount: toNumericString(line.discountAmount ?? 0),
+                  discountPercent: toNumericString(line.discountPercent ?? 0),
+                  taxRate: toNumericString(line.taxRate ?? 0),
+                  taxAmount: toNumericString(line.taxAmount ?? 0),
+                  totalNetAmount: toNumericString(line.totalNetAmount ?? 0),
+                  totalGrossAmount: toNumericString(line.totalGrossAmount ?? 0),
+                  metadata: line.metadata ?? null
+                })
+              );
+            }
+          }
+          if (parsed.customFieldSetId) {
+            await setRecordCustomFields(em, {
+              entityId: E.sales.sales_invoice,
+              recordId: invoiceId,
+              organizationId: parsed.organizationId,
+              tenantId: parsed.tenantId,
+              values: normalizeCustomFieldValues(
+                parsed.customFields ?? {}
+              )
+            });
+          }
+        }
+      ],
+      { transaction: true }
+    );
     const dataEngine = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
       dataEngine,
@@ -6783,42 +6919,57 @@ const createCreditMemoCommand = {
       createdAt: /* @__PURE__ */ new Date(),
       updatedAt: /* @__PURE__ */ new Date()
     });
-    em.persist(creditMemo);
-    if (parsed.lines?.length) {
-      for (let i = 0; i < parsed.lines.length; i++) {
-        const line = parsed.lines[i];
-        em.persist(
-          em.create(SalesCreditMemoLine, {
-            id: randomUUID(),
-            creditMemo,
-            orderLineId: line.orderLineId ?? null,
-            organizationId: parsed.organizationId,
-            tenantId: parsed.tenantId,
-            lineNumber: line.lineNumber ?? i + 1,
-            name: line.name ?? null,
-            sku: line.sku ?? null,
-            description: line.description ?? null,
-            quantity: toNumericString(line.quantity ?? 0),
-            quantityUnit: line.quantityUnit ?? null,
-            normalizedQuantity: toNumericString(line.normalizedQuantity ?? 0),
-            normalizedUnit: line.normalizedUnit ?? null,
-            uomSnapshot: line.uomSnapshot ?? null,
-            currencyCode: line.currencyCode ?? parsed.currencyCode,
-            unitPriceNet: toNumericString(line.unitPriceNet ?? 0),
-            unitPriceGross: toNumericString(line.unitPriceGross ?? 0),
-            taxRate: toNumericString(line.taxRate ?? 0),
-            taxAmount: toNumericString(line.taxAmount ?? 0),
-            totalNetAmount: toNumericString(line.totalNetAmount ?? 0),
-            totalGrossAmount: toNumericString(line.totalGrossAmount ?? 0),
-            metadata: line.metadata ?? null
-          })
-        );
-      }
-    }
-    if (parsed.customFieldSetId) {
-      await setRecordCustomFields(em, creditMemoId, parsed.customFieldSetId, parsed);
-    }
-    await em.flush();
+    await withAtomicFlush(
+      em,
+      [
+        async () => {
+          em.persist(creditMemo);
+          if (parsed.lines?.length) {
+            for (let i = 0; i < parsed.lines.length; i++) {
+              const line = parsed.lines[i];
+              em.persist(
+                em.create(SalesCreditMemoLine, {
+                  id: randomUUID(),
+                  creditMemo,
+                  orderLineId: line.orderLineId ?? null,
+                  organizationId: parsed.organizationId,
+                  tenantId: parsed.tenantId,
+                  lineNumber: line.lineNumber ?? i + 1,
+                  name: line.name ?? null,
+                  sku: line.sku ?? null,
+                  description: line.description ?? null,
+                  quantity: toNumericString(line.quantity ?? 0),
+                  quantityUnit: line.quantityUnit ?? null,
+                  normalizedQuantity: toNumericString(line.normalizedQuantity ?? 0),
+                  normalizedUnit: line.normalizedUnit ?? null,
+                  uomSnapshot: line.uomSnapshot ?? null,
+                  currencyCode: line.currencyCode ?? parsed.currencyCode,
+                  unitPriceNet: toNumericString(line.unitPriceNet ?? 0),
+                  unitPriceGross: toNumericString(line.unitPriceGross ?? 0),
+                  taxRate: toNumericString(line.taxRate ?? 0),
+                  taxAmount: toNumericString(line.taxAmount ?? 0),
+                  totalNetAmount: toNumericString(line.totalNetAmount ?? 0),
+                  totalGrossAmount: toNumericString(line.totalGrossAmount ?? 0),
+                  metadata: line.metadata ?? null
+                })
+              );
+            }
+          }
+          if (parsed.customFieldSetId) {
+            await setRecordCustomFields(em, {
+              entityId: E.sales.sales_credit_memo,
+              recordId: creditMemoId,
+              organizationId: parsed.organizationId,
+              tenantId: parsed.tenantId,
+              values: normalizeCustomFieldValues(
+                parsed.customFields ?? {}
+              )
+            });
+          }
+        }
+      ],
+      { transaction: true }
+    );
     const dataEngine = ctx.container.resolve("dataEngine");
     await emitCrudSideEffects({
       dataEngine,