@curless/hotel-storefront 0.57.0 → 0.58.0

package/dist/tools.js

@@ -140,7 +140,7 @@ export const homeListing = (t, brand, count) => {
     };
 };
 export const withheldTools = (n, caps) => new Set([
-    ...(caps.members ? [] : [n.signIn, n.signOut, n.forgetPreferences]),
+    ...(caps.members ? [] : [n.signIn, n.signOut, n.forgetPreferences, n.memberCard]),
     ...(caps.extras ? [] : [n.listExtras]),
     ...(caps.changes || caps.extras ? [] : [n.previewChange, n.changeBooking]),
     ...(caps.policies === false ? [n.policies] : []),
@@ -280,7 +280,7 @@ const forCapabilities = (tools, n, v, caps) => {
             if (t.name === n.signIn)
                 out = {
                     ...out,
-                    description: out.description.replace('and answers with their tier, their point balance', 'and answers with their tier, their point balance, the coupons they hold'),
+                    description: out.description.replace('it answers with their tier, their point balance', 'it answers with their tier, their point balance, the coupons they hold'),
                 };
         }
         // ⚠️ THE PICKED ROOM'S BOOKING TAKES THE SAME GUEST FIELDS as the trip's:
@@ -887,19 +887,43 @@ const allTools = (n, v) => {
         },
         {
             name: n.signIn,
-            // ⚠️ A MEMBERSHIP NUMBER AND A SURNAME. No password appears in this
-            // schema because none exists: the connector has nowhere to put one, and
-            // a description that mentioned passwords would invite a model to ask for
-            // one in a chat transcript.
-            description: `Signs a ${v.brand} loyalty member in for this conversation with their membership number and the surname on it, and answers with their tier, their point balance and what the tier takes off the public rate. Room rates and trip totals are then quoted at the member rate until they are signed out.`,
+            // ⚠️ NOTHING ABOUT THE MEMBER IS ASKED FOR HERE (0.58.0, robin 11-06: 「我们
+            // 自己的登陆也要改成外链」): the membership number and the surname are typed
+            // on our page (account/member-login.ts), never in the chat - so no schema
+            // here has a field a model could fill with them.
+            description: `Starts signing a ${v.brand} loyalty member in for this conversation, on ${v.brand}'s own sign-in page: answers with a one-time link and a short code the page shows too, where the guest types their membership number and the surname on it; the chat does not carry them. Once they have, it answers with their tier, their point balance and what the tier takes off the public rate; room rates and trip totals are then quoted at the member rate until they are signed out.`,
             annotations: edits(`Sign in to ${v.brand}`, open),
             inputSchema: {
                 type: 'object',
                 properties: {
-                    number: { type: 'string', description: 'The membership number, as it is printed' },
-                    surname: { type: 'string', description: 'The surname on that membership' },
+                    lang: {
+                        type: 'string',
+                        enum: ['zh', 'en'],
+                        description: 'The language the page opens in: zh for a guest writing Chinese, en otherwise. The page has a switch.',
+                    },
                 },
-                required: ['number', 'surname'],
+            },
+        },
+        {
+            name: n.memberCard,
+            // The card's own (app-only, server.ts): never offered to the assistant.
+            description: `The booking card's own way to start a ${v.brand} membership sign-in, or to see whether its page has been used yet - for the conversation the card was drawn for.`,
+            annotations: edits(`${v.brand} membership (card)`, open),
+            inputSchema: {
+                type: 'object',
+                properties: {
+                    action: {
+                        type: 'string',
+                        enum: ['sign_in', 'view'],
+                        description: 'sign_in: a new one-time sign-in page; view: whether this conversation is signed in yet',
+                    },
+                    lang: {
+                        type: 'string',
+                        enum: ['zh', 'en'],
+                        description: 'The language the page opens in',
+                    },
+                },
+                required: ['action'],
             },
         },
         {
@@ -1532,13 +1556,35 @@ export const buildOutputSchemas = (n) => ({
     [n.signIn]: {
         type: 'object',
         properties: {
-            view: { enum: ['member', 'member-not-found'] },
+            view: { enum: ['member', 'member-sign-in', 'error'] },
             brand: STR,
             toolNames: OBJ,
             bookingMode: STR,
             demo: BOOL,
             demoNote: STR,
             member: OBJ,
+            signedIn: BOOL,
+            url: STR,
+            shortCode: STR,
+            expiresAt: STR,
+            expiresInSeconds: { type: 'number' },
+            code: STR,
+        },
+        required: ['view'],
+    },
+    [n.memberCard]: {
+        type: 'object',
+        properties: {
+            view: { enum: ['member', 'member-sign-in', 'no-member', 'error'] },
+            brand: STR,
+            toolNames: OBJ,
+            bookingMode: STR,
+            member: OBJ,
+            signedIn: BOOL,
+            waiting: BOOL,
+            expiresAt: STR,
+            expiresInSeconds: { type: 'number' },
+            code: STR,
         },
         required: ['view'],
     },
@@ -2329,6 +2375,36 @@ notSent = false) => c.returned
 const POINTS_DO_NOT_PAY = 'Points cannot pay for a room here, not even in part: what a point is worth has not been published, so give no rate for them.';
 /** The rule a coupon is used by, said once where coupons are listed. */
 const COUPON_RULE = 'One coupon per booking, taken off after the member rate. Use one only when the guest names it or agrees to it - using it spends it - by passing its id as `coupon` to the trip view (to price it) and to the booking.';
+/** Beside a member sign-in's answer where a card is drawn: the link and its short code, the card's alone. */
+export const MEMBER_SIGN_IN_META_KEY = 'curless/member-sign-in';
+const MEMBER_NEVER_IN_CHAT = 'Never in this chat: do not ask for, or accept, a membership number or a surname here, and never write back one the guest typed - not even to say which to change.';
+/**
+ * A signed-in member, as the model reads it (0.58.0): signed in, the tier and
+ * what it takes off, the points and the coupons - what pricing and booking
+ * need. ⚠️ NOT THE NAME OR THE NUMBER: those are the card's, beside the answer
+ * (server.ts `memberApart`) - the model is told who is signed in by what the
+ * membership does, not who it is.
+ */
+const memberAnswer = (deps, key, member, lead) => ({
+    structured: {
+        view: 'member',
+        ...common(deps, key),
+        member: memberForCard(member, deps.vocab.brand),
+    },
+    text: [
+        `${lead ? `${lead}: ` : ''}signed in as a ${member.programme} ${member.tier.name} member.`,
+        `Rates now show the ${member.tier.name} member rate, ${Math.round(member.tier.discount * 100)}% off the public one.`,
+        ...((deps.backend.capabilities ?? FULL_CAPABILITIES).coupons
+            ? memberSaid(member, deps.vocab.brand)
+            : [POINTS_DO_NOT_PAY]),
+        member.preferences?.length
+            ? `Saved preferences on this membership: ${member.preferences.map((k) => REQUEST_WORDS[k]).join(', ')}. They are ticked on the booking form; mention them, and ask before booking with them.`
+            : '',
+    ]
+        .filter(Boolean)
+        .join('\n')
+        .replace(/^signed/, 'Signed'),
+});
 /** A signed-in member's coupons and points, for the sign-in answer - see `memberCouponsSaid`. */
 const memberSaid = (m, brand) => [
     `Points: ${m.points.toLocaleString('en-GB')}.${m.pointsExpiring ? ` ${m.pointsExpiring.points.toLocaleString('en-GB')} of them lapse on ${m.pointsExpiring.on}.` : ''} ${POINTS_DO_NOT_PAY}`,
@@ -7072,64 +7148,77 @@ const answerTool = async (deps, name, rawArgs, ctx) => {
                 .join('\n'),
         };
     }
-    if (name === t.signIn) {
-        const number = str(args.number);
-        const surname = str(args.surname);
-        // Counted like a booking lookup - see limits.ts. A number and a surname
-        // read a tier, a point balance and saved preferences.
-        const tries = [
-            `signin|${key}`,
-            `member|${number.replace(/\s+/g, '').toUpperCase()}`,
-            // The network too, as for bookings - see `guarded`.
-            ...(ctx.ip ? [`ip|${ctx.ip}`] : []),
-        ];
-        if (deps.misses?.blocked(tries)) {
+    if (name === t.signIn || name === t.memberCard) {
+        const fromCard = name === t.memberCard;
+        // ⚠️ THE CARD'S OWN WHERE A CARD IS DRAWN (app-only, server.ts): a client
+        // that draws none is refused it - the code it hands out is the card's alone.
+        if (fromCard && ctx.noCards)
+            return {
+                structured: { view: 'error', ...common(deps, key), code: 'card_only' },
+                text: `${t.memberCard} is the booking card's own. ${t.signIn} signs a member in from the chat.`,
+                isError: true,
+            };
+        const signedIn = deps.members.read(key);
+        if (signedIn)
+            return memberAnswer(deps, key, signedIn, fromCard ? '' : 'Already signed in');
+        if (fromCard && args.action !== 'sign_in') {
             return {
                 structured: {
-                    view: 'member-not-found',
+                    view: 'no-member',
                     ...common(deps, key),
-                    query: number,
-                    tooMany: true,
+                    ...(deps.memberLogin?.waiting(key) ? { waiting: true } : {}),
                 },
-                text: 'Too many membership numbers and surnames that did not match, so signing in is paused for a quarter of an hour. Check both as they are printed on the card, then try again.',
+                text: `Nobody is signed in as a ${deps.vocab.brand} member in this conversation.`,
             };
         }
-        const member = await deps.backend.signInMember(number, surname);
-        if (!member)
-            deps.misses?.miss(tries);
-        if (!member) {
-            // ⚠️ NO TIER FOR A NUMBER THAT DID NOT MATCH. Being generous here - "close
-            // enough, have the discount" - is inventing a membership, and the guest
-            // would find out at the desk.
+        const login = deps.memberLogin;
+        if (!login)
             return {
-                structured: { view: 'member-not-found', ...common(deps, key), query: number },
-                text: `No ${deps.vocab.brand} membership matches that number and surname. Check both as they are printed; nothing else is needed - a password is never asked for here.`,
+                structured: { view: 'error', ...common(deps, key), code: 'no_sign_in_page' },
+                text: `Signing in as a ${deps.vocab.brand} member is not open here.`,
+                isError: true,
             };
-        }
-        deps.members.set(key, member);
+        const made = login.start(key, { noCards: ctx.noCards, lang: args.lang, ip: ctx.ip });
+        if (!made.ok)
+            return {
+                structured: { view: 'error', ...common(deps, key), code: made.code },
+                text: made.code === 'too_many_links'
+                    ? `Too many sign-in links were asked for in this conversation just now. Wait a few minutes, then ask again. ${MEMBER_NEVER_IN_CHAT}`
+                    : 'Too many sign-ins are being started just now. Try again in a minute.',
+                isError: true,
+            };
+        const said = { expiresAt: made.expiresAt, expiresInSeconds: made.expiresInSeconds };
+        if (ctx.noCards)
+            return {
+                structured: {
+                    view: 'member-sign-in',
+                    ...common(deps, key),
+                    signedIn: false,
+                    url: made.url,
+                    shortCode: made.short,
+                    ...said,
+                },
+                text: `A one-time ${deps.vocab.brand} member sign-in page is ready: ${made.url} - the guest opens it in their browser and types their membership number and the surname on it there. ${MEMBER_NEVER_IN_CHAT} The page shows the code ${made.short}: tell the guest it must match the code you give them here, and to close the page if it does not. The link works once, for ${made.minutes} minutes. When they say they are done, call ${t.signIn} again: it then answers with their tier and member rate.`,
+            };
+        // ⚠️ THE LINK AND THE CODE ARE THE CARD'S (as the account's, Nexva's review
+        // P1-1): where a card is drawn the model is never handed the short code, so
+        // text a page slipped into the chat cannot show a matching one.
         return {
-            structured: {
-                view: 'member',
-                ...common(deps, key),
-                member: memberForCard(member, deps.vocab.brand),
+            structured: { view: 'member-sign-in', ...common(deps, key), signedIn: false, ...said },
+            text: `A one-time ${deps.vocab.brand} member sign-in page is ready for the guest, opened from the card: they type their membership number and surname on that page. ${MEMBER_NEVER_IN_CHAT} The card shows a code the page shows too, and shows them signed in when they are done; the link works once, for ${made.minutes} minutes.`,
+            meta: {
+                [MEMBER_SIGN_IN_META_KEY]: {
+                    url: made.url,
+                    shortCode: made.short,
+                    expiresAt: made.expiresAt,
+                },
             },
-            text: [
-                `Signed in as ${member.name}${member.names?.zh ? ` (${member.names.zh})` : ''} · ${member.programme} ${member.tier.name} · ${member.points.toLocaleString('en-GB')} points.`,
-                `Rates now show the ${member.tier.name} member rate, ${Math.round(member.tier.discount * 100)}% off the public one.`,
-                ...((deps.backend.capabilities ?? FULL_CAPABILITIES).coupons
-                    ? memberSaid(member, deps.vocab.brand)
-                    : [POINTS_DO_NOT_PAY]),
-                member.preferences?.length
-                    ? `Saved preferences on this membership: ${member.preferences.map((k) => REQUEST_WORDS[k]).join(', ')}. They are ticked on the booking form; mention them, and ask before booking with them.`
-                    : '',
-            ]
-                .filter(Boolean)
-                .join('\n'),
         };
     }
     if (name === t.signOut) {
         const was = deps.members.read(key);
         deps.members.clear(key);
+        deps.memberLogin?.cancel(key);
         return {
             structured: { view: 'signed-out', ...common(deps, key) },
             text: was