@voyant-travel/quotes 0.122.5 → 0.122.7

package/dist/proposal-routes.d.ts

@@ -1,4 +1,4 @@
-import { type ReserveTripDeps, type StartCheckoutDeps, type TripSnapshot } from "@voyant-travel/trips";
+import { type CancelTripComponentsDeps, type ReserveTripDeps, type StartCheckoutDeps, type TripSnapshot } from "@voyant-travel/trips";
 import type { PostgresJsDatabase } from "drizzle-orm/postgres-js";
 import { type Context, Hono } from "hono";
 import type { QuoteVersion, QuoteVersionLine } from "./schema.js";
@@ -23,6 +23,11 @@ export interface QuoteProposalRoutesOptions {
     reserveTripDeps(c: Context): ReserveTripDeps;
     /** Build the trips checkout deps for a request (payment-session wiring). */
     startCheckoutDeps(c: Context): StartCheckoutDeps;
+    /**
+     * Build the trips cancel deps for a request (provider hold-release wiring).
+     * Used to release a reserved Trip when final CRM acceptance loses a race.
+     */
+    cancelTripComponentsDeps(c: Context): CancelTripComponentsDeps;
     /**
      * Resolve the deployment's public operator profile, surfaced on the public
      * proposal payload. Returns `null` when no profile is configured.

package/dist/proposal-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proposal-routes.d.ts","sourceRoot":"","sources":["../src/proposal-routes.ts"],"names":[],"mappings":"AA4BA,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,iBAAiB,EAGtB,KAAK,YAAY,EAIlB,MAAM,sBAAsB,CAAA;AAE7B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AACjE,OAAO,EAAE,KAAK,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAA;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AACjE,OAAO,EAA6B,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAG7E;;;;;;;GAOG;AACH,MAAM,WAAW,0BAA0B;IACzC,2DAA2D;IAC3D,SAAS,CAAC,CAAC,EAAE,OAAO,GAAG,kBAAkB,CAAA;IACzC;;;OAGG;IACH,4BAA4B,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAAA;IACvD,+EAA+E;IAC/E,eAAe,CAAC,CAAC,EAAE,OAAO,GAAG,eAAe,CAAA;IAC5C,4EAA4E;IAC5E,iBAAiB,CAAC,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAA;IAChD;;;OAGG;IACH,sBAAsB,CAAC,EAAE,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAA;CACxE;AAED,KAAK,wBAAwB,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,SAAS,EAAE;QACT,EAAE,EAAE,OAAO,CAAA;QACX,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;CACF,CAAA;AAED,KAAK,oCAAoC,GAAG;IAC1C,SAAS,EAAE;QACT,EAAE,EAAE,OAAO,CAAA;QACX,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,CAAA;CACF,CAAA;AAED,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,cAAc,EAAE,MAAM,CAAA;IACtB,gBAAgB,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,KAAK,EAAE,8BAA8B,EAAE,CAAA;IACvC,KAAK,EAAE,+BAA+B,EAAE,CAAA;IACxC,QAAQ,EAAE,OAAO,GAAG,IAAI,CAAA;IACxB,WAAW,EAAE,MAAM,CAAA;IACnB;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAA;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC9C,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,8BAA8B;IAC7C,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,MAAM,CAAA;IAC5B,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,YAAY,EAAE,YAAY,CAAA;IAC1B,WAAW,EAAE,MAAM,CAAA;CACpB;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAA;CAC/B;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAA;IACnD,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAA;IAC/B,QAAQ,EAAE,MAAM,CAAA;IAChB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAED,MAAM,MAAM,qCAAqC,GAAG;IAClD,QAAQ,EAAE,YAAY,CAAA;IACtB,YAAY,EAAE,YAAY,CAAA;IAC1B,KAAK,EAAE,gBAAgB,EAAE,CAAA;CAC1B,CAAA;AAED,KAAK,wBAAwB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,CAAA;AA0BnG,uFAAuF;AACvF,wBAAgB,4BAA4B,CAC1C,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,UAK1C;AA+CD,6FAA6F;AAC7F,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAAC,wBAAwB,CAAC,CAKhC;AAED,0FAA0F;AAC1F,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAAC,wBAAwB,CAAC,CAMhC;AAED,wFAAwF;AACxF,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,0BAA0B,GAClC,IAAI,CAAC,oCAAoC,CAAC,CAM5C;AAidD,gFAAgF;AAChF,wBAAgB,+BAA+B,CAAC,QAAQ,EAAE,YAAY,GAAG,wBAAwB,CAUhG"}
+{"version":3,"file":"proposal-routes.d.ts","sourceRoot":"","sources":["../src/proposal-routes.ts"],"names":[],"mappings":"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"}

package/dist/proposal-routes.js

@@ -202,30 +202,78 @@ async function handleAcceptPublicProposal(c, options) {
     const proposalForLock = await quotesService.getQuoteVersionProposal(db, quoteVersionId);
     if (!proposalForLock)
         return c.json({ error: "Proposal not found" }, 404);
+    const quoteId = proposalForLock.quote.id;
     try {
-        const lockedResult = await db.transaction((tx) => acceptPublicProposalWithQuoteLock({
+        // Phase 1 — prepare under the quote-accept lock (txn 1). Validates the
+        // proposal/snapshot and either fast-paths an accepted replay or returns a
+        // prepared snapshot ready to reserve.
+        const prepared = await db.transaction((tx) => preparePublicProposalAcceptWithQuoteLock({
             c,
-            options,
             db: tx,
-            quoteId: proposalForLock.quote.id,
+            quoteId,
             quoteVersionId,
             body,
         }));
-        if (lockedResult.kind === "response")
-            return lockedResult.response;
-        const checkout = await startAcceptedProposalCheckout(c, options, lockedResult.snapshot, body, quoteVersionId);
-        const checkoutWarnings = checkout
-            ? checkout.failures.map((failure) => failure.reason)
-            : ["checkout_start_failed"];
-        return c.json({
-            data: {
-                status: "accepted",
-                checkoutUrl: checkout?.target.checkoutUrl ?? null,
-                paymentSessionId: checkout?.target.paymentSessionId ?? null,
-                currency: checkout?.target.currency ?? lockedResult.accepted.quoteVersion.currency,
-                totalAmountCents: checkout?.target.totalAmountCents ?? lockedResult.accepted.quoteVersion.totalAmountCents,
-                warnings: [...lockedResult.warnings, ...(checkout?.warnings ?? []), ...checkoutWarnings],
-            },
+        if (prepared.kind === "response")
+            return prepared.response;
+        if (prepared.kind === "accepted") {
+            return respondWithAcceptedProposal({
+                c,
+                options,
+                snapshot: prepared.snapshot,
+                body,
+                quoteVersionId,
+                accepted: prepared.accepted,
+                reserveWarnings: prepared.warnings,
+            });
+        }
+        // Phase 2 — reserve OUTSIDE any transaction, on the durable request db.
+        // Sourced catalog adapters may create upstream supplier holds; running this
+        // outside the CRM accept transaction keeps those holds durably recorded.
+        // reserveTrip's own atomic claim serializes concurrent accepts so only one
+        // request can create holds for the same envelope.
+        const reserved = await reservePreparedPublicProposal(c, options, db, prepared.snapshot, body, quoteVersionId);
+        if (reserved.failures.length > 0) {
+            return c.json({
+                error: "Proposal could not be reserved",
+                failures: reserved.failures.map(({ code, reason }) => ({ code, reason })),
+            }, 409);
+        }
+        // Phase 3 — finalize CRM acceptance under the quote-accept lock (txn 2).
+        // If the final accept loses a race (declined/superseded/conflict), release
+        // the reservation so the supplier hold isn't orphaned.
+        let finalized;
+        try {
+            finalized = await db.transaction((tx) => finalizePublicProposalAcceptWithQuoteLock({
+                c,
+                db: tx,
+                quoteId,
+                quoteVersionId,
+                snapshot: prepared.snapshot,
+            }));
+        }
+        catch (error) {
+            await releaseAcceptedProposalReservation(c, options, db, prepared.snapshot, reserved, {
+                quoteVersionId,
+                reason: "quote_accept_failed",
+            });
+            throw error;
+        }
+        if (finalized.kind === "response") {
+            await releaseAcceptedProposalReservation(c, options, db, prepared.snapshot, reserved, {
+                quoteVersionId,
+                reason: "quote_accept_failed",
+            });
+            return finalized.response;
+        }
+        return respondWithAcceptedProposal({
+            c,
+            options,
+            snapshot: prepared.snapshot,
+            body,
+            quoteVersionId,
+            accepted: finalized.accepted,
+            reserveWarnings: reserved.warnings,
         });
     }
     catch (error) {
@@ -238,7 +286,7 @@ async function handleAcceptPublicProposal(c, options) {
         throw error;
     }
 }
-async function acceptPublicProposalWithQuoteLock({ c, options, db, quoteId, quoteVersionId, body, }) {
+async function preparePublicProposalAcceptWithQuoteLock({ c, db, quoteId, quoteVersionId, body, }) {
     await lockQuoteAccept(db, quoteId);
     await quotesService.expireQuoteVersionIfPastValidUntil(db, quoteVersionId);
     const proposal = await quotesService.getQuoteVersionProposal(db, quoteVersionId);
@@ -282,7 +330,6 @@ async function acceptPublicProposalWithQuoteLock({ c, options, db, quoteId, quot
         }
         return { kind: "accepted", accepted, snapshot, warnings: [] };
     }
-    assertSnapshotCanUsePublicAcceptReserve(snapshot);
     const liveTrip = await tripsService.getTrip(db, snapshot.envelopeId);
     if (!liveTrip) {
         return {
@@ -290,11 +337,61 @@ async function acceptPublicProposalWithQuoteLock({ c, options, db, quoteId, quot
             response: c.json({ error: "Proposal Trip envelope not found" }, 409),
         };
     }
-    assertLiveTripMatchesSnapshot(liveTrip, snapshot);
-    const reserveIdempotencyKey = `proposal-accept-reserve:${quoteVersionId}:${body.idempotencyKey ?? "default"}`;
-    const reserved = await tripsService.reserveTrip(db, {
+    // Resume a crashed acceptance: if the Trip was already reserved under this
+    // proposal's reserve key (reserve succeeded, finalize never ran), the live
+    // Trip is no longer `priced`, so skip the frozen-snapshot comparison and let
+    // phase 2 replay the reservation idempotently before finalize accepts.
+    if (!isResumableProposalReservation(liveTrip.envelope, proposalReserveIdempotencyKey(quoteVersionId, body))) {
+        assertLiveTripMatchesSnapshot(liveTrip, snapshot);
+    }
+    return { kind: "prepared", snapshot };
+}
+async function finalizePublicProposalAcceptWithQuoteLock({ c, db, quoteId, quoteVersionId, snapshot, }) {
+    await lockQuoteAccept(db, quoteId);
+    await quotesService.expireQuoteVersionIfPastValidUntil(db, quoteVersionId);
+    const proposal = await quotesService.getQuoteVersionProposal(db, quoteVersionId);
+    if (!proposal)
+        return { kind: "response", response: c.json({ error: "Proposal not found" }, 404) };
+    if (proposal.quoteVersion.status === "draft") {
+        return { kind: "response", response: c.json({ error: "Proposal not found" }, 404) };
+    }
+    if (proposal.quoteVersion.status === "superseded") {
+        return {
+            kind: "response",
+            response: c.json({ error: "Proposal has been superseded" }, 410),
+        };
+    }
+    if (proposal.quoteVersion.status === "accepted" &&
+        proposal.quote.acceptedVersionId === proposal.quoteVersion.id) {
+        const accepted = await quotesService.acceptQuoteVersion(db, quoteVersionId, {});
+        if (!accepted) {
+            return { kind: "response", response: c.json({ error: "Proposal not found" }, 404) };
+        }
+        return { kind: "accepted", accepted };
+    }
+    if (proposal.quoteVersion.status !== "sent") {
+        return {
+            kind: "response",
+            response: c.json({ error: "Proposal can no longer be accepted" }, 409),
+        };
+    }
+    // The frozen snapshot must not have changed between prepare and finalize.
+    if (proposal.quoteVersion.tripSnapshotId !== snapshot.id) {
+        return {
+            kind: "response",
+            response: c.json({ error: "Proposal Trip snapshot changed before acceptance" }, 409),
+        };
+    }
+    assertProposalMatchesTripSnapshot(proposal, snapshot);
+    const accepted = await quotesService.acceptQuoteVersion(db, quoteVersionId, {});
+    if (!accepted)
+        return { kind: "response", response: c.json({ error: "Proposal not found" }, 404) };
+    return { kind: "accepted", accepted };
+}
+function reservePreparedPublicProposal(c, options, db, snapshot, body, quoteVersionId) {
+    return tripsService.reserveTrip(db, {
         envelopeId: snapshot.envelopeId,
-        idempotencyKey: reserveIdempotencyKey,
+        idempotencyKey: proposalReserveIdempotencyKey(quoteVersionId, body),
         refreshScope: {
             locale: "en-US",
             audience: "customer",
@@ -302,19 +399,66 @@ async function acceptPublicProposalWithQuoteLock({ c, options, db, quoteId, quot
             currency: snapshot.currency,
         },
     }, options.reserveTripDeps(c));
-    if (reserved.failures.length > 0) {
-        return {
-            kind: "response",
-            response: c.json({
-                error: "Proposal could not be reserved",
-                failures: reserved.failures.map(({ code, reason }) => ({ code, reason })),
-            }, 409),
-        };
+}
+/**
+ * Deterministic reserve idempotency key for a proposal acceptance. Stable
+ * across retries with the same request body, so a crashed accept can replay the
+ * same reservation instead of creating a second supplier hold.
+ */
+function proposalReserveIdempotencyKey(quoteVersionId, body) {
+    return `proposal-accept-reserve:${quoteVersionId}:${body.idempotencyKey ?? "default"}`;
+}
+/**
+ * A live Trip that has already been claimed/reserved under THIS proposal's
+ * reserve idempotency key is a resumable in-flight acceptance — not a "Trip
+ * changed since sent" conflict. Recognising it lets a retry replay the
+ * reservation and finalize, instead of wedging on the frozen `priced` snapshot
+ * comparison and stranding the supplier hold.
+ */
+function isResumableProposalReservation(envelope, reserveKey) {
+    return (envelope.reserveIdempotencyKey === reserveKey &&
+        ["reserve_in_progress", "reserved", "checkout_started", "booked"].includes(envelope.status));
+}
+async function releaseAcceptedProposalReservation(c, options, db, snapshot, reserved, release) {
+    // An idempotent replay returns the existing holds without creating new ones,
+    // so it must never trigger a cancellation of components owned by the request
+    // that actually reserved them.
+    if (reserved.warnings.includes("idempotent_replay"))
+        return;
+    const reservedComponentIds = reserved.reserved.map((component) => component.componentId);
+    if (reservedComponentIds.length === 0)
+        return;
+    try {
+        await tripsService.cancelComponents(db, {
+            envelopeId: snapshot.envelopeId,
+            componentIds: reservedComponentIds,
+            reason: release.reason,
+            idempotencyKey: `proposal-accept-release:${release.quoteVersionId}:${release.reason}`,
+            request: {
+                initiatedBy: "public-proposal-accept",
+                quoteVersionId: release.quoteVersionId,
+            },
+        }, options.cancelTripComponentsDeps(c));
     }
-    const accepted = await quotesService.acceptQuoteVersion(db, quoteVersionId, {});
-    if (!accepted)
-        return { kind: "response", response: c.json({ error: "Proposal not found" }, 404) };
-    return { kind: "accepted", accepted, snapshot, warnings: reserved.warnings };
+    catch (error) {
+        console.warn("[proposal] failed to release reservation after proposal accept conflict:", error);
+    }
+}
+async function respondWithAcceptedProposal({ c, options, snapshot, body, quoteVersionId, accepted, reserveWarnings, }) {
+    const checkout = await startAcceptedProposalCheckout(c, options, snapshot, body, quoteVersionId);
+    const checkoutWarnings = checkout
+        ? checkout.failures.map((failure) => failure.reason)
+        : ["checkout_start_failed"];
+    return c.json({
+        data: {
+            status: "accepted",
+            checkoutUrl: checkout?.target.checkoutUrl ?? null,
+            paymentSessionId: checkout?.target.paymentSessionId ?? null,
+            currency: checkout?.target.currency ?? accepted.quoteVersion.currency,
+            totalAmountCents: checkout?.target.totalAmountCents ?? accepted.quoteVersion.totalAmountCents,
+            warnings: [...reserveWarnings, ...(checkout?.warnings ?? []), ...checkoutWarnings],
+        },
+    });
 }
 function lockQuoteAccept(db, quoteId) {
     return db.execute(
@@ -324,22 +468,6 @@ function lockQuoteAccept(db, quoteId) {
 function quoteAcceptLockKey(quoteId) {
     return `quote-accept:${quoteId}`;
 }
-function assertSnapshotCanUsePublicAcceptReserve(snapshot) {
-    const sourcedCatalogComponent = snapshot.frozenComponents.find(isSourcedCatalogSnapshotComponent);
-    if (!sourcedCatalogComponent)
-        return;
-    // reserveTrip runs under the Quote accept transaction. Owned catalog holds
-    // and manual placeholders are DB-local, but sourced catalog adapters can
-    // create upstream holds before local release records commit.
-    throw new QuoteVersionConflictError("Sourced catalog components cannot be accepted from public proposals yet");
-}
-function isSourcedCatalogSnapshotComponent(component) {
-    return Boolean(component.kind === "catalog_booking" &&
-        component.entityModule &&
-        component.entityId &&
-        component.sourceKind &&
-        component.sourceKind !== "owned");
-}
 async function startAcceptedProposalCheckout(c, options, snapshot, body, quoteVersionId) {
     try {
         return await tripsService.startCheckout(options.resolveDb(c), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voyant-travel/quotes",
-  "version": "0.122.5",
+  "version": "0.122.7",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {
@@ -43,7 +43,7 @@
     "@voyant-travel/quotes-contracts": "^0.108.0",
     "@voyant-travel/db": "^0.108.4",
     "@voyant-travel/hono": "^0.112.2",
-    "@voyant-travel/trips": "^0.120.0"
+    "@voyant-travel/trips": "^0.121.0"
   },
   "devDependencies": {
     "drizzle-kit": "^0.31.10",