@curless/hotel-storefront 0.27.7 → 0.27.9

package/dist/tools.js

@@ -6,7 +6,7 @@ import { formatMoney, money, multiplyMoney, toMinor } from './money.js';
 import { MAX_COMPARED, MAX_CONS, MAX_DAYS, MAX_ITEMS_PER_DAY, MAX_MOMENTS, MAX_PROS, buildItinerary, compareHotels, } from './present.js';
 import { regionOf } from './regions.js';
 import { MAX_EXTRA_QUANTITY, MAX_ROOMS_PER_LINE, TRIP_TTL_MS, clampCount, shownOf, tripKey, } from './trip.js';
-import { DEMO_NOTE } from './vocab.js';
+import { DEMO_NOTE, branded, catalogue, upFirst } from './vocab.js';
 // The eleven things a guest can do: find hotels, look at one on dates, see what
 // else it offers, build a trip, ask for the rooms, and deal with a booking they
 // already have.
@@ -151,7 +151,8 @@ const forCapabilities = (tools, n, v, caps) => {
             }
             if (!caps.members)
                 out = { ...out, inputSchema: without(out.inputSchema, 'rememberRequests') };
-            if (caps.booking === 'pay-at-hotel') {
+            // A market's suppliers book differently - its own description says so.
+            if (caps.booking === 'pay-at-hotel' && !v.market) {
                 out = {
                     ...out,
                     // ⚠️ A SANDBOX BOOKS NOTHING REAL, and its description says so
@@ -182,8 +183,8 @@ const allTools = (n, v) => {
     return [
         {
             name: n.listHotels,
-            description: `${v.brand} ${v.nounPlural}, shown as a card. 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\` and \`breakfast\` 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 ${v.brand} ${v.nounPlural}`, open),
+            description: `${upFirst(catalogue(v))}, shown as a card. 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\` and \`breakfast\` 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',
                 properties: {
@@ -223,6 +224,14 @@ const allTools = (n, v) => {
                         type: 'string',
                         description: "One of the group's brands, as the list's brand counts name it",
                     },
+                    ...(v.market
+                        ? {
+                            group: {
+                                type: 'string',
+                                description: "One hotel group's hotels only, by the group's name",
+                            },
+                        }
+                        : {}),
                     facilities: {
                         type: 'array',
                         items: { type: 'string', enum: FACILITIES.map((x) => x.key) },
@@ -246,7 +255,7 @@ const allTools = (n, v) => {
         {
             name: n.getHotel,
             description: `One ${v.noun} in full: description, amenities, address, and check-in and check-out times where the ${v.noun} publishes them. Given \`checkIn\` and \`checkOut\` it also returns the room types that can be booked for those nights, each with its nightly rate, the stay total including taxes and fees, whether it can be cancelled free and until when, and how many rooms are left. \`rooms\` leaves out the types that have fewer than that many. Without dates it returns the ${v.noun} only, because a room has no price until the nights are known. The ${v.noun} is drawn as a card for the guest to look at.${v.hints.hotel ? ` ${v.hints.hotel}` : ''}`,
-            annotations: reads(`View one ${v.brand} ${v.noun}`, open),
+            annotations: reads(`View one ${catalogue(v, true)}`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -274,7 +283,7 @@ const allTools = (n, v) => {
             // 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. The ids are the ones a comparison and a plan take.`,
-            annotations: reads(`Look up ${v.brand} ${v.nounPlural}`, open),
+            annotations: reads(`Look up ${catalogue(v)}`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -300,7 +309,7 @@ const allTools = (n, v) => {
         {
             name: n.listExtras,
             description: `What one ${v.noun} offers beside the room: airport transfers, dinners, guided experiences, spa and family add-ons, each with its price and whether it is charged per stay, per person or per night, drawn as a card for the guest to look at.`,
-            annotations: reads(`${v.brand} add-ons`, open),
+            annotations: reads(v.market ? `Add-ons on ${v.brand}` : `${v.brand} add-ons`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -367,10 +376,15 @@ const allTools = (n, v) => {
             // ⚠️ A DEMONSTRATION BOOKING IS SAID AS ONE (2026-10-05 audit, P2):
             // "asks Shangri-La to hold the rooms" read as a real hold, and a guest
             // could take the code to the real hotel.
-            description: v.demo
-                ? `Makes a demonstration booking request for the trip's rooms, for a named guest: it returns a confirmation code and the moment the demonstration hold lapses on its own. ${v.brand} does not receive it and no real room is held. No payment is taken and no card is collected. Preferences - a bed type, a floor, a late arrival - ride along on the request.`
-                : `Asks ${v.brand} to hold the trip's rooms for a named guest and returns a confirmation code and the moment the hold lapses. No payment is taken and no card is collected; the rooms are held, not paid for. Preferences - a bed type, a floor, a late arrival - ride along on the booking as requests the desk tries to meet.`,
-            annotations: books(`Request a ${v.brand} booking`, open),
+            description: v.market
+                ? // ⚠️ THE GROUP HOLDS THE BOOKING, NOT THE MARKET - and what a booking
+                    // makes is the group's: a hold, a test booking, or a reservation paid
+                    // at the hotel. The answer says which, stay by stay.
+                    `Books the trip's rooms for a named guest with the hotel group each stay belongs to, one group at a time: a trip holding two groups' hotels is booked group by group. What a booking makes is that group's - a demonstration hold that lapses on its own, a test booking in a simulated system, or the hotel's own reservation paid at the hotel - and the answer says which for every stay. No payment is taken here and no card is collected. Preferences - a bed type, a floor, a late arrival - ride along on the booking as requests.`
+                : v.demo
+                    ? `Makes a demonstration booking request for the trip's rooms, for a named guest: it returns a confirmation code and the moment the demonstration hold lapses on its own. ${v.brand} does not receive it and no real room is held. No payment is taken and no card is collected. Preferences - a bed type, a floor, a late arrival - ride along on the request.`
+                    : `Asks ${v.brand} to hold the trip's rooms for a named guest and returns a confirmation code and the moment the hold lapses. No payment is taken and no card is collected; the rooms are held, not paid for. Preferences - a bed type, a floor, a late arrival - ride along on the booking as requests the desk tries to meet.`,
+            annotations: books(v.market ? `Request a booking on ${v.brand}` : `Request a ${v.brand} booking`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -397,6 +411,16 @@ const allTools = (n, v) => {
                         type: 'boolean',
                         description: 'True when the guest asked for these room preferences to be remembered for their next stays. Needs a signed-in member; what is kept is the lasting kind - a bed type, a floor, a quiet or connecting room; an accessible room is asked for on each stay and is not kept',
                     },
+                    // A booking is made with one group at a time; a trip holding two
+                    // groups' hotels is booked group by group (Marketplace, §6-1).
+                    ...(v.market
+                        ? {
+                            group: {
+                                type: 'string',
+                                description: "The hotel group to book now, by name, when the trip holds more than one group's hotels. Its stays are booked and the others stay in the trip",
+                            },
+                        }
+                        : {}),
                 },
                 required: ['name', 'email'],
             },
@@ -557,7 +581,7 @@ const allTools = (n, v) => {
             // model that could send a price could one day send the wrong one, onto a
             // card that looks official.
             description: `Puts two to four ${v.nounPlural} side by side as one card. Each column's price, rate, cancellation terms, breakfast and rooms left come from the ${v.noun}'s own record; the arguments carry only the ids, one line on who each suits, and its pros and cons. With \`checkIn\`/\`checkOut\` the columns carry each ${v.noun}'s cheapest room for those nights; without them, a from-price.`,
-            annotations: reads(`Compare ${v.brand} ${v.nounPlural}`, open),
+            annotations: reads(`Compare ${catalogue(v)}`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -590,7 +614,7 @@ const allTools = (n, v) => {
         {
             name: n.itinerary,
             description: `A day-by-day plan as one card: 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(`Lay out a ${v.brand} itinerary`, open),
+            annotations: reads(v.market ? `Lay out an itinerary on ${v.brand}` : `Lay out a ${v.brand} itinerary`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -680,7 +704,7 @@ const allTools = (n, v) => {
         {
             name: n.policies,
             description: `What one ${v.noun} publishes about cancellation, check-in and check-out, children and extra beds, pets, deposits and accessibility. With \`topic\` it returns that topic; without, all of them.`,
-            annotations: reads(`${v.brand} policies`, open),
+            annotations: reads(v.market ? `${upFirst(v.noun)} policies on ${v.brand}` : `${v.brand} policies`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
@@ -1046,6 +1070,40 @@ const memberBadge = (deps, key) => {
         }
         : { signedIn: false };
 };
+/** A market's group by its id or its name, as a guest or a model would say it. */
+const groupNamed = (deps, said) => {
+    const want = said.trim().toLowerCase();
+    return deps.backend
+        .suppliers?.()
+        .find((x) => x.id.toLowerCase() === want || x.name.toLowerCase() === want);
+};
+/** The same trip line at a count of nothing - which takes it out (`TripStore.set`). */
+const unset = (l) => l.kind === 'extra' ? { ...l, quantity: 0 } : { ...l, rooms: 0 };
+/**
+ * On a group's own connector, the connector itself. In a market, the supplier
+ * named on the booking or the hotel.
+ *
+ * ⚠️ NEVER THE MARKET. "Asks Otaless to hold the rooms" or "Otaless's own
+ * reservation" would send a guest to a desk that has never heard of Otaless,
+ * and a market holding a demonstration beside a group's real system must not
+ * call either by the other's terms (robin, 2026-10-07).
+ */
+const holderOf = (deps, supplier) => {
+    const s = supplier ? deps.backend.suppliers?.().find((x) => x.id === supplier) : undefined;
+    if (s)
+        return {
+            name: s.name,
+            caps: s.capabilities,
+            demo: s.mode !== 'live',
+            sandbox: s.mode === 'sandbox',
+        };
+    return {
+        name: deps.vocab.brand,
+        caps: deps.backend.capabilities ?? FULL_CAPABILITIES,
+        demo: deps.vocab.demo,
+        sandbox: !!deps.vocab.sandbox,
+    };
+};
 /**
  * What was made, in one sentence - which depends on what asking MAKES here.
  *
@@ -1058,47 +1116,56 @@ const memberBadge = (deps, key) => {
  */
 const bookedLine = (deps, b) => {
     const total = formatMoney(b.quote.total);
-    if ((deps.backend.capabilities ?? FULL_CAPABILITIES).booking === 'pay-at-hotel') {
-        if (deps.vocab.sandbox)
-            return `${total} in the simulated system. **This is a test booking** - not a ${deps.vocab.brand} reservation: no room is held and nothing is paid, now or at any hotel.`;
+    const h = holderOf(deps, b.supplier);
+    if (h.caps.booking === 'pay-at-hotel') {
+        if (h.sandbox)
+            return `${total} in the simulated system. **This is a test booking** - not a ${h.name} reservation: no room is held and nothing is paid, now or at any hotel.`;
         return b.status === 'requested'
-            ? `${total} all in, to be paid at the hotel. ${deps.vocab.brand} 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 ${deps.vocab.brand}'s own reservation, kept until it is cancelled, and ${b.guest.name} pays at check-in.`;
+            ? `${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.`;
     }
     const lapses = b.holdUntilLocal
         ? `${b.holdUntilLocal} hotel time`
         : `${b.holdUntil?.slice(0, 16).replace('T', ' ')} UTC`;
     // ⚠️ NOT "PRESENTS A CARD AT CHECK-IN" (2026-10-05 audit, P2): a demo
     // booking has no check-in, and saying so sent a guest towards a real desk.
-    if (deps.vocab.demo)
-        return `${total} all in. **${demoBookingWords(deps)}** Nothing has been charged and no card is needed. The demonstration hold lapses on its own at ${lapses}.`;
+    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.`;
 };
 /** What a demonstration booking is, in one sentence - see `demoBookingNote`. */
-const demoBookingWords = (deps) => `This is a demonstration booking: ${deps.vocab.brand} has not received it and is not holding any room.`;
+const demoBookingWords = (h) => `This is a demonstration booking: ${h.name} has not received it and is not holding any room.`;
 /**
  * Said on every answer about a demonstration booking - made, changed or
  * cancelled - and on nothing else: a hold of the demo's that a guest took for
  * the hotel's would send them to a desk with a code nobody there has.
  */
-const demoBookingNote = (deps) => deps.vocab.demo && (deps.backend.capabilities ?? FULL_CAPABILITIES).booking === 'hold'
-    ? demoBookingWords(deps)
-    : '';
-const common = (deps, key) => ({
-    brand: deps.vocab.brand,
-    ...(deps.logoUrl ? { logoUrl: deps.logoUrl } : {}),
-    toolNames: deps.offered
-        ? Object.fromEntries(Object.entries(deps.tools).filter(([, name]) => deps.offered?.has(name)))
-        : deps.tools,
-    bookingMode: (deps.backend.capabilities ?? FULL_CAPABILITIES).booking,
-    ...((deps.backend.capabilities ?? FULL_CAPABILITIES).requiresPhone
-        ? { phoneRequired: true }
-        : {}),
-    ...(deps.vocab.sandbox ? { sandbox: true } : {}),
-    vocab: { noun: deps.vocab.noun, nounPlural: deps.vocab.nounPlural },
-    ...(deps.vocab.demo ? { demo: true, demoNote: DEMO_NOTE } : { demo: false }),
-    ...(key ? memberBadge(deps, key) : {}),
-});
+const demoBookingNote = (deps, supplier) => {
+    const h = holderOf(deps, supplier);
+    return h.demo && h.caps.booking === 'hold' ? demoBookingWords(h) : '';
+};
+const common = (deps, key) => {
+    const caps = deps.backend.capabilities ?? FULL_CAPABILITIES;
+    return {
+        brand: deps.vocab.brand,
+        ...(deps.logoUrl ? { logoUrl: deps.logoUrl } : {}),
+        toolNames: deps.offered
+            ? Object.fromEntries(Object.entries(deps.tools).filter(([, name]) => deps.offered?.has(name)))
+            : deps.tools,
+        bookingMode: caps.booking,
+        ...(caps.requiresPhone ? { phoneRequired: true } : {}),
+        ...(deps.vocab.sandbox ? { sandbox: true } : {}),
+        ...(caps.programme ? { programme: caps.programme } : {}),
+        ...(caps.codePrefix ? { codePrefix: caps.codePrefix } : {}),
+        // A market: the card draws each hotel and booking as its group's.
+        ...(deps.backend.suppliers
+            ? { market: { name: deps.vocab.brand, suppliers: deps.backend.suppliers() } }
+            : {}),
+        vocab: { noun: deps.vocab.noun, nounPlural: deps.vocab.nounPlural },
+        ...(deps.vocab.demo ? { demo: true, demoNote: DEMO_NOTE } : { demo: false }),
+        ...(key ? memberBadge(deps, key) : {}),
+    };
+};
 /**
  * When a room stops being free to cancel, the way a guest reads it: the
  * hotel's own clock when the backend knows it, else the instant in UTC - never
@@ -1107,10 +1174,12 @@ const common = (deps, key) => ({
 const freeUntilText = (r) => r.freeCancellationLocal ??
     `${(r.freeCancellationUntil ?? '').slice(0, 16).replace('T', ' ')} UTC`;
 /** One line of a trip, flattened for the card. Prices are strings: the card never does arithmetic. */
-const quoteForCard = (quote) => ({
+const quoteForCard = (quote, groupOf) => ({
     lines: quote.lines.map((l) => ({
         kind: l.kind,
         hotelId: l.hotelId,
+        // In a market: whose stay this is, so the card books it with that group.
+        ...(groupOf?.(l.hotelId) ? { supplier: groupOf(l.hotelId) } : {}),
         hotelName: l.hotelName,
         roomRef: l.roomRef,
         extraRef: l.extraRef,
@@ -1145,7 +1214,7 @@ const tripText = (quote, demo) => {
     if (quote.lines.length === 0)
         return 'The trip is empty.';
     const lines = quote.lines.map((l) => l.kind === 'room'
-        ? `- ${l.quantity ?? 1}× ${l.title} at ${l.hotelName}, ${l.stay?.checkIn} to ${l.stay?.checkOut} (${l.nights} nights) — ${formatMoney(l.total)}`
+        ? `- ${l.quantity ?? 1}× ${l.title} at ${l.hotelName}, ${l.stay?.checkIn} to ${l.stay?.checkOut} (${l.nights} ${l.nights === 1 ? 'night' : 'nights'}) — ${formatMoney(l.total)}`
         : `- ${l.ordered ?? l.quantity}× ${l.title}${l.ordered !== undefined && l.quantity !== undefined && l.quantity !== l.ordered ? ` (${l.quantity} in all, over the stay)` : ''} — ${formatMoney(l.total)}`);
     return [
         ...lines,
@@ -1490,6 +1559,8 @@ const remember = (deps, k, amount) => {
         m.delete(oldest);
     }
 };
+/** "a, b and c" - "a and b" - "a". */
+const listAnd = (xs) => xs.length > 1 ? `${xs.slice(0, -1).join(', ')} and ${xs.at(-1)}` : (xs[0] ?? '');
 /** The counts a call can carry, and what each may be. */
 const COUNTS = ['guests', 'rooms', 'quantity'];
 /** "2" is 2: a host that sends a count as a string has not asked for something else. */
@@ -1639,12 +1710,15 @@ const currentTrip = async (deps, key, who) => {
     const [only] = parts;
     const orphans = needsRoomIn(deps.tools, lines, parts);
     const needs = orphans.needsRoom.length ? { needsRoom: orphans.needsRoom } : {};
+    const groupOf = deps.backend.supplierOf
+        ? (id) => deps.backend.supplierOf?.(id)
+        : undefined;
     if (parts.length === 1 && only) {
         return {
             structured: {
                 view: 'trip',
                 ...common(deps, key),
-                ...quoteForCard(only),
+                ...quoteForCard(only, groupOf),
                 ...needs,
                 count: lines.length,
             },
@@ -1653,7 +1727,7 @@ const currentTrip = async (deps, key, who) => {
                 .join('\n'),
         };
     }
-    const shaped = parts.map(quoteForCard);
+    const shaped = parts.map((p) => quoteForCard(p, groupOf));
     const bookable = parts.map((p) => p.lines.some((l) => l.kind === 'room'));
     return {
         structured: {
@@ -1703,6 +1777,7 @@ const filtersOf = (args) => {
         : [];
     const f = {
         ...(str(args.brand) ? { brand: str(args.brand) } : {}),
+        ...(str(args.group) ? { supplier: str(args.group) } : {}),
         ...(facilities.length ? { facilities } : {}),
         ...(args.freeCancellation === true ? { freeCancellation: true } : {}),
         ...(args.breakfast === true ? { breakfast: true } : {}),
@@ -1746,7 +1821,16 @@ const refineFor = (r, on, total,
 dated = false) => {
     const narrows = (count, active) => active || (count > 0 && count < total);
     const brands = r.brands.filter((b) => narrows(b.count, b.name === on?.brand));
+    // In a market: the groups, by id - the card names them from `market`.
+    const groups = (r.suppliers ?? []).filter((x) => narrows(x.count, x.id === on?.supplier));
     return {
+        ...(r.suppliers
+            ? {
+                groups: groups.length > 1 || on?.supplier
+                    ? groups.map((x) => ({ ...x, on: x.id === on?.supplier }))
+                    : [],
+            }
+            : {}),
         brands: brands.length > 1 || on?.brand ? brands.map((b) => ({ ...b, on: b.name === on?.brand })) : [],
         facilities: r.facilities
             .filter((x) => narrows(x.count, !!on?.facilities?.includes(x.key)))
@@ -1943,6 +2027,10 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 : undefined,
             filters: filtersOf(args),
         };
+        // A group as a guest names it, to the id the market files it under.
+        const named = ask.filters?.supplier ? groupNamed(deps, ask.filters.supplier) : undefined;
+        if (ask.filters?.supplier && named)
+            ask.filters = { ...ask.filters, supplier: named.id };
         const who = identity(deps, ctx, key, args);
         let answer = await deps.backend.searchHotels(ask, who);
         // A brand as the data spells it, so its chip shows as ON and can be turned
@@ -2108,7 +2196,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                         ...(ask.stay ? { stay: ask.stay } : {}),
                         ...(today ? { today } : {}),
                     },
-                    text: `${total} ${deps.vocab.brand} ${n} in ${only?.name}, in ${only?.cities.length} cities to choose from: ${every(only?.cities ?? [])}. A city lists its ${n}; \`all\` lists every one in ${only?.name}.`,
+                    text: `${total} ${branded(deps.vocab, n)} in ${only?.name}, in ${only?.cities.length} cities to choose from: ${every(only?.cities ?? [])}. A city lists its ${n}; \`all\` lists every one in ${only?.name}.`,
                 };
             }
             const regions = [
@@ -2132,7 +2220,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                     ...(ask.stay ? { stay: ask.stay } : {}),
                     ...(today ? { today } : {}),
                 },
-                text: `${total} ${deps.vocab.brand} ${n} in ${facets.cities.length} cities across ${countries.length} countries, to choose from by region, country and city - ${regions.map((r) => `${r.name}: ${every(r.countries)}`).join('; ')}. A city or a country lists its ${n}.`,
+                text: `${total} ${branded(deps.vocab, n)} in ${facets.cities.length} cities across ${countries.length} countries, to choose from by region, country and city - ${regions.map((r) => `${r.name}: ${every(r.countries)}`).join('; ')}. A city or a country lists its ${n}.`,
             };
         }
         if (hotels.length === 0) {
@@ -2166,7 +2254,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                         : ceilingEmpty
                             ? `None of the ${answer.beforeCeiling} that match has a room for those nights.`
                             : [
-                                `No ${deps.vocab.brand} ${deps.vocab.nounPlural} match that.`,
+                                `No ${branded(deps.vocab, deps.vocab.nounPlural)} match that.`,
                                 // What was tried and also failed is worth a sentence: it tells a
                                 // guest the word itself is the problem, not the narrowing.
                                 widened ? `${sentence(widened.to)} found nothing either.` : '',
@@ -2278,7 +2366,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 ...(answer.currencies.length > 1 ? { currencies: answer.currencies } : {}),
             },
             text: [
-                `${total} ${deps.vocab.brand} ${total === 1 ? deps.vocab.noun : deps.vocab.nounPlural}${where}.`,
+                `${total} ${branded(deps.vocab, total === 1 ? deps.vocab.noun : deps.vocab.nounPlural)}${where}.`,
                 // ⚠️ NO "BELOW", NO "TAP". This sentence is read out by a voice
                 // assistant as often as it is drawn next to a card, and a guest whose
                 // host has no card at all cannot tap the one it tells them to tap. The
@@ -2301,7 +2389,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
         if (!detail) {
             return {
                 structured: { view: 'hotel-not-found', ...common(deps, key), query: wanted },
-                text: `No ${deps.vocab.brand} ${deps.vocab.noun} by that name. ${t.listHotels} lists them.`,
+                text: `No ${branded(deps.vocab, deps.vocab.noun)} by that name. ${t.listHotels} lists them.`,
             };
         }
         const h = detail.hotel;
@@ -2458,9 +2546,9 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                     ...(dropped.length ? { dropped } : {}),
                 },
                 text: city
-                    ? `No ${deps.vocab.brand} ${deps.vocab.nounPlural} in "${city}". ${t.listHotels} with no place shows the places there are.`
+                    ? `No ${branded(deps.vocab, deps.vocab.nounPlural)} in "${city}". ${t.listHotels} with no place shows the places there are.`
                     : named.length
-                        ? `No ${deps.vocab.brand} ${deps.vocab.noun} answers to ${dropped.map((d) => `"${d}"`).join(', ')}.`
+                        ? `No ${branded(deps.vocab, deps.vocab.noun)} answers to ${dropped.map((d) => `"${d}"`).join(', ')}.`
                         : `Name a \`city\`, or up to ${LOOK_UP_MAX} ${deps.vocab.nounPlural} in \`${deps.vocab.nounPlural}\`.`,
             };
         }
@@ -2520,7 +2608,14 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 total > read.length
                     ? `${total - read.length} more ${total - read.length === 1 ? 'is' : 'are'} there; name ${total - read.length === 1 ? 'it' : 'them'} in \`${deps.vocab.nounPlural}\` to read ${total - read.length === 1 ? 'it' : 'them'}.`
                     : '',
-                `Draw the answer now as ONE card with these ids: a plan or days the guest asked for (行程 - recommended or arranged) is ${t.itinerary}; which ${deps.vocab.noun} to stay at is ${t.compare}. Not ${t.listHotels}, ${t.getHotel} or ${t.listExtras}, which each draw another card.`,
+                // ⚠️ WHAT THE IDS ARE FOR, SAID AS A FACT (2026-10-05 audit, P3): this was
+                // "Draw the answer now as ONE card", an instruction in a tool result.
+                // The rule itself lives in the server instructions; what stays here is
+                // what each next call would draw, which is what kept it to one card.
+                `These ids are what ${t.itinerary} (a plan or days - 行程, recommended or arranged) and ${t.compare} (which ${deps.vocab.noun} to stay at) take; each of those draws one card. ${listAnd(
+                // Only tools this deployment offers: a name it withholds is one the
+                // model would try (2026-10-05 audit, P2 - Huazhu has no add-ons).
+                [t.listHotels, t.getHotel, t.listExtras].filter((n) => !deps.offered || deps.offered.has(n)))} would each draw a card of their own.`,
                 deps.vocab.demo ? DEMO_NOTE : '',
             ]
                 .filter(Boolean)
@@ -2569,7 +2664,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
         if (!detail) {
             return {
                 structured: { view: 'hotel-not-found', ...common(deps, key), query: wanted },
-                text: `No ${deps.vocab.brand} ${deps.vocab.noun} by that name.`,
+                text: `No ${branded(deps.vocab, deps.vocab.noun)} by that name.`,
             };
         }
         const extras = await deps.backend.extrasFor(detail.hotel.id, booked?.stay ?? asStay(args));
@@ -2613,7 +2708,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                     error: 'hotel-not-found',
                     query: wanted,
                 },
-                text: `No ${deps.vocab.brand} ${deps.vocab.noun} by that name.`,
+                text: `No ${branded(deps.vocab, deps.vocab.noun)} by that name.`,
             };
         }
         const hotelId = detail.hotel.id;
@@ -2629,9 +2724,9 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                         error: 'no-such-extra',
                         query: extraRef,
                     },
-                    text: (deps.backend.capabilities ?? FULL_CAPABILITIES).extras
+                    text: holderOf(deps, detail.hotel.supplier).caps.extras
                         ? `${detail.hotel.name} does not offer that. ${t.listExtras} lists what it has.`
-                        : `${deps.vocab.brand} ${deps.vocab.nounPlural} sell rooms only here - there are no add-ons.`,
+                        : `${holderOf(deps, detail.hotel.supplier).name} ${deps.vocab.nounPlural} sell rooms only here - there are no add-ons.`,
                 };
             }
             const line = {
@@ -2714,17 +2809,39 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
         };
     }
     if (name === t.requestBooking) {
-        const lines = deps.trips.read(key);
-        if (lines.length === 0) {
+        const inTrip = deps.trips.read(key);
+        if (inTrip.length === 0) {
             return {
                 structured: { view: 'empty-trip', ...common(deps, key) },
                 text: `There is nothing in the trip yet. ${t.addToTrip} puts room nights in it.`,
             };
         }
+        // ⚠️ ONE GROUP AT A TIME, in a market: a booking cannot be all-or-nothing
+        // across two groups' systems (Marketplace, §6-1). `group` books one
+        // group's stays and leaves the rest in the trip.
+        const asked = deps.backend.suppliers ? str(args.group) : '';
+        const group = asked ? groupNamed(deps, asked) : undefined;
+        const groupOf = (l) => deps.backend.supplierOf?.(l.hotelId);
+        const lines = group ? inTrip.filter((l) => groupOf(l) === group.id) : inTrip;
+        if (asked && (!group || lines.length === 0)) {
+            const there = [...new Set(inTrip.map(groupOf))]
+                .map((id) => holderOf(deps, id).name)
+                .filter(Boolean);
+            const words = group
+                ? `Nothing in the trip is with ${group.name}. It holds stays with ${listAnd(there)}.`
+                : `No hotel group here is called "${asked}". The trip holds stays with ${listAnd(there)}.`;
+            return {
+                structured: { view: 'error', ...common(deps, key), error: 'no-such-group', detail: words },
+                text: words,
+            };
+        }
         const guest = { name: str(args.name), email: str(args.email) };
         // A phone where the backend needs one: a booking paid at the hotel and
         // guaranteed by nobody, which the hotel has to be able to follow up.
-        const phoneNeeded = !!(deps.backend.capabilities ?? FULL_CAPABILITIES).requiresPhone;
+        // In a market, the trip's own groups decide - not whichever group needs most.
+        const phoneNeeded = deps.backend.suppliers
+            ? lines.some((l) => !!holderOf(deps, deps.backend.supplierOf?.(l.hotelId)).caps.requiresPhone)
+            : !!(deps.backend.capabilities ?? FULL_CAPABILITIES).requiresPhone;
         const phone = str(args.phone);
         const missing = [
             !guest.name && 'a name',
@@ -2759,7 +2876,16 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
             // only place an Identity is built; the guest's email still overrides,
             // because a booking is found by the address it was made with.
             { ...identity(deps, ctx, key), email: guest.email }, requests);
-            deps.trips.clear(key);
+            if (lines.length === inTrip.length)
+                deps.trips.clear(key);
+            else
+                for (const l of lines)
+                    deps.trips.set(key, unset(l));
+            // What is left is priced again, and that price is what the next
+            // group's booking is held to (ShownQuote).
+            const rest = lines.length === inTrip.length
+                ? undefined
+                : await currentTrip(deps, key, identity(deps, ctx, key));
             // ⚠️ REMEMBERED ONLY WHEN ASKED - see `rememberPreferences`. Said either
             // way, so neither the guest nor the model assumes something was kept.
             const signedIn = deps.members.read(key);
@@ -2844,7 +2970,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 },
                 text: [
                     several
-                        ? `${booked.length} bookings, one for each stay - each hotel keeps its own nights under its own code, and each is ${(deps.backend.capabilities ?? FULL_CAPABILITIES).changes ? 'changed or cancelled' : 'cancelled'} on its own.`
+                        ? `${booked.length} bookings, one for each stay - each hotel keeps its own nights under its own code, and each is ${holderOf(deps, first.booking.supplier).caps.changes ? 'changed or cancelled' : 'cancelled'} on its own.`
                         : '',
                     ...booked.flatMap(({ booking, asked }) => [
                         `**${booking.confirmationCode}** · ${booking.hotelName} · ${booking.stay.checkIn} to ${booking.stay.checkOut}`,
@@ -2852,6 +2978,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                         ...asked,
                     ]),
                     remembered?.line ?? '',
+                    rest ? `The trip's other stays are still in it, not booked:\n${rest.text}` : '',
                     deps.vocab.demo ? DEMO_NOTE : '',
                 ]
                     .filter(Boolean)
@@ -2867,6 +2994,17 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 const again = await currentTrip(deps, key, identity(deps, ctx, key));
                 return { ...again, text: [words, again.text].join('\n\n') };
             }
+            if (err.code === 'mixed-supplier') {
+                const again = await currentTrip(deps, key, identity(deps, ctx, key));
+                return {
+                    ...again,
+                    text: [
+                        words,
+                        `${t.requestBooking} with \`group\` books one group's stays and leaves the others in the trip.`,
+                        again.text,
+                    ].join('\n\n'),
+                };
+            }
             return {
                 structured: {
                     view: 'error',
@@ -2983,7 +3121,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                         : 'The total is unchanged.',
                     preview.rule,
                     `Say the word and it moves (${t.changeBooking} with \`confirmed\`).`,
-                    demoBookingNote(deps),
+                    demoBookingNote(deps, preview.supplier),
                     deps.vocab.demo ? DEMO_NOTE : '',
                 ]
                     .filter(Boolean)
@@ -3046,7 +3184,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 text: [
                     `${changed.confirmationCode} now holds ${changed.stay.checkIn} to ${changed.stay.checkOut}, ${formatMoney(changed.quote.total)} all in.`,
                     'The confirmation code has not changed. **Nothing has been charged.**',
-                    demoBookingNote(deps),
+                    demoBookingNote(deps, changed.supplier),
                     deps.vocab.demo ? DEMO_NOTE : '',
                 ]
                     .filter(Boolean)
@@ -3094,7 +3232,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 preview.cancellable
                     ? `Say the word and it is cancelled (${t.cancelBooking} with \`confirmed\`).`
                     : '',
-                demoBookingNote(deps),
+                demoBookingNote(deps, preview.supplier),
                 deps.vocab.demo ? DEMO_NOTE : '',
             ]
                 .filter(Boolean)
@@ -3130,6 +3268,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
         // the rate's terms, and where the two differ the hotel's is the one that
         // will be charged.
         const charged = cancelled.cancellationFee ?? preview.fee;
+        const h = holderOf(deps, cancelled.supplier);
         return {
             structured: {
                 view: 'cancelled',
@@ -3140,14 +3279,14 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 cancellable: false,
             },
             text: [
-                deps.vocab.sandbox
+                h.sandbox
                     ? // A test booking cancelled in the simulation: no hotel, no charge (2026-10-05 audit, P2).
                         `${cancelled.confirmationCode} is cancelled in the simulated system. ${charged.minor === 0 ? 'No fee.' : `A real booking on this rate would be charged ${formatMoney(charged)}; this one is a test, and nothing is charged.`}`
-                    : deps.vocab.demo
+                    : h.demo
                         ? // Nobody charges a demonstration anything (2026-10-05 audit, P2).
                             `${cancelled.confirmationCode} is cancelled. ${charged.minor === 0 ? 'No fee.' : `A real booking on this rate would be charged ${formatMoney(charged)}; this is a demonstration, and nothing is charged.`}`
                         : `${cancelled.confirmationCode} is cancelled. ${charged.minor === 0 ? 'No fee.' : `The hotel charges ${formatMoney(charged)}.`}`,
-                demoBookingNote(deps),
+                demoBookingNote(deps, cancelled.supplier),
                 deps.vocab.demo ? DEMO_NOTE : '',
             ]
                 .filter(Boolean)
@@ -3176,7 +3315,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                     ...common(deps, key),
                     dropped: comparison.dropped,
                 },
-                text: `None of those are ${deps.vocab.brand} ${deps.vocab.nounPlural}: ${comparison.dropped.map((d) => d.name).join(', ')}.`,
+                text: `None of those are ${catalogue(deps.vocab)}: ${comparison.dropped.map((d) => d.name).join(', ')}.`,
             };
         }
         return {
@@ -3332,7 +3471,7 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
         if (!detail) {
             return {
                 structured: { view: 'hotel-not-found', ...common(deps, key), query: wanted },
-                text: `No ${deps.vocab.brand} ${deps.vocab.noun} by that name.`,
+                text: `No ${branded(deps.vocab, deps.vocab.noun)} by that name.`,
             };
         }
         const policies = await deps.backend.policies(detail.hotel.id);