@curless/hotel-storefront 0.12.0 → 0.13.1

package/dist/card.generated.js.map

@@ -1 +1 @@
-{"version":3,"file":"card.generated.js","sourceRoot":"","sources":["../src/card.generated.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,wEAAwE;AACxE,gFAAgF;AAChF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,eAAe,GAAW,MAAM,CAAC,IAAI,CAChD,0nkVAA0nkV,EAC1nkV,QAAQ,CACT,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAEnB,2FAA2F;AAC3F,MAAM,CAAC,MAAM,qBAAqB,GAChC,kEAAkE,CAAC"}
+{"version":3,"file":"card.generated.js","sourceRoot":"","sources":["../src/card.generated.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,wEAAwE;AACxE,gFAAgF;AAChF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,eAAe,GAAW,MAAM,CAAC,IAAI,CAChD,s7uVAAs7uV,EACt7uV,QAAQ,CACT,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAEnB,2FAA2F;AAC3F,MAAM,CAAC,MAAM,qBAAqB,GAChC,kEAAkE,CAAC"}

package/dist/demo-hotels.d.ts

@@ -1,5 +1,5 @@
 import type { HotelBackend } from './backend.js';
-import type { Booking, ExtraKind, HotelPolicyTopic } from './types.js';
+import type { Booking, ExtraKind, HotelPolicyTopic, TripLine } from './types.js';
 /**
  * The hotels, out of a JSON file, priced by us.
  *
@@ -112,7 +112,7 @@ export type RawHotelData = {
     membership?: RawMembership;
 };
 export type DemoError = Error & {
-    code: 'not-found' | 'bad-stay' | 'unavailable' | 'mixed-currency' | 'empty-trip' | 'no-guest';
+    code: 'not-found' | 'bad-stay' | 'unavailable' | 'mixed-currency' | 'empty-trip' | 'no-guest' | 'partly-unavailable';
 };
 export declare const demoError: (code: DemoError["code"], message: string) => DemoError;
 export type DemoHotelsOptions = {
@@ -126,6 +126,20 @@ export type DemoHotelsOptions = {
 type StoredBooking = Booking & {
     sessionId: string;
 };
+/**
+ * A trip cut into the stays a hotel would confirm one by one: the rooms at one
+ * hotel for the same nights, and the add-ons bought for those nights.
+ *
+ * An add-on goes with the stay at its hotel whose nights hold its day, else
+ * the first stay there. One at a hotel the trip holds no room at is an orphan -
+ * it would otherwise ride along on another hotel's booking.
+ */
+export declare const splitByStay: (lines: TripLine[]) => {
+    groups: TripLine[][];
+    orphans: Extract<TripLine, {
+        kind: "extra";
+    }>[];
+};
 export declare const createDemoHotels: (opts: DemoHotelsOptions) => HotelBackend & {
     /** For the tools: the same clock the prices were computed against. */
     today(hotelId?: string): string;

package/dist/demo-hotels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"demo-hotels.d.ts","sourceRoot":"","sources":["../src/demo-hotels.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"demo-hotels.d.ts","sourceRoot":"","sources":["../src/demo-hotels.ts"],"names":[],"mappings":"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"}

package/dist/demo-hotels.js

@@ -30,6 +30,43 @@ const HOLD_STOPS_BEFORE_ARRIVAL_MS = 2 * 3_600_000;
 const CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
 /** Only ever used for an empty trip, which has no hotel to take a currency from. */
 const DEFAULT_CURRENCY = 'HKD';
+/**
+ * A trip cut into the stays a hotel would confirm one by one: the rooms at one
+ * hotel for the same nights, and the add-ons bought for those nights.
+ *
+ * An add-on goes with the stay at its hotel whose nights hold its day, else
+ * the first stay there. One at a hotel the trip holds no room at is an orphan -
+ * it would otherwise ride along on another hotel's booking.
+ */
+export const splitByStay = (lines) => {
+    const stays = [];
+    for (const l of lines) {
+        if (l.kind !== 'room')
+            continue;
+        const same = stays.find((g) => g.hotelId === l.hotelId &&
+            g.stay.checkIn === l.stay.checkIn &&
+            g.stay.checkOut === l.stay.checkOut);
+        if (same)
+            same.lines.push(l);
+        else
+            stays.push({ hotelId: l.hotelId, stay: l.stay, lines: [l] });
+    }
+    const orphans = [];
+    for (const l of lines) {
+        if (l.kind !== 'extra')
+            continue;
+        const here = stays.filter((g) => g.hotelId === l.hotelId);
+        const day = l.day;
+        const home = (day ? here.find((g) => g.stay.checkIn <= day && day <= g.stay.checkOut) : undefined) ??
+            here[0];
+        if (home)
+            home.lines.push(l);
+        else
+            orphans.push(l);
+    }
+    stays.sort((a, b) => a.stay.checkIn.localeCompare(b.stay.checkIn));
+    return { groups: stays.map((g) => g.lines), orphans };
+};
 export const createDemoHotels = (opts) => {
     const hotels = opts.data.hotels;
     const now = opts.now ?? (() => Date.now());
@@ -250,11 +287,26 @@ export const createDemoHotels = (opts) => {
             return undefined;
         return { kinds, ...(arrivingAt ? { arrivingAt } : {}), ...(note ? { note } : {}) };
     };
-    const confirmationCode = () => {
+    /**
+     * A code nobody else holds. ⚠️ UNIQUE, NOT JUST RANDOM: a code is how a
+     * booking is found, and a trip of two stays asks for two at once - two
+     * bookings under one code would be the second one cancelled by the first's.
+     */
+    const confirmationCode = (alsoTaken) => {
+        const inUse = (code) => alsoTaken.has(code) || [...bookings.values()].some((b) => b.confirmationCode === code);
         let out = '';
-        for (let i = 0; i < 6; i += 1)
-            out += CODE_ALPHABET[Math.floor(rng() * CODE_ALPHABET.length)] ?? 'X';
-        return `SL-${out}`;
+        for (let attempt = 0; attempt < 20; attempt += 1) {
+            out = '';
+            for (let i = 0; i < 6; i += 1)
+                out += CODE_ALPHABET[Math.floor(rng() * CODE_ALPHABET.length)] ?? 'X';
+            if (!inUse(`SL-${out}`))
+                return `SL-${out}`;
+        }
+        // A generator that keeps repeating itself (a test's fixed one) still has
+        // to give each booking its own.
+        for (let n = 1;; n += 1)
+            if (!inUse(`SL-${out}${n}`))
+                return `SL-${out}${n}`;
     };
     const mine = (b, who) => b.sessionId === who.sessionId ||
         (!!who.email && b.guest.email.toLowerCase() === who.email.toLowerCase());
@@ -281,6 +333,8 @@ export const createDemoHotels = (opts) => {
         // What the tier took off, added up as we go - so the card can say what
         // membership was worth on THIS trip rather than quoting a percentage.
         let saved = 0;
+        // Rooms this same trip has already taken, by hotel, room type and night.
+        const taken = new Map();
         for (const line of trip.lines) {
             const h = byId(line.hotelId);
             if (!h) {
@@ -312,15 +366,25 @@ export const createDemoHotels = (opts) => {
                 }
                 const room = priceRoom(h, raw, line.stay, who, ignore);
                 const wanted = Math.max(1, Math.floor(line.rooms ?? 1));
-                if (room.roomsLeft < wanted) {
+                // ⚠️ AND THIS TRIP'S OWN EARLIER LINES. `priceRoom` counts every other
+                // booking; two lines of one trip for the same room on overlapping
+                // nights it does not, and the one suite a hotel has was held twice for
+                // the night they shared (2026-09-28 audit).
+                const held = eachNight(line.stay.checkIn, line.stay.checkOut).map((n) => `${h.id}|${raw.id}|${n}`);
+                const left = Math.max(0, room.roomsLeft - Math.max(0, ...held.map((k) => taken.get(k) ?? 0)));
+                if (left < wanted) {
                     dropped.push({
                         title: `${h.name} - ${raw.name}`,
-                        why: room.roomsLeft === 0
-                            ? 'That room has gone since it went into the trip.'
-                            : `Only ${room.roomsLeft} of that room is left and the trip asks for ${wanted}.`,
+                        why: left === 0
+                            ? room.roomsLeft === 0
+                                ? 'That room has gone since it went into the trip.'
+                                : 'This trip already holds the last of that room on one of those nights.'
+                            : `Only ${left} of that room is left and the trip asks for ${wanted}.`,
                     });
                     continue;
                 }
+                for (const k of held)
+                    taken.set(k, (taken.get(k) ?? 0) + wanted);
                 if (raw.sleeps < line.stay.guests) {
                     dropped.push({
                         title: `${h.name} - ${raw.name}`,
@@ -364,8 +428,11 @@ export const createDemoHotels = (opts) => {
                 });
                 continue;
             }
-            const roomStay = trip.lines.find((l) => l.kind === 'room' && l.hotelId === h.id);
-            const stay = roomStay && roomStay.kind === 'room' ? roomStay.stay : undefined;
+            // The stay it belongs to: the room at this hotel whose nights hold its
+            // day, and the first one here when it names no day.
+            const here = trip.lines.flatMap((l) => l.kind === 'room' && l.hotelId === h.id ? [l.stay] : []);
+            const day = line.day;
+            const stay = (day ? here.find((s) => s.checkIn <= day && day <= s.checkOut) : undefined) ?? here[0];
             const extra = toExtra(h, rawExtra);
             const units = extraUnits(rawExtra, stay, line.quantity);
             const total = multiplyMoney(extra.price, units);
@@ -379,6 +446,7 @@ export const createDemoHotels = (opts) => {
                 title: extra.name,
                 detail: extra.description,
                 quantity: units,
+                ordered: Math.max(1, line.quantity),
                 unit: extra.price,
                 total,
                 day: line.day ?? (stay && rawExtra.when === 'departure' ? stay.checkOut : stay?.checkIn),
@@ -423,6 +491,141 @@ export const createDemoHotels = (opts) => {
                 : {}),
         };
     };
+    /**
+     * The booking's lines on new nights, each room keeping its own type and
+     * count unless `single` says otherwise.
+     *
+     * ⚠️ EACH LINE ITS OWN. This wrote every line with the first line's room and
+     * count, so a booking of a Deluxe and a Suite came back as two Deluxes.
+     */
+    const linesOn = (b, stay, single) => {
+        const shift = nightsBetween(b.stay.checkIn, stay.checkIn);
+        return b.quote.lines.map((l) => {
+            if (l.kind === 'room')
+                return {
+                    kind: 'room',
+                    hotelId: l.hotelId,
+                    roomId: single?.roomId ?? String(l.roomRef),
+                    rooms: single?.rooms ?? l.quantity ?? 1,
+                    stay: { ...stay, guests: l.stay?.guests ?? stay.guests },
+                };
+            // An add-on keeps its place in the stay: a dinner on the second night is
+            // still on the second night after the stay moves.
+            const day = l.day ? addDays(l.day, shift) : undefined;
+            return {
+                kind: 'extra',
+                hotelId: l.hotelId,
+                extraId: String(l.extraRef ?? ''),
+                quantity: l.ordered ?? l.quantity ?? 1,
+                ...(day && stay.checkIn <= day && day <= stay.checkOut ? { day } : {}),
+            };
+        });
+    };
+    /**
+     * A change, worked out whole: what the preview shows AND the quote the change
+     * would store, from one computation.
+     *
+     * ⚠️ ONE NUMBER, NOT TWO. The preview used to price only the first room and
+     * compare it with the whole booking - add-ons and all - so "HK$13,141.90
+     * more" was confirmed and HK$14,554.40 more was stored. The guest agrees to
+     * a figure; the figure has to be the one that is kept.
+     */
+    const planChange = async (b, change, who) => {
+        const h = byId(b.hotelId);
+        const rooms = b.quote.lines.filter((l) => l.kind === 'room' && l.roomRef);
+        const [line] = rooms;
+        const from = {
+            stay: b.stay,
+            rooms: rooms.reduce((n, l) => n + (l.quantity ?? 1), 0) || 1,
+            roomName: rooms.map((l) => l.title).join(' + ') || 'the room',
+            total: b.quote.total,
+        };
+        const base = {
+            bookingId: b.id,
+            confirmationCode: b.confirmationCode,
+            hotelName: b.hotelName,
+            from,
+        };
+        const no = (rule) => ({ preview: { ...base, changeable: false, rule } });
+        if (b.status !== 'requested' && b.status !== 'confirmed')
+            return no(`This booking is ${b.status}; there is nothing left to change.`);
+        if (!h || !line?.roomRef)
+            return no('This booking has no room line to change.');
+        // ⚠️ A NON-REFUNDABLE RATE CANNOT BE MOVED EITHER - ANY ROOM ON IT. The
+        // hotel's own words are "cannot be cancelled or changed"; offering a change
+        // would be this card contradicting the policy on the screen beside it.
+        const locked = rooms.find((l) => h.rooms.find((r) => r.id === l.roomRef)?.refundable === false);
+        if (locked)
+            return no(`${locked.title} is a non-refundable rate: it cannot be cancelled or changed. Book the new nights as their own stay - this one stands.`);
+        if (rooms.length > 1 && (change.room !== undefined || change.rooms !== undefined))
+            return no(`This booking holds ${rooms.length} room types (${from.roomName}). A change of room type or of how many works on a booking of one; the dates can still move, or cancel it and book again.`);
+        const raw = h.rooms.find((r) => r.id === line.roomRef);
+        let wantedRoom = raw;
+        if (change.room) {
+            // ⚠️ A NAME THAT MATCHES NOTHING IS NOT "THE SAME ROOM". It fell back to
+            // the current room, and the guest who asked for a suite was shown a
+            // preview of the room they already had.
+            wantedRoom = roomOf(h, change.room);
+            if (!wantedRoom)
+                return no(`No room type at ${h.name} answers to "${change.room}".`);
+        }
+        if (!wantedRoom)
+            return no('That room type is no longer listed.');
+        const stay = {
+            checkIn: change.checkIn ?? b.stay.checkIn,
+            checkOut: change.checkOut ?? b.stay.checkOut,
+            guests: b.stay.guests,
+        };
+        const count = Math.max(1, Math.min(MAX_ROOMS_PER_LINE, Math.floor(change.rooms ?? line.quantity ?? 1)));
+        const problem = stayProblem(stay, today(h.id));
+        if (problem)
+            return no(problem);
+        const sameNights = stay.checkIn === b.stay.checkIn && stay.checkOut === b.stay.checkOut;
+        if (sameNights &&
+            (rooms.length > 1 || (count === (line.quantity ?? 1) && wantedRoom.id === line.roomRef)))
+            return no('That is what this booking already holds.');
+        // What is left for the NEW nights with this booking left out of the count:
+        // a guest moving from two rooms to three must not be refused by the two
+        // they are giving back. ⚠️ LEFT OUT, NOT ADDED BACK. By night, this
+        // booking holds rooms only on the nights it already covers; adding its
+        // rooms back across the whole new stay would count rooms it never held
+        // on the nights that do not overlap.
+        const one = rooms.length === 1;
+        const left = priceRoom(h, wantedRoom, stay, who, b.id).roomsLeft;
+        if (one && left < count)
+            return no(`${wantedRoom.name} has ${left} left for ${stay.checkIn} to ${stay.checkOut}; this change needs ${count}.`);
+        const quote = await quoteTrip({ lines: linesOn(b, stay, one ? { roomId: wantedRoom.id, rooms: count } : undefined) }, who, b.id);
+        const lost = quote.dropped?.[0];
+        if (lost || !quote.lines.some((l) => l.kind === 'room'))
+            return no(lost
+                ? `${lost.title}: ${lost.why}`
+                : 'The rooms on this booking could not be held for the new nights.');
+        const becomesLocked = wantedRoom.id !== line.roomRef && !wantedRoom.refundable;
+        return {
+            preview: {
+                ...base,
+                to: {
+                    stay,
+                    rooms: one ? count : from.rooms,
+                    roomName: one ? wantedRoom.name : from.roomName,
+                    total: quote.total,
+                },
+                difference: money(quote.total.minor - from.total.minor, quote.total.currency),
+                changeable: true,
+                roomsLeft: left,
+                rule: [
+                    `The new nights are priced at today's rates for those nights, not at the rate this booking was made on.`,
+                    'Nothing has been charged, so a difference is what the desk asks for - or gives back - at check-in.',
+                    becomesLocked
+                        ? `${wantedRoom.name} is a non-refundable rate: once the booking is on it, it cannot be cancelled or changed.`
+                        : '',
+                ]
+                    .filter(Boolean)
+                    .join(' '),
+            },
+            quote,
+        };
+    };
     /** What cancelling this booking costs, line by line, in the hotel's own terms. */
     const feeFor = (b, at) => {
         const currency = b.quote.total.currency;
@@ -637,7 +840,6 @@ export const createDemoHotels = (opts) => {
             return memberFor(number, surname);
         },
         async requestBooking(trip, guest, who, requests) {
-            const quote = await quoteTrip(trip, who);
             // ⚠️ A ROOM HELD FOR NOBODY. The tool's schema says name and email are
             // required, but a schema is what the model is TOLD, not what it must do -
             // `request_booking {}` came back with a confirmation code and
@@ -648,33 +850,54 @@ export const createDemoHotels = (opts) => {
             if (!guest.name.trim() || !guest.email.includes('@')) {
                 throw demoError('no-guest', "A booking needs the guest's name and an email to send it to.");
             }
-            const [firstRoom] = quote.lines.filter((l) => l.kind === 'room');
-            const first = firstRoom ? byId(firstRoom.hotelId) : undefined;
-            const stay = quote.stay;
-            if (!firstRoom || !first || !stay) {
-                throw demoError('empty-trip', quote.dropped?.[0]?.why ??
+            const whole = await quoteTrip(trip, who);
+            if (!whole.lines.some((l) => l.kind === 'room')) {
+                throw demoError('empty-trip', whole.dropped?.[0]?.why ??
                     'There are no room nights in this trip, so there is nothing to book.');
             }
-            const arrival = arrivalInstant(stay.checkIn, first.checkInFrom ?? '15:00', offsetOf(first));
+            // ⚠️ ALL OF IT OR NONE OF IT - see the seam. This used to book whatever
+            // still priced and clear the trip, so a Beijing suite that went while
+            // the guest was typing their name was simply not there any more.
+            const { groups, orphans } = splitByStay(trip.lines);
+            const problems = [
+                ...(whole.dropped ?? []).map((d) => `${d.title}: ${d.why}`),
+                ...orphans.map((l) => `${byId(l.hotelId)?.name ?? l.hotelId} - ${l.extraId}: an add-on here needs a room night at the same hotel in this trip.`),
+            ];
+            if (problems.length) {
+                throw demoError('partly-unavailable', `Nothing was booked. ${problems.join(' ')} The trip is as it was - take that out or change it, then ask again.`);
+            }
+            const quotes = await Promise.all(groups.map((g) => quoteTrip({ lines: g }, who)));
             const t = now();
-            const holdUntil = new Date(Math.max(t + 3_600_000, Math.min(t + holdMs, arrival - HOLD_STOPS_BEFORE_ARRIVAL_MS))).toISOString();
-            seq += 1;
-            const booking = {
-                id: `bk_${Date.now().toString(36)}_${seq}`,
-                confirmationCode: confirmationCode(),
-                status: 'requested',
-                createdAt: new Date(t).toISOString(),
-                holdUntil,
-                hotelId: first.id,
-                hotelName: first.name,
-                stay,
-                guest,
-                quote,
-                sessionId: who.sessionId,
-                ...(cleanRequests(requests) ? { requests: cleanRequests(requests) } : {}),
-            };
-            bookings.set(booking.id, booking);
-            return { ...booking };
+            const made = [];
+            for (const quote of quotes) {
+                const [firstRoom] = quote.lines.filter((l) => l.kind === 'room');
+                const h = firstRoom ? byId(firstRoom.hotelId) : undefined;
+                if (!firstRoom || !h || !quote.stay || quote.dropped?.length) {
+                    // Every line priced a moment ago as part of the whole trip; a stay
+                    // that does not now is a bug, and still books nothing.
+                    throw demoError('partly-unavailable', 'Nothing was booked: the trip changed while it was being held.');
+                }
+                const arrival = arrivalInstant(quote.stay.checkIn, h.checkInFrom ?? '15:00', offsetOf(h));
+                const holdUntil = new Date(Math.max(t + 3_600_000, Math.min(t + holdMs, arrival - HOLD_STOPS_BEFORE_ARRIVAL_MS))).toISOString();
+                seq += 1;
+                made.push({
+                    id: `bk_${Date.now().toString(36)}_${seq}`,
+                    confirmationCode: confirmationCode(new Set(made.map((m) => m.confirmationCode))),
+                    status: 'requested',
+                    createdAt: new Date(t).toISOString(),
+                    holdUntil,
+                    hotelId: h.id,
+                    hotelName: h.name,
+                    stay: quote.stay,
+                    guest,
+                    quote,
+                    sessionId: who.sessionId,
+                    ...(cleanRequests(requests) ? { requests: cleanRequests(requests) } : {}),
+                });
+            }
+            for (const booking of made)
+                bookings.set(booking.id, booking);
+            return made.map((booking) => ({ ...booking }));
         },
         async listBookings(who, limit = 10) {
             sweep();
@@ -698,107 +921,17 @@ export const createDemoHotels = (opts) => {
             const b = findBooking(bookingRef, who);
             if (!b)
                 return null;
-            const h = byId(b.hotelId);
-            const line = b.quote.lines.find((l) => l.kind === 'room');
-            const from = {
-                stay: b.stay,
-                rooms: line?.quantity ?? 1,
-                roomName: line?.title ?? 'the room',
-                total: b.quote.total,
-            };
-            const base = {
-                bookingId: b.id,
-                confirmationCode: b.confirmationCode,
-                hotelName: b.hotelName,
-                from,
-            };
-            const no = (rule) => ({ ...base, changeable: false, rule });
-            if (b.status !== 'requested' && b.status !== 'confirmed')
-                return no(`This booking is ${b.status}; there is nothing left to change.`);
-            if (!h || !line?.roomRef)
-                return no('This booking has no room line to change.');
-            const raw = h.rooms.find((r) => r.id === line.roomRef);
-            // ⚠️ A NON-REFUNDABLE RATE CANNOT BE MOVED EITHER. The hotel's own words
-            // are "cannot be cancelled or changed"; offering a change would be this
-            // card contradicting the policy on the screen beside it.
-            if (raw && !raw.refundable)
-                return no(`${line.title} is a non-refundable rate: it cannot be cancelled or changed. Book the new nights as their own stay - this one stands.`);
-            const wantedRoom = change.room ? (roomOf(h, change.room) ?? raw) : raw;
-            if (!wantedRoom)
-                return no('No room type here answers to that.');
-            const stay = {
-                checkIn: change.checkIn ?? b.stay.checkIn,
-                checkOut: change.checkOut ?? b.stay.checkOut,
-                guests: b.stay.guests,
-            };
-            const rooms = Math.max(1, Math.min(MAX_ROOMS_PER_LINE, Math.floor(change.rooms ?? from.rooms)));
-            const problem = stayProblem(stay, today(h.id));
-            if (problem)
-                return no(problem);
-            if (stay.checkIn === b.stay.checkIn &&
-                stay.checkOut === b.stay.checkOut &&
-                rooms === from.rooms &&
-                wantedRoom.id === line.roomRef)
-                return no('That is what this booking already holds.');
-            // What is left for the NEW nights with this booking left out of the count:
-            // a guest moving from two rooms to three must not be refused by the two
-            // they are giving back. ⚠️ LEFT OUT, NOT ADDED BACK. By night, this
-            // booking holds rooms only on the nights it already covers; adding its
-            // rooms back across the whole new stay would count rooms it never held
-            // on the nights that do not overlap.
-            const priced = priceRoom(h, wantedRoom, stay, who, b.id);
-            const left = priced.roomsLeft;
-            if (left < rooms)
-                return no(`${wantedRoom.name} has ${left} left for ${stay.checkIn} to ${stay.checkOut}; this change needs ${rooms}.`);
-            const total = multiplyMoney(priced.stayTotal, rooms);
-            return {
-                ...base,
-                to: { stay, rooms, roomName: wantedRoom.name, total },
-                difference: money(total.minor - from.total.minor, total.currency),
-                changeable: true,
-                roomsLeft: left,
-                rule: [
-                    `The new nights are priced at today's rates for those nights, not at the rate this booking was made on.`,
-                    'Nothing has been charged, so a difference is what the desk asks for - or gives back - at check-in.',
-                ].join(' '),
-            };
+            return (await planChange(b, change, who)).preview;
         },
         async changeBooking(bookingRef, change, who) {
-            const preview = await this.previewChange(bookingRef, change, who);
-            if (!preview)
-                return null;
-            if (!preview.changeable || !preview.to)
-                throw demoError('unavailable', preview.rule);
+            sweep();
             const b = findBooking(bookingRef, who);
-            const h = b ? byId(b.hotelId) : undefined;
-            const line = b?.quote.lines.find((l) => l.kind === 'room');
-            if (!b || !h || !line?.roomRef)
+            if (!b)
                 return null;
-            const room = change.room ? (roomOf(h, change.room) ?? undefined) : undefined;
-            // Re-quote the whole booking, so add-on lines move with the nights they
-            // were bought for rather than being silently dropped or double-counted.
-            const lines = b.quote.lines.map((l) => l.kind === 'room'
-                ? {
-                    kind: 'room',
-                    hotelId: b.hotelId,
-                    roomId: room?.id ?? String(l.roomRef),
-                    rooms: preview.to?.rooms ?? l.quantity ?? 1,
-                    stay: preview.to?.stay ?? b.stay,
-                }
-                : {
-                    kind: 'extra',
-                    hotelId: b.hotelId,
-                    extraId: String(l.extraRef ?? ''),
-                    quantity: l.quantity ?? 1,
-                    stay: preview.to?.stay ?? b.stay,
-                });
-            // Re-quoted with this booking left out of the count — the same rule the
-            // preview used. Counting it against itself here dropped the room line
-            // whenever the stock was tight, and saved a booking with no room in it.
-            const quote = await quoteTrip({ lines }, who, b.id);
-            if (!quote.lines.some((l) => l.kind === 'room')) {
-                throw demoError('unavailable', quote.dropped?.[0]?.why ?? 'The room could not be held for the new nights.');
-            }
+            // The very quote the preview showed is the one stored - see `planChange`.
+            const { preview, quote } = await planChange(b, change, who);
+            if (!preview.changeable || !preview.to || !quote)
+                throw demoError('unavailable', preview.rule);
             const updated = {
                 ...b,
                 stay: preview.to.stay,
@@ -826,7 +959,7 @@ export const createDemoHotels = (opts) => {
                 rule: cancellable
                     ? [
                         ...rules,
-                        'Nothing has been charged for this booking, so a fee above is what the hotel would put on the card at check-in time, not a refund we would keep.',
+                        'Nothing has been charged for this booking, so any fee is what the hotel would put on the card at check-in time, not a refund we would keep.',
                     ].join(' ')
                     : `This booking is ${b.status}; there is nothing left to cancel.`,
                 freeUntil,