@danceiny/gotry 0.0.1-rc.17 → 0.0.1-rc.19

package/dist/scripts/{booking-copilot-availability-policy-v2-tests.js → booking-copilot-availability-policy-tests.js}

@@ -3,9 +3,9 @@ import { mkdtempSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { ensureLedger } from '../src/state-ledger.js';
-import { BookingCopilotTaskRuntimeV2 } from '../src/booking-surface/runtime-v2.js';
-import { createAvailabilityPolicyV2, digestV2, MAX_HOTELS_PER_TASK_V2, MAX_OFFER_CHECKS_PER_HOTEL_V2, MAX_OFFER_QUERIES_PER_HOTEL_V2, recordObservedOffersQueryV2, recordOfferCheckIssuedV2, recordOfferCheckReceiptV2, recordOffersGenerationV2, recordOffersQueryIssuedV2, canIssueOfferCheckV2 } from '../src/booking-surface/availability-policy-v2.js';
-import { bookingSurfaceAllowedActionsV2 } from '../src/booking-surface/contracts-v2.js';
+import { BookingCopilotTaskRuntime } from '../src/booking-surface/runtime.js';
+import { createAvailabilityPolicy, digest, MAX_HOTELS_PER_TASK, MAX_OFFER_CHECKS_PER_HOTEL, MAX_OFFER_QUERIES_PER_HOTEL, recordObservedOffersQuery, recordOfferCheckIssued, recordOfferCheckReceipt, recordOffersGeneration, recordOffersQueryIssued, canIssueOfferCheck } from '../src/booking-surface/availability-policy.js';
+import { bookingSurfaceAllowedActions } from '../src/booking-surface/contracts.js';
 const versionFor = (offerRef, suffix = 'v1')=>`${offerRef}:${suffix}`;
 const verifiedCapability = (offerRef, offerVersionRef = versionFor(offerRef), expiresAt = '2026-09-01T10:30:00.000Z')=>({
         offerRef,
@@ -14,7 +14,7 @@ const verifiedCapability = (offerRef, offerVersionRef = versionFor(offerRef), ex
         expiresAt
     });
 const ws = (revision, hotels, offers, shortlistedOfferRefs = [], verifiedOffer)=>({
-        schemaVersion: 'booking.surface.v2',
+        schemaVersion: 'booking.surface',
         contextRef: 'ctx-availability',
         surface: 'tenant',
         revision,
@@ -49,7 +49,7 @@ const ws = (revision, hotels, offers, shortlistedOfferRefs = [], verifiedOffer)=
         } : {}
     });
 const receipt = (actionId, revision, offerRef, status = 'unavailable', available = false, checkedOfferVersionRef = versionFor(offerRef), currentOfferVersionRef)=>({
-        schemaVersion: 'booking.surface.v2',
+        schemaVersion: 'booking.surface',
         kind: 'action.receipt',
         actionId,
         contextRef: 'ctx-availability',
@@ -74,10 +74,10 @@ const receipt = (actionId, revision, offerRef, status = 'unavailable', available
             relaxationsApplied: []
         }
     });
-const foldQuery = (state, hotelRefs, workspace, actionId, queryReceipt, criteriaDigest = '')=>recordOffersGenerationV2(state, hotelRefs, workspace, actionId, digestV2(queryReceipt), queryReceipt, criteriaDigest);
+const foldQuery = (state, hotelRefs, workspace, actionId, queryReceipt, criteriaDigest = '')=>recordOffersGeneration(state, hotelRefs, workspace, actionId, digest(queryReceipt), queryReceipt, criteriaDigest);
 const criteria = {};
 const offersReceipt = (actionId, revision, hotelRefs, offerRefs, loadedHotelCount, status = 'applied', outcome = 'complete', hardCriteriaMet = true)=>({
-        schemaVersion: 'booking.surface.v2',
+        schemaVersion: 'booking.surface',
         kind: 'action.receipt',
         actionId,
         contextRef: 'ctx-availability',
@@ -100,7 +100,7 @@ const offersReceipt = (actionId, revision, hotelRefs, offerRefs, loadedHotelCoun
         }
     });
 const gapReceipt = (actionId, revision, status = 'failed')=>({
-        schemaVersion: 'booking.surface.v2',
+        schemaVersion: 'booking.surface',
         kind: 'action.receipt',
         actionId,
         contextRef: 'ctx-availability',
@@ -122,13 +122,13 @@ const gapReceipt = (actionId, revision, status = 'failed')=>({
             relaxationsApplied: []
         }
     });
-assert.deepEqual(bookingSurfaceAllowedActionsV2('storefront'), [
+assert.deepEqual(bookingSurfaceAllowedActions('storefront'), [
     'search.patch',
     'search.run',
     'results.view.patch',
     'hotel.focus'
 ]);
-assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
+assert.deepEqual(bookingSurfaceAllowedActions('payment_link'), [
     'search.patch',
     'search.run',
     'results.view.patch',
@@ -136,9 +136,9 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     'hotel.select'
 ]);
 {
-    assert.equal(MAX_HOTELS_PER_TASK_V2, 5);
-    assert.equal(MAX_OFFER_CHECKS_PER_HOTEL_V2, 2);
-    assert.equal(MAX_OFFER_QUERIES_PER_HOTEL_V2, 2);
+    assert.equal(MAX_HOTELS_PER_TASK, 5);
+    assert.equal(MAX_OFFER_CHECKS_PER_HOTEL, 2);
+    assert.equal(MAX_OFFER_QUERIES_PER_HOTEL, 2);
     const unavailableWorkspace = ws(0, [
         'budget-hotel'
     ], [
@@ -147,8 +147,8 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'budget-hotel'
         ]
     ]);
-    let exhausted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), 'budget-check-1');
-    exhausted = recordOfferCheckReceiptV2(exhausted, ws(1, [
+    let exhausted = recordOfferCheckIssued(createAvailabilityPolicy(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), 'budget-check-1');
+    exhausted = recordOfferCheckReceipt(exhausted, ws(1, [
         'budget-hotel'
     ], [
         [
@@ -157,7 +157,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
         ]
     ]), receipt('budget-check-1', 1, 'budget-hotel:ratepkg-1'), 'budget-check-1', 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), 0);
     assert.equal(exhausted.hotels['budget-hotel']?.freshOffersRequired, true, 'first unavailable opens exactly one fresh-generation transition');
-    exhausted = recordOffersQueryIssuedV2(exhausted, [
+    exhausted = recordOffersQueryIssued(exhausted, [
         'budget-hotel'
     ], ws(1, [
         'budget-hotel'
@@ -172,7 +172,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     ], [
         'budget-hotel:ratepkg-1'
     ], 1);
-    const reused = recordOffersGenerationV2(exhausted, [
+    const reused = recordOffersGeneration(exhausted, [
         'budget-hotel'
     ], ws(2, [
         'budget-hotel'
@@ -181,7 +181,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'budget-hotel:ratepkg-1',
             'budget-hotel'
         ]
-    ]), 'budget-query-1', digestV2(reusedReceipt), reusedReceipt);
+    ]), 'budget-query-1', digest(reusedReceipt), reusedReceipt);
     assert.deepEqual(reused.hotels['budget-hotel']?.currentOfferRefs, [], 'fresh HotelRates cannot re-admit the checked stale OfferRef');
     assert.equal(reused.hotels['budget-hotel']?.freshOffersRequired, true, 'stale OfferRef reuse leaves an explicit refresh transition');
     const refreshedReceipt = offersReceipt('budget-query-1', 2, [
@@ -189,7 +189,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     ], [
         'budget-hotel:ratepkg-2'
     ], 1);
-    exhausted = recordOffersGenerationV2(exhausted, [
+    exhausted = recordOffersGeneration(exhausted, [
         'budget-hotel'
     ], ws(2, [
         'budget-hotel'
@@ -198,8 +198,8 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'budget-hotel:ratepkg-2',
             'budget-hotel'
         ]
-    ]), 'budget-query-1', digestV2(refreshedReceipt), refreshedReceipt);
-    exhausted = recordOfferCheckIssuedV2(exhausted, ws(2, [
+    ]), 'budget-query-1', digest(refreshedReceipt), refreshedReceipt);
+    exhausted = recordOfferCheckIssued(exhausted, ws(2, [
         'budget-hotel'
     ], [
         [
@@ -207,7 +207,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'budget-hotel'
         ]
     ]), 'budget-hotel:ratepkg-2', versionFor('budget-hotel:ratepkg-2'), 'budget-check-2');
-    exhausted = recordOfferCheckReceiptV2(exhausted, ws(3, [
+    exhausted = recordOfferCheckReceipt(exhausted, ws(3, [
         'budget-hotel'
     ], [
         [
@@ -217,7 +217,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     ]), receipt('budget-check-2', 3, 'budget-hotel:ratepkg-2'), 'budget-check-2', 'budget-hotel:ratepkg-2', versionFor('budget-hotel:ratepkg-2'), 2);
     assert.equal(exhausted.hotels['budget-hotel']?.checksIssued, 2, 'second unavailable consumes the lifetime CheckAvail budget');
     assert.equal(exhausted.terminal?.code, 'availability_exhausted_complete', 'second unavailable reaches conclusive exhaustion');
-    assert.throws(()=>recordOfferCheckIssuedV2(exhausted, ws(3, [
+    assert.throws(()=>recordOfferCheckIssued(exhausted, ws(3, [
             'budget-hotel'
         ], [
             [
@@ -248,8 +248,8 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
                 relaxationsApplied: []
             }
         });
-    let inconclusive = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), 'gap-check-1');
-    inconclusive = recordOfferCheckReceiptV2(inconclusive, ws(1, [
+    let inconclusive = recordOfferCheckIssued(createAvailabilityPolicy(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), 'gap-check-1');
+    inconclusive = recordOfferCheckReceipt(inconclusive, ws(1, [
         'budget-hotel'
     ], [
         [
@@ -260,7 +260,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     assert.equal(inconclusive.hotels['budget-hotel']?.status, 'inconclusive', 'generic gap is not accepted as a typed negative');
     assert.equal(inconclusive.hotels['budget-hotel']?.tombstonedOfferRefs.includes('budget-hotel:ratepkg-1'), false, 'generic gap cannot tombstone logical offer');
     assert.equal(inconclusive.hotels['budget-hotel']?.tombstonedOfferVersionRefs.includes(versionFor('budget-hotel:ratepkg-1')), false, 'generic gap cannot tombstone offer version');
-    inconclusive = recordOffersQueryIssuedV2(inconclusive, [
+    inconclusive = recordOffersQueryIssued(inconclusive, [
         'budget-hotel'
     ], ws(1, [
         'budget-hotel'
@@ -275,7 +275,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     ], [
         'budget-hotel:ratepkg-3'
     ], 1);
-    inconclusive = recordOffersGenerationV2(inconclusive, [
+    inconclusive = recordOffersGeneration(inconclusive, [
         'budget-hotel'
     ], ws(2, [
         'budget-hotel'
@@ -284,8 +284,8 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'budget-hotel:ratepkg-3',
             'budget-hotel'
         ]
-    ]), 'gap-query-1', digestV2(gapRefreshedReceipt), gapRefreshedReceipt);
-    inconclusive = recordOfferCheckIssuedV2(inconclusive, ws(2, [
+    ]), 'gap-query-1', digest(gapRefreshedReceipt), gapRefreshedReceipt);
+    inconclusive = recordOfferCheckIssued(inconclusive, ws(2, [
         'budget-hotel'
     ], [
         [
@@ -293,7 +293,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'budget-hotel'
         ]
     ]), 'budget-hotel:ratepkg-3', versionFor('budget-hotel:ratepkg-3'), 'gap-check-2');
-    inconclusive = recordOfferCheckReceiptV2(inconclusive, ws(3, [
+    inconclusive = recordOfferCheckReceipt(inconclusive, ws(3, [
         'budget-hotel'
     ], [
         [
@@ -317,7 +317,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
         'no_match'
     ]){
         const gapAction = `generic-gap-${status}`;
-        const gapState = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), gapAction);
+        const gapState = recordOfferCheckIssued(createAvailabilityPolicy(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), gapAction);
         const gap = {
             ...receipt(gapAction, 1, 'budget-hotel:ratepkg-1', status),
             observation: {
@@ -341,7 +341,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
                 relaxationsApplied: []
             }
         };
-        const afterGap = recordOfferCheckReceiptV2(gapState, ws(1, [
+        const afterGap = recordOfferCheckReceipt(gapState, ws(1, [
             'budget-hotel'
         ], [
             [
@@ -353,8 +353,8 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
         assert.equal(afterGap.hotels['budget-hotel']?.tombstonedOfferRefs.includes('budget-hotel:ratepkg-1'), false, `${status} with generic gap cannot tombstone logical offer`);
         assert.equal(afterGap.hotels['budget-hotel']?.tombstonedOfferVersionRefs.includes(versionFor('budget-hotel:ratepkg-1')), false, `${status} with generic gap cannot tombstone version`);
     }
-    let queryBudget = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), 'query-budget-check');
-    queryBudget = recordOfferCheckReceiptV2(queryBudget, ws(1, [
+    let queryBudget = recordOfferCheckIssued(createAvailabilityPolicy(unavailableWorkspace), unavailableWorkspace, 'budget-hotel:ratepkg-1', versionFor('budget-hotel:ratepkg-1'), 'query-budget-check');
+    queryBudget = recordOfferCheckReceipt(queryBudget, ws(1, [
         'budget-hotel'
     ], [
         [
@@ -373,7 +373,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
         ]
     ]){
         const offerRef = `budget-hotel:query-ratepkg-${revision}`;
-        queryBudget = recordOffersQueryIssuedV2(queryBudget, [
+        queryBudget = recordOffersQueryIssued(queryBudget, [
             'budget-hotel'
         ], ws(revision - 1, [
             'budget-hotel'
@@ -388,7 +388,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
         ], [
             offerRef
         ], 1);
-        queryBudget = recordOffersGenerationV2(queryBudget, [
+        queryBudget = recordOffersGeneration(queryBudget, [
             'budget-hotel'
         ], ws(revision, [
             'budget-hotel'
@@ -397,10 +397,10 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
                 offerRef,
                 'budget-hotel'
             ]
-        ]), actionId, digestV2(queryReceipt), queryReceipt);
+        ]), actionId, digest(queryReceipt), queryReceipt);
     }
     assert.equal(queryBudget.hotels['budget-hotel']?.offerQueriesIssued, 2, 'two refresh queries are retained as lifetime usage');
-    assert.throws(()=>recordOffersQueryIssuedV2(queryBudget, [
+    assert.throws(()=>recordOffersQueryIssued(queryBudget, [
             'budget-hotel'
         ], ws(3, [
             'budget-hotel'
@@ -429,7 +429,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
         'candidate-4',
         'candidate-5'
     ]);
-    const candidates = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(candidateWorkspace), candidateWorkspace, 'candidate-6', versionFor('candidate-6'), 'candidate-check');
+    const candidates = recordOfferCheckIssued(createAvailabilityPolicy(candidateWorkspace), candidateWorkspace, 'candidate-6', versionFor('candidate-6'), 'candidate-check');
     assert.deepEqual(candidates.hotelRefs, [
         'h6',
         'h1',
@@ -451,8 +451,8 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'dup-b'
         ]
     ]);
-    assert.throws(()=>createAvailabilityPolicyV2(duplicateWorkspace), /availability_duplicate_offer_ref/, 'loaded OfferRef must be globally unique before any .find-based authority lookup');
-    assert.throws(()=>canIssueOfferCheckV2(createAvailabilityPolicyV2(ws(0, [
+    assert.throws(()=>createAvailabilityPolicy(duplicateWorkspace), /availability_duplicate_offer_ref/, 'loaded OfferRef must be globally unique before any .find-based authority lookup');
+    assert.throws(()=>canIssueOfferCheck(createAvailabilityPolicy(ws(0, [
             'dup-a'
         ], [])), duplicateWorkspace, 'dup-offer', versionFor('dup-offer')), /availability_duplicate_offer_ref/);
 }{
@@ -478,7 +478,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     ], [
         'room-4'
     ]);
-    const selected = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(roomList), roomList, 'room-4', versionFor('room-4'), 'room-check');
+    const selected = recordOfferCheckIssued(createAvailabilityPolicy(roomList), roomList, 'room-4', versionFor('room-4'), 'room-check');
     assert.deepEqual(selected.hotels['room-hotel']?.currentOfferRefs, [
         'room-4',
         'room-1',
@@ -493,10 +493,10 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'complete-hotel'
         ]
     ]);
-    const completeStarted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(complete), complete, 'complete-1', versionFor('complete-1'), 'complete-check');
-    const completeQuery = recordOffersQueryIssuedV2(completeStarted, [
+    const completeStarted = recordOfferCheckIssued(createAvailabilityPolicy(complete), complete, 'complete-1', versionFor('complete-1'), 'complete-check');
+    const completeQuery = recordOffersQueryIssued(completeStarted, [
         'complete-hotel'
-    ], complete, 'complete-query', digestV2(criteria), criteria);
+    ], complete, 'complete-query', digest(criteria), criteria);
     const fourOfferWorkspace = ws(1, [
         'complete-hotel'
     ], [
@@ -517,9 +517,9 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'complete-hotel'
         ]
     ]);
-    assert.throws(()=>recordOffersGenerationV2(completeQuery, [
+    assert.throws(()=>recordOffersGeneration(completeQuery, [
             'complete-hotel'
-        ], fourOfferWorkspace, 'complete-query', digestV2(offersReceipt('complete-query', 1, [
+        ], fourOfferWorkspace, 'complete-query', digest(offersReceipt('complete-query', 1, [
             'complete-hotel'
         ], [
             'complete-1',
@@ -533,7 +533,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'complete-2',
             'complete-3',
             'complete-4'
-        ], 1), digestV2(criteria), criteria), /availability_offer_limit_exceeded/);
+        ], 1), digest(criteria), criteria), /availability_offer_limit_exceeded/);
 }{
     const partialWorkspace = ws(0, [
         'partial-hotel'
@@ -551,16 +551,16 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'partial-hotel'
         ]
     ]);
-    const partialStarted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(partialWorkspace), partialWorkspace, 'partial-1', versionFor('partial-1'), 'partial-check');
-    const partialQuery = recordOffersQueryIssuedV2(partialStarted, [
+    const partialStarted = recordOfferCheckIssued(createAvailabilityPolicy(partialWorkspace), partialWorkspace, 'partial-1', versionFor('partial-1'), 'partial-check');
+    const partialQuery = recordOffersQueryIssued(partialStarted, [
         'partial-hotel'
-    ], partialWorkspace, 'partial-query', digestV2(criteria), criteria);
+    ], partialWorkspace, 'partial-query', digest(criteria), criteria);
     const partialReceipt = offersReceipt('partial-query', 1, [
         'partial-hotel'
     ], [
         'partial-2'
     ], 1, 'partial', 'partial', false);
-    const partial = recordOffersGenerationV2(partialQuery, [
+    const partial = recordOffersGeneration(partialQuery, [
         'partial-hotel'
     ], ws(1, [
         'partial-hotel'
@@ -577,11 +577,11 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'partial-3',
             'partial-hotel'
         ]
-    ]), 'partial-query', digestV2(partialReceipt), partialReceipt, digestV2(criteria), criteria);
+    ]), 'partial-query', digest(partialReceipt), partialReceipt, digest(criteria), criteria);
     assert.equal(partial.hotels['partial-hotel']?.currentGeneration?.evidence, 'partial');
     assert.equal(partial.hotels['partial-hotel']?.currentOfferRefs.length, 0);
     assert.equal(partial.hotels['partial-hotel']?.freshOffersRequired, true);
-    assert.throws(()=>recordOffersGenerationV2(partialQuery, [
+    assert.throws(()=>recordOffersGeneration(partialQuery, [
             'partial-hotel'
         ], ws(1, [
             'partial-hotel'
@@ -594,7 +594,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
                 'partial-2',
                 'partial-hotel'
             ]
-        ]), 'partial-query', digestV2(offersReceipt('partial-query', 1, [
+        ]), 'partial-query', digest(offersReceipt('partial-query', 1, [
             'partial-hotel'
         ], [
             'partial-1'
@@ -602,7 +602,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'partial-hotel'
         ], [
             'partial-1'
-        ], 2, 'partial', 'partial', false), digestV2(criteria), criteria), /availability_offers_count_mismatch/);
+        ], 2, 'partial', 'partial', false), digest(criteria), criteria), /availability_offers_count_mismatch/);
     const emptyWorkspace = ws(0, [
         'empty-hotel'
     ], [
@@ -611,16 +611,16 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'empty-hotel'
         ]
     ]);
-    const emptyStarted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(emptyWorkspace), emptyWorkspace, 'empty-1', versionFor('empty-1'), 'empty-check');
-    const emptyQuery = recordOffersQueryIssuedV2(emptyStarted, [
+    const emptyStarted = recordOfferCheckIssued(createAvailabilityPolicy(emptyWorkspace), emptyWorkspace, 'empty-1', versionFor('empty-1'), 'empty-check');
+    const emptyQuery = recordOffersQueryIssued(emptyStarted, [
         'empty-hotel'
     ], emptyWorkspace, 'empty-query');
     const empty = offersReceipt('empty-query', 1, [
         'empty-hotel'
     ], [], 0, 'no_match', 'empty', false);
-    assert.throws(()=>recordOffersGenerationV2(emptyQuery, [
+    assert.throws(()=>recordOffersGeneration(emptyQuery, [
             'empty-hotel'
-        ], emptyWorkspace, 'empty-query', digestV2(empty), empty), /availability_offers_workspace_mismatch/);
+        ], emptyWorkspace, 'empty-query', digest(empty), empty), /availability_offers_workspace_mismatch/);
 }{
     const seedWorkspace = ws(0, [
         'seed-hotel'
@@ -635,15 +635,15 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
     ], [
         'seed-1'
     ], 1);
-    const seeded = recordObservedOffersQueryV2(createAvailabilityPolicyV2(seedWorkspace), [
+    const seeded = recordObservedOffersQuery(createAvailabilityPolicy(seedWorkspace), [
         'seed-hotel'
-    ], digestV2(criteria), seedWorkspace, seed, 'seed-query', digestV2(seed), criteria);
-    assert.equal(seeded.criteriaDigest, digestV2(criteria));
-    const cleared = recordObservedOffersQueryV2(seeded, [
+    ], digest(criteria), seedWorkspace, seed, 'seed-query', digest(seed), criteria);
+    assert.equal(seeded.criteriaDigest, digest(criteria));
+    const cleared = recordObservedOffersQuery(seeded, [
         'seed-hotel'
-    ], digestV2(criteria), ws(2, [
+    ], digest(criteria), ws(2, [
         'seed-hotel'
-    ], []), gapReceipt('failed-query', 2), 'failed-query', digestV2(gapReceipt('failed-query', 2)), criteria);
+    ], []), gapReceipt('failed-query', 2), 'failed-query', digest(gapReceipt('failed-query', 2)), criteria);
     assert.equal(cleared.criteria, undefined);
     assert.equal(cleared.criteriaDigest, undefined);
     assert.equal(cleared.lastQuerySourceActionId, undefined);
@@ -655,32 +655,32 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             'verify-hotel'
         ]
     ]);
-    const verificationStarted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(verificationWorkspace), verificationWorkspace, 'verify-1', versionFor('verify-1'), 'verify-check');
+    const verificationStarted = recordOfferCheckIssued(createAvailabilityPolicy(verificationWorkspace), verificationWorkspace, 'verify-1', versionFor('verify-1'), 'verify-check');
     const wrongVerified = {
         ...verificationWorkspace,
         revision: 1,
         verifiedOffer: verifiedCapability('other-offer', versionFor('other-offer'))
     };
-    const wrong = recordOfferCheckReceiptV2(verificationStarted, wrongVerified, receipt('verify-check', 1, 'verify-1', 'applied', true), 'verify-check', 'verify-1', versionFor('verify-1'), 0);
+    const wrong = recordOfferCheckReceipt(verificationStarted, wrongVerified, receipt('verify-check', 1, 'verify-1', 'applied', true), 'verify-check', 'verify-1', versionFor('verify-1'), 0);
     assert.notEqual(wrong.terminal?.code, 'availability_confirmed');
     assert.equal(wrong.hotels['verify-hotel']?.status, 'inconclusive');
-    const matchingStarted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(verificationWorkspace), verificationWorkspace, 'verify-1', versionFor('verify-1'), 'verify-match');
+    const matchingStarted = recordOfferCheckIssued(createAvailabilityPolicy(verificationWorkspace), verificationWorkspace, 'verify-1', versionFor('verify-1'), 'verify-match');
     const matchingWorkspace = {
         ...verificationWorkspace,
         revision: 1,
         verifiedOffer: verifiedCapability('verify-1')
     };
-    const matching = recordOfferCheckReceiptV2(matchingStarted, matchingWorkspace, receipt('verify-match', 1, 'verify-1', 'applied', true), 'verify-match', 'verify-1', versionFor('verify-1'), 0);
+    const matching = recordOfferCheckReceipt(matchingStarted, matchingWorkspace, receipt('verify-match', 1, 'verify-1', 'applied', true), 'verify-match', 'verify-1', versionFor('verify-1'), 0);
     assert.equal(matching.terminal?.code, 'availability_confirmed');
     const verificationSeedReceipt = offersReceipt('verify-seed', 0, [
         'verify-hotel'
     ], [
         'verify-1'
     ], 1);
-    const verificationSeed = recordObservedOffersQueryV2(createAvailabilityPolicyV2(verificationWorkspace), [
+    const verificationSeed = recordObservedOffersQuery(createAvailabilityPolicy(verificationWorkspace), [
         'verify-hotel'
-    ], digestV2(criteria), verificationWorkspace, verificationSeedReceipt, 'verify-seed', digestV2(verificationSeedReceipt), criteria);
-    const changedStarted = recordOfferCheckIssuedV2(verificationSeed, verificationWorkspace, 'verify-1', versionFor('verify-1'), 'verify-changed');
+    ], digest(criteria), verificationWorkspace, verificationSeedReceipt, 'verify-seed', digest(verificationSeedReceipt), criteria);
+    const changedStarted = recordOfferCheckIssued(verificationSeed, verificationWorkspace, 'verify-1', versionFor('verify-1'), 'verify-changed');
     const changedReceipt = {
         ...receipt('verify-changed', 1, 'verify-1', 'changed', true, versionFor('verify-1'), versionFor('verify-1', 'v2')),
         observation: {
@@ -703,7 +703,7 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
             relaxationsApplied: []
         }
     };
-    const changed = recordOfferCheckReceiptV2(changedStarted, {
+    const changed = recordOfferCheckReceipt(changedStarted, {
         ...verificationWorkspace,
         revision: 1,
         loadedOffers: [
@@ -741,16 +741,16 @@ assert.deepEqual(bookingSurfaceAllowedActionsV2('payment_link'), [
 ], [
     'b1'
 ]);
-assert.throws(()=>recordOffersQueryIssuedV2(createAvailabilityPolicyV2(initial), [
+assert.throws(()=>recordOffersQueryIssued(createAvailabilityPolicy(initial), [
         'h1'
     ], initial, 'pre-q'), /recovery_not_started/);
-let state = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(initial), initial, 'o1', versionFor('o1'), 'check-1');
+let state = recordOfferCheckIssued(createAvailabilityPolicy(initial), initial, 'o1', versionFor('o1'), 'check-1');
 assert.deepEqual(state.hotelRefs, [
     'h1',
     'h2'
 ]);
 assert.equal(state.hotels.h1?.offerQueriesIssued, 0);
-state = recordOfferCheckReceiptV2(state, ws(1, [
+state = recordOfferCheckReceipt(state, ws(1, [
     'h1',
     'h2'
 ], [
@@ -768,7 +768,7 @@ state = recordOfferCheckReceiptV2(state, ws(1, [
     ]
 ]), receipt('check-1', 1, 'o1'), 'check-1', 'o1', versionFor('o1'), 0);
 assert.equal(state.hotels.h1?.freshOffersRequired, true);
-assert.equal(canIssueOfferCheckV2(state, ws(1, [
+assert.equal(canIssueOfferCheck(state, ws(1, [
     'h1',
     'h2'
 ], [
@@ -781,7 +781,7 @@ assert.equal(canIssueOfferCheckV2(state, ws(1, [
         'h2'
     ]
 ]), 'b1', versionFor('b1')).ok, false);
-let q = recordOffersQueryIssuedV2(state, [
+let q = recordOffersQueryIssued(state, [
     'h1'
 ], ws(1, [
     'h1',
@@ -796,7 +796,7 @@ let q = recordOffersQueryIssuedV2(state, [
         'h2'
     ]
 ]), 'q1', 'criteria-a');
-assert.throws(()=>recordOffersQueryIssuedV2(q, [
+assert.throws(()=>recordOffersQueryIssued(q, [
         'h1'
     ], ws(1, [
         'h1',
@@ -840,7 +840,7 @@ const completeQueryReceipt = {
         loadedHotelCount: 1
     }
 };
-q = recordOffersQueryIssuedV2(q, [
+q = recordOffersQueryIssued(q, [
     'h1'
 ], ws(2, [
     'h1',
@@ -873,7 +873,7 @@ q = foldQuery(q, [
 assert.deepEqual(q.hotels.h1?.currentOfferRefs, [
     'o2'
 ]);
-q = recordOfferCheckIssuedV2(q, ws(3, [
+q = recordOfferCheckIssued(q, ws(3, [
     'h1',
     'h2'
 ], [
@@ -886,7 +886,7 @@ q = recordOfferCheckIssuedV2(q, ws(3, [
         'h2'
     ]
 ]), 'o2', versionFor('o2'), 'check-2');
-q = recordOfferCheckReceiptV2(q, ws(4, [
+q = recordOfferCheckReceipt(q, ws(4, [
     'h1',
     'h2'
 ], [
@@ -904,7 +904,7 @@ assert.deepEqual(q.hotels.h1?.invalidatedOfferRefs, [
 ]);
 assert.equal(q.hotels.h1?.freshOffersRequired, false);
 assert.equal(q.terminal, undefined);
-assert.throws(()=>recordOffersQueryIssuedV2(q, [
+assert.throws(()=>recordOffersQueryIssued(q, [
         'h1'
     ], ws(4, [
         'h1',
@@ -930,8 +930,8 @@ const fw = ws(0, [
 ], [
     'b:ratepkg-1'
 ]);
-let fallback = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(fw), fw, 'a:ratepkg-1', versionFor('a:ratepkg-1'), 'fa');
-fallback = recordOfferCheckReceiptV2(fallback, ws(1, [
+let fallback = recordOfferCheckIssued(createAvailabilityPolicy(fw), fw, 'a:ratepkg-1', versionFor('a:ratepkg-1'), 'fa');
+fallback = recordOfferCheckReceipt(fallback, ws(1, [
     'a',
     'b'
 ], [
@@ -947,7 +947,7 @@ fallback = recordOfferCheckReceiptV2(fallback, ws(1, [
     'b:ratepkg-1'
 ]), receipt('fa', 1, 'a:ratepkg-1'), 'fa', 'a:ratepkg-1', versionFor('a:ratepkg-1'), 0);
 assert.equal(fallback.hotels.a?.freshOffersRequired, true);
-fallback = recordOffersQueryIssuedV2(fallback, [
+fallback = recordOffersQueryIssued(fallback, [
     'a'
 ], ws(1, [
     'a',
@@ -981,7 +981,7 @@ fallback = foldQuery(fallback, [
     ]
 ]), 'fq1', fallbackEmpty);
 assert.equal(fallback.activeHotelOrdinal, 1);
-assert.equal(canIssueOfferCheckV2(fallback, ws(2, [
+assert.equal(canIssueOfferCheck(fallback, ws(2, [
     'a',
     'b'
 ], [
@@ -990,7 +990,7 @@ assert.equal(canIssueOfferCheckV2(fallback, ws(2, [
         'b'
     ]
 ]), 'b:ratepkg-1', versionFor('b:ratepkg-1')).ok, false);
-fallback = recordOffersQueryIssuedV2(fallback, [
+fallback = recordOffersQueryIssued(fallback, [
     'b'
 ], ws(2, [
     'a',
@@ -1025,7 +1025,7 @@ fallback = foldQuery(fallback, [
         'b'
     ]
 ]), 'fq2', fallbackOffers);
-assert.equal(canIssueOfferCheckV2(fallback, ws(3, [
+assert.equal(canIssueOfferCheck(fallback, ws(3, [
     'a',
     'b'
 ], [
@@ -1034,7 +1034,7 @@ assert.equal(canIssueOfferCheckV2(fallback, ws(3, [
         'b'
     ]
 ]), 'b:ratepkg-1', versionFor('b:ratepkg-1')).ok, true);
-let exhausted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(ws(0, [
+let exhausted = recordOfferCheckIssued(createAvailabilityPolicy(ws(0, [
     'x'
 ], [
     [
@@ -1049,7 +1049,7 @@ let exhausted = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(ws(0, [
         'x'
     ]
 ]), 'x1', versionFor('x1'), 'ex1');
-exhausted = recordOfferCheckReceiptV2(exhausted, ws(1, [
+exhausted = recordOfferCheckReceipt(exhausted, ws(1, [
     'x'
 ], [
     [
@@ -1059,7 +1059,7 @@ exhausted = recordOfferCheckReceiptV2(exhausted, ws(1, [
 ]), receipt('ex1', 1, 'x1'), 'ex1', 'x1', versionFor('x1'), 0);
 assert.equal(exhausted.terminal, undefined);
 assert.equal(exhausted.hotels.x?.freshOffersRequired, true);
-exhausted = recordOffersQueryIssuedV2(exhausted, [
+exhausted = recordOffersQueryIssued(exhausted, [
     'x'
 ], ws(1, [
     'x'
@@ -1087,7 +1087,7 @@ exhausted = foldQuery(exhausted, [
 ], []), 'exq', exhaustedReceipt);
 assert.equal(exhausted.hotels.x?.generationNo, 2);
 assert.equal(exhausted.terminal?.code, 'availability_exhausted_complete');
-assert.throws(()=>recordOfferCheckIssuedV2(exhausted, ws(2, [
+assert.throws(()=>recordOfferCheckIssued(exhausted, ws(2, [
         'x'
     ], []), 'x1', versionFor('x1'), 'after-terminal'), /availability_terminal/);
 {
@@ -1106,8 +1106,8 @@ assert.throws(()=>recordOfferCheckIssuedV2(exhausted, ws(2, [
         'candidate-a',
         'candidate-b'
     ]);
-    let candidateState = recordOfferCheckIssuedV2(createAvailabilityPolicyV2(candidateWorkspace), candidateWorkspace, 'candidate-a', versionFor('candidate-a'), 'candidate-a-check');
-    candidateState = recordOfferCheckReceiptV2(candidateState, ws(1, [
+    let candidateState = recordOfferCheckIssued(createAvailabilityPolicy(candidateWorkspace), candidateWorkspace, 'candidate-a', versionFor('candidate-a'), 'candidate-a-check');
+    candidateState = recordOfferCheckReceipt(candidateState, ws(1, [
         'candidate-hotel'
     ], [
         [
@@ -1143,12 +1143,12 @@ assert.throws(()=>recordOfferCheckIssuedV2(exhausted, ws(2, [
         'candidate-a',
         'candidate-b'
     ], 1);
-    candidateState = recordOffersQueryIssuedV2(candidateState, [
+    candidateState = recordOffersQueryIssued(candidateState, [
         'candidate-hotel'
     ], queryWorkspace, 'candidate-query');
-    candidateState = recordOffersGenerationV2(candidateState, [
+    candidateState = recordOffersGeneration(candidateState, [
         'candidate-hotel'
-    ], queryWorkspace, 'candidate-query', digestV2(candidateQueryReceipt), candidateQueryReceipt);
+    ], queryWorkspace, 'candidate-query', digest(candidateQueryReceipt), candidateQueryReceipt);
     assert.equal(candidateState.hotels['candidate-hotel']?.currentOfferRefs.includes('candidate-a'), false, 'unavailable A@v1 is not re-admitted by a same-hotel candidate query');
     assert.deepEqual(candidateState.hotels['candidate-hotel']?.currentOfferRefs, [
         'candidate-b'
@@ -1164,10 +1164,10 @@ assert.throws(()=>recordOfferCheckIssuedV2(exhausted, ws(2, [
     ], [
         'candidate-b'
     ]);
-    assert.equal(canIssueOfferCheckV2(candidateState, bWorkspace, 'candidate-b', versionFor('candidate-b')).ok, true, 'B@v1 is recheckable after A@v1 unavailable');
-    candidateState = recordOfferCheckIssuedV2(candidateState, bWorkspace, 'candidate-b', versionFor('candidate-b'), 'candidate-b-check');
+    assert.equal(canIssueOfferCheck(candidateState, bWorkspace, 'candidate-b', versionFor('candidate-b')).ok, true, 'B@v1 is recheckable after A@v1 unavailable');
+    candidateState = recordOfferCheckIssued(candidateState, bWorkspace, 'candidate-b', versionFor('candidate-b'), 'candidate-b-check');
     const bVerified = verifiedCapability('candidate-b', versionFor('candidate-b'));
-    candidateState = recordOfferCheckReceiptV2(candidateState, ws(3, [
+    candidateState = recordOfferCheckReceipt(candidateState, ws(3, [
         'candidate-hotel'
     ], [
         [
@@ -1178,17 +1178,17 @@ assert.throws(()=>recordOfferCheckIssuedV2(exhausted, ws(2, [
         'candidate-b'
     ], bVerified), receipt('candidate-b-check', 3, 'candidate-b', 'applied', true), 'candidate-b-check', 'candidate-b', versionFor('candidate-b'), 2);
     assert.equal(candidateState.terminal?.code, 'availability_confirmed', 'recheck of B@v1 can confirm after A@v1 unavailable');
-}console.log('BOOKING COPILOT AVAILABILITY POLICY V2: admission, criteria CAS, stale no-generation, invalidation, cursor fallback, exhaustion, absorbing terminal OK');
+}console.log('BOOKING COPILOT AVAILABILITY POLICY: admission, criteria CAS, stale no-generation, invalidation, cursor fallback, exhaustion, absorbing terminal OK');
 const ledgerRoot = mkdtempSync(join(tmpdir(), 'gotry-availability-proof-'));
 const ledger = ensureLedger(ledgerRoot);
-const runtime = new BookingCopilotTaskRuntimeV2(ledger, {
+const runtime = new BookingCopilotTaskRuntime(ledger, {
     contextRefFactory: ()=>'ctx-availability'
 });
 const runtimeWorkspace = ws(0, [
     'rh'
 ], []);
 runtime.startTask({
-    schemaVersion: 'booking.surface.v2',
+    schemaVersion: 'booking.surface',
     kind: 'user.turn',
     taskId: 'runtime-availability',
     turnId: 'turn-1',
@@ -1198,7 +1198,7 @@ runtime.startTask({
     }
 });
 const query = {
-    schemaVersion: 'booking.surface.v2',
+    schemaVersion: 'booking.surface',
     kind: 'offers.query',
     actionId: 'rq-1',
     contextRef: 'ctx-availability',
@@ -1214,7 +1214,7 @@ const query = {
 };
 runtime.issueOperation('runtime-availability', query);
 runtime.continueWithReceipt({
-    schemaVersion: 'booking.surface.v2',
+    schemaVersion: 'booking.surface',
     kind: 'action.receipt.continuation',
     taskId: 'runtime-availability',
     workspace: ws(1, [
@@ -1226,7 +1226,7 @@ runtime.continueWithReceipt({
         ]
     ]),
     receipt: {
-        schemaVersion: 'booking.surface.v2',
+        schemaVersion: 'booking.surface',
         kind: 'action.receipt',
         actionId: 'rq-1',
         contextRef: 'ctx-availability',
@@ -1253,7 +1253,7 @@ runtime.continueWithReceipt({
     }
 });
 const check = {
-    schemaVersion: 'booking.surface.v2',
+    schemaVersion: 'booking.surface',
     kind: 'offer.check',
     actionId: 'rc-1',
     contextRef: 'ctx-availability',
@@ -1268,12 +1268,12 @@ const check = {
 runtime.issueOperation('runtime-availability', check);
 runtime.issueOperation('runtime-availability', check);
 assert.equal(runtime.resumeTask('runtime-availability')?.availability.attempts.length, 1);
-const restarted = new BookingCopilotTaskRuntimeV2(ensureLedger(ledgerRoot), {
+const restarted = new BookingCopilotTaskRuntime(ensureLedger(ledgerRoot), {
     contextRefFactory: ()=>'ctx-availability'
 });
 assert.equal(restarted.resumeTask('runtime-availability')?.availability.attempts[0]?.actionId, 'rc-1');
 runtime.continueWithReceipt({
-    schemaVersion: 'booking.surface.v2',
+    schemaVersion: 'booking.surface',
     kind: 'action.receipt.continuation',
     taskId: 'runtime-availability',
     workspace: ws(2, [
@@ -1296,14 +1296,14 @@ const query2 = {
 };
 runtime.issueOperation('runtime-availability', query2);
 runtime.continueWithReceipt({
-    schemaVersion: 'booking.surface.v2',
+    schemaVersion: 'booking.surface',
     kind: 'action.receipt.continuation',
     taskId: 'runtime-availability',
     workspace: ws(3, [
         'rh'
     ], []),
     receipt: {
-        schemaVersion: 'booking.surface.v2',
+        schemaVersion: 'booking.surface',
         kind: 'action.receipt',
         actionId: 'rq-2',
         contextRef: 'ctx-availability',
@@ -1329,7 +1329,7 @@ runtime.continueWithReceipt({
 });
 assert.equal(runtime.resumeTask('runtime-availability')?.phase, 'terminal');
 const eventCount = ledger.countEvents();
-const terminalBatchPayload = ledger.db.prepare("SELECT payload FROM events WHERE kind = 'booking.copilot.v2.decision.batch' ORDER BY seq DESC LIMIT 1").get();
+const terminalBatchPayload = ledger.db.prepare("SELECT payload FROM events WHERE kind = 'booking.copilot.decision.batch' ORDER BY seq DESC LIMIT 1").get();
 const terminalBatch = JSON.parse(terminalBatchPayload.payload);
 assert.deepEqual(runtime.terminalDecisionBatch('runtime-availability', terminalBatch.requestKey), terminalBatch.events);
 assert.deepEqual(runtime.terminalDecisionBatch('runtime-availability', terminalBatch.requestKey), terminalBatch.events, 'exact terminal batch replay is read-only');
@@ -1352,4 +1352,4 @@ rmSync(ledgerRoot, {
 });
 
 
-//# sourceURL=ts/scripts/booking-copilot-availability-policy-v2-tests.ts
+//# sourceURL=ts/scripts/booking-copilot-availability-policy-tests.ts