@wix/himalaya-cli 0.1633.0 → 0.1634.0

package/templates/branded-lite/tier5-src/wix-spaces-members/index.ts

@@ -1,23 +1,34 @@
 // Public site-member directory. Search, sorting, totals and offset paging match
 // OneApp's Members v1 query; no owner roster or build-time count is substituted.
 import { defineService } from "@himalaya/state";
-import { queryMembers, type WixMember } from "@himalaya/wix-members";
+import { queryMembers, followMember, unfollowMember, type WixMember } from "@himalaya/wix-members";
 import { createCollectionQuery } from "../_shared/collection-query.js";
 import { readAccess, assertReadAccess, readAccessDenied, type ReadAccess } from "../_shared/member-read.js";
 import { memberAccessChanged } from "../_shared/member-access.js";
 import { withEmptyFlags } from "../_shared/empty-flags.js";
+import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { memberRowExtras, followLabel, type MemberRowExtras } from "../_shared/member-row-extras.js";
 
-interface Row { id: string; name: string; subtitle: string; initial: string; photo: string; sectionTitle: string }
+interface Row extends MemberRowExtras { id: string; name: string; initial: string; photo: string; sectionTitle: string }
 interface S {
   status: "loading" | "ready" | "error";
   members: Row[]; emptyText: string;
   query: string; total: number | null; searchLabel: string;
   nextCursor: string; noMore: boolean; noPageError: boolean;
   error: string; notErrored: boolean; notLoading: boolean; hideSearch: boolean;
+  followHint: string;
 }
 const PAGE_SIZE = 50;
 const SEARCH_FIELDS = ["contact.firstName", "contact.lastName", "profile.nickname"];
 let directoryAccess: ReadAccess | undefined;
+// A Follow the signed-in member just made or undone. Rows keep the state they were read with, so this
+// shows the change at once; the next first-page read replaces it with what the server says.
+const followChanges = new Map<string, boolean>();
+const pendingFollows = new Set<string>();
+
+/** Who a directory read, and a write that follows it, belong to: the site and the signed-in member. A reload
+ *  builds a NEW ReadAccess object for the same reader, so identity says nothing; this key does. */
+const readerKey = (access: ReadAccess | undefined): string => access ? JSON.stringify([access.tenant, access.member.scope, access.member.email]) : "";
 
 function name(m: WixMember): string {
   const nick = m.profile?.nickname?.trim();
@@ -25,10 +36,14 @@ function name(m: WixMember): string {
   const full = [m.contact?.firstName, m.contact?.lastName].filter(Boolean).join(" ").trim();
   return full || "Member";
 }
-function row(m: WixMember): Row {
+function row(m: WixMember, extras: MemberRowExtras): Row {
   const n = name(m);
   // Login emails are not directory subtitles. Only public profile content is presented.
-  return { id: m.id, name: n, subtitle: "", initial: (n[0] || "#").toUpperCase(), photo: m.profile?.photo?.url || "", sectionTitle: "" };
+  return { id: m.id, name: n, initial: (n[0] || "#").toUpperCase(), photo: m.profile?.photo?.url || "", sectionTitle: "", ...extras };
+}
+function withFollowChange(item: Row): Row {
+  const following = followChanges.get(item.id);
+  return following === undefined ? item : { ...item, isFollowing: following, followLabel: followLabel(following) };
 }
 function sections(rows: Row[]): Row[] {
   const groups = new Map<string, Row[]>();
@@ -47,16 +62,17 @@ const directory = createCollectionQuery<Row>({
     if (!Number.isSafeInteger(offset) || offset < 0) throw new Error("Invalid member page offset");
     const access = cursor ? directoryAccess : await readAccess();
     if (!access) throw memberAccessChanged();
-    if (!cursor) directoryAccess = access;
+    if (!cursor) { directoryAccess = access; followChanges.clear(); followHint = ""; }
     await assertReadAccess(access);
     const response = await queryMembers({ query: {
       filter: { status: "APPROVED", privacyStatus: "PUBLIC" },
       sorting: [{ fieldName: "profile.nickname", order: "ASC" }],
       paging: { limit: PAGE_SIZE, offset },
     }, ...(criteria.query ? { search: { expression: criteria.query, fields: SEARCH_FIELDS } } : {}) });
+    if (!Array.isArray(response.members) || response.members.some(member => !member?.id)) throw new Error("Invalid member page");
+    const extras = response.members.length ? await memberRowExtras(response.members.map(member => member.id), access) : undefined;
     await assertReadAccess(access);
     if (access !== directoryAccess) throw memberAccessChanged();
-    if (!Array.isArray(response.members) || response.members.some(member => !member?.id)) throw new Error("Invalid member page");
     const metadata = response.metadata;
     if (metadata?.offset !== undefined && metadata.offset !== offset) throw new Error("Mismatched member page offset");
     const total = !metadata?.tooManyToCount && typeof metadata?.total === "number" && Number.isSafeInteger(metadata.total) && metadata.total >= 0
@@ -64,7 +80,7 @@ const directory = createCollectionQuery<Row>({
     const next = offset + response.members.length;
     if (!response.members.length && total !== undefined && total > next) throw new Error("Incomplete member page");
     return {
-      items: response.members.map(row), total,
+      items: response.members.map(member => row(member, extras!(member.id))), total,
       nextCursor: response.members.length && (total === undefined ? response.members.length === PAGE_SIZE : next < total) ? String(next) : "",
     };
   },
@@ -73,6 +89,7 @@ const directory = createCollectionQuery<Row>({
 // Set once the reader has typed a search: from then on the field stays mounted, even while a cleared search
 // reloads the full directory (no rows, no query yet), so it never unmounts and loses focus mid-edit.
 let searched = false;
+let followHint = "";
 
 function project(): S {
   const page = directory.getState();
@@ -81,7 +98,7 @@ function project(): S {
   const failed = page.status === "error";
   return {
     status: failed ? "error" : loading ? "loading" : "ready",
-    members: sections(page.items), query: page.criteria.query, total,
+    members: sections(page.items.map(withFollowChange)), query: page.criteria.query, total,
     searchLabel: total === null ? "" : `${total} ${total === 1 ? "member" : "members"}`,
     emptyText: page.status === "ready" && !page.items.length ? page.criteria.query ? "No results" : "No members yet" : "",
     nextCursor: loading || page.loadingMore || page.pageError ? "" : page.nextCursor,
@@ -94,21 +111,24 @@ function project(): S {
     // A successful empty SEARCH keeps its field reachable (to clear the query); a directory that is
     // loading or truly empty (no query, no rows) has nothing to search.
     hideSearch: failed || (!page.items.length && !page.criteria.query && !searched),
+    followHint,
   };
 }
 const svc = defineService<S, {
-  load: (s: S) => Promise<undefined>;
+  load: (s: S, arg?: unknown) => Promise<undefined>;
   filter: (s: S, arg?: unknown) => Promise<undefined>;
   loadMore: (s: S) => Promise<undefined>;
   retry: (s: S) => Promise<undefined>;
+  toggleFollow: (s: S, arg?: unknown) => Promise<S | undefined>;
   changed: (s: S) => S;
 }>("spacesMembers", withEmptyFlags({
   state: { status: "loading", members: [], emptyText: "", query: "", total: null, searchLabel: "", nextCursor: "", noMore: true, noPageError: true,
-    error: "", notErrored: true, notLoading: false, hideSearch: true },
+    error: "", notErrored: true, notLoading: false, hideSearch: true, followHint: "" },
   // A restored worker must re-read the current reader/site before showing a roster.
-  notHydrated: ["status", "members", "emptyText", "query", "total", "searchLabel", "nextCursor", "noMore", "noPageError", "error", "notErrored", "notLoading", "hideSearch"],
+  notHydrated: ["status", "members", "emptyText", "query", "total", "searchLabel", "nextCursor", "noMore", "noPageError", "error", "notErrored", "notLoading", "hideSearch", "followHint"],
   actions: {
-    load: async () => { await directory.query(directory.getState().criteria); return undefined; },
+    // The screen's onAppear carries the copy pack (the owner's wording, the stock translations) and the app language.
+    load: async (_s, arg) => { stashCopy(arg); await directory.query(directory.getState().criteria); return undefined; },
     filter: async (_s, arg) => {
       const value = typeof arg === "string" ? arg : (arg as { value?: unknown })?.value;
       if (typeof value === "string" && value.trim()) searched = true;
@@ -116,6 +136,34 @@ const svc = defineService<S, {
     },
     loadMore: async () => { await directory.loadMore(); return undefined; },
     retry: async () => { await directory.retry(); return undefined; },
+    // Only a signed-in member reaches this: a Visitor's Follow opens sign-in from the descriptor instead.
+    toggleFollow: async (_s, arg) => {
+      const id = (arg as { id?: unknown } | undefined)?.id;
+      const access = directoryAccess;
+      if (typeof id !== "string" || !id || !access?.member.email || pendingFollows.has(id)) return undefined;
+      const row = directory.getState().items.find(item => item.id === id);
+      if (!row) return undefined;
+      const following = withFollowChange(row).isFollowing;
+      pendingFollows.add(id);
+      try {
+        await assertReadAccess(access);
+        if (following) await unfollowMember(id); else await followMember(id);
+        await assertReadAccess(access);
+        // A first-page reload (typing in search, Retry) may have replaced directoryAccess while the write was in
+        // flight. The write still stands for the same reader on the same site, so it is recorded; only another
+        // reader's list must not take it.
+        if (readerKey(access) !== readerKey(directoryAccess)) return undefined;
+        followChanges.set(id, !following);
+        followHint = "";
+      } catch {
+        // A failed write belongs to the member who tapped: the control keeps its state and says so.
+        if (readerKey(access) !== readerKey(directoryAccess)) return undefined;
+        followHint = copyParam("members.followError", "Couldn't update Follow — try again.");
+      } finally {
+        pendingFollows.delete(id);
+      }
+      return project();
+    },
     changed: () => project(),
   },
 }, { members: "noMembers" }));

package/templates/community-club/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/events-meetups/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/gym-fitness/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/nonprofit-cause/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/podcast-creator/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/portfolio-creative/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/restaurant/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/retail-store/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/salon-spa/dev/index.ts

@@ -12714,7 +12714,7 @@ const SCREENS = runtimeSetting({
                                                         "type": "Text",
                                                         "props": {
                                                           "text": "$item.bodyMarkdown",
-                                                          "style": "body",
+                                                          "style": "caption",
                                                           "color": "textPrimary",
                                                           "collapseWhenEmpty": true,
                                                           "textDirection": "auto",
@@ -12918,7 +12918,8 @@ const SCREENS = runtimeSetting({
                                                               }
                                                             }
                                                           ],
-                                                          "spacing": 6
+                                                          "spacing": 6,
+                                                          "horizontal": false
                                                         }
                                                       },
                                                       "modifiers": {
@@ -12941,7 +12942,7 @@ const SCREENS = runtimeSetting({
                                                       "modifiers": {}
                                                     }
                                                   ],
-                                                  "spacing": 7,
+                                                  "spacing": 5,
                                                   "alignment": "leading"
                                                 }
                                               },
@@ -12958,12 +12959,12 @@ const SCREENS = runtimeSetting({
                                                 },
                                                 "cornerRadius": 16,
                                                 "padding": {
-                                                  "leading": 10,
-                                                  "trailing": 10,
-                                                  "top": 10,
-                                                  "bottom": 10
+                                                  "leading": 8,
+                                                  "trailing": 8,
+                                                  "top": 8,
+                                                  "bottom": 8
                                                 },
-                                                "maxWidth": 360,
+                                                "maxWidth": 300,
                                                 "hiddenPath": "$item.isCard"
                                               }
                                             },
@@ -13372,7 +13373,8 @@ const SCREENS = runtimeSetting({
                                                                       }
                                                                     }
                                                                   ],
-                                                                  "spacing": 6
+                                                                  "spacing": 6,
+                                                                  "horizontal": false
                                                                 }
                                                               },
                                                               "modifiers": {
@@ -13524,7 +13526,7 @@ const SCREENS = runtimeSetting({
                                                 "type": "Text",
                                                 "props": {
                                                   "text": "$item.bodyText",
-                                                  "style": "body",
+                                                  "style": "caption",
                                                   "color": "textOnAccent",
                                                   "collapseWhenEmpty": true,
                                                   "textDirection": "auto",
@@ -13549,7 +13551,7 @@ const SCREENS = runtimeSetting({
                                               "modifiers": {}
                                             }
                                           ],
-                                          "spacing": 7,
+                                          "spacing": 5,
                                           "alignment": "leading"
                                         }
                                       },
@@ -13560,12 +13562,12 @@ const SCREENS = runtimeSetting({
                                         },
                                         "cornerRadius": 16,
                                         "padding": {
-                                          "leading": 10,
-                                          "trailing": 10,
-                                          "top": 10,
-                                          "bottom": 10
+                                          "leading": 8,
+                                          "trailing": 8,
+                                          "top": 8,
+                                          "bottom": 8
                                         },
-                                        "maxWidth": 360
+                                        "maxWidth": 300
                                       }
                                     }
                                   ],
@@ -13787,10 +13789,11 @@ const SCREENS = runtimeSetting({
                                         "type": "Text",
                                         "props": {
                                           "text": "$item.label",
-                                          "style": "body",
+                                          "style": "caption",
                                           "color": "accentPrimary",
                                           "collapseWhenEmpty": true,
-                                          "textDirection": "auto"
+                                          "textDirection": "auto",
+                                          "maxLines": 1
                                         }
                                       },
                                       "modifiers": {}
@@ -13801,13 +13804,13 @@ const SCREENS = runtimeSetting({
                                 }
                               },
                               "modifiers": {
-                                "fillMaxWidth": true,
-                                "cornerRadius": 16,
+                                "fillMaxWidth": false,
+                                "cornerRadius": 12,
                                 "padding": {
-                                  "leading": 14,
-                                  "trailing": 14,
-                                  "top": 10,
-                                  "bottom": 10
+                                  "leading": 10,
+                                  "trailing": 10,
+                                  "top": 5,
+                                  "bottom": 5
                                 },
                                 "background": {
                                   "token": "accentSurface"
@@ -13837,10 +13840,11 @@ const SCREENS = runtimeSetting({
                                         "type": "Text",
                                         "props": {
                                           "text": "$item.label",
-                                          "style": "body",
+                                          "style": "caption",
                                           "color": "textSecondary",
                                           "collapseWhenEmpty": true,
-                                          "textDirection": "auto"
+                                          "textDirection": "auto",
+                                          "maxLines": 1
                                         }
                                       },
                                       "modifiers": {}
@@ -13851,16 +13855,16 @@ const SCREENS = runtimeSetting({
                                 }
                               },
                               "modifiers": {
-                                "fillMaxWidth": true,
-                                "cornerRadius": 16,
+                                "fillMaxWidth": false,
+                                "cornerRadius": 12,
                                 "padding": {
-                                  "leading": 14,
-                                  "trailing": 14,
-                                  "top": 10,
-                                  "bottom": 10
+                                  "leading": 10,
+                                  "trailing": 10,
+                                  "top": 5,
+                                  "bottom": 5
                                 },
                                 "background": {
-                                  "token": "surfaceElevated"
+                                  "token": "surfaceSecondary"
                                 },
                                 "hiddenPath": "$item.enabled"
                               }
@@ -13871,11 +13875,12 @@ const SCREENS = runtimeSetting({
                         }
                       },
                       "modifiers": {
-                        "fillMaxWidth": true
+                        "fillMaxWidth": false
                       }
                     }
                   ],
-                  "spacing": 6
+                  "spacing": 8,
+                  "horizontal": true
                 }
               },
               "modifiers": {
@@ -13891,41 +13896,72 @@ const SCREENS = runtimeSetting({
                 "props": {
                   "children": [
                     {
-                      "id": "himi_business_chat.draft",
+                      "id": "himi_business_chat.draft_shell",
                       "body": {
                         "package": "himalaya",
-                        "type": "TextField",
+                        "type": "ZStack",
                         "props": {
-                          "valuePath": "$service:businessChat.draft",
-                          "onChange": {
-                            "actionId": "tier5.businessChat.setDraft"
-                          },
-                          "placeholder": "Type your message…",
-                          "maxLength": 4000,
-                          "multilineMaxLines": 5,
-                          "borderless": true
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "himi_business_chat.draft_outline",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "children": [],
+                                  "spacing": 0,
+                                  "alignment": "leading"
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "height": 40,
+                                "background": {
+                                  "token": "surfacePrimary"
+                                },
+                                "cornerRadius": 20,
+                                "border": {
+                                  "width": 1,
+                                  "color": {
+                                    "token": "border"
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_business_chat.draft",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "TextField",
+                                "props": {
+                                  "valuePath": "$service:businessChat.draft",
+                                  "onChange": {
+                                    "actionId": "tier5.businessChat.setDraft"
+                                  },
+                                  "placeholder": "Type your message…",
+                                  "maxLength": 4000,
+                                  "multilineMaxLines": 1,
+                                  "borderless": true
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "accessibilityLabel": "Type your message",
+                                "padding": {
+                                  "leading": 8,
+                                  "trailing": 8,
+                                  "top": 0,
+                                  "bottom": 0
+                                }
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
                         "weight": 1,
-                        "fillMaxWidth": true,
-                        "accessibilityLabel": "Type your message",
-                        "padding": {
-                          "leading": 12,
-                          "trailing": 10,
-                          "top": 2,
-                          "bottom": 2
-                        },
-                        "background": {
-                          "token": "surfacePrimary"
-                        },
-                        "cornerRadius": 22,
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        }
+                        "fillMaxWidth": true
                       }
                     },
                     {
@@ -13992,16 +14028,22 @@ const SCREENS = runtimeSetting({
                       }
                     }
                   ],
-                  "spacing": 8,
+                  "spacing": 6,
                   "alignment": "center"
                 }
               },
               "modifiers": {
-                "fillMaxWidth": true
+                "fillMaxWidth": true,
+                "padding": {
+                  "leading": 8,
+                  "trailing": 8,
+                  "top": 0,
+                  "bottom": 0
+                }
               }
             }
           ],
-          "spacing": 8,
+          "spacing": 0,
           "alignment": "leading"
         }
       },
@@ -14012,10 +14054,10 @@ const SCREENS = runtimeSetting({
           "token": "surfacePrimary"
         },
         "padding": {
-          "leading": 8,
-          "trailing": 8,
-          "top": 8,
-          "bottom": 8
+          "leading": 0,
+          "trailing": 0,
+          "top": 4,
+          "bottom": 0
         }
       }
     },

package/templates/salon-spa/tier5-src/_shared/branded-lite-hosted.ts

@@ -97,6 +97,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_gift_card: ["giftCards"],
   himi_gift_cards: ["giftCards"],
   himi_groups: ["groups"],
+  himi_inbox: ["inbox"],
   himi_group_about: ["groups"],
   himi_my_groups: ["groups"],
   himi_invoice: ["invoices"],

package/templates/salon-spa/tier5-src/_shared/business-chat-history.ts

@@ -27,7 +27,10 @@ export function smartChatHistory(aiMessages: unknown[], memberPage: unknown[], p
     const mine = sender === 'SITE_VISITOR' && VISITOR_TYPES.has(kind);
     if (!mine && !(sender === 'ASSISTANT' && ASSISTANT_TYPES.has(kind)) && !(sender === 'USER' && STAFF_TYPES.has(kind))) continue;
     const body = object(message.body);
-    const bodyText = [text(body.mainText), text(body.footerText)].filter(Boolean).join('\n');
+    const selectedAction = kind === 'VISITOR_OPTION_SELECTED' && Array.isArray(body.additionalData)
+      ? body.additionalData.map(object).find(part => part.type === 'select_option' && text(part.action).trim())?.action
+      : '';
+    const bodyText = [text(body.mainText) || text(selectedAction), text(body.footerText)].filter(Boolean).join('\n');
     const rich = memberRows.get(text(message.inboxId));
     // A quick-reply-only metadata answer is not an empty bubble (the options are shown by the composer).
     if (!bodyText && !rich) continue;

package/templates/salon-spa/tier5-src/_shared/business-chat-presenter.ts

@@ -1,3 +1,4 @@
+import { isBusinessRoom } from "./inbox-rooms.js";
 import { businessChatCopy } from "./business-chat-copy.js";
 import { formatMonthDay } from "./engine-intl.js";
 type RecordValue = Record<string, unknown>;
@@ -78,13 +79,7 @@ const object = (value: unknown): RecordValue =>
 /** Return a sole existing two-party business room, or a unique business-name match among several;
  * never create a room or guess among remaining matches. */
 export function selectExistingBusinessRoom(rooms: unknown[], businessName?: string, requireUnambiguous = false): { id: string; participantId: string } | undefined {
-  let candidates = rooms.filter((value) => {
-    const room = object(value);
-    return typeof room.id === "string" && !!room.id &&
-      typeof room.participantId === "string" && !!room.participantId &&
-      room.participantCount === 2 && room.clientReferenceType === "contactId" &&
-      Object.keys(object(room.businessContext)).length > 0;
-  });
+  let candidates = rooms.filter(isBusinessRoom);
   const candidateCount = candidates.length;
   if (candidateCount > 1 && businessName?.trim()) {
     // Keep case significant so differently named businesses are not conflated.