@curless/hotel-storefront 0.47.8 → 0.48.0

package/dist/tools.js

@@ -1,7 +1,7 @@
 import { DEFAULT_PAGE, FULL_CAPABILITIES, LASTING_REQUESTS, MAX_PAGE, REQUEST_KINDS, REQUEST_NOTE_MAX, guestTooLong, unitWords, } from './backend.js';
 import { MAX_GUESTS, isDay, nights as nightsBetween } from './dates.js';
 import { FACILITIES } from './facilities.js';
-import { DESCRIPTION_MAX, POLICY_MAX, guestText, hotelText } from './fence.js';
+import { DESCRIPTION_MAX, POLICY_MAX, hotelText } from './fence.js';
 import { clockOf, minutesOf, startProblem, stayWords, windowWords } from './hourly.js';
 import { amountsIn, formatMoney, keepingAmounts, money, multiplyMoney, toMinor } from './money.js';
 import { namedExactly, roomNamesOf, roomTypeNamed, withTraditional } from './names.js';
@@ -431,7 +431,7 @@ const allTools = (n, v) => {
             // the guest for one question (robin, 2026-09-29, Opus in Claude.ai). The
             // reference apps do the same split: search without a card, present with
             // one.
-            description: `Reads up to ${LOOK_UP_MAX} ${v.nounPlural} - a \`city\`'s (or a country's), or the ones named in \`${v.nounPlural}\` - and returns them as text, with nothing drawn and nothing shown to the guest: each one's id, area, rating, description and amenities, its add-ons with their ids and prices, and, given \`checkIn\` and \`checkOut\`, its rooms priced for those nights with taxes in. It is how the ${v.nounPlural} of a day-by-day plan are chosen - for each part of the trip, those near where its days are spent; a city with a span of dates and 行程 is such a plan, also right after a list of ${v.nounPlural} - and the ids are the ones a comparison and a plan take.`,
+            description: `Reads up to ${LOOK_UP_MAX} ${v.nounPlural} - a \`city\`'s (or a country's), or the ones named in \`${v.nounPlural}\` - and returns them as text, with nothing drawn and nothing shown to the guest: each one's id, area, rating, description and amenities, its add-ons with their ids and prices, and, given \`checkIn\` and \`checkOut\`, its rooms priced for those nights with taxes in. It is how the ${v.nounPlural} of a day-by-day plan are chosen - for each part of the trip, those near where its days are spent (a week in a big city has two or three parts, its far-out days side by side with a ${v.noun} near them); a city with a span of dates and 行程 is such a plan, also right after a list of ${v.nounPlural} - and the ids are the ones a comparison and a plan take.`,
             annotations: reads(`Look up ${catalogue(v)}`, open),
             inputSchema: {
                 type: 'object',
@@ -740,7 +740,7 @@ const allTools = (n, v) => {
         },
         {
             name: n.itinerary,
-            description: `A day-by-day plan (行程) as one card - the card for a trip of several days, or for a guest who asks to have their days planned (a city with a span of dates and 行程 is one, also right after a list of ${v.nounPlural}): the days are laid out by where they are spent, and each part of the trip has a ${v.noun} near those days, chosen from the ${v.nounPlural} read up as text. A week in a big city is usually two or three stays: days more than about 45 minutes each way from the rest (a palace or park on the city's edge, a day out of town) have a ${v.noun} near them, with the reason in that day's \`why\`. Each day is checked against that place's closing days for its date (many museums close on Mondays). Each day carries its own label, an optional note, the moments of the day in order, and the ${v.nounPlural} and add-ons attached to it, with their details filled in from their own records - a ${v.noun} with its photograph and, given dates, the price of its nights. Each stay is marked with whether it is booked, in the trip or only in the plan, and the card says how many of each. Nothing is added to the trip.`,
+            description: `A day-by-day plan (行程) as one card - the card for a trip of several days, or for a guest who asks to have their days planned (a city with a span of dates and 行程 is one, also right after a list of ${v.nounPlural}): the days are laid out by where they are spent, and each part of the trip has a ${v.noun} near those days, chosen from the ${v.nounPlural} read up as text. A week in a big city is usually two or three stays: its far-out sights fall on neighbouring days, and those nights have a ${v.noun} near them, with the reason in that day's \`why\` (Beijing's Summer Palace, Yuanmingyuan, Fragrant Hills and the Peking and Tsinghua campuses - 颐和园, 圆明园, 香山, 北大清华 - are days side by side in the north-west); a day out of town, such as the Great Wall, is a day of its own, there and back. One ${v.noun} for the whole week is the plan when every day is within about 45 minutes of it, with the stay in two parts as the other way the reply names. Nothing here knows a sight's opening days: each day is drawn as it is given, with its date (many museums close on Mondays, the Palace Museum - 故宫 - among them). Each day carries its own label, an optional note, the moments of the day in order, and the ${v.nounPlural} and add-ons attached to it, with their details filled in from their own records - a ${v.noun} with its photograph and, given dates, the price of its nights. Each stay is marked with whether it is booked, in the trip or only in the plan, and the card says how many of each. Nothing is added to the trip.`,
             annotations: reads(v.market ? `Lay out an itinerary on ${v.brand}` : `Lay out a ${v.brand} itinerary`, open),
             inputSchema: {
                 type: 'object',
@@ -910,6 +910,20 @@ const allTools = (n, v) => {
                 type: 'object',
                 properties: {
                     ...guestProps,
+                    // The room the form shows, as pick_room returned it - see `pickChanged`.
+                    hotel: { type: 'string', description: `The ${v.noun} id on the form` },
+                    room: { type: 'string', description: 'The room type id on the form' },
+                    rooms: {
+                        type: 'integer',
+                        minimum: 1,
+                        maximum: MAX_ROOMS_PER_LINE,
+                        description: 'How many of that room type the form shows',
+                    },
+                    ...stayProps,
+                    startTime: {
+                        type: 'string',
+                        description: 'For a room by the hour: the start the form shows, HH:MM',
+                    },
                 },
                 required: ['name', 'email'],
             },
@@ -1177,6 +1191,13 @@ const BOOKING_SCHEMA = {
          * 2026-10-14).
          */
         failed: ARR,
+        /**
+         * The same stays for the same guest asked for again within minutes: the
+         * booking made then is the answer, and nothing new was booked.
+         */
+        repeat: BOOL,
+        /** A form whose room is no longer the one picked: the pick that would put it back (`pickChanged`). */
+        again: OBJ,
     },
     required: ['view'],
 };
@@ -1729,7 +1750,7 @@ const bookedLine = (deps, b) => {
             return `${total} in ${h.name}'s test system. **This is a test booking** - it holds no room for anyone, nothing is paid, now or at any hotel, and nobody needs to go there.`;
         return b.status === 'requested'
             ? `${total} all in, to be paid at the hotel. ${h.name} has not confirmed this booking yet - that takes up to eight minutes, and ${deps.tools.listBookings} shows when it has. Nothing has been charged.`
-            : `${total} all in, paid at the hotel. **Nothing has been charged here** - this is ${h.name}'s own reservation, kept until it is cancelled, and ${b.guest.name} pays at check-in.`;
+            : `${total} all in, paid at the hotel. **Nothing has been charged here** - this is ${h.name}'s own reservation, kept until it is cancelled, and the guest pays at check-in.`;
     }
     const lapses = b.holdUntilLocal
         ? `${b.holdUntilLocal} hotel time`
@@ -1738,7 +1759,7 @@ const bookedLine = (deps, b) => {
     // booking has no check-in, and saying so sent a guest towards a real desk.
     if (h.demo)
         return `${total} all in. **${demoBookingWords(h)}** Nothing has been charged and no card is needed. The demonstration hold lapses on its own at ${lapses}.`;
-    return `${total} all in. **Nothing has been charged** - the rooms are held until ${lapses}, and ${b.guest.name} presents a card at check-in.`;
+    return `${total} all in. **Nothing has been charged** - the rooms are held until ${lapses}, and the guest presents a card at check-in.`;
 };
 /** What a demonstration booking is, in one sentence - see `demoBookingNote`. */
 const demoBookingWords = (h) => `This is a demonstration booking: ${h.name} has not received it and is not holding any room.`;
@@ -1941,6 +1962,8 @@ const readRequests = (args) => {
         dropped,
     };
 };
+/** Said of a booking that carries the guest's note - see `requestLines`. */
+export const NOTE_PASSED = 'A note from the guest was passed to the hotel.';
 /**
  * The sentences a booking's requests earn, in the order a guest reads them.
  *
@@ -1962,8 +1985,12 @@ const requestLines = (b, dropped, checkInFrom) => {
             : REQUEST_WORDS[k]);
         out.push(`Asked for on the booking: ${words.join(', ')}. The desk meets what it can on the day; none of it is held.`);
     }
+    // ⚠️ THAT THERE IS A NOTE, NOT WHAT IT SAYS (2026-10-27 audit, F3): the
+    // guest's own words are theirs, typed on the card's form - the card shows
+    // them from `_meta` (server.ts, `guestsApart`), and the model is told only
+    // that one went to the hotel.
     if (r.note)
-        out.push(`Passed to the hotel:\n${guestText('note for the hotel', r.note, REQUEST_NOTE_MAX)}`);
+        out.push(NOTE_PASSED);
     if (r.kinds.includes('accessible-room')) {
         out.push(`An accessible room is a room type, and this booking does not hold one - ${b.hotelName} confirms accessible rooms directly, quoting ${b.confirmationCode}.`);
     }
@@ -2955,6 +2982,41 @@ const fitsManyOf = (deps, dropped) => dropped.flatMap((d) => d.candidates?.lengt
 const LONG_STAY_NIGHTS = 4;
 /** The other areas a long stay's answer names - one hotel each. */
 const OTHER_AREAS_MAX = 4;
+/**
+ * Every plan's answer ends with this: the card is the plan, and a correction
+ * found after drawing it is said, not drawn.
+ *
+ * ⚠️ ONE PLAN, ONE CARD - SAID WHERE THE MODEL READS IT LAST (the owner,
+ * 2026-10-26, live 0.47.8): the plan put the Palace Museum on a Monday, the
+ * model noticed after drawing it and drew the whole plan again - two plan
+ * cards in one answer, "以第二张卡片为准". The instructions and the description
+ * say to check closing days before drawing; this was said only in the answer
+ * of a long stay at one hotel. It is in every plan's answer now.
+ */
+export const PLAN_DRAWN_ONCE = 'The plan on the card is this one. Something to change that you notice now - a sight closed on its day, a day too far from its hotel - goes in your reply, not in another plan: the plan is drawn again only when the guest asks for the change.';
+/** An area's names as a day might say them: "Haidian", "海淀区" and "海淀". */
+const areaWords = (h) => {
+    const out = new Set();
+    for (const name of [h.area, ...Object.values(h.names?.area ?? {})]) {
+        const n = name?.trim();
+        if (!n)
+            continue;
+        out.add(n);
+        const short = n.replace(/\s+district$/i, '').replace(/区$/, '');
+        if (short.length >= 2)
+            out.add(short);
+    }
+    return [...out];
+};
+/** Whether a day's own words - label, note, moments - name one of these. */
+const dayNames = (day, words) => {
+    const said = [day.label, day.note, ...(day.plan ?? []).flatMap((m) => [m.what, m.note])]
+        .filter(Boolean)
+        .join(' ');
+    return words.some((w) => /^[\x20-\x7e]+$/.test(w)
+        ? new RegExp(`\\b${w.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`, 'i').test(said)
+        : said.includes(w));
+};
 /**
  * For each priced stay of four nights or more, the other areas of its city that
  * have a hotel - for the model, in the tool's text, never on the card or in the
@@ -2968,13 +3030,21 @@ const OTHER_AREAS_MAX = 4;
  * model can plan the stay in parts - or offer the move - without a second
  * look-up. Nothing where the city has no other area, or the backend cannot say:
  * a nudge that guesses is worse than none.
+ *
+ * ⚠️ AND A WHOLE TRIP AT ONE HOTEL SAYS WHEN THAT FITS (0.47.9, after live
+ * 0.47.8: six nights in Dongcheng, "only one day is far, not worth a move").
+ * One hotel throughout is the plan only when every day is within about 45
+ * minutes of it; otherwise the reply names the split as the other way. A day
+ * whose own words name another area's hotel is named here - also for a trip
+ * shorter than four nights - so the model does not have to find it again.
  */
-const longStayNudges = async (deps, stays) => {
+const longStayNudges = async (deps, stays, days) => {
     // The areas the plan already uses are not "other" for any of its stays.
     const used = new Set(stays.map((x) => x.area?.toLowerCase()).filter(Boolean));
     const out = [];
+    const whole = stays.length === 1;
     for (const x of stays) {
-        if ((x.nights ?? 0) < LONG_STAY_NIGHTS || !x.area || !x.city)
+        if (!x.area || !x.city || (x.nights ?? 0) < (whole ? 2 : LONG_STAY_NIGHTS))
             continue;
         let hotels;
         try {
@@ -2996,10 +3066,29 @@ const longStayNudges = async (deps, stays) => {
         }
         if (byArea.size === 0)
             continue;
+        // Only for a whole trip at one hotel: which of its days name another area.
+        const elsewhere = whole
+            ? days.flatMap((day, i) => {
+                const h = [...byArea.values()].find((o) => dayNames(day, areaWords(o)));
+                return h
+                    ? [
+                        `Day ${i + 1}${day.date ? ` (${day.date})` : ''} names ${h.area}, where ${h.name} (\`${h.id}\`) is.`,
+                    ]
+                    : [];
+            })
+            : [];
+        if ((x.nights ?? 0) < LONG_STAY_NIGHTS && elsewhere.length === 0)
+            continue;
         const others = [...byArea.values()]
             .slice(0, OTHER_AREAS_MAX)
             .map((h) => `${h.area} - ${h.name} (\`${h.id}\`)`);
-        out.push(`${stays.length === 1 ? `All ${x.nights} nights are` : `${x.nights} nights are`} at ${x.name} (${x.area}). ${x.city} also has: ${others.join('; ')}. In your reply, name the planned days that are far from ${x.area} and offer moving those nights to the hotel here nearest them, with the reason in one sentence - or say why every day suits ${x.area}. The plan on screen stays as it is; draw it again only if the guest asks.`);
+        out.push(whole
+            ? [
+                `All ${x.nights} nights are at ${x.name} (${x.area}). ${x.city} also has: ${others.join('; ')}.`,
+                ...elsewhere,
+                `One hotel for the whole trip fits only when every day is within about 45 minutes of it. In your reply, name the days spent farther out than that and add one sentence on the other way - "it could also be two stays: ..." - those nights at the hotel here nearest them, and why; or say in one sentence why every day is within reach of ${x.area}.`,
+            ].join(' ')
+            : `${x.nights} nights are at ${x.name} (${x.area}). ${x.city} also has: ${others.join('; ')}. In your reply, name the planned days that are far from ${x.area} and offer moving those nights to the hotel here nearest them, with the reason in one sentence - or say why every day suits ${x.area}.`);
     }
     return out;
 };
@@ -3029,6 +3118,58 @@ const direct = (a) => ({
     ...a,
     structured: { ...a.structured, direct: true },
 });
+/**
+ * The booking form's room, when it is NOT the room picked now: the refusal to
+ * book it. Undefined when the form books what it shows.
+ *
+ * ⚠️ THE PICK IS THE CONVERSATION'S, THE FORM IS ONE CARD'S (2026-10-27 audit,
+ * F1). Two cards of one conversation share the slot (`pickedKey`): Reserve on
+ * the second replaced the first's room, and the first card's form then booked
+ * the second's room under its own picture of another. The form says which room
+ * it shows; one that is not the slot's - or a slot emptied since, by a booking
+ * or "Don't book" on the other card - books nothing, and `again` is the pick
+ * that would put the form's room back.
+ *
+ * A form that names no room is a card from before 0.48.0, booked as before.
+ */
+const pickChanged = (deps, key, args) => {
+    const room = str(args.room);
+    if (!room)
+        return undefined;
+    const l = deps.trips.read(pickedKey(key)).find((x) => x.kind === 'room');
+    const said = (v) => v !== undefined && v !== null && v !== '';
+    const same = (asked, held) => !said(asked) || String(asked) === String(held);
+    if (l?.kind === 'room' &&
+        str(args.hotel) === l.hotelId &&
+        room === l.roomId &&
+        same(args.rooms, l.rooms ?? 1) &&
+        same(args.guests, l.stay.guests) &&
+        (l.hourly
+            ? same(args.startTime, l.hourly.start)
+            : same(args.checkIn, l.stay.checkIn) && same(args.checkOut, l.stay.checkOut)))
+        return undefined;
+    const words = l
+        ? 'Nothing was booked: the booking form was for another room than the one picked now - Reserve was pressed on another card of this conversation since. The guest presses Reserve on the room they want again.'
+        : 'Nothing was booked: the room on the booking form is no longer picked - another card of this conversation booked a room or let it go since. The guest presses Reserve on the room they want again.';
+    return {
+        structured: {
+            view: 'error',
+            ...common(deps, key),
+            error: 'pick-changed',
+            detail: words,
+            again: {
+                hotel: str(args.hotel),
+                room,
+                rooms: said(args.rooms) ? Number(args.rooms) : 1,
+                ...(said(args.guests) ? { guests: Number(args.guests) } : {}),
+                ...(said(args.startTime)
+                    ? { startTime: str(args.startTime) }
+                    : { checkIn: str(args.checkIn), checkOut: str(args.checkOut) }),
+            },
+        },
+        text: words,
+    };
+};
 /**
  * A room line, validated and priced against the hotel's calendar and put into
  * one slot of the trip store - THE ONE ROOM-LINE CODE, for `add_to_trip` (`store`
@@ -3297,7 +3438,7 @@ const bookTripLines = async (deps, t, ctx, key, store, args, nothingThere) => {
     const { requests, dropped } = readRequests(args);
     try {
         const shown = deps.trips.shown(store);
-        const { booked: made, failed } = await deps.backend.requestBooking({ lines, ...(shown ? { shown } : {}) }, {
+        const { booked: made, failed, repeat, } = await deps.backend.requestBooking({ lines, ...(shown ? { shown } : {}) }, {
             ...guest,
             ...(str(args.phone) ? { phone: str(args.phone) } : {}),
             ...(requests?.note ? { notes: requests.note } : {}),
@@ -3473,8 +3614,14 @@ const bookTripLines = async (deps, t, ctx, key, store, args, nothingThere) => {
                     ? { accessibility: true }
                     : {}),
                 ...(notBooked.length ? { failed: notBooked } : {}),
+                ...(repeat ? { repeat: true } : {}),
             },
             text: [
+                // ⚠️ THE SAME BOOKING ASKED FOR AGAIN IS SAID TO BE THAT, never a new
+                // one (2026-10-27 audit, F2): it was answered as if just booked.
+                repeat
+                    ? `NOTHING NEW WAS BOOKED: the same ${booked.length > 1 ? 'stays' : 'stay'} for the same guest ${booked.length > 1 ? 'were' : 'was'} asked for a few minutes ago, and ${booked.length > 1 ? 'these are the bookings' : 'this is the booking'} made then. A booking for someone else is made under their name.`
+                    : '',
                 // ⚠️ BOOKED IS CONFIRMED: a stay still being confirmed is said as
                 // that, and not counted (总线程, 2026-10-14).
                 notBooked.length || (booked.length > 1 && waiting)
@@ -4432,6 +4579,9 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
     // The card's own: the room the guest picked with Reserve, booked exactly as
     // a trip is - and the trip left as it is.
     if (name === t.bookPicked) {
+        const changed = pickChanged(deps, key, args);
+        if (changed)
+            return direct(changed);
         return direct(await bookTripLines(deps, t, ctx, key, pickedKey(key), args, 'Nothing is picked: the guest presses Reserve on a room first.'));
     }
     if (name === t.listBookings) {
@@ -5006,11 +5156,12 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                         `Priced stays (${plan.stay?.guests ?? 2} guests; ${t.addToTrip} takes each one's hotel id, room id and dates):`,
                         ...stays,
                         // ⚠️ IN THE TEXT ONLY - not in `structured`, not in the schema.
-                        ...(await longStayNudges(deps, stayItems)),
+                        ...(await longStayNudges(deps, stayItems, plan.days)),
                     ]
                     : []),
                 ...plan.dropped.map((d) => `Left out: ${d.name} — ${d.why}`),
                 ...fitsManyOf(deps, plan.dropped),
+                PLAN_DRAWN_ONCE,
                 deps.vocab.demo ? noteFor(deps.vocab) : '',
             ]
                 .filter(Boolean)