@wix/himalaya-cli 0.1614.0 → 0.1615.0

package/templates/branded-lite/tier5-src/himi-branded-lite-galleries/index.ts

@@ -2,12 +2,15 @@
 //
 // Published Gallery page photos are carried by site analyze in the descriptor and
 // displayed without a Pro Gallery request. Sites with no page gallery use the Wix
-// API gateway. Failed reads remain errors; sample data is explicit preview only.
+// API gateway: the list takes each gallery's first item as its cover, and opening a
+// gateway gallery reads its items. Failed reads remain errors; sample data is explicit
+// preview only.
 //
 import { defineService } from "../_shared/collection-service.js";
 import { get as getAppInfo } from "@himalaya/app-info";
 import { LOADING, loaded, loadFailed, type LoadCopy, type LoadFlags } from "../_shared/branded-load-state.js";
-import { presence, type PresenceFlags } from "../_shared/detail-presence.js";
+import { isNotFoundError, presence, type PresenceFlags } from "../_shared/detail-presence.js";
+import { wixMediaUrl } from "@himalaya/wix-media";
 
 const GALLERIES_PATH = "/progallery/v2/galleries";
 const LEGACY_GALLERIES_URL =
@@ -20,9 +23,12 @@ function wixApi(): WixApi | null {
   return (globalThis as { himalaya?: { wixApi?: WixApi } }).himalaya?.wixApi ?? null;
 }
 
-interface RawGallery { id: string; name?: string; totalItems?: number; totalItemsCount?: number }
+interface RawItem { id?: unknown; title?: unknown; image?: { imageInfo?: unknown } }
+interface RawGallery { id: string; name?: string; totalItems?: number; totalItemsCount?: number; items?: RawItem[]; source?: "gateway" | "legacy" }
 interface StaticGallery { id: string; title: string; photos: string[] }
-interface Row { id: string; title: string; subtitle: string; name: string; description: string; image: string; noCover: boolean }
+/** `source`: which route listed the gallery. Only a GATEWAY gallery can be opened live by id —
+ *  a legacy row's id (or a synthesized `gallery-<n>`) is unknown to the gateway. */
+interface Row { id: string; title: string; subtitle: string; name: string; description: string; image: string; noCover: boolean; hasCover: boolean; source: "gateway" | "legacy" | "page" }
 interface PhotoRow { id: string; url: string; title: string }
 interface S extends LoadFlags, PresenceFlags {
   galleries: Row[]; emptyText: string;
@@ -56,12 +62,56 @@ function parseStaticGalleries(raw: unknown): StaticGallery[] {
 }
 
 let staticGalleries: StaticGallery[] = [];
+/** The gateway gallery open on screen: each `open` counts up, and a read answers for its own. */
+let openSeq = 0;
+type PhotosRead = { seq: number; title?: string; photos?: PhotoRow[] } | { seq: number; error: unknown };
+
+/** A Pro Gallery image item's URL. `imageInfo` is either a Wix media object (`{ id, url }`,
+ *  where `url` may be the bare media id) or a `wix:image://` string; anything else is "". */
+function itemUrl(item: RawItem | undefined): string {
+  const info = item?.image?.imageInfo;
+  if (typeof info === "string") return wixMediaUrl(info);
+  if (!info || typeof info !== "object") return "";
+  const media = info as { url?: unknown; id?: unknown };
+  return wixMediaUrl(media.url) || wixMediaUrl(media.id);
+}
 
 function norm(g: RawGallery, i: number): Row {
   const title = (g.name || "").trim() || `Gallery ${i + 1}`;
   const n = g.totalItems ?? g.totalItemsCount ?? 0;
   const subtitle = n ? (n === 1 ? "1 photo" : `${n} photos`) : "";
-  return { id: g.id, title, subtitle, name: title, description: subtitle, image: "", noCover: true };
+  // The list asks for one item per gallery (itemLimit=1): that item is the cover.
+  const image = itemUrl(Array.isArray(g.items) ? g.items[0] : undefined);
+  return { id: g.id, title, subtitle, name: title, description: subtitle, image, noCover: !image, hasCover: !!image, source: g.source ?? "gateway" };
+}
+
+/** A gateway gallery's photos, in the gallery's own order, page by page (`itemOffset` /
+ *  `itemLimit`; `totalItems` says when to stop — `offset`/`limit` are ignored on this route).
+ *  Capped so a huge gallery cannot stall the screen. Video and text items carry no image and
+ *  are skipped. */
+const ITEM_PAGE = 100, ITEM_MAX = 500;
+async function readGalleryPhotos(api: WixApi, id: string): Promise<{ title: string; photos: PhotoRow[] }> {
+  let name: unknown = "";
+  const items: RawItem[] = [];
+  for (let offset = 0; offset < ITEM_MAX; offset += ITEM_PAGE) {
+    const res = await api.call("GET", `${GALLERIES_PATH}/${encodeURIComponent(id)}?itemOffset=${offset}&itemLimit=${ITEM_PAGE}`) as { gallery?: { name?: unknown; items?: unknown; totalItems?: unknown } } | null;
+    const gallery = res?.gallery;
+    if (!gallery || typeof gallery !== "object") throw new Error("Malformed Pro Gallery response");
+    if (offset === 0) name = gallery.name;
+    const page = Array.isArray(gallery.items) ? gallery.items as RawItem[] : [];
+    items.push(...page);
+    const total = typeof gallery.totalItems === "number" ? gallery.totalItems : undefined;
+    if (page.length < ITEM_PAGE || (total !== undefined && items.length >= total)) break;
+  }
+  const photos = items.flatMap((item, index): PhotoRow[] => {
+    // The original media URL, like a page gallery's: the photo viewer (`view`) accepts only
+    // that form, and the renderer sizes the image to its slot.
+    const url = itemUrl(item).replace(/\/v1\/.*$/, "");
+    if (!url) return [];
+    const title = typeof item.title === "string" && item.title.trim() ? item.title.trim() : `Photo ${index + 1}`;
+    return [{ id: typeof item.id === "string" && item.id ? item.id : `${id}-${index}`, url, title }];
+  });
+  return { title: typeof name === "string" ? name.trim() : "", photos };
 }
 
 async function readGalleries(api: WixApi): Promise<RawGallery[]> {
@@ -88,7 +138,7 @@ async function readLegacyGalleries(api: WixApi): Promise<RawGallery[]> {
   return raw.map((gallery, index) => {
     if (!gallery || typeof gallery !== "object") throw new Error("Malformed legacy Pro Gallery row");
     const row = gallery as Partial<RawGallery>;
-    return { ...row, id: typeof row.id === "string" && row.id ? row.id : `gallery-${index}` };
+    return { ...row, id: typeof row.id === "string" && row.id ? row.id : `gallery-${index}`, source: "legacy" as const };
   });
 }
 
@@ -118,9 +168,9 @@ async function readCompatibleGalleries(api: WixApi): Promise<RawGallery[]> {
 }
 
 const MOCK: Row[] = [
-  { id: "sample-work",   title: "Our Work",     subtitle: "24 photos", name: "Our Work", description: "24 photos", image: "", noCover: true },
-  { id: "sample-events", title: "Events",       subtitle: "48 photos", name: "Events", description: "48 photos", image: "", noCover: true },
-  { id: "sample-team",   title: "The Team",     subtitle: "9 photos", name: "The Team", description: "9 photos", image: "", noCover: true },
+  { id: "sample-work",   title: "Our Work",     subtitle: "24 photos", name: "Our Work", description: "24 photos", image: "", noCover: true, hasCover: false, source: "page" },
+  { id: "sample-events", title: "Events",       subtitle: "48 photos", name: "Events", description: "48 photos", image: "", noCover: true, hasCover: false, source: "page" },
+  { id: "sample-team",   title: "The Team",     subtitle: "9 photos", name: "The Team", description: "9 photos", image: "", noCover: true, hasCover: false, source: "page" },
 ];
 
 /** sample rows reach the screen ONLY in the host's explicit sample preview;
@@ -133,14 +183,21 @@ const COPY: LoadCopy<Row> = {
   sample: () => MOCK.map((r) => ({ ...r })),
 };
 
+/** The newest state, for an action that answers after an await (`s` is from before it). */
+const current = (s: S): S => (svc.getState?.() as S | undefined) ?? s;
+
 const svc = defineService<S, {
   load: (s: S, arg?: { staticGalleries?: unknown }) => Promise<S>;
   open: (s: S, arg?: { staticGalleries?: unknown }) => S;
+  photosRead: (s: S, arg?: PhotosRead) => S | undefined;
   view: (s: S) => S;
 }>("himiBrandedGalleries", {
   state: { ...LOADING, ...presence("loading"), galleries: [], emptyText: "", galleryTitle: "", photos: [], photoUrl: "", photoTitle: "", noGallery: true, hasPhotos: false, hasPhoto: false, noPhoto: true },
   actions: {
     load: async (s, arg) => {
+      // No `openSeq` bump here: the list and a gallery never share a worker (workers are pooled by
+      // screen and input), and a host's refresh runs `load` on the gallery's own worker, where a
+      // bump would drop that gallery's read in flight and leave its screen blank.
       try {
         if (arg && "staticGalleries" in arg) {
           staticGalleries = [];
@@ -149,7 +206,7 @@ const svc = defineService<S, {
         if (staticGalleries.length) {
           const rows = staticGalleries.map((gallery) => {
             const subtitle = gallery.photos.length === 1 ? "1 photo" : `${gallery.photos.length} photos`;
-            return { id: gallery.id, title: gallery.title, subtitle, name: gallery.title, description: subtitle, image: gallery.photos[0], noCover: false };
+            return { id: gallery.id, title: gallery.title, subtitle, name: gallery.title, description: subtitle, image: gallery.photos[0], noCover: false, hasCover: true, source: "page" as const };
           });
           return { ...s, ...loaded("galleries", rows, COPY) };
         }
@@ -157,12 +214,17 @@ const svc = defineService<S, {
         if (!api) return { ...s, ...loadFailed("galleries", new Error("Wix bridge unavailable"), COPY) };
         const raw = await readCompatibleGalleries(api);
         const galleries = raw.map(norm);
-        return { ...s, ...loaded("galleries", galleries, COPY) };
+        // From the state as it is NOW: on a gallery's own worker, its photos may have landed
+        // (`photosRead`) during the read, and `s` is from before it.
+        return { ...current(s), ...loaded("galleries", galleries, COPY) };
       } catch (err) {
-        return { ...s, ...loadFailed("galleries", err, COPY) };
+        return { ...current(s), ...loadFailed("galleries", err, COPY) };
       }
     },
     open: (s, arg) => {
+      // Every open, live or not, makes the reads of earlier opens stale (`photosRead` drops them):
+      // a page or legacy gallery opened after a slow gateway read must not get that read's photos.
+      const seq = ++openSeq;
       try {
         if (arg && "staticGalleries" in arg) {
           staticGalleries = [];
@@ -174,11 +236,41 @@ const svc = defineService<S, {
       }
       const id = input("id");
       const gallery = staticGalleries.find((entry) => entry.id === id);
+      // No page galleries were carried in: a gateway (Pro Gallery app) gallery is read live, but
+      // ONLY when the tap says the list row came from the gateway (`source: "gateway"`, the row's
+      // own field). A legacy row's id and a sample row's id ("sample-work") are unknown to the
+      // gateway, and a tap that passes no source (Branded Lite's) cannot tell them apart: those
+      // open as before, by their title.
+      const api = wixApi();
+      const live = input("source") === "gateway" && !/^gallery-\d+$/.test(id);
+      if (id && !staticGalleries.length && api && live) {
+        // The read lands through `photosRead`, tagged with this open: a pooled worker shows THIS
+        // gallery loading at once (never the last one's photos), and a slower read for a gallery
+        // left since is dropped instead of overwriting the one on screen.
+        const name = input("name");
+        void readGalleryPhotos(api, id).then(
+          ({ title, photos }) => svc.photosRead({ seq, title: title || name, photos }),
+          (err: unknown) => svc.photosRead({ seq, error: err }),
+        );
+        return { ...s, ...LOADING, ...presence("loading"), galleryTitle: name, photos: [], noGallery: true, hasPhotos: false,
+          photoUrl: "", photoTitle: "", hasPhoto: false, noPhoto: true };
+      }
       const missing = !id || (staticGalleries.length > 0 && !gallery);
       return { ...s, ...loaded("galleries", s.galleries, COPY), ...presence(missing ? "missing" : "found"), galleryTitle: gallery?.title || input("name"),
         photos: (gallery?.photos ?? []).map((url, index) => ({ id: `${id}-${index}`, url, title: `Photo ${index + 1}` })),
         noGallery: missing, hasPhotos: !!gallery?.photos.length, noPhoto: true };
     },
+    photosRead: (s, arg) => {
+      if (!arg || arg.seq !== openSeq) return undefined;
+      if ("error" in arg) {
+        // A 404 is the gallery being GONE — the not-found state alone, never also an error card
+        // whose Retry cannot succeed. Any other failure is the error state.
+        return { ...s, ...(isNotFoundError(arg.error) ? { ...loaded("galleries", s.galleries, COPY), ...presence("missing") } : { ...loadFailed("galleries", arg.error, COPY), ...presence("failed") }),
+          galleryTitle: "", photos: [], noGallery: true, hasPhotos: false, photoUrl: "", photoTitle: "", hasPhoto: false, noPhoto: true };
+      }
+      return { ...s, ...loaded("galleries", s.galleries, COPY), ...presence("found"), galleryTitle: arg.title ?? "",
+        photos: arg.photos ?? [], noGallery: false, hasPhotos: (arg.photos ?? []).length > 0, photoUrl: "", photoTitle: "", hasPhoto: false, noPhoto: true };
+    },
     view: (s) => {
       const photoUrl = input("url");
       const valid = /^https:\/\/static\.wixstatic\.com\/media\/[A-Za-z0-9_~.-]+$/.test(photoUrl);

package/templates/community-club/tier5-src/_shared/branded-load-state.ts

@@ -35,11 +35,14 @@ export interface LoadFlags {
   notMock: boolean;
   notMockEmpty: boolean;
   notMockUnavailable: boolean;
+  /** hiddenWhen gate for the empty state: false ONLY when the site answered with no rows
+   *  (`notMockEmpty` is true then — it gates the sample banner, not the empty state). */
+  hideEmpty: boolean;
 }
 
 export const LOADING: LoadFlags = {
   status: "loading", error: "", signInRequired: false, notErrored: true, notLoading: false, busy: true, noSignIn: true,
-  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true,
+  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true, hideEmpty: true,
 };
 
 const READY: LoadFlags = { ...LOADING, status: "ready", notLoading: true, busy: false };
@@ -78,7 +81,7 @@ type Rows<K extends string, T> = { [P in K]: T[] } & { emptyText: string } & Loa
 export function loaded<K extends string, T>(key: K, rows: T[], copy: LoadCopy<T>): Rows<K, T> {
   if (rows.length) return { ...READY, [key]: rows, emptyText: "" } as Rows<K, T>;
   if (samplesRequested()) return sampleRows(key, copy, "empty");
-  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty) } as Rows<K, T>;
+  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty), hideEmpty: false } as Rows<K, T>;
 }
 
 /** A query threw. Never rows the customer did not create. */

package/templates/community-club/tier5-src/_shared/himi-account.ts

@@ -1,6 +1,8 @@
 import { dispatch } from "@himalaya/dispatch";
 // Relative for node resolution (see himi-store.ts note); rewritten off-repo.
 import { displayName, getMyData, initials, type WixMyData } from "@himalaya/wix-users";
+import { getMyMember } from "@himalaya/wix-members";
+import { wixMediaUrl } from "@himalaya/wix-media";
 import { formatDateMedium, formatWeekdayDateTime } from "../_shared/engine-intl.js";
 
 export interface AccountProfile {
@@ -82,6 +84,31 @@ function profileFromData(data: WixMyData, fallbackEmail = ""): AccountProfile {
   };
 }
 
+/** The signed-in site member's name and photo from their member record, or undefined when it
+ *  cannot be read or names nobody (the caller then shows the email). */
+async function siteMemberProfile(email: string): Promise<AccountProfile | undefined> {
+  try {
+    const member = (await getMyMember({ fieldsets: ["FULL"] }))?.member;
+    const name = [member?.contact?.firstName, member?.contact?.lastName].map((part) => (part ?? "").trim()).filter(Boolean).join(" ")
+      || (member?.profile?.nickname ?? "").trim();
+    if (!name) return undefined;
+    const image = wixMediaUrl(member?.profile?.photo?.url) || wixMediaUrl(member?.profile?.photo?.id) || "";
+    return {
+      isMember: true,
+      identityLine: "Signed in",
+      detailLine: email || name,
+      memberName: name,
+      memberEmail: email || member?.loginEmail || "",
+      memberImage: image,
+      memberInitials: initialsFromName(name) || "M",
+      hasMemberImage: !!image,
+      noMemberImage: !image,
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 export function guestProfile(detailLine: string): AccountProfile {
   return {
     isMember: false,
@@ -118,6 +145,10 @@ export async function loadMemberProfile(guestDetailLine: string): Promise<Accoun
     const data = await getMyData();
     return profileFromData(data, storedEmail);
   } catch {
+    // The account profile is an owner endpoint: the web host refuses it, and a site member need
+    // not have one. The member's own record (the Members API) still names them.
+    const member = await siteMemberProfile(storedEmail);
+    if (member) return member;
     return {
       isMember: true,
       identityLine: "Signed in",

package/templates/events-meetups/tier5-src/_shared/branded-load-state.ts

@@ -35,11 +35,14 @@ export interface LoadFlags {
   notMock: boolean;
   notMockEmpty: boolean;
   notMockUnavailable: boolean;
+  /** hiddenWhen gate for the empty state: false ONLY when the site answered with no rows
+   *  (`notMockEmpty` is true then — it gates the sample banner, not the empty state). */
+  hideEmpty: boolean;
 }
 
 export const LOADING: LoadFlags = {
   status: "loading", error: "", signInRequired: false, notErrored: true, notLoading: false, busy: true, noSignIn: true,
-  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true,
+  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true, hideEmpty: true,
 };
 
 const READY: LoadFlags = { ...LOADING, status: "ready", notLoading: true, busy: false };
@@ -78,7 +81,7 @@ type Rows<K extends string, T> = { [P in K]: T[] } & { emptyText: string } & Loa
 export function loaded<K extends string, T>(key: K, rows: T[], copy: LoadCopy<T>): Rows<K, T> {
   if (rows.length) return { ...READY, [key]: rows, emptyText: "" } as Rows<K, T>;
   if (samplesRequested()) return sampleRows(key, copy, "empty");
-  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty) } as Rows<K, T>;
+  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty), hideEmpty: false } as Rows<K, T>;
 }
 
 /** A query threw. Never rows the customer did not create. */

package/templates/events-meetups/tier5-src/_shared/himi-account.ts

@@ -1,6 +1,8 @@
 import { dispatch } from "@himalaya/dispatch";
 // Relative for node resolution (see himi-store.ts note); rewritten off-repo.
 import { displayName, getMyData, initials, type WixMyData } from "@himalaya/wix-users";
+import { getMyMember } from "@himalaya/wix-members";
+import { wixMediaUrl } from "@himalaya/wix-media";
 import { formatDateMedium, formatWeekdayDateTime } from "../_shared/engine-intl.js";
 
 export interface AccountProfile {
@@ -82,6 +84,31 @@ function profileFromData(data: WixMyData, fallbackEmail = ""): AccountProfile {
   };
 }
 
+/** The signed-in site member's name and photo from their member record, or undefined when it
+ *  cannot be read or names nobody (the caller then shows the email). */
+async function siteMemberProfile(email: string): Promise<AccountProfile | undefined> {
+  try {
+    const member = (await getMyMember({ fieldsets: ["FULL"] }))?.member;
+    const name = [member?.contact?.firstName, member?.contact?.lastName].map((part) => (part ?? "").trim()).filter(Boolean).join(" ")
+      || (member?.profile?.nickname ?? "").trim();
+    if (!name) return undefined;
+    const image = wixMediaUrl(member?.profile?.photo?.url) || wixMediaUrl(member?.profile?.photo?.id) || "";
+    return {
+      isMember: true,
+      identityLine: "Signed in",
+      detailLine: email || name,
+      memberName: name,
+      memberEmail: email || member?.loginEmail || "",
+      memberImage: image,
+      memberInitials: initialsFromName(name) || "M",
+      hasMemberImage: !!image,
+      noMemberImage: !image,
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 export function guestProfile(detailLine: string): AccountProfile {
   return {
     isMember: false,
@@ -118,6 +145,10 @@ export async function loadMemberProfile(guestDetailLine: string): Promise<Accoun
     const data = await getMyData();
     return profileFromData(data, storedEmail);
   } catch {
+    // The account profile is an owner endpoint: the web host refuses it, and a site member need
+    // not have one. The member's own record (the Members API) still names them.
+    const member = await siteMemberProfile(storedEmail);
+    if (member) return member;
     return {
       isMember: true,
       identityLine: "Signed in",

package/templates/gym-fitness/tier5-src/_shared/branded-load-state.ts

@@ -35,11 +35,14 @@ export interface LoadFlags {
   notMock: boolean;
   notMockEmpty: boolean;
   notMockUnavailable: boolean;
+  /** hiddenWhen gate for the empty state: false ONLY when the site answered with no rows
+   *  (`notMockEmpty` is true then — it gates the sample banner, not the empty state). */
+  hideEmpty: boolean;
 }
 
 export const LOADING: LoadFlags = {
   status: "loading", error: "", signInRequired: false, notErrored: true, notLoading: false, busy: true, noSignIn: true,
-  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true,
+  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true, hideEmpty: true,
 };
 
 const READY: LoadFlags = { ...LOADING, status: "ready", notLoading: true, busy: false };
@@ -78,7 +81,7 @@ type Rows<K extends string, T> = { [P in K]: T[] } & { emptyText: string } & Loa
 export function loaded<K extends string, T>(key: K, rows: T[], copy: LoadCopy<T>): Rows<K, T> {
   if (rows.length) return { ...READY, [key]: rows, emptyText: "" } as Rows<K, T>;
   if (samplesRequested()) return sampleRows(key, copy, "empty");
-  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty) } as Rows<K, T>;
+  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty), hideEmpty: false } as Rows<K, T>;
 }
 
 /** A query threw. Never rows the customer did not create. */

package/templates/gym-fitness/tier5-src/_shared/himi-account.ts

@@ -1,6 +1,8 @@
 import { dispatch } from "@himalaya/dispatch";
 // Relative for node resolution (see himi-store.ts note); rewritten off-repo.
 import { displayName, getMyData, initials, type WixMyData } from "@himalaya/wix-users";
+import { getMyMember } from "@himalaya/wix-members";
+import { wixMediaUrl } from "@himalaya/wix-media";
 import { formatDateMedium, formatWeekdayDateTime } from "../_shared/engine-intl.js";
 
 export interface AccountProfile {
@@ -82,6 +84,31 @@ function profileFromData(data: WixMyData, fallbackEmail = ""): AccountProfile {
   };
 }
 
+/** The signed-in site member's name and photo from their member record, or undefined when it
+ *  cannot be read or names nobody (the caller then shows the email). */
+async function siteMemberProfile(email: string): Promise<AccountProfile | undefined> {
+  try {
+    const member = (await getMyMember({ fieldsets: ["FULL"] }))?.member;
+    const name = [member?.contact?.firstName, member?.contact?.lastName].map((part) => (part ?? "").trim()).filter(Boolean).join(" ")
+      || (member?.profile?.nickname ?? "").trim();
+    if (!name) return undefined;
+    const image = wixMediaUrl(member?.profile?.photo?.url) || wixMediaUrl(member?.profile?.photo?.id) || "";
+    return {
+      isMember: true,
+      identityLine: "Signed in",
+      detailLine: email || name,
+      memberName: name,
+      memberEmail: email || member?.loginEmail || "",
+      memberImage: image,
+      memberInitials: initialsFromName(name) || "M",
+      hasMemberImage: !!image,
+      noMemberImage: !image,
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 export function guestProfile(detailLine: string): AccountProfile {
   return {
     isMember: false,
@@ -118,6 +145,10 @@ export async function loadMemberProfile(guestDetailLine: string): Promise<Accoun
     const data = await getMyData();
     return profileFromData(data, storedEmail);
   } catch {
+    // The account profile is an owner endpoint: the web host refuses it, and a site member need
+    // not have one. The member's own record (the Members API) still names them.
+    const member = await siteMemberProfile(storedEmail);
+    if (member) return member;
     return {
       isMember: true,
       identityLine: "Signed in",

package/templates/gym-fitness/tier5-src/_shared/himi-booking-saved.ts

@@ -0,0 +1,88 @@
+// Saved (favorite) booking services use the host's durable, app-scoped KV, shared by every
+// screen worker — the service detail toggles a row (himi-booking-service `toggleSaved`), the
+// Favorites list reads them (himi-booking-saved). Same model as _shared/himi-store-saved.ts: a
+// failed write must never claim that a save succeeded.
+export interface SavedService {
+  id: string;
+  name: string;
+  /** The price line as the detail showed it ("$250"), kept so the list paints offline. */
+  price: string;
+  /** The duration line ("1 hr"). */
+  duration: string;
+  image: string;
+  category: string;
+  /** A course: the list's Book passes `course` to the time screen, which then refuses a course
+   *  whose record failed to load instead of offering its sessions one by one. */
+  course?: boolean;
+}
+type StorageLike = { getItem(key: string): string | null; setItem(key: string, value: string): void };
+type Host = { himalaya?: { storage?: StorageLike; input?: Record<string, unknown> }; localStorage?: StorageLike };
+const BASE = "himi-booking:saved-services:v1";
+function storage(): StorageLike {
+  const host = globalThis as Host;
+  const kv = host.himalaya?.storage ?? host.localStorage;
+  if (!kv) throw new Error("Saved-service storage is unavailable");
+  return kv;
+}
+const validPart = (value: unknown): value is string => typeof value === "string" && /^[A-Za-z0-9_.:-]{1,128}$/.test(value) && value !== "default";
+/** Saves belong to whoever made them. A signed-in member's live under the host's authenticated
+ *  account + business — the partition collection preferences use, so a second member on the same
+ *  device never sees them; a visitor's live on the device. A member's partition, read for the
+ *  first time, takes the visitor's saves on this device (signing in carries them, like a cart),
+ *  once — the device list is then emptied. */
+function storeKey(kv: StorageLike): string {
+  const input = (globalThis as Host).himalaya?.input;
+  const account = input?.__himiPreferenceAccount, business = input?.__himiPreferenceBusiness;
+  if (!validPart(account) || !validPart(business)) return BASE;
+  const key = `${BASE}.${account}.${encodeURIComponent(business)}`;
+  if (kv.getItem(key) === null) {
+    const visitor = kv.getItem(BASE);
+    if (visitor !== null) {
+      kv.setItem(key, visitor);
+      // Empty the device list only once the member's copy is confirmed: a web host may swallow a
+      // failed write, and clearing then would lose the visitor's saves.
+      if (kv.getItem(key) === visitor) kv.setItem(BASE, "[]");
+    }
+  }
+  return key;
+}
+const str = (value: unknown): string => (typeof value === "string" ? value : "");
+export function readSavedServices(): SavedService[] {
+  const kv = storage();
+  const raw = kv.getItem(storeKey(kv));
+  if (!raw) return [];
+  const parsed: unknown = JSON.parse(raw);
+  if (!Array.isArray(parsed)) throw new Error("Invalid saved-service data");
+  const rows = new Map<string, SavedService>();
+  for (const value of parsed) {
+    if (!value || typeof value !== "object") continue;
+    const row = value as Record<string, unknown>;
+    if (typeof row.id !== "string" || !row.id.trim() || typeof row.name !== "string") continue;
+    rows.set(row.id, { id: row.id, name: row.name, price: str(row.price), duration: str(row.duration), image: str(row.image), category: str(row.category), ...(row.course === true ? { course: true } : {}) });
+  }
+  return [...rows.values()];
+}
+
+export function isServiceSaved(id: string): boolean {
+  return readSavedServices().some(row => row.id === id);
+}
+export function writeSavedServices(rows: SavedService[]): void {
+  const kv = storage();
+  const key = storeKey(kv);
+  const value = JSON.stringify(rows);
+  kv.setItem(key, value);
+  // Web hosts may swallow quota/security errors. Confirm the synchronous write
+  // before displaying success; a missing/mismatched read is a failed save.
+  if (kv.getItem(key) !== value) throw new Error("Saved-service write did not persist");
+}
+/** Save or unsave; returns the new saved state. The newest save is listed first. */
+export function toggleSavedService(service: SavedService): boolean {
+  if (!service.id.trim() || !service.name.trim()) throw new Error("No service to save");
+  const rows = readSavedServices();
+  const saved = !rows.some(row => row.id === service.id);
+  writeSavedServices(saved ? [service, ...rows] : rows.filter(row => row.id !== service.id));
+  return saved;
+}
+export function removeSavedService(id: string): void {
+  writeSavedServices(readSavedServices().filter(row => row.id !== id));
+}

package/templates/gym-fitness/tier5-src/himi-booking-service/index.ts

@@ -22,6 +22,7 @@ import { wixMediaUrl, WIX_DETAIL_IMAGE, WIX_LIST_IMAGE } from "@himalaya/wix-med
 import { formatClock, formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
 import { descriptionBody } from "../_shared/rich-body.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
+import { isServiceSaved, toggleSavedService } from "../_shared/himi-booking-saved.js";
 
 // Offline-first (data-offline): the service detail is a public read-through. On a
 // fetch failure we fall back to the last-synced row for this service written by
@@ -182,6 +183,13 @@ interface S {
   sessionMessageOk: boolean;
   sessionMessageFailed: boolean;
   noSessionMessage: boolean;
+  // ---- Favorites (the heart an app adds with withServiceSaveToggle; _shared/himi-booking-saved.ts) ----
+  saved: boolean;
+  notSaved: boolean;
+  /** The heart's spoken label: what a tap does now. */
+  saveLabel: string;
+  /** "" unless the last save or unsave failed. */
+  saveMessage: string;
 }
 
 function inputId(): string {
@@ -790,6 +798,10 @@ function derive(s: S): S {
     // Change Time opens the time screen, which cannot book a service closed to online booking.
     noChangeTime: (control !== "book" && control !== "waitlist" && control !== "closed") || !s.bookableOnline,
     noSessionMessage: !s.sessionMessage,
+    notSaved: !s.saved,
+    saveLabel: s.saved
+      ? copyParam("service.unsaveLabel", "Remove from favorites")
+      : copyParam("service.saveLabel", "Save to favorites"),
     notBookableOnline: !s.bookableOnline,
     noAbout: !s.about && !s.aboutJson,
     noPolicy: s.policyLines.length === 0,
@@ -866,9 +878,16 @@ function withService(s: S, service: WixService): S {
     // WS-C — canonical param-less target; the descriptor's choose-time CTA
     // binds the separate `id` state field as a first-class nav param.
     timeScreenId: "himi_time",
+    saved: savedNow(serviceId),
   });
 }
 
+/** Whether the service is a favorite. Unreadable storage reads as not saved: the heart is a
+ *  convenience and never holds the screen back. */
+function savedNow(id: string): boolean {
+  try { return !!id && isServiceSaved(id); } catch { return false; }
+}
+
 /** The service record: with staff details when this token may read them, else without. */
 async function fetchService(id: string): Promise<WixService | undefined> {
   try {
@@ -897,9 +916,10 @@ const svc = defineService<S, {
   book: (s: S) => S;
   changeTime: (s: S) => S;
   joinWaitlist: (s: S, arg?: unknown) => Promise<S>;
+  toggleSaved: (s: S) => S;
 }>("himiBookingService", {
   // A join's outcome belongs to that visit: a cold start must not replay it from saved state.
-  notHydrated: ["sessionMessage", "sessionMessageOk", "sessionMessageFailed", "noSessionMessage"],
+  notHydrated: ["sessionMessage", "sessionMessageOk", "sessionMessageFailed", "noSessionMessage", "saveMessage"],
   state: derive({
     status: "loading",
     id,
@@ -1005,6 +1025,10 @@ const svc = defineService<S, {
     noChangeTime: true,
     ...NO_SESSION_MESSAGE,
     noSessionMessage: true,
+    saved: false,
+    notSaved: true,
+    saveLabel: "",
+    saveMessage: "",
   }),
   actions: {
     load: async (s, arg) => {
@@ -1012,14 +1036,16 @@ const svc = defineService<S, {
       rememberSignIn(arg);
       if (!s.id) return derive({ ...s, status: "ready", errored: true });
       // A new view: a join's outcome from before is not news when the screen shows again.
-      const start = { ...s, policyExpanded: false, scheduleExpanded: false, ...NO_SESSION_MESSAGE };
+      const start = { ...s, policyExpanded: false, scheduleExpanded: false, saveMessage: "", ...NO_SESSION_MESSAGE };
       try {
         const service = await fetchService(s.id);
         if (!service) return withSession(derive({ ...start, status: "ready" }), undefined);
         loadedService = service;
         // The session the Agenda row opened on, read beside the service-wide availability.
         const [shown, sel] = await Promise.all([withGroupAvailability(withService(start, service), service), readSessionBounded(service)]);
-        return withSession(shown, sel);
+        // The heart is read again after the waits (the session read takes up to 10 s): a toggle
+        // tapped meanwhile wrote storage, and the snapshot taken before would undo it.
+        return withSession({ ...shown, saved: savedNow(s.id) }, sel);
       } catch {
         // Offline: paint from the last-synced services cache (written by the list
         // worker) before falling back to the error state. The cache holds the name,
@@ -1038,6 +1064,7 @@ const svc = defineService<S, {
             category: String(cached.category ?? ""),
             images: image ? [{ url: image, alt: name }] : [],
             timeScreenId: `himi_time_${s.id}`,
+            saved: savedNow(s.id),
           }, undefined);
         }
         return withSession({ ...start, status: "ready", errored: true, name: "" }, undefined);
@@ -1056,6 +1083,26 @@ const svc = defineService<S, {
     },
     togglePolicy: (s) => derive({ ...s, policyExpanded: !s.policyExpanded }),
     toggleSchedule: (s) => derive({ ...s, scheduleExpanded: !s.scheduleExpanded }),
+    // The heart: save or unsave this service on the device (the member's own list once signed
+    // in). The row keeps what the Favorites list shows offline; a failed write says so and never
+    // shows the heart as saved.
+    toggleSaved: (s) => {
+      if (!s.id || !s.hasService || s.errored) return s;
+      try {
+        const saved = toggleSavedService({
+          id: s.id,
+          name: s.name,
+          price: s.priceIsText ? "" : s.priceText,
+          duration: s.durationText,
+          image: s.image,
+          category: s.category,
+          ...(s.isCourse ? { course: true } : {}),
+        });
+        return derive({ ...s, saved, saveMessage: "" });
+      } catch {
+        return derive({ ...s, saved: savedNow(s.id), saveMessage: copyParam("service.saveError", "Could not update your favorites. Try again.") });
+      }
+    },
     // The footer button opens the time screen for the loaded service. A worker directive,
     // not a `himi.open` with a `$service:` id param: the iOS and Android sticky footers
     // dispatch their taps without resolving `$service:` params, so the id never arrived.