@danceiny/gotry 0.0.1-rc.18 → 0.0.1-rc.20

package/dist/src/booking-surface/{availability-policy-v2.js → availability-policy.js}

@@ -1,14 +1,14 @@
 import { createHash } from 'node:crypto';
-export const MAX_HOTELS_PER_TASK_V2 = 5;
-export const MAX_OFFERS_PER_HOTEL_GENERATION_V2 = 3;
-export const MAX_OFFER_CHECKS_PER_HOTEL_V2 = 2;
-export const MAX_OFFER_QUERIES_PER_HOTEL_V2 = 2;
+export const MAX_HOTELS_PER_TASK = 5;
+export const MAX_OFFERS_PER_HOTEL_GENERATION = 3;
+export const MAX_OFFER_CHECKS_PER_HOTEL = 2;
+export const MAX_OFFER_QUERIES_PER_HOTEL = 2;
 function unique(values) {
     return [
         ...new Set(values)
     ];
 }
-export function assertWorkspaceLoadedOfferRefsUniqueV2(workspace) {
+export function assertWorkspaceLoadedOfferRefsUnique(workspace) {
     if (workspace.loadedOffers.length !== new Set(workspace.loadedOffers.map((offer)=>offer.offerRef)).size) throw new Error('availability_duplicate_offer_ref');
     if (workspace.loadedOffers.length !== new Set(workspace.loadedOffers.map((offer)=>offer.offerVersionRef)).size) throw new Error('availability_duplicate_offer_version_ref');
 }
@@ -20,20 +20,20 @@ function stable(value) {
             stable(value[key])
         ]));
 }
-export function digestV2(value) {
+export function digest(value) {
     return createHash('sha256').update(JSON.stringify(stable(value))).digest('hex');
 }
-function workspaceDigestV2(workspace) {
+function workspaceDigest(workspace) {
     const { contextRef: _context, ...bound } = workspace;
-    return digestV2(bound);
+    return digest(bound);
 }
 function offerRefsForHotel(workspace, hotelRef, selectedOfferRef) {
     const refs = unique(workspace.loadedOffers.filter((offer)=>offer.hotelRef === hotelRef).map((offer)=>offer.offerRef));
     if (selectedOfferRef) return unique([
         selectedOfferRef,
         ...refs
-    ]).slice(0, MAX_OFFERS_PER_HOTEL_GENERATION_V2);
-    if (refs.length > MAX_OFFERS_PER_HOTEL_GENERATION_V2) throw new Error('availability_offer_limit_exceeded');
+    ]).slice(0, MAX_OFFERS_PER_HOTEL_GENERATION);
+    if (refs.length > MAX_OFFERS_PER_HOTEL_GENERATION) throw new Error('availability_offer_limit_exceeded');
     return refs;
 }
 function loadedOfferVersion(workspace, offerRef, offerVersionRef) {
@@ -45,7 +45,7 @@ function legalOfferRefsForHotel(workspace, hotel, refs) {
         const loaded = workspace.loadedOffers.find((offer)=>offer.offerRef === ref && offer.hotelRef === hotel.hotelRef);
         return Boolean(loaded && !hotel.tombstonedOfferVersionRefs.includes(loaded.offerVersionRef));
     });
-    if (legal.length > MAX_OFFERS_PER_HOTEL_GENERATION_V2) throw new Error('availability_offer_limit_exceeded');
+    if (legal.length > MAX_OFFERS_PER_HOTEL_GENERATION) throw new Error('availability_offer_limit_exceeded');
     return unique(legal);
 }
 function copyHotel(hotel) {
@@ -124,7 +124,7 @@ function isCriterion(value, valueCheck) {
 function isMoney(value) {
     return isPlainRecord(value) && Object.keys(value).length === 3 && typeof value.amount === 'string' && Boolean(value.amount) && typeof value.currency === 'string' && Boolean(value.currency) && typeof value.sourceFactRef === 'string' && Boolean(value.sourceFactRef);
 }
-function isOfferCriteriaV2(value) {
+function isOfferCriteria(value) {
     if (!isPlainRecord(value)) return false;
     const allowed = [
         'roomType',
@@ -160,13 +160,13 @@ function isOfferCriteriaV2(value) {
 }
 function bindCriteria(next, criteriaDigest, criteria, required = false) {
     if (criteria !== undefined) {
-        if (!isOfferCriteriaV2(criteria) || digestV2(criteria) !== criteriaDigest) throw new Error('availability_criteria_invalid');
+        if (!isOfferCriteria(criteria) || digest(criteria) !== criteriaDigest) throw new Error('availability_criteria_invalid');
         if (next.criteriaDigest !== undefined && next.criteriaDigest !== criteriaDigest) throw new Error('availability_criteria_changed');
-        if (next.criteria && digestV2(next.criteria) !== criteriaDigest) throw new Error('availability_criteria_changed');
+        if (next.criteria && digest(next.criteria) !== criteriaDigest) throw new Error('availability_criteria_changed');
         next.criteria = structuredClone(criteria);
         next.criteriaDigest = criteriaDigest;
     } else if (required && !next.criteria) throw new Error('availability_criteria_required');
-    else if (next.criteria && next.criteriaDigest !== digestV2(next.criteria)) throw new Error('availability_criteria_mismatch');
+    else if (next.criteria && next.criteriaDigest !== digest(next.criteria)) throw new Error('availability_criteria_mismatch');
     else if (!next.criteria && criteriaDigest) {
         if (next.criteriaDigest !== undefined && next.criteriaDigest !== criteriaDigest) throw new Error('availability_criteria_changed');
         next.criteriaDigest = criteriaDigest;
@@ -184,7 +184,7 @@ function terminalFor(state) {
         reason: 'confirmed',
         evidence: 'conclusive'
     };
-    if (hotels.some((hotel)=>hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL_V2 && (hotel.status === 'active' || hotel.status === 'unvisited' || hotel.freshOffersRequired && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL_V2))) return undefined;
+    if (hotels.some((hotel)=>hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL && (hotel.status === 'active' || hotel.status === 'unvisited' || hotel.freshOffersRequired && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL))) return undefined;
     const conclusive = hotels.every((hotel)=>hotel.status === 'negative');
     return {
         code: conclusive ? 'availability_exhausted_complete' : 'availability_exhausted_inconclusive',
@@ -224,8 +224,8 @@ function phaseForActiveHotel(state) {
     const active = state.hotels[state.hotelRefs[state.activeHotelOrdinal] ?? ''];
     return active?.status === 'active' && active.currentGeneration?.valid && active.currentOfferRefs.length > 0 && !active.freshOffersRequired ? 'need_check' : 'need_offers';
 }
-export function createAvailabilityPolicyV2(workspace) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function createAvailabilityPolicy(workspace) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     return {
         initialized: false,
         recoveryStarted: false,
@@ -237,11 +237,11 @@ export function createAvailabilityPolicyV2(workspace) {
         queryReservations: []
     };
 }
-export function recordVisibleHotelsV2(state, _workspace) {
+export function recordVisibleHotels(state, _workspace) {
     return copyState(state);
 }
-export function recordObservedOffersQueryV2(state, hotelRefs, criteriaDigest, workspace, receipt, sourceActionId, receiptDigest, criteria) {
-    if (workspace) assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function recordObservedOffersQuery(state, hotelRefs, criteriaDigest, workspace, receipt, sourceActionId, receiptDigest, criteria) {
+    if (workspace) assertWorkspaceLoadedOfferRefsUnique(workspace);
     if (state.recoveryStarted) return copyState(state);
     const next = copyState(state);
     if (!workspace || !receipt) return next;
@@ -257,12 +257,12 @@ export function recordObservedOffersQueryV2(state, hotelRefs, criteriaDigest, wo
         delete next.criteria;
         delete next.criteriaDigest;
         bindCriteria(next, criteriaDigest, criteria);
-        if (!sourceActionId || sourceActionId !== receipt.actionId || !receiptDigest || receiptDigest !== digestV2(receipt)) throw new Error('availability_query_provenance_mismatch');
+        if (!sourceActionId || sourceActionId !== receipt.actionId || !receiptDigest || receiptDigest !== digest(receipt)) throw new Error('availability_query_provenance_mismatch');
         next.lastQueryHotelRefs = [
             ...new Set(hotelRefs)
         ];
         next.lastQueryCriteriaDigest = criteriaDigest || undefined;
-        next.lastQueryOfferHotels = validateOffersReceiptWorkspaceV2(receipt, workspace, hotelRefs);
+        next.lastQueryOfferHotels = validateOffersReceiptWorkspace(receipt, workspace, hotelRefs);
         next.lastQuerySourceActionId = sourceActionId;
         next.lastQuerySourceReceiptDigest = receiptDigest;
         next.lastQueryWorkspaceRevision = workspace.revision;
@@ -272,8 +272,8 @@ export function recordObservedOffersQueryV2(state, hotelRefs, criteriaDigest, wo
     }
     return next;
 }
-export function validateOffersReceiptWorkspaceV2(receipt, workspace, hotelRefs) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function validateOffersReceiptWorkspace(receipt, workspace, hotelRefs) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     if (receipt.observation.kind !== 'offers.state') throw new Error('availability_offers_observation_required');
     const requested = unique(hotelRefs);
     if (!sameSet(receipt.observation.hotelRefs, requested)) throw new Error('availability_offers_hotel_mismatch');
@@ -304,14 +304,14 @@ export function validateOffersReceiptWorkspaceV2(receipt, workspace, hotelRefs)
 function sameSet(a, b) {
     return a.length === b.length && unique(a).sort().every((value, index)=>value === unique(b).sort()[index]);
 }
-export function recordOffersQueryIssuedV2(state, hotelRefs, workspace, actionId, criteriaDigest = '', criteria) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function recordOffersQueryIssued(state, hotelRefs, workspace, actionId, criteriaDigest = '', criteria) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     const next = copyState(state);
     const requested = unique(hotelRefs);
-    if (!requested.length || requested.length > MAX_HOTELS_PER_TASK_V2) throw new Error('availability_hotel_limit_exceeded');
+    if (!requested.length || requested.length > MAX_HOTELS_PER_TASK) throw new Error('availability_hotel_limit_exceeded');
     if (!state.recoveryStarted) throw new Error('availability_recovery_not_started');
     if (state.terminal) {
-        if (requested.some((ref)=>state.hotels[ref]?.offerQueriesIssued >= MAX_OFFER_QUERIES_PER_HOTEL_V2)) throw new Error('availability_offer_query_limit_reached');
+        if (requested.some((ref)=>state.hotels[ref]?.offerQueriesIssued >= MAX_OFFER_QUERIES_PER_HOTEL)) throw new Error('availability_offer_query_limit_reached');
         throw new Error('availability_terminal');
     }
     if (requested.some((ref)=>!next.hotels[ref])) throw new Error('availability_hotel_unknown');
@@ -324,7 +324,7 @@ export function recordOffersQueryIssuedV2(state, hotelRefs, workspace, actionId,
     }
     for (const hotelRef of requested){
         const hotel = next.hotels[hotelRef];
-        if (hotel.offerQueriesIssued >= MAX_OFFER_QUERIES_PER_HOTEL_V2) throw new Error('availability_offer_query_limit_reached');
+        if (hotel.offerQueriesIssued >= MAX_OFFER_QUERIES_PER_HOTEL) throw new Error('availability_offer_query_limit_reached');
         hotel.offerQueriesIssued += 1;
     }
     next.queryReservations.push({
@@ -338,21 +338,21 @@ export function recordOffersQueryIssuedV2(state, hotelRefs, workspace, actionId,
     next.initialized = true;
     return next;
 }
-export function recordOffersGenerationV2(state, hotelRefs, workspace, actionId, receiptDigest, receipt, criteriaDigest = '', criteria) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function recordOffersGeneration(state, hotelRefs, workspace, actionId, receiptDigest, receipt, criteriaDigest = '', criteria) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     if (!state.recoveryStarted) return copyState(state);
     if (state.terminal) throw new Error('availability_terminal');
     const next = copyState(state);
     const requested = unique(hotelRefs);
-    if (!requested.length || requested.length > MAX_HOTELS_PER_TASK_V2) throw new Error('availability_hotel_limit_exceeded');
+    if (!requested.length || requested.length > MAX_HOTELS_PER_TASK) throw new Error('availability_hotel_limit_exceeded');
     const reservation = next.queryReservations.find((query)=>query.actionId === actionId);
     if (!reservation || !sameSet(reservation.hotelRefs, requested)) throw new Error('availability_query_not_reserved');
     if (receipt.actionId !== actionId) throw new Error('availability_query_receipt_mismatch');
-    if (receiptDigest !== digestV2(receipt)) throw new Error('availability_receipt_digest_mismatch');
+    if (receiptDigest !== digest(receipt)) throw new Error('availability_receipt_digest_mismatch');
     if (requested.some((ref)=>!next.hotels[ref])) throw new Error('availability_hotel_unknown');
     else if ((requested.length !== 1 || next.hotelRefs[next.activeHotelOrdinal] !== requested[0]) && (next.attempts.length > 0 || Object.values(next.hotels).some((hotel)=>hotel.generationNo > 0))) throw new Error('availability_hotel_not_active');
     bindCriteria(next, criteriaDigest, criteria);
-    if (receipt.observation.kind === 'offers.state') validateOffersReceiptWorkspaceV2(receipt, workspace, requested);
+    if (receipt.observation.kind === 'offers.state') validateOffersReceiptWorkspace(receipt, workspace, requested);
     for (const hotelRef of requested){
         const hotel = next.hotels[hotelRef];
         const partial = receipt.status === 'changed' || receipt.status === 'partial' || receipt.status === 'failed' || receipt.status === 'stale' || receipt.resultContract.outcome === 'partial' || receipt.resultContract.outcome === 'complete' && !receipt.resultContract.hardCriteriaMet || Boolean(receipt.resultContract.blockers.length) || Boolean(receipt.resultContract.gapCodes.length) || Boolean(receipt.observation.kind === 'gap' || receipt.observation.kind === 'offers.state' && receipt.observation.gapCodes?.length);
@@ -368,18 +368,18 @@ export function recordOffersGenerationV2(state, hotelRefs, workspace, actionId,
             hotel.invalidatedOfferRefs = [
                 ...hotel.currentGeneration?.orderedOfferRefs ?? []
             ];
-            hotel.freshOffersRequired = hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL_V2 && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL_V2;
+            hotel.freshOffersRequired = hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL;
             hotel.status = 'inconclusive';
             hotel.lastEvidence = 'inconclusive';
             continue;
         }
         const filteredAllCandidates = candidateRefs.length > 0 && refs.length === 0;
-        const noLegalRefsNeedsRefresh = filteredAllCandidates && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL_V2;
+        const noLegalRefsNeedsRefresh = filteredAllCandidates && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL;
         hotel.generationNo += 1;
         hotel.generation = hotel.generationNo;
         hotel.currentOfferRefs = partial || noLegalRefsNeedsRefresh ? [] : refs;
         hotel.invalidatedOfferRefs = partial || noLegalRefsNeedsRefresh ? candidateRefs : [];
-        hotel.freshOffersRequired = (partial || noLegalRefsNeedsRefresh) && hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL_V2 && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL_V2;
+        hotel.freshOffersRequired = (partial || noLegalRefsNeedsRefresh) && hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL;
         hotel.status = partial || noLegalRefsNeedsRefresh ? 'inconclusive' : refs.length ? 'active' : 'negative';
         hotel.lastEvidence = partial || noLegalRefsNeedsRefresh ? 'inconclusive' : refs.length ? 'none' : 'unavailable';
         hotel.currentGeneration = {
@@ -390,7 +390,7 @@ export function recordOffersGenerationV2(state, hotelRefs, workspace, actionId,
                 receiptDigest,
                 workspaceRevision: workspace.revision
             },
-            offerSetDigest: digestV2(refs),
+            offerSetDigest: digest(refs),
             orderedOfferRefs: refs,
             evidence: partial ? 'partial' : 'complete',
             valid: refs.length > 0 && !partial
@@ -412,8 +412,8 @@ export function recordOffersGenerationV2(state, hotelRefs, workspace, actionId,
     delete next.terminal;
     return withTerminal(next);
 }
-export function canIssueOfferCheckV2(state, workspace, offerRef, offerVersionRef) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function canIssueOfferCheck(state, workspace, offerRef, offerVersionRef) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     if (!state.recoveryStarted) {
         const loaded = loadedOfferVersion(workspace, offerRef, offerVersionRef);
         return loaded ? {
@@ -458,7 +458,7 @@ export function canIssueOfferCheckV2(state, workspace, offerRef, offerVersionRef
         ok: false,
         code: 'generation_invalid'
     };
-    if (hotel.checksIssued >= MAX_OFFER_CHECKS_PER_HOTEL_V2) return {
+    if (hotel.checksIssued >= MAX_OFFER_CHECKS_PER_HOTEL) return {
         ok: false,
         code: 'hotel_check_limit_reached'
     };
@@ -471,8 +471,8 @@ export function canIssueOfferCheckV2(state, workspace, offerRef, offerVersionRef
         generation: hotel.generationNo
     };
 }
-function startRecoveryAtOfferV2(state, workspace, offerRef, actionId) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+function startRecoveryAtOffer(state, workspace, offerRef, actionId) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     const loaded = workspace.loadedOffers.find((offer)=>offer.offerRef === offerRef);
     if (!loaded) return copyState(state);
     const shortlistHotels = workspace.shortlistedOfferRefs.map((ref)=>workspace.loadedOffers.find((offer)=>offer.offerRef === ref)?.hotelRef ?? state.lastQueryOfferHotels?.[ref]).map((ref, index)=>{
@@ -483,12 +483,12 @@ function startRecoveryAtOfferV2(state, workspace, offerRef, actionId) {
     const candidates = unique([
         loaded.hotelRef,
         ...fallbackHotels
-    ]).slice(0, MAX_HOTELS_PER_TASK_V2);
+    ]).slice(0, MAX_HOTELS_PER_TASK);
     const next = copyState(state);
     next.recoveryStarted = true;
     next.recoveryId = `recovery:${actionId}`;
     next.hotelRefs = candidates;
-    next.candidateSetDigest = digestV2(candidates);
+    next.candidateSetDigest = digest(candidates);
     next.hotels = Object.fromEntries(candidates.map((ref)=>[
             ref,
             newHotel(ref)
@@ -499,12 +499,12 @@ function startRecoveryAtOfferV2(state, workspace, offerRef, actionId) {
     const mapped = state.lastQueryOfferHotels?.[offerRef] === loaded.hotelRef && state.lastQueryWorkspaceRevision === workspace.revision && Boolean(state.lastQuerySourceActionId && state.lastQuerySourceReceiptDigest) && sameSet(mappedRefs, currentRefs);
     if (mapped && state.criteria) {
         next.criteria = structuredClone(state.criteria);
-        next.criteriaDigest = digestV2(next.criteria);
+        next.criteriaDigest = digest(next.criteria);
     }
     const refs = mapped && state.lastQueryOfferHotels ? unique([
         offerRef,
         ...mappedRefs
-    ]).slice(0, MAX_OFFERS_PER_HOTEL_GENERATION_V2) : offerRefsForHotel(workspace, loaded.hotelRef, offerRef);
+    ]).slice(0, MAX_OFFERS_PER_HOTEL_GENERATION) : offerRefsForHotel(workspace, loaded.hotelRef, offerRef);
     const source = mapped ? {
         kind: 'query_receipt',
         actionId: state.lastQuerySourceActionId,
@@ -512,7 +512,7 @@ function startRecoveryAtOfferV2(state, workspace, offerRef, actionId) {
         workspaceRevision: state.lastQueryWorkspaceRevision
     } : {
         kind: 'workspace_snapshot',
-        workspaceDigest: workspaceDigestV2(workspace),
+        workspaceDigest: workspaceDigest(workspace),
         workspaceRevision: workspace.revision
     };
     nextHotel.generationNo = 1;
@@ -522,7 +522,7 @@ function startRecoveryAtOfferV2(state, workspace, offerRef, actionId) {
     nextHotel.currentGeneration = {
         generationId: `${loaded.hotelRef}:generation:1`,
         source,
-        offerSetDigest: digestV2(refs),
+        offerSetDigest: digest(refs),
         orderedOfferRefs: refs,
         evidence: 'complete',
         valid: refs.length > 0
@@ -531,15 +531,15 @@ function startRecoveryAtOfferV2(state, workspace, offerRef, actionId) {
     next.availabilityPhase = 'need_check';
     return next;
 }
-export function recordOfferCheckIssuedV2(state, workspace, offerRef, offerVersionRef, actionId = `offer-check-${offerRef}-${state.attempts.length + 1}`) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function recordOfferCheckIssued(state, workspace, offerRef, offerVersionRef, actionId = `offer-check-${offerRef}-${state.attempts.length + 1}`) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     if (state.terminal) throw new Error('availability_terminal');
     if (!state.recoveryStarted) {
         if (!loadedOfferVersion(workspace, offerRef, offerVersionRef)) throw new Error('availability_offer_not_loaded');
-        const started = startRecoveryAtOfferV2(state, workspace, offerRef, actionId);
-        return recordOfferCheckIssuedV2(started, workspace, offerRef, offerVersionRef, actionId);
+        const started = startRecoveryAtOffer(state, workspace, offerRef, actionId);
+        return recordOfferCheckIssued(started, workspace, offerRef, offerVersionRef, actionId);
     }
-    const decision = canIssueOfferCheckV2(state, workspace, offerRef, offerVersionRef);
+    const decision = canIssueOfferCheck(state, workspace, offerRef, offerVersionRef);
     if (!decision.ok) throw new Error(`availability_${decision.code}`);
     const next = copyState(state);
     const hotel = next.hotels[decision.hotelRef];
@@ -558,21 +558,21 @@ export function recordOfferCheckIssuedV2(state, workspace, offerRef, offerVersio
     next.availabilityPhase = 'waiting_check';
     return next;
 }
-export function reduceAvailabilityActionV2(state, workspace, action) {
+export function reduceAvailabilityAction(state, workspace, action) {
     if (action.kind === 'offers.query') {
-        if (!isOfferCriteriaV2(action.input.criteria) && (!state.criteria || !isOfferCriteriaV2(state.criteria))) throw new Error('availability_criteria_required');
-        if (!isOfferCriteriaV2(action.input.criteria) && state.recoveryStarted) throw new Error('availability_criteria_required');
-        if (!isOfferCriteriaV2(action.input.criteria)) throw new Error('availability_criteria_required');
-        const criteriaDigest = digestV2(action.input.criteria);
-        let next = recordObservedOffersQueryV2(state, action.input.hotelRefs, criteriaDigest);
-        if (state.recoveryStarted) next = recordOffersQueryIssuedV2(next, action.input.hotelRefs, workspace, action.actionId, criteriaDigest, action.input.criteria);
+        if (!isOfferCriteria(action.input.criteria) && (!state.criteria || !isOfferCriteria(state.criteria))) throw new Error('availability_criteria_required');
+        if (!isOfferCriteria(action.input.criteria) && state.recoveryStarted) throw new Error('availability_criteria_required');
+        if (!isOfferCriteria(action.input.criteria)) throw new Error('availability_criteria_required');
+        const criteriaDigest = digest(action.input.criteria);
+        let next = recordObservedOffersQuery(state, action.input.hotelRefs, criteriaDigest);
+        if (state.recoveryStarted) next = recordOffersQueryIssued(next, action.input.hotelRefs, workspace, action.actionId, criteriaDigest, action.input.criteria);
         return next;
     }
-    if (action.kind === 'offer.check') return recordOfferCheckIssuedV2(state, workspace, action.input.offerRef, action.input.offerVersionRef, action.actionId);
+    if (action.kind === 'offer.check') return recordOfferCheckIssued(state, workspace, action.input.offerRef, action.input.offerVersionRef, action.actionId);
     return copyState(state);
 }
-export function recordOfferCheckReceiptV2(state, workspace, receipt, actionId, offerRef, offerVersionRef, expectedRevision) {
-    assertWorkspaceLoadedOfferRefsUniqueV2(workspace);
+export function recordOfferCheckReceipt(state, workspace, receipt, actionId, offerRef, offerVersionRef, expectedRevision) {
+    assertWorkspaceLoadedOfferRefsUnique(workspace);
     if (!state.recoveryStarted) return copyState(state);
     const attempt = state.attempts.find((candidate)=>candidate.actionId === actionId);
     if (!attempt) throw new Error('availability_attempt_unknown');
@@ -642,7 +642,7 @@ export function recordOfferCheckReceiptV2(state, workspace, receipt, actionId, o
         ...hotel.currentGeneration.orderedOfferRefs
     ];
     hotel.currentOfferRefs = [];
-    hotel.freshOffersRequired = hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL_V2 && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL_V2;
+    hotel.freshOffersRequired = hotel.checksIssued < MAX_OFFER_CHECKS_PER_HOTEL && hotel.offerQueriesIssued < MAX_OFFER_QUERIES_PER_HOTEL;
     hotel.status = completeNegative ? 'negative' : 'inconclusive';
     hotel.lastEvidence = completeNegative ? 'unavailable' : 'inconclusive';
     const currentOrdinal = next.hotelRefs.indexOf(attempt.hotelRef);
@@ -654,24 +654,24 @@ export function recordOfferCheckReceiptV2(state, workspace, receipt, actionId, o
     next.availabilityPhase = phaseForActiveHotel(next);
     return withTerminal(next);
 }
-export function reduceAvailabilityReceiptV2(state, workspace, receipt, action) {
-    let next = recordVisibleHotelsV2(state, workspace);
+export function reduceAvailabilityReceipt(state, workspace, receipt, action) {
+    let next = recordVisibleHotels(state, workspace);
     if (action.kind === 'offers.query' && !state.recoveryStarted) {
-        if (!isOfferCriteriaV2(action.input.criteria)) throw new Error('availability_criteria_required');
-        next = recordObservedOffersQueryV2(next, action.input.hotelRefs, digestV2(action.input.criteria), workspace, receipt, action.actionId, digestV2(receipt), action.input.criteria);
+        if (!isOfferCriteria(action.input.criteria)) throw new Error('availability_criteria_required');
+        next = recordObservedOffersQuery(next, action.input.hotelRefs, digest(action.input.criteria), workspace, receipt, action.actionId, digest(receipt), action.input.criteria);
     } else if (action.kind === 'offers.query' && state.recoveryStarted) {
-        if (!isOfferCriteriaV2(action.input.criteria)) throw new Error('availability_criteria_required');
-        next = recordOffersGenerationV2(next, action.input.hotelRefs, workspace, action.actionId, digestV2(receipt), receipt, state.criteriaDigest ?? '', action.input.criteria);
+        if (!isOfferCriteria(action.input.criteria)) throw new Error('availability_criteria_required');
+        next = recordOffersGeneration(next, action.input.hotelRefs, workspace, action.actionId, digest(receipt), receipt, state.criteriaDigest ?? '', action.input.criteria);
     } else if (action.kind === 'offer.check') {
         if (action.expectedRevision === undefined) throw new Error('availability_expected_revision_missing');
-        next = recordOfferCheckReceiptV2(next, workspace, receipt, action.actionId, action.input.offerRef, action.input.offerVersionRef, action.expectedRevision);
+        next = recordOfferCheckReceipt(next, workspace, receipt, action.actionId, action.input.offerRef, action.input.offerVersionRef, action.expectedRevision);
     }
     return next;
 }
-export function availabilityPolicyIsTerminalV2(state) {
+export function availabilityPolicyIsTerminal(state) {
     return Boolean(state.terminal);
 }
-export function availabilityPolicyResultV2(state) {
+export function availabilityPolicyResult(state) {
     return state.terminal ? {
         ...state.terminal,
         hotelRefs: [
@@ -679,7 +679,7 @@ export function availabilityPolicyResultV2(state) {
         ]
     } : undefined;
 }
-export function validateAvailabilityPolicyV2(state) {
+export function validateAvailabilityPolicy(state) {
     try {
         if (!state || typeof state.initialized !== 'boolean' || typeof state.recoveryStarted !== 'boolean') return false;
         if (state.recoveryId !== undefined && (typeof state.recoveryId !== 'string' || !state.recoveryId)) return false;
@@ -692,7 +692,7 @@ export function validateAvailabilityPolicyV2(state) {
             'waiting_check',
             'terminal'
         ].includes(state.availabilityPhase)) return false;
-        if (!Number.isSafeInteger(state.activeHotelOrdinal) || !Array.isArray(state.hotelRefs) || state.hotelRefs.length > MAX_HOTELS_PER_TASK_V2) return false;
+        if (!Number.isSafeInteger(state.activeHotelOrdinal) || !Array.isArray(state.hotelRefs) || state.hotelRefs.length > MAX_HOTELS_PER_TASK) return false;
         if (state.hotelRefs.some((ref)=>typeof ref !== 'string' || !ref) || new Set(state.hotelRefs).size !== state.hotelRefs.length) return false;
         if (state.hotelRefs.length && (state.activeHotelOrdinal < 0 || state.activeHotelOrdinal >= state.hotelRefs.length) || !state.hotelRefs.length && state.activeHotelOrdinal !== 0) return false;
         if (!state.hotels || typeof state.hotels !== 'object' || Object.keys(state.hotels).sort().join('\0') !== [
@@ -702,7 +702,7 @@ export function validateAvailabilityPolicyV2(state) {
         if (!state.recoveryStarted) {
             if (state.recoveryId !== undefined || state.candidateSetDigest !== undefined || state.hotelRefs.length || Object.keys(state.hotels).length || state.attempts.length || state.queryReservations.length || state.terminal !== undefined) return false;
             if (state.criteria !== undefined || state.criteriaDigest !== undefined) {
-                if (!isOfferCriteriaV2(state.criteria) || !state.criteriaDigest || state.criteriaDigest !== digestV2(state.criteria)) return false;
+                if (!isOfferCriteria(state.criteria) || !state.criteriaDigest || state.criteriaDigest !== digest(state.criteria)) return false;
             }
             if (state.lastQueryCriteriaDigest !== undefined && state.lastQueryCriteriaDigest !== state.criteriaDigest) return false;
             if (state.lastQueryHotelRefs !== undefined && (!Array.isArray(state.lastQueryHotelRefs) || new Set(state.lastQueryHotelRefs).size !== state.lastQueryHotelRefs.length || state.lastQueryHotelRefs.some((ref)=>typeof ref !== 'string' || !ref))) return false;
@@ -711,8 +711,8 @@ export function validateAvailabilityPolicyV2(state) {
             if (state.lastQuerySourceReceiptDigest !== undefined && state.lastQuerySourceActionId === undefined) return false;
             return state.initialized === false && state.availabilityPhase === 'need_offers';
         }
-        if (!state.initialized || !state.recoveryId || !state.candidateSetDigest || state.candidateSetDigest !== digestV2(state.hotelRefs)) return false;
-        const criteriaBound = isOfferCriteriaV2(state.criteria) && Boolean(state.criteriaDigest) && state.criteriaDigest === digestV2(state.criteria);
+        if (!state.initialized || !state.recoveryId || !state.candidateSetDigest || state.candidateSetDigest !== digest(state.hotelRefs)) return false;
+        const criteriaBound = isOfferCriteria(state.criteria) && Boolean(state.criteriaDigest) && state.criteriaDigest === digest(state.criteria);
         const manualCheckWorkspaceSnapshot = state.attempts.length > 0 && state.attempts.every((attempt)=>state.hotels[attempt.hotelRef]?.currentGeneration?.source.kind === 'workspace_snapshot');
         const manualCheckMayBindCriteria = !state.criteria && !state.criteriaDigest && state.queryReservations.length === 0 && manualCheckWorkspaceSnapshot && ([
             'waiting_check',
@@ -748,20 +748,20 @@ export function validateAvailabilityPolicyV2(state) {
                 hotel.generation,
                 hotel.checkCount
             ].every(Number.isSafeInteger)) return false;
-            if (hotel.checksIssued < 0 || hotel.checksIssued > MAX_OFFER_CHECKS_PER_HOTEL_V2 || hotel.offerQueriesIssued < 0 || hotel.offerQueriesIssued > MAX_OFFER_QUERIES_PER_HOTEL_V2 || hotel.generationNo < 0 || hotel.generation !== hotel.generationNo || hotel.checkCount !== hotel.checksIssued) return false;
+            if (hotel.checksIssued < 0 || hotel.checksIssued > MAX_OFFER_CHECKS_PER_HOTEL || hotel.offerQueriesIssued < 0 || hotel.offerQueriesIssued > MAX_OFFER_QUERIES_PER_HOTEL || hotel.generationNo < 0 || hotel.generation !== hotel.generationNo || hotel.checkCount !== hotel.checksIssued) return false;
             if (typeof hotel.freshOffersRequired !== 'boolean' || !Array.isArray(hotel.currentOfferRefs) || !Array.isArray(hotel.invalidatedOfferRefs) || !Array.isArray(hotel.tombstonedOfferRefs) || !Array.isArray(hotel.tombstonedOfferVersionRefs)) return false;
             if (hotel.currentOfferRefs.some((offer)=>typeof offer !== 'string' || !offer) || hotel.invalidatedOfferRefs.some((offer)=>typeof offer !== 'string' || !offer) || hotel.tombstonedOfferRefs.some((offer)=>typeof offer !== 'string' || !offer) || hotel.tombstonedOfferVersionRefs.some((offer)=>typeof offer !== 'string' || !offer)) return false;
-            if (new Set(hotel.currentOfferRefs).size !== hotel.currentOfferRefs.length || new Set(hotel.invalidatedOfferRefs).size !== hotel.invalidatedOfferRefs.length || new Set(hotel.tombstonedOfferRefs).size !== hotel.tombstonedOfferRefs.length || new Set(hotel.tombstonedOfferVersionRefs).size !== hotel.tombstonedOfferVersionRefs.length || hotel.currentOfferRefs.length > MAX_OFFERS_PER_HOTEL_GENERATION_V2 || hotel.invalidatedOfferRefs.length > MAX_OFFERS_PER_HOTEL_GENERATION_V2 || hotel.currentOfferRefs.some((offer)=>hotel.invalidatedOfferRefs.includes(offer) || hotel.tombstonedOfferRefs.includes(offer))) return false;
+            if (new Set(hotel.currentOfferRefs).size !== hotel.currentOfferRefs.length || new Set(hotel.invalidatedOfferRefs).size !== hotel.invalidatedOfferRefs.length || new Set(hotel.tombstonedOfferRefs).size !== hotel.tombstonedOfferRefs.length || new Set(hotel.tombstonedOfferVersionRefs).size !== hotel.tombstonedOfferVersionRefs.length || hotel.currentOfferRefs.length > MAX_OFFERS_PER_HOTEL_GENERATION || hotel.invalidatedOfferRefs.length > MAX_OFFERS_PER_HOTEL_GENERATION || hotel.currentOfferRefs.some((offer)=>hotel.invalidatedOfferRefs.includes(offer) || hotel.tombstonedOfferRefs.includes(offer))) return false;
             const generation = hotel.currentGeneration;
             if (hotel.generationNo === 0) {
                 if (generation !== undefined || hotel.currentOfferRefs.length || hotel.invalidatedOfferRefs.length || hotel.tombstonedOfferRefs.length || hotel.tombstonedOfferVersionRefs.length || hotel.status !== 'unvisited' || hotel.lastEvidence !== 'none' || hotel.checksIssued !== 0 || hotel.offerQueriesIssued !== 0 || hotel.freshOffersRequired) return false;
                 continue;
             }
-            if (!generation || generation.generationId !== `${ref}:generation:${hotel.generationNo}` || !/^[0-9a-f]{64}$/.test(generation.offerSetDigest) || generation.offerSetDigest !== digestV2(generation.orderedOfferRefs) || !Array.isArray(generation.orderedOfferRefs) || generation.orderedOfferRefs.length > MAX_OFFERS_PER_HOTEL_GENERATION_V2 || generation.orderedOfferRefs.some((offer)=>typeof offer !== 'string' || !offer) || new Set(generation.orderedOfferRefs).size !== generation.orderedOfferRefs.length || ![
+            if (!generation || generation.generationId !== `${ref}:generation:${hotel.generationNo}` || !/^[0-9a-f]{64}$/.test(generation.offerSetDigest) || generation.offerSetDigest !== digest(generation.orderedOfferRefs) || !Array.isArray(generation.orderedOfferRefs) || generation.orderedOfferRefs.length > MAX_OFFERS_PER_HOTEL_GENERATION || generation.orderedOfferRefs.some((offer)=>typeof offer !== 'string' || !offer) || new Set(generation.orderedOfferRefs).size !== generation.orderedOfferRefs.length || ![
                 'complete',
                 'partial'
             ].includes(generation.evidence) || typeof generation.valid !== 'boolean') return false;
-            if (generation.offerSetDigest !== digestV2(generation.orderedOfferRefs) || hotel.currentOfferRefs.some((offer)=>!generation.orderedOfferRefs.includes(offer)) || hotel.invalidatedOfferRefs.some((offer)=>!generation.orderedOfferRefs.includes(offer))) return false;
+            if (generation.offerSetDigest !== digest(generation.orderedOfferRefs) || hotel.currentOfferRefs.some((offer)=>!generation.orderedOfferRefs.includes(offer)) || hotel.invalidatedOfferRefs.some((offer)=>!generation.orderedOfferRefs.includes(offer))) return false;
             const source = generation.source;
             if (!source || ![
                 'query_receipt',
@@ -770,7 +770,7 @@ export function validateAvailabilityPolicyV2(state) {
             if (source.kind === 'query_receipt' && (typeof source.actionId !== 'string' || !source.actionId || !/^[0-9a-f]{64}$/.test(source.receiptDigest))) return false;
             if (source.kind === 'workspace_snapshot' && (typeof source.workspaceDigest !== 'string' || !/^[0-9a-f]{64}$/.test(source.workspaceDigest))) return false;
             if (source.kind === 'query_receipt' && state.lastQuerySourceActionId === source.actionId && (state.lastQuerySourceReceiptDigest !== source.receiptDigest || state.lastQueryWorkspaceRevision !== source.workspaceRevision)) return false;
-            if (hotel.freshOffersRequired && (hotel.currentOfferRefs.length !== 0 || hotel.checksIssued >= MAX_OFFER_CHECKS_PER_HOTEL_V2 || hotel.offerQueriesIssued >= MAX_OFFER_QUERIES_PER_HOTEL_V2)) return false;
+            if (hotel.freshOffersRequired && (hotel.currentOfferRefs.length !== 0 || hotel.checksIssued >= MAX_OFFER_CHECKS_PER_HOTEL || hotel.offerQueriesIssued >= MAX_OFFER_QUERIES_PER_HOTEL)) return false;
             if (hotel.status === 'unvisited' || hotel.status === 'negative') {
                 if (hotel.status === 'unvisited' || hotel.lastEvidence !== 'unavailable' || hotel.currentOfferRefs.length || generation.valid) return false;
             }
@@ -798,7 +798,7 @@ export function validateAvailabilityPolicyV2(state) {
         if (new Set(state.queryReservations.map((reservation)=>reservation.actionId)).size !== state.queryReservations.length) return false;
         const reservedHotels = new Set();
         for (const reservation of state.queryReservations){
-            if (typeof reservation.actionId !== 'string' || !reservation.actionId || !Array.isArray(reservation.hotelRefs) || !reservation.hotelRefs.length || reservation.hotelRefs.length > MAX_HOTELS_PER_TASK_V2 || new Set(reservation.hotelRefs).size !== reservation.hotelRefs.length || reservation.hotelRefs.some((ref)=>!state.hotels[ref]) || !Number.isSafeInteger(reservation.workspaceRevision) || reservation.workspaceRevision < 0 || reservation.hotelRefs.some((ref)=>reservedHotels.has(ref))) return false;
+            if (typeof reservation.actionId !== 'string' || !reservation.actionId || !Array.isArray(reservation.hotelRefs) || !reservation.hotelRefs.length || reservation.hotelRefs.length > MAX_HOTELS_PER_TASK || new Set(reservation.hotelRefs).size !== reservation.hotelRefs.length || reservation.hotelRefs.some((ref)=>!state.hotels[ref]) || !Number.isSafeInteger(reservation.workspaceRevision) || reservation.workspaceRevision < 0 || reservation.hotelRefs.some((ref)=>reservedHotels.has(ref))) return false;
             reservation.hotelRefs.forEach((ref)=>reservedHotels.add(ref));
         }
         if (state.availabilityPhase === 'waiting_offers' && state.queryReservations.length === 0) return false;
@@ -812,7 +812,7 @@ export function validateAvailabilityPolicyV2(state) {
         if (state.availabilityPhase !== 'terminal' && state.terminal) return false;
         const recomputedTerminal = terminalFor(state);
         if (state.terminal) {
-            if (!recomputedTerminal || digestV2(state.terminal) !== digestV2(recomputedTerminal)) return false;
+            if (!recomputedTerminal || digest(state.terminal) !== digest(recomputedTerminal)) return false;
         } else if (recomputedTerminal && ![
             'waiting_offers',
             'waiting_check'
@@ -822,9 +822,9 @@ export function validateAvailabilityPolicyV2(state) {
         return false;
     }
 }
-export function availabilityPolicyActionIsRelevantV2(action) {
+export function availabilityPolicyActionIsRelevant(action) {
     return action.kind === 'offers.query' || action.kind === 'offer.check';
 }
 
 
-//# sourceURL=ts/src/booking-surface/availability-policy-v2.ts
+//# sourceURL=ts/src/booking-surface/availability-policy.ts

package/dist/src/booking-surface/canonical-schema.js

@@ -1,5 +1,5 @@
 /**
- * Runtime projection of the canonical booking.surface.v1 JSON Schema.
+ * Runtime projection of the canonical booking.surface JSON Schema.
  *
  * dsh tools need self-contained JSON Schemas, while the canonical document is
  * organized with local $refs. This helper derives each action branch directly
@@ -9,10 +9,8 @@
 
 import { readFileSync } from 'node:fs'
 
-const schemaUrl = new URL('../../../schemas/booking.surface.v1.schema.json', import.meta.url)
-export const canonicalBookingSurfaceSchemaV1 = JSON.parse(readFileSync(schemaUrl, 'utf8'))
-const schemaV2Url = new URL('../../../schemas/booking.surface.v2.schema.json', import.meta.url)
-export const canonicalBookingSurfaceSchemaV2 = JSON.parse(readFileSync(schemaV2Url, 'utf8'))
+const schemaUrl = new URL('../../../schemas/booking.surface.schema.json', import.meta.url)
+export const canonicalBookingSurfaceSchema = JSON.parse(readFileSync(schemaUrl, 'utf8'))
 
 function clone(value) {
   return JSON.parse(JSON.stringify(value))
@@ -20,14 +18,11 @@ function clone(value) {
 
 function definitionFromRef(ref, schema) {
   const prefix = '#/$defs/'
-  if (typeof ref !== 'string') {
+  if (typeof ref !== 'string' || !ref.startsWith(prefix)) {
     throw new Error(`booking_schema_external_ref_forbidden:${String(ref)}`)
   }
-  const externalV1 = 'https://gotry.dev/schemas/booking.surface.v1.schema.json#/$defs/'
-  const definitionSchema = ref.startsWith(prefix) ? schema : ref.startsWith(externalV1) ? canonicalBookingSurfaceSchemaV1 : undefined
-  if (!definitionSchema) throw new Error(`booking_schema_external_ref_forbidden:${String(ref)}`)
-  const name = ref.startsWith(prefix) ? ref.slice(prefix.length) : ref.slice(externalV1.length)
-  const definition = definitionSchema.$defs?.[name]
+  const name = ref.slice(prefix.length)
+  const definition = schema.$defs?.[name]
   if (!definition) throw new Error(`booking_schema_missing_definition:${name}`)
   return definition
 }
@@ -38,9 +33,8 @@ function inlineLocalRefs(value, schema, stack = []) {
   if (typeof value.$ref === 'string') {
     if (stack.includes(value.$ref)) throw new Error(`booking_schema_recursive_ref:${value.$ref}`)
     const { $ref, ...siblings } = value
-    const definitionSchema = typeof $ref === 'string' && $ref.startsWith('https://gotry.dev/schemas/booking.surface.v1.schema.json#/$defs/') ? canonicalBookingSurfaceSchemaV1 : schema
     return {
-      ...inlineLocalRefs(definitionFromRef($ref, schema), definitionSchema, [...stack, $ref]),
+      ...inlineLocalRefs(definitionFromRef($ref, schema), schema, [...stack, $ref]),
       ...inlineLocalRefs(siblings, schema, stack),
     }
   }
@@ -73,11 +67,7 @@ function canonicalActionSchemaForKind(kind, schema, definitionName) {
 }
 
 export function canonicalBookingActionSchemaForKind(kind) {
-  return canonicalActionSchemaForKind(kind, canonicalBookingSurfaceSchemaV1, 'BookingReadActionV1')
-}
-
-export function canonicalBookingActionSchemaForKindV2(kind) {
-  return canonicalActionSchemaForKind(kind, canonicalBookingSurfaceSchemaV2, 'Action')
+  return canonicalActionSchemaForKind(kind, canonicalBookingSurfaceSchema, 'Action')
 }
 
 const DSH_JSON_SCHEMA_KEYS = new Set([
@@ -107,7 +97,3 @@ function projectDshSchema(value) {
 export function dshBookingActionSchemaForKind(kind) {
   return projectDshSchema(canonicalBookingActionSchemaForKind(kind))
 }
-
-export function dshBookingActionSchemaForKindV2(kind) {
-  return projectDshSchema(canonicalBookingActionSchemaForKindV2(kind))
-}