@curless/hotel-storefront 0.48.1 → 0.49.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, hotelText } from './fence.js';
+import { DESCRIPTION_MAX, POLICY_MAX, hotelName, 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';
@@ -298,7 +298,7 @@ const allTools = (n, v) => {
             // description says it too, as what the card is, never as an order: the
             // directory rule (tool-descriptions.test.ts) holds, and "first" is one of
             // its words, hence "the other way round".
-            description: `${upFirst(catalogue(v))}, shown as a card for a guest to look through and pick one ${v.noun} to book. A trip of several days that wants its days planned (行程, 安排, an itinerary) is planned the other way round - the days, then for each part of the trip a ${v.noun} near where those days are spent, read up as text and set on the plan - and this card is no part of it, also when the guest was looking through it a moment before. Asked with no place - or a country of many cities - it answers with the places to choose from: regions, countries and cities, each with how many ${v.nounPlural} it has; \`all\` lists the ${v.nounPlural} themselves. \`city\` (a city or a country) or \`query\` answers with the ${v.nounPlural}: a picture, the city and area, a rating where the ${v.noun} publishes one, and a from-price, and a city usually holds several. With \`checkIn\` and \`checkOut\` every ${v.noun} is priced for those nights - its cheapest room that takes the party, \`rooms\` of it, for the whole stay with taxes - or marked as having no room for them. \`sort\` and \`maxNightly\` order and cap by that price, or by the from-price without dates, where the matches share one currency. \`brand\`, \`facilities\`, \`freeCancellation\`, \`breakfast\` and \`bed\` narrow the list, and the answer counts what each would leave. A long list comes a page at a time: the answer says how many more there are and the \`offset\` of the next page. Words or a place that match nothing are widened once, and the answer names what it widened to.${v.hints.search ? ` ${v.hints.search}` : ''}`,
+            description: `${upFirst(catalogue(v))}, shown as a card for a guest to look through and pick one ${v.noun} to book. It holds no plan of days: a day-by-day plan (行程, 安排, an itinerary) is a card of its own, laid out by the days, with a ${v.noun} for each part of the trip read up as text. Asked with no place - or a country of many cities - it answers with the places to choose from: regions, countries and cities, each with how many ${v.nounPlural} it has; \`all\` lists the ${v.nounPlural} themselves. \`city\` (a city or a country) or \`query\` answers with the ${v.nounPlural}: a picture, the city and area, a rating where the ${v.noun} publishes one, and a from-price, and a city usually holds several. With \`checkIn\` and \`checkOut\` every ${v.noun} is priced for those nights - its cheapest room that takes the party, \`rooms\` of it, for the whole stay with taxes - or marked as having no room for them. \`sort\` and \`maxNightly\` order and cap by that price, or by the from-price without dates, where the matches share one currency. \`brand\`, \`facilities\`, \`freeCancellation\`, \`breakfast\` and \`bed\` narrow the list, and the answer counts what each would leave. A long list comes a page at a time: the answer says how many more there are and the \`offset\` of the next page. Words or a place that match nothing are widened once, and the answer names what it widened to.${v.hints.search ? ` ${v.hints.search}` : ''}`,
             annotations: reads(`Browse ${catalogue(v)}`, open),
             inputSchema: {
                 type: 'object',
@@ -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 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.`,
+            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. Nothing it reads is shown, so the ${v.nounPlural} of a day-by-day plan - for each part of the trip, those near where its days are spent - can be read up before the plan is drawn; its 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: 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.`,
+            description: `A day-by-day plan (行程) as one card - the card for a trip of several days, or for days a guest asked to have planned (a city with a span of dates and 行程 is one): 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 suits days that are all within about 45 minutes of it. 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',
@@ -983,6 +983,8 @@ const TRIP_SCHEMA = {
         subtotal: STR,
         taxesAndFees: STR,
         total: STR,
+        /** Which of a room type's rates a room named by its type was put in as - the text's first line. */
+        took: STR,
         /** Who is signed in, on every payload. */
         member: OBJ,
         /** What the tier took off THIS trip, and what it earns. */
@@ -1373,6 +1375,10 @@ export const buildOutputSchemas = (n) => ({
             inTrip: { type: 'number' },
             planned: { type: 'number' },
             dropped: ARR,
+            /** The stays not booked yet, together - only when all are priced in one currency. */
+            staysTotal: STR,
+            /** What the text says of a long stay at one hotel, in the same words. */
+            nudges: STRS,
         },
         required: ['view'],
     },
@@ -2815,8 +2821,8 @@ const suggestionsFor = async (deps, d) => {
             out.push({
                 // The label IS what is sent: a chip that sends more than it says is
                 // a chip that says something else in the guest's name.
-                label: `Compare ${hotel.name} with the other ${hotel.city} hotels`,
-                say: `Compare ${hotel.name} with the other ${hotel.city} hotels`,
+                label: `Compare ${hotelName(hotel.name)} with the other ${hotelName(hotel.city)} hotels`,
+                say: `Compare ${hotelName(hotel.name)} with the other ${hotelName(hotel.city)} hotels`,
             });
     }
     // The price order is not a suggestion any more: it is the list's own sort
@@ -2825,12 +2831,12 @@ const suggestionsFor = async (deps, d) => {
         const pick = (d.columns ?? []).find((c) => c.recommended);
         if (pick) {
             out.push({
-                label: `Rooms at ${pick.hotel.name}`,
+                label: `Rooms at ${hotelName(pick.hotel.name)}`,
                 ask: { tool: 'getHotel', args: { hotel: pick.hotel.id, ...on } },
             });
             out.push({
-                label: `Plan the days at ${pick.hotel.name}`,
-                say: `Plan the days at ${pick.hotel.name}`,
+                label: `Plan the days at ${hotelName(pick.hotel.name)}`,
+                say: `Plan the days at ${hotelName(pick.hotel.name)}`,
             });
         }
     }
@@ -3072,7 +3078,7 @@ const longStayNudges = async (deps, stays, days) => {
                 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.`,
+                        `Day ${i + 1}${day.date ? ` (${day.date})` : ''} names ${hotelName(h.area)}, where ${hotelName(h.name)} (\`${h.id}\`) is.`,
                     ]
                     : [];
             })
@@ -3081,14 +3087,18 @@ const longStayNudges = async (deps, stays, days) => {
             continue;
         const others = [...byArea.values()]
             .slice(0, OTHER_AREAS_MAX)
-            .map((h) => `${h.area} - ${h.name} (\`${h.id}\`)`);
+            .map((h) => `${hotelName(h.area)} - ${hotelName(h.name)} (\`${h.id}\`)`);
+        // The plan's own stay, in the same cleaned words.
+        const at = hotelName(x.name);
+        const area = hotelName(x.area);
+        const city = hotelName(x.city);
         out.push(whole
             ? [
-                `All ${x.nights} nights are at ${x.name} (${x.area}). ${x.city} also has: ${others.join('; ')}.`,
+                `All ${x.nights} nights are at ${at} (${area}). ${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}.`,
+                `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 ${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}.`);
+            : `${x.nights} nights are at ${at} (${area}). ${city} also has: ${others.join('; ')}. In your reply, name the planned days that are far from ${area} and offer moving those nights to the hotel here nearest them, with the reason in one sentence - or say why every day suits ${area}.`);
     }
     return out;
 };
@@ -3191,6 +3201,31 @@ const putRoomLine = async (deps, t, ctx, key, store, args, detail) => {
     // 2026-10-12).
     const who = identity(deps, ctx, key);
     const startTime = str(args.startTime);
+    // ⚠️ TAKING A ROOM OUT NEEDS NO ROOM FOR SALE. The lookups below are of
+    // what is for sale, so a room that had gone since it went into the trip -
+    // the stay a booking could not make - could not be taken out of it
+    // (2026-10-14). Nor could a room by the hour once its window had passed:
+    // the start was checked against today's window first, and every line of a
+    // trip must be removable (2026-10-27 audit, F6). The line in the trip is the
+    // one asked about - by its nights, or a room by the hour by its start.
+    if (args.rooms !== undefined && clampCount(args.rooms, MAX_ROOMS_PER_LINE) === 0) {
+        const asked = asStay(args);
+        const start = startTime ? minutesOf(startTime) : undefined;
+        const held = deps.trips
+            .read(store)
+            .find((l) => l.kind === 'room' &&
+            l.hotelId === hotelId &&
+            l.roomId === roomRef &&
+            (l.hourly
+                ? start !== undefined &&
+                    minutesOf(l.hourly.start) === start &&
+                    (!asked || l.stay.checkIn === asked.checkIn)
+                : !!asked && l.stay.checkIn === asked.checkIn && l.stay.checkOut === asked.checkOut));
+        if (held) {
+            deps.trips.set(store, unset(held));
+            return currentTrip(deps, key, who, store);
+        }
+    }
     const today = (startTime || !asStay(args)
         ? deps.backend.hourlyRooms?.(hotelId, guestsOf(args), who)
         : undefined);
@@ -3269,23 +3304,6 @@ const putRoomLine = async (deps, t, ctx, key, store, args, detail) => {
                 : 'Which nights? A room needs a check-in and a check-out date before it can go into the trip.',
         };
     }
-    // ⚠️ TAKING A ROOM OUT NEEDS NO ROOM FOR SALE. The lookup below is of
-    // what is for sale, so a room that had gone since it went into the trip -
-    // the stay a booking could not make - could not be taken out of it
-    // (2026-10-14). The line in the trip is the one asked about.
-    if (args.rooms !== undefined && clampCount(args.rooms, MAX_ROOMS_PER_LINE) === 0) {
-        const held = deps.trips
-            .read(store)
-            .find((l) => l.kind === 'room' &&
-            l.hotelId === hotelId &&
-            l.roomId === roomRef &&
-            l.stay.checkIn === stay.checkIn &&
-            l.stay.checkOut === stay.checkOut);
-        if (held) {
-            deps.trips.set(store, unset(held));
-            return currentTrip(deps, key, identity(deps, ctx, key), store);
-        }
-    }
     // The backend owns the calendar - it knows each hotel's own timezone, and a
     // second opinion computed from this process's clock would disagree with it
     // for eight hours a day.
@@ -3370,7 +3388,11 @@ const putRoomLine = async (deps, t, ctx, key, store, args, detail) => {
         rooms: clampCount(args.rooms ?? 1, MAX_ROOMS_PER_LINE),
     });
     const now = await currentTrip(deps, key, identity(deps, ctx, key), store);
-    return took ? { ...now, text: `${took}\n${now.text}` } : now;
+    // Which rate was taken, in the structure too and in the same words - see
+    // the itinerary's `nudges` (2026-10-27 audit, F11).
+    return took
+        ? { ...now, structured: { ...now.structured, took }, text: `${took}\n${now.text}` }
+        : now;
 };
 /**
  * Books the rooms in one slot of the trip store for a named guest - THE ONE
@@ -4370,7 +4392,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
             const extras = await deps.backend.extrasFor(h.id, stay);
             const rooms = (detail.rooms ?? []).filter((r) => r.roomsLeft >= roomsWanted);
             blocks.push([
-                `### ${h.name} · id \`${h.id}\``,
+                `### ${hotelName(h.name)} · id \`${h.id}\``,
                 [
                     [h.area, h.city, h.country].filter(Boolean).join(', '),
                     h.brand,
@@ -4386,7 +4408,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                     : rooms.length
                         ? [
                             `Rooms for ${stay.checkIn} to ${stay.checkOut}, ${stay.guests} guests${roomsWanted > 1 ? `, ${roomsWanted} rooms` : ''}:`,
-                            ...rooms.map((r) => `- ${r.name} · sleeps ${r.sleeps}${r.breakfast ? ' · breakfast' : ''} · ${formatMoney(r.stayTotal)} for the stay incl. taxes and fees${r.freeCancellationUntil ? `, free to cancel until ${freeUntilText(r)}` : r.refundable ? '' : ', non-refundable'}`),
+                            ...rooms.map((r) => `- ${r.name} · sleeps ${r.sleeps}${r.breakfast ? ' · breakfast' : ''} · ${formatMoney(r.stayTotal)} for the stay incl. taxes and fees${roomsWanted > 1 ? ` (${formatMoney(multiplyMoney(r.stayTotal, roomsWanted))} for ${roomsWanted} rooms)` : ''}${r.freeCancellationUntil ? `, free to cancel until ${freeUntilText(r)}` : r.refundable ? '' : ', non-refundable'}`),
                         ].join('\n')
                         : (detail.noRooms ?? `No room type here has ${roomsWanted} left for those nights.`),
                 extras.length
@@ -4721,9 +4743,13 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 url: step.url,
                 ...(step.kind === 'confirm' ? { booking: bookingForCard(step.booking) } : {}),
             },
+            // ⚠️ THE LINK STAYS ON THE CARD (2026-10-27 audit, F9). Only the card
+            // calls this, and the card hands this text to the model as context - so
+            // UnionPay's own page, a link nobody here knows the life of, went into
+            // the conversation. `url` is in the structure, for the card alone.
             text: step.kind === 'enroll'
-                ? `No UnionPay card is on file for that email yet. UnionPay's page to add one: ${step.url} - once it is added, paying with UnionPay again opens the confirmation.`
-                : `UnionPay's page to confirm ${step.booking.confirmationCode} on: ${step.url} - the hotel is asked once UnionPay has confirmed it.`,
+                ? `No UnionPay card is on file for that email yet. UnionPay's page to add one is on the card - once it is added, paying with UnionPay again opens the confirmation.`
+                : `UnionPay's page to confirm ${step.booking.confirmationCode} on is on the card - the hotel is asked once UnionPay has confirmed it.`,
         };
     }
     if (name === t.previewChange || name === t.changeBooking) {
@@ -5146,17 +5172,37 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
         const stayItems = plan.days
             .flatMap((day) => day.items)
             .filter((x) => x.kind === 'hotel' && (x.night ?? 1) === 1 && x.checkIn && x.roomId);
-        const stays = stayItems.map((x, i) => `Stay ${i + 1}: ${x.name} (\`${x.id}\`), room \`${x.roomId}\`${x.roomName ? ` (${x.roomName})` : ''}, ${x.checkIn} to ${x.checkOut}${x.nights ? ` (${x.nights} ${x.nights === 1 ? 'night' : 'nights'})` : ''}${x.booked ? ` - booked, ${x.booked}` : x.inTrip ? ' - in the trip' : ''}`);
+        // Each stay's rate says its terms where they bind - see `ItineraryItem.refundable`.
+        const termsOf = (x) => [
+            x.refundable === false ? 'non-refundable' : '',
+            x.payment === 'prepaid' ? 'paid in advance' : '',
+        ]
+            .filter(Boolean)
+            .join(', ');
+        const stays = stayItems.map((x, i) => `Stay ${i + 1}: ${hotelName(x.name)} (\`${x.id}\`), room \`${x.roomId}\`${x.roomName ? ` (${hotelName(x.roomName)}${termsOf(x) ? `; ${termsOf(x)}` : ''})` : termsOf(x) ? ` (${termsOf(x)})` : ''}, ${x.checkIn} to ${x.checkOut}${x.nights ? ` (${x.nights} ${x.nights === 1 ? 'night' : 'nights'})` : ''}${x.booked ? ` - booked, ${x.booked}` : x.inTrip ? ' - in the trip' : ''}`);
+        // ⚠️ IN BOTH, IN THE SAME WORDS (2026-10-27 audit, F11): a host that hands
+        // the model `structuredContent` rather than the text never saw what the
+        // text said of a long stay. The model's part of the answer is the same on
+        // either side.
+        const nudges = stays.length ? await longStayNudges(deps, stayItems, plan.days) : [];
         return {
-            structured: { view: 'itinerary', ...common(deps, key), ...plan, gap },
+            structured: {
+                view: 'itinerary',
+                ...common(deps, key),
+                ...plan,
+                gap,
+                ...(nudges.length ? { nudges } : {}),
+            },
             text: [
                 `**${plan.title}** · ${plan.days.length} ${plan.days.length === 1 ? 'day' : 'days'}. ${gap}`,
                 ...(stays.length
                     ? [
                         `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, plan.days)),
+                        ...(plan.staysTotal
+                            ? [`Together, the stays not booked yet: ${plan.staysTotal}.`]
+                            : []),
+                        ...nudges,
                     ]
                     : []),
                 ...plan.dropped.map((d) => `Left out: ${d.name} — ${d.why}`),