@dainamite/cpq 0.5.0 → 0.7.0

package/dist/modules/cpq/services/cpqQuotingService.js

@@ -1,4 +1,12 @@
 var _a, _b;
+import { cloneQuoteAdjustments, removeQuoteLineTree } from "./priceAdjustments/quoteAdjustmentLifecycle.js";
+import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
+import { loadQuoteAdjustments } from "./priceAdjustments/loadQuoteAdjustments.js";
+import { resolveManualAdjustments } from "./priceAdjustments/resolveManualAdjustments.js";
+import { withChargeWaterfall } from "./priceAdjustments/chargeWaterfall.js";
+import { withQuotePricingWrite } from "./priceAdjustments/quotePricingWrite.js";
+import { emitQuoteWriteEvents } from "./priceAdjustments/quotePricingEvents.js";
+import { computeWaterfallSummary } from "./priceAdjustments/pricingSnapshot.js";
 import { SalesQuote, SalesQuoteLine } from "@open-mercato/core/modules/sales/data/entities";
 import { CustomerEntity } from "@open-mercato/core/modules/customers/data/entities";
 import {
@@ -17,6 +25,17 @@ import {
   ARC_QUOTE_TYPES,
   getBaseCurrencyCode
 } from "./types.js";
+import {
+  ARC_PRICE_FROZEN_KEY,
+  ARC_REPRICED_KEY,
+  arcPricingInputsChanged,
+  buildArcMirrorConfiguration,
+  isFrozenAmendMirrorLine,
+  isArcMirrorLine,
+  stripArcMarkers,
+  stripQuoteOnlyArcMarkers
+} from "./arcPriceFreeze.js";
+import { isArcCancelledLine, planArcLineRemoval, planArcLineRestore, removalCancelsItem } from "./arcLineRemoval.js";
 class DefaultCpqQuotingService {
   constructor(deps) {
     this.em = deps.em;
@@ -108,12 +127,26 @@ class DefaultCpqQuotingService {
   }
   // ─── Add Quote Item ────────────────────────────────────────────
   async addQuoteItem(quoteId, item, scope) {
-    const em = this.em;
-    const cpqConfig = await this.loadCpqConfig(em, quoteId, scope);
+    return this.writeQuote(quoteId, scope, (em, quote) => this.addQuoteItemInTransaction(quoteId, item, scope, em, quote), void 0, void 0, LINE_EVENTS);
+  }
+  async addQuoteItemInTransaction(quoteId, item, scope, em, cpqConfig) {
+    item = { ...item, configuration: stripArcMarkers(item.configuration) };
     const salesQuote = await this.loadSalesQuote(em, cpqConfig.quoteId, scope);
     if (TERMINAL_STATUSES.includes(cpqConfig.cpqStatus)) {
       throw new QuotingError(409, `Cannot modify quote in '${cpqConfig.cpqStatus}' status`);
     }
+    if (item.parentLineId && cpqConfig.quoteType && cpqConfig.quoteType !== "new") {
+      const parent = await em.findOne(CpqQuoteLineConfiguration, {
+        quoteLineId: item.parentLineId,
+        quoteConfigurationId: cpqConfig.id,
+        organizationId: scope.organizationId,
+        tenantId: scope.tenantId,
+        deletedAt: null
+      });
+      if (parent && isArcCancelledLine(parent, cpqConfig.quoteType)) {
+        throw new QuotingError(409, "Cannot add a component to a subscription item marked for removal");
+      }
+    }
     const { offering, spec } = await this.resolveOffering(em, item, scope);
     const mergedConfig = {
       ...cpqConfig.quoteContext ?? {},
@@ -224,8 +257,10 @@ class DefaultCpqQuotingService {
   }
   // ─── Update Quote Item ─────────────────────────────────────────
   async updateQuoteItem(quoteId, lineId, update, scope) {
-    const em = this.em;
-    const cpqConfig = await this.loadCpqConfig(em, quoteId, scope);
+    return this.writeQuote(quoteId, scope, (em, quote) => this.updateQuoteItemInTransaction(quoteId, lineId, update, scope, em, quote), void 0, void 0, LINE_EVENTS);
+  }
+  async updateQuoteItemInTransaction(quoteId, lineId, update, scope, em, cpqConfig) {
+    update = { ...update, configuration: stripArcMarkers(update.configuration) };
     const salesQuote = await this.loadSalesQuote(em, cpqConfig.quoteId, scope);
     if (TERMINAL_STATUSES.includes(cpqConfig.cpqStatus)) {
       throw new QuotingError(409, `Cannot modify quote in '${cpqConfig.cpqStatus}' status`);
@@ -238,6 +273,9 @@ class DefaultCpqQuotingService {
       deletedAt: null
     });
     if (!lineConfig) throw new QuotingError(404, "Quote line not found");
+    if (isArcCancelledLine(lineConfig, cpqConfig.quoteType)) {
+      throw new QuotingError(409, "This subscription item is marked for removal \u2014 restore it before changing it");
+    }
     const quoteLine = await em.findOne(SalesQuoteLine, {
       id: lineId,
       organizationId: scope.organizationId,
@@ -279,12 +317,27 @@ class DefaultCpqQuotingService {
     if (existingCfg?._arcMirroredName !== void 0) {
       arcMarkers._arcMirroredName = existingCfg._arcMirroredName;
     }
+    const wasFrozen = isFrozenAmendMirrorLine(existingCfg, cpqConfig.quoteType);
+    const pricingInputsChanged = wasFrozen && arcPricingInputsChanged(
+      {
+        configuration: existingCfg,
+        quantity: lineConfig.quantity,
+        termMonths: lineConfig.termMonths,
+        startDate: lineConfig.startDate,
+        endDate: lineConfig.endDate,
+        usageEstimates: lineConfig.usageEstimates
+      },
+      update
+    );
+    const staysFrozen = wasFrozen && !pricingInputsChanged;
+    if (staysFrozen) arcMarkers[ARC_PRICE_FROZEN_KEY] = true;
+    if (pricingInputsChanged || existingCfg?.[ARC_REPRICED_KEY] === true) arcMarkers[ARC_REPRICED_KEY] = true;
     update.configuration = { ...update.configuration, ...arcMarkers };
     mergedConfig._arcMirroredFromItemId = arcMarkers._arcMirroredFromItemId;
     mergedConfig._arcMirroredName = arcMarkers._arcMirroredName;
     const isArcMirrored = !!arcMarkers._arcMirroredFromItemId;
     let charges;
-    if (lineConfig.offeringId || lineConfig.productId) {
+    if ((lineConfig.offeringId || lineConfig.productId) && !staysFrozen) {
       charges = await this.pricingService.resolveProductCharges({
         offeringId: lineConfig.offeringId ?? void 0,
         productId: lineConfig.productId ?? void 0,
@@ -330,8 +383,9 @@ class DefaultCpqQuotingService {
   }
   // ─── Remove Quote Item ─────────────────────────────────────────
   async removeQuoteItem(quoteId, lineId, scope) {
-    const em = this.em;
-    const cpqConfig = await this.loadCpqConfig(em, quoteId, scope);
+    return this.writeQuote(quoteId, scope, (em, quote) => this.removeQuoteItemInTransaction(quoteId, lineId, scope, em, quote), void 0, void 0, LINE_EVENTS);
+  }
+  async removeQuoteItemInTransaction(quoteId, lineId, scope, em, cpqConfig) {
     const salesQuote = await this.loadSalesQuote(em, cpqConfig.quoteId, scope);
     if (TERMINAL_STATUSES.includes(cpqConfig.cpqStatus)) {
       throw new QuotingError(409, `Cannot modify quote in '${cpqConfig.cpqStatus}' status`);
@@ -344,31 +398,78 @@ class DefaultCpqQuotingService {
       deletedAt: null
     });
     if (!lineConfig) throw new QuotingError(404, "Quote line not found");
-    const now = /* @__PURE__ */ new Date();
-    lineConfig.deletedAt = now;
-    const children = await em.find(CpqQuoteLineConfiguration, {
-      parentLineId: lineId,
-      quoteConfigurationId: cpqConfig.id,
+    if (removalCancelsItem(lineConfig, cpqConfig.quoteType)) {
+      if (lineConfig.action === "cancel") {
+        throw new QuotingError(409, "This subscription item is already marked for removal");
+      }
+      const plan = planArcLineRemoval(lineConfig, await loadLines(em, cpqConfig.id, scope), cpqConfig.quoteType);
+      for (const root of plan.removeRoots) await removeQuoteLineTree(em, cpqConfig.id, root, scope);
+      await withAtomicFlush(em, [() => {
+        for (const line of plan.cancel) {
+          line.action = "cancel";
+          line.charges = [];
+          line.nrcTotal = "0";
+          line.mrcTotal = "0";
+          line.isConfigured = true;
+          line.validationErrors = null;
+        }
+      }]);
+    } else {
+      await removeQuoteLineTree(em, cpqConfig.id, lineConfig, scope);
+    }
+    return this.recalculateInternal(em, cpqConfig, salesQuote, scope, true);
+  }
+  // ─── Restore a removed subscription item (Amend / Renew) ───────
+  async restoreQuoteItem(quoteId, lineId, scope) {
+    return this.writeQuote(quoteId, scope, (em, quote) => this.restoreQuoteItemInTransaction(lineId, scope, em, quote), void 0, void 0, LINE_EVENTS);
+  }
+  async restoreQuoteItemInTransaction(lineId, scope, em, cpqConfig) {
+    const salesQuote = await this.loadSalesQuote(em, cpqConfig.quoteId, scope);
+    if (TERMINAL_STATUSES.includes(cpqConfig.cpqStatus)) {
+      throw new QuotingError(409, `Cannot modify quote in '${cpqConfig.cpqStatus}' status`);
+    }
+    const lines = await loadLines(em, cpqConfig.id, scope);
+    const lineConfig = lines.find((line) => line.quoteLineId === lineId);
+    if (!lineConfig) throw new QuotingError(404, "Quote line not found");
+    if (!isArcCancelledLine(lineConfig, cpqConfig.quoteType) || !isArcMirrorLine(lineConfig.configuration, cpqConfig.quoteType)) {
+      throw new QuotingError(409, "Only subscription items marked for removal can be restored");
+    }
+    const plan = planArcLineRestore(lineConfig, lines, cpqConfig.quoteType);
+    if (!plan.ok) throw new QuotingError(409, "Restore the parent item first");
+    const itemIdOf = (line) => line.sourceSubscriptionItemId ?? line.configuration?._arcMirroredFromItemId ?? null;
+    const itemIds = plan.restore.map(itemIdOf).filter((id) => !!id);
+    const items = itemIds.length ? await em.find(CpqInventorySubscriptionItem, { id: { $in: itemIds }, organizationId: scope.organizationId, tenantId: scope.tenantId, deletedAt: null }) : [];
+    const itemById = new Map(items.map((item) => [item.id, item]));
+    const salesLines = await em.find(SalesQuoteLine, {
+      id: { $in: plan.restore.map((line) => line.quoteLineId) },
       organizationId: scope.organizationId,
       tenantId: scope.tenantId,
       deletedAt: null
     });
-    for (const child of children) {
-      child.deletedAt = now;
-      const childSalesLine = await em.findOne(SalesQuoteLine, {
-        id: child.quoteLineId,
-        organizationId: scope.organizationId,
-        tenantId: scope.tenantId
-      });
-      if (childSalesLine) childSalesLine.deletedAt = now;
-    }
-    const salesLine = await em.findOne(SalesQuoteLine, {
-      id: lineId,
-      organizationId: scope.organizationId,
-      tenantId: scope.tenantId
+    const salesLineById = new Map(salesLines.map((line) => [line.id, line]));
+    const restores = plan.restore.map((line) => {
+      const itemId = itemIdOf(line);
+      const item = itemId ? itemById.get(itemId) : void 0;
+      if (!item || ["terminated", "expired", "superseded"].includes(item.status)) {
+        throw new QuotingError(409, "The subscription item is no longer active and cannot be restored");
+      }
+      return { line, item };
     });
-    if (salesLine) salesLine.deletedAt = now;
-    await em.flush();
+    const arcType = cpqConfig.quoteType;
+    await withAtomicFlush(em, [() => {
+      for (const { line, item } of restores) {
+        line.action = "modify";
+        line.configuration = buildArcMirrorConfiguration(item.configuration, item, arcType);
+        line.charges = pickArcMirrorCharges(item, cpqConfig.currencyCode);
+        line.quantity = item.quantity;
+        line.nrcTotal = String(item.nrcAmount ?? 0);
+        line.mrcTotal = String(item.mrcAmount);
+        line.isConfigured = true;
+        line.validationErrors = null;
+        const salesLine = salesLineById.get(line.quoteLineId);
+        if (salesLine) salesLine.quantity = String(item.quantity);
+      }
+    }]);
     return this.recalculateInternal(em, cpqConfig, salesQuote, scope, true);
   }
   // ─── Get Quote (read from DB, no recalculation) ────────────────
@@ -386,15 +487,42 @@ class DefaultCpqQuotingService {
   }
   // ─── Recalculate ───────────────────────────────────────────────
   async recalculate(quoteId, options, scope) {
-    const em = options.save ? this.em.fork() : this.em;
-    const cpqConfig = await this.loadCpqConfig(em, quoteId, scope);
+    if (options.save) {
+      return this.writeQuote(
+        quoteId,
+        scope,
+        (em, quote) => this.recalculateFromConfig(em, quote, scope, true),
+        void 0,
+        (quote) => {
+          if (TERMINAL_STATUSES.includes(quote.cpqStatus)) throw new QuotingError(409, `Cannot recalculate quote in '${quote.cpqStatus}' status`);
+        }
+      );
+    }
+    const cpqConfig = await this.loadCpqConfig(this.em, quoteId, scope);
+    return this.recalculateFromConfig(this.em, { ...cpqConfig }, scope, false);
+  }
+  async recalculateFromConfig(em, cpqConfig, scope, save) {
+    if (save && TERMINAL_STATUSES.includes(cpqConfig.cpqStatus)) {
+      throw new QuotingError(409, `Cannot recalculate quote in '${cpqConfig.cpqStatus}' status`);
+    }
     const salesQuote = await this.loadSalesQuote(em, cpqConfig.quoteId, scope);
-    return this.recalculateInternal(em, cpqConfig, salesQuote, scope, options.save);
+    return this.recalculateInternal(em, cpqConfig, salesQuote, scope, save);
   }
   // ─── Clone Quote ───────────────────────────────────────────────
   async cloneQuote(quoteId, scope) {
-    const em = this.em;
-    const original = await this.loadCpqConfig(em, quoteId, scope);
+    const created = {};
+    const result = await this.writeQuote(
+      quoteId,
+      scope,
+      (em, quote) => this.cloneQuoteInTransaction(quoteId, scope, em, quote, created),
+      void 0,
+      void 0,
+      { pricingCause: "clone" }
+    );
+    if (created.quote) await emitQuoteWriteEvents(null, created.quote, { pricingCause: "clone" });
+    return result;
+  }
+  async cloneQuoteInTransaction(quoteId, scope, em, original, created = {}) {
     const originalQuote = await this.loadSalesQuote(em, original.quoteId, scope);
     const { number: quoteNumber } = await this.numberGenerator.generate({
       kind: "quote",
@@ -422,11 +550,13 @@ class DefaultCpqQuotingService {
     });
     em.persist(newSalesQuote);
     const newCpqConfig = em.create(CpqQuoteConfiguration, {
+      id: crypto.randomUUID(),
       organizationId: scope.organizationId,
       tenantId: scope.tenantId,
       quoteId: newSalesQuoteId,
       customerId: original.customerId,
       cpqStatus: "new",
+      pricingRevision: 1,
       version: original.version + 1,
       parentQuoteId: original.id,
       currencyCode: original.currencyCode,
@@ -435,6 +565,8 @@ class DefaultCpqQuotingService {
       pricingSummary: emptyPricingSummary(original.currencyCode)
     });
     em.persist(newCpqConfig);
+    created.quote = newCpqConfig;
+    await em.flush();
     const originalLines = await em.find(CpqQuoteLineConfiguration, {
       quoteConfigurationId: original.id,
       organizationId: scope.organizationId,
@@ -489,7 +621,8 @@ class DefaultCpqQuotingService {
         startDate: origLine.startDate,
         termMonths: origLine.termMonths,
         endDate: origLine.endDate,
-        configuration: { ...origLine.configuration },
+        // A clone is a new quote: quote-only ARC pricing markers don't apply.
+        configuration: { ...stripQuoteOnlyArcMarkers(origLine.configuration) },
         quantity: origLine.quantity,
         charges: origLine.charges ? [...origLine.charges] : null,
         nrcTotal: origLine.nrcTotal,
@@ -516,12 +649,22 @@ class DefaultCpqQuotingService {
       }
     }
     await em.flush();
+    await cloneQuoteAdjustments(em, original.id, newCpqConfig, lineIdMap, scope);
+    await em.flush();
     return this.recalculateInternal(em, newCpqConfig, newSalesQuote, scope, true);
   }
   // ─── Transition Status ─────────────────────────────────────────
-  async transitionStatus(quoteId, targetStatus, scope) {
-    const em = this.em;
-    const cpqConfig = await this.loadCpqConfig(em, quoteId, scope);
+  async transitionStatus(quoteId, targetStatus, scope, actorUserId = null) {
+    return this.writeQuote(
+      quoteId,
+      scope,
+      (em, quote) => this.transitionStatusInTransaction(quoteId, targetStatus, scope, em, quote),
+      void 0,
+      void 0,
+      { pricingCause: "recalculate", statusCause: "manual", actorUserId }
+    );
+  }
+  async transitionStatusInTransaction(quoteId, targetStatus, scope, em, cpqConfig) {
     const salesQuote = await this.loadSalesQuote(em, cpqConfig.quoteId, scope);
     const currentStatus = cpqConfig.cpqStatus;
     const allowed = ALLOWED_TRANSITIONS[currentStatus] ?? [];
@@ -531,7 +674,7 @@ class DefaultCpqQuotingService {
     const isSubmitForApproval = targetStatus === "in_approval" || targetStatus === "pre_approved" || targetStatus === "with_customer";
     const quoteType = cpqConfig.quoteType ?? "new";
     if (isSubmitForApproval && quoteType !== "new") {
-      const validation = await this.validateArcQuote(quoteId, scope);
+      const validation = await this.validateArcQuote(quoteId, scope, em);
       if (!validation.ok) {
         throw new QuotingError(
           422,
@@ -544,8 +687,26 @@ class DefaultCpqQuotingService {
     const lines = await this.loadLineConfigs(em, cpqConfig.id, scope);
     return this.buildQuoteResult(em, cpqConfig, salesQuote, lines);
   }
+  async writeQuote(quoteId, scope, execute, expectedRevision, validate, events = { pricingCause: "recalculate" }) {
+    return withQuotePricingWrite(
+      this.em,
+      quoteId,
+      scope,
+      execute,
+      (status, message) => new QuotingError(status, message),
+      expectedRevision,
+      validate,
+      events
+    );
+  }
+  /** Called by adjustment commands that already own the quote lock/revision. */
+  async recalculateLockedQuote(em, quote, scope, save = true, adjustments) {
+    const salesQuote = await this.loadSalesQuote(em, quote.quoteId, scope);
+    const config = save ? quote : { ...quote };
+    return this.recalculateInternal(em, config, salesQuote, scope, save, adjustments);
+  }
   // ─── Internal: Recalculate ─────────────────────────────────────
-  async recalculateInternal(em, cpqConfig, salesQuote, scope, save) {
+  async recalculateInternal(em, cpqConfig, salesQuote, scope, save, draftAdjustments) {
     const lineConfigs = await em.find(CpqQuoteLineConfiguration, {
       quoteConfigurationId: cpqConfig.id,
       organizationId: scope.organizationId,
@@ -574,7 +735,7 @@ class DefaultCpqQuotingService {
         mergedConfig.term_months = lineConfig.termMonths;
       }
       let validationErrors = [];
-      if (lineConfig.offeringId) {
+      if (lineConfig.offeringId && !isArcCancelledLine(lineConfig, cpqConfig.quoteType)) {
         const validation = await this.validationService.validateOfferingConfiguration({
           offeringId: lineConfig.offeringId,
           configuration: lineConfig.configuration,
@@ -584,8 +745,11 @@ class DefaultCpqQuotingService {
       }
       const cfgRecord = lineConfig.configuration;
       const isArcMirrored = !!cfgRecord?._arcMirroredFromItemId;
+      const isFrozen = isFrozenAmendMirrorLine(cfgRecord, cpqConfig.quoteType);
       let charges;
-      if (lineConfig.offeringId || lineConfig.productId) {
+      if (isArcCancelledLine(lineConfig, cpqConfig.quoteType)) {
+        charges = [];
+      } else if ((lineConfig.offeringId || lineConfig.productId) && !isFrozen) {
         charges = await this.pricingService.resolveProductCharges({
           offeringId: lineConfig.offeringId ?? void 0,
           productId: lineConfig.productId ?? void 0,
@@ -606,36 +770,74 @@ class DefaultCpqQuotingService {
       if (!isConfigured) allValid = false;
       allErrors.push(...validationErrors);
       computedLines.push({ lineConfig, charges, nrcTotal, mrcTotal, usageEstimates, usageTotalEstimated, validationErrors, isConfigured });
+    }
+    const adjustments = draftAdjustments ?? await loadQuoteAdjustments(em, cpqConfig.id, scope);
+    const adjusted = resolveManualAdjustments(computedLines.map(({ lineConfig, charges }) => ({
+      lineId: lineConfig.quoteLineId,
+      parentLineId: lineConfig.parentLineId ?? null,
+      enginePriced: !!(lineConfig.offeringId || lineConfig.productId),
+      mirrored: isArcMirrorLine(lineConfig.configuration, cpqConfig.quoteType),
+      charges
+    })), adjustments, cpqConfig.currencyCode);
+    const adjustedById = new Map(adjusted.lines.map((line) => [line.lineId, line]));
+    const computedIds = new Set(computedLines.map((line) => line.lineConfig.quoteLineId));
+    for (const computed of computedLines) {
+      const { lineConfig } = computed;
+      if (adjustments.length) computed.charges = adjustedById.get(lineConfig.quoteLineId).charges;
+      const adjustmentErrors = adjusted.errors.filter((error) => error.quoteLineId === lineConfig.quoteLineId);
+      if (adjustmentErrors.length) {
+        computed.isConfigured = false;
+        allValid = false;
+        const errors = adjustmentErrors.map((error) => ({ message: error.code, attribute: error.chargeCode, lineId: error.quoteLineId, adjustmentId: error.adjustmentId }));
+        computed.validationErrors.push(...errors);
+        allErrors.push(...errors);
+      }
+      Object.assign(computed, computeLineTotals(
+        computed.charges,
+        lineConfig.quantity,
+        lineConfig.usageEstimates?.map((entry) => ({ chargeCode: entry.chargeCode, estimatedQuantity: entry.estimatedQuantity }))
+      ));
+      const { charges, nrcTotal, mrcTotal, usageEstimates, usageTotalEstimated, validationErrors, isConfigured } = computed;
       if (save) {
-        em.assign(lineConfig, {
-          charges,
-          nrcTotal: String(nrcTotal),
-          mrcTotal: String(mrcTotal),
-          usageEstimates: usageEstimates ?? null,
-          usageTotalEstimated: usageTotalEstimated != null ? String(usageTotalEstimated) : null,
-          validationErrors: validationErrors.length > 0 ? validationErrors : null,
-          isConfigured
-        });
-        const salesLine = await em.findOne(SalesQuoteLine, {
-          id: lineConfig.quoteLineId,
-          organizationId: scope.organizationId,
-          tenantId: scope.tenantId
-        });
-        if (salesLine) {
-          const perInstanceNrc = charges.filter((c) => c.chargeType === "nrc").reduce((s, c) => s + (c.totalPrice ?? 0), 0);
-          const perInstanceMrc = charges.filter((c) => c.chargeType === "mrc").reduce((s, c) => s + (c.totalPrice ?? 0), 0);
-          const unitPriceNet = perInstanceNrc + perInstanceMrc;
-          em.assign(salesLine, {
-            quantity: String(lineConfig.quantity),
-            unitPriceNet: String(unitPriceNet),
-            unitPriceGross: String(unitPriceNet),
-            totalNetAmount: String(unitPriceNet * lineConfig.quantity),
-            totalGrossAmount: String(unitPriceNet * lineConfig.quantity),
-            updatedAt: /* @__PURE__ */ new Date()
-          });
-        }
+        await withAtomicFlush(em, [
+          () => {
+            em.assign(lineConfig, {
+              charges,
+              nrcTotal: String(nrcTotal),
+              mrcTotal: String(mrcTotal),
+              usageEstimates: usageEstimates ?? null,
+              usageTotalEstimated: usageTotalEstimated != null ? String(usageTotalEstimated) : null,
+              validationErrors: validationErrors.length > 0 ? validationErrors : null,
+              isConfigured
+            });
+          },
+          async () => {
+            const salesLine = await em.findOne(SalesQuoteLine, {
+              id: lineConfig.quoteLineId,
+              organizationId: scope.organizationId,
+              tenantId: scope.tenantId
+            });
+            if (salesLine) {
+              const perInstanceNrc = charges.filter((charge) => charge.chargeType === "nrc").reduce((sum, charge) => sum + (charge.totalPrice ?? 0), 0);
+              const perInstanceMrc = charges.filter((charge) => charge.chargeType === "mrc").reduce((sum, charge) => sum + (charge.totalPrice ?? 0), 0);
+              const unitPriceNet = perInstanceNrc + perInstanceMrc;
+              em.assign(salesLine, {
+                quantity: String(lineConfig.quantity),
+                unitPriceNet: String(unitPriceNet),
+                unitPriceGross: String(unitPriceNet),
+                totalNetAmount: String(unitPriceNet * lineConfig.quantity),
+                totalGrossAmount: String(unitPriceNet * lineConfig.quantity),
+                updatedAt: /* @__PURE__ */ new Date()
+              });
+            }
+          }
+        ]);
       }
     }
+    for (const error of adjusted.errors.filter((entry) => !computedIds.has(entry.quoteLineId))) {
+      allValid = false;
+      allErrors.push({ message: error.code, attribute: error.chargeCode, lineId: error.quoteLineId, adjustmentId: error.adjustmentId });
+    }
     const relationshipErrors = await this.validationService.validateRelationships({
       lines: lineConfigs.map((l) => ({
         lineId: l.quoteLineId,
@@ -659,6 +861,13 @@ class DefaultCpqQuotingService {
       cpqConfig.cpqStatus = cpqStatus;
     }
     const pricingSummary = computePricingSummaryFromComputed(computedLines, cpqConfig.currencyCode);
+    Object.assign(pricingSummary, computeWaterfallSummary(computedLines.map(({ lineConfig, charges }) => ({
+      lineId: lineConfig.quoteLineId,
+      quantity: lineConfig.quantity,
+      termMonths: lineConfig.termMonths,
+      includeInDeal: !isArcMirrorLine(lineConfig.configuration, cpqConfig.quoteType),
+      charges
+    })), adjustments, cpqConfig.currencyCode));
     const validationResult = { valid: allValid, errors: allErrors };
     if (save) {
       cpqConfig.validationResult = validationResult;
@@ -674,7 +883,9 @@ class DefaultCpqQuotingService {
       });
       await em.flush();
     }
-    return this.buildQuoteResultFromComputed(em, cpqConfig, salesQuote, computedLines, validationResult, pricingSummary);
+    const result = await this.buildQuoteResultFromComputed(em, cpqConfig, salesQuote, computedLines, validationResult, pricingSummary);
+    result.adjustmentErrors = adjusted.errors;
+    return result;
   }
   // ─── Helpers ───────────────────────────────────────────────────
   async loadCpqConfig(em, quoteId, scope) {
@@ -764,7 +975,7 @@ class DefaultCpqQuotingService {
         mrcTotal: Number(lc.mrcTotal),
         usageEstimates: lc.usageEstimates ?? null,
         usageTotalEstimated: lc.usageTotalEstimated != null ? Number(lc.usageTotalEstimated) : null,
-        charges: lc.charges ?? [],
+        charges: (lc.charges ?? []).map(withChargeWaterfall),
         isConfigured: lc.isConfigured,
         validationErrors: lc.validationErrors ?? null,
         arcSource: pickArcSource(lc, arcSourceMap),
@@ -773,6 +984,16 @@ class DefaultCpqQuotingService {
     }
     const finalValidation = validationResult ?? cpqConfig.validationResult ?? { valid: true, errors: [] };
     const finalPricing = pricingSummary ?? computePricingSummary(lineConfigs, cpqConfig.currencyCode);
+    if (!pricingSummary) {
+      const adjustments = await loadQuoteAdjustments(em, cpqConfig.id, { organizationId: cpqConfig.organizationId, tenantId: cpqConfig.tenantId });
+      Object.assign(finalPricing, computeWaterfallSummary(lines.map((line) => ({
+        lineId: line.lineId,
+        quantity: line.quantity,
+        termMonths: line.termMonths,
+        includeInDeal: !isArcMirrorLine(line.configuration, cpqConfig.quoteType),
+        charges: line.charges
+      })), adjustments, cpqConfig.currencyCode));
+    }
     const { customerName, convertedOrderId } = await resolveQuoteSideData(em, cpqConfig);
     return {
       id: cpqConfig.id,
@@ -782,6 +1003,7 @@ class DefaultCpqQuotingService {
       customerName,
       cpqStatus: cpqConfig.cpqStatus,
       version: cpqConfig.version,
+      pricingRevision: cpqConfig.pricingRevision ?? 0,
       parentQuoteId: cpqConfig.parentQuoteId ?? null,
       currencyCode: cpqConfig.currencyCode,
       convertedOrderId,
@@ -836,7 +1058,7 @@ class DefaultCpqQuotingService {
         mrcTotal,
         usageEstimates,
         usageTotalEstimated,
-        charges,
+        charges: charges.map(withChargeWaterfall),
         isConfigured,
         validationErrors: validationErrors.length > 0 ? validationErrors : null,
         arcSource: pickArcSource(lc, arcSourceMap),
@@ -852,6 +1074,7 @@ class DefaultCpqQuotingService {
       customerName,
       cpqStatus: cpqConfig.cpqStatus,
       version: cpqConfig.version,
+      pricingRevision: cpqConfig.pricingRevision ?? 0,
       parentQuoteId: cpqConfig.parentQuoteId ?? null,
       currencyCode: cpqConfig.currencyCode,
       convertedOrderId,
@@ -941,6 +1164,7 @@ function aggregateAdjustmentTotals(allCharges) {
   for (const charge of allCharges) {
     if (!charge.adjustments) continue;
     for (const adj of charge.adjustments) {
+      if (adj.origin === "manual") continue;
       if (adj.delta < 0) {
         discountTotal += Math.abs(adj.delta) * (charge.quantity ?? 1);
       } else if (adj.delta > 0) {
@@ -1021,8 +1245,12 @@ function computePricingSummaryFromComputed(computedLines, currencyCode) {
     currencyCode
   };
 }
+const LINE_EVENTS = { pricingCause: "line" };
 function emptyPricingSummary(currencyCode) {
   return {
+    // A new quote starts with a real baseline hash, so its first priced line is
+    // a pricing change; only pre-feature quotes have no stored hash.
+    snapshotHash: computeWaterfallSummary([], [], currencyCode).snapshotHash,
     nrcTotal: 0,
     mrcTotal: 0,
     usageCharges: [],
@@ -1339,43 +1567,39 @@ DefaultCpqQuotingService.prototype.attachTargetSubscription = async function(quo
 };
 DefaultCpqQuotingService.prototype.detachTargetSubscription = async function(quoteId, targetId, scope) {
   const em = this.em;
-  const cpqConfig = await loadCpqConfigStrict(em, quoteId, scope);
-  ensureEditable(cpqConfig);
-  const target = await em.findOne(CpqQuoteTargetSubscription, {
-    id: targetId,
-    quoteId: cpqConfig.id,
-    organizationId: scope.organizationId,
-    tenantId: scope.tenantId,
-    deletedAt: null
-  });
-  if (!target) throw new QuotingError(404, "Target subscription not found");
-  const lines = await em.find(CpqQuoteLineConfiguration, {
-    quoteConfigurationId: cpqConfig.id,
-    targetSubscriptionId: target.subscriptionId,
-    organizationId: scope.organizationId,
-    tenantId: scope.tenantId,
-    deletedAt: null
-  });
-  const now = /* @__PURE__ */ new Date();
-  for (const line of lines) {
-    line.deletedAt = now;
-    const salesLine = await em.findOne(SalesQuoteLine, { id: line.quoteLineId });
-    if (salesLine) salesLine.deletedAt = now;
-  }
-  target.deletedAt = now;
-  if (target.quoteType === "renew") {
-    const remaining = await em.find(CpqQuoteTargetSubscription, {
+  await withQuotePricingWrite(em, quoteId, scope, async (tx, cpqConfig) => {
+    const target = await tx.findOne(CpqQuoteTargetSubscription, {
+      id: targetId,
       quoteId: cpqConfig.id,
       organizationId: scope.organizationId,
       tenantId: scope.tenantId,
-      deletedAt: null,
-      id: { $ne: target.id }
+      deletedAt: null
+    });
+    if (!target) throw new QuotingError(404, "Target subscription not found");
+    const lines = await tx.find(CpqQuoteLineConfiguration, {
+      quoteConfigurationId: cpqConfig.id,
+      targetSubscriptionId: target.subscriptionId,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      deletedAt: null
     });
-    if (remaining.length === 1) {
-      remaining[0].mergeAction = "standalone";
+    for (const line of lines) {
+      if (line.deletedAt) continue;
+      await removeQuoteLineTree(tx, cpqConfig.id, line, scope);
     }
-  }
-  await em.flush();
+    const remaining = target.quoteType === "renew" ? await tx.find(CpqQuoteTargetSubscription, {
+      quoteId: cpqConfig.id,
+      organizationId: scope.organizationId,
+      tenantId: scope.tenantId,
+      deletedAt: null,
+      id: { $ne: target.id }
+    }) : [];
+    await withAtomicFlush(tx, [() => {
+      target.deletedAt = /* @__PURE__ */ new Date();
+      if (remaining.length === 1) remaining[0].mergeAction = "standalone";
+    }]);
+    await this.recalculateLockedQuote(tx, cpqConfig, scope, true);
+  }, (status, message) => new QuotingError(status, message), void 0, ensureEditable, { pricingCause: "line" });
   return { ok: true };
 };
 DefaultCpqQuotingService.prototype.updateTargetSubscription = async function(quoteId, targetId, patch, scope) {
@@ -1442,8 +1666,8 @@ DefaultCpqQuotingService.prototype.setMergeMeta = async function(quoteId, meta,
   const lines = await loadLines(em, cpqConfig.id, scope);
   return this.buildQuoteResult(em, cpqConfig, salesQuote, lines);
 };
-DefaultCpqQuotingService.prototype.validateArcQuote = async function(quoteId, scope) {
-  const em = this.em;
+DefaultCpqQuotingService.prototype.validateArcQuote = async function(quoteId, scope, transactionEm) {
+  const em = transactionEm ?? this.em;
   const cpqConfig = await loadCpqConfigStrict(em, quoteId, scope);
   const errors = [];
   if (cpqConfig.quoteType === "new") {
@@ -1669,6 +1893,7 @@ async function mapTargetView(em, target, scope) {
 }
 function emptyArcPricingSummary(currencyCode) {
   return {
+    snapshotHash: computeWaterfallSummary([], [], currencyCode).snapshotHash,
     nrcTotal: 0,
     mrcTotal: 0,
     usageCharges: [],
@@ -1783,11 +2008,7 @@ async function mirrorTargetSubscriptionItems(em, cpqConfig, sub, salesQuote, quo
       startDate: null,
       termMonths: null,
       endDate: null,
-      configuration: {
-        ...item.configuration,
-        _arcMirroredFromItemId: item.id,
-        _arcMirroredName: item.name
-      },
+      configuration: buildArcMirrorConfiguration(item.configuration, item, quoteType),
       quantity: item.quantity,
       charges: pickArcMirrorCharges(item, sub.currencyCode),
       nrcTotal: String(item.nrcAmount ?? 0),