@wix/himalaya-cli 0.1613.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/branded-lite/tier5-src/himi-branded-lite-home/index.ts

@@ -9,7 +9,14 @@ import { withIapPresentation } from "../_shared/iap-presentation.js";
 import { queryServices, type WixService } from "@himalaya/wix-bookings";
 import { getPost, queryPosts, type WixPost } from "@himalaya/wix-blog";
 import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
-import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
+import {
+  listMyParticipations,
+  participationsByProgram,
+  queryJoinApplications,
+  queryPrograms,
+  type WixProgram,
+} from "@himalaya/wix-online-programs";
+import { getMyMember } from "@himalaya/wix-members";
 import { listFeedItems, type WixFeedItem, type WixFeedProfile } from "@himalaya/wix-social-feed";
 import { queryItems as queryMenuItems, querySections as queryMenuSections } from "@himalaya/wix-restaurants";
 import { normalizeEvent, queryEvents } from "../_shared/himi-events.js";
@@ -166,6 +173,13 @@ interface ProgramCard {
   noImage: boolean;
 }
 
+/** A member's own program state, kept separate from the visitor catalog cards. */
+interface MemberProgramCard extends ProgramCard {
+  stateLabel: string;
+  progressFraction: number;
+  hideProgress: boolean;
+}
+
 /** A communityPulse latest-activity Carousel card (design §4.5). */
 interface FeedHighlight {
   id: string;
@@ -308,6 +322,8 @@ interface State {
   noNextEvent: boolean;
   homePrograms: ProgramCard[];
   noHomePrograms: boolean;
+  memberPrograms: MemberProgramCard[];
+  noMemberPrograms: boolean;
   /** The videos module's carousel — the newest ready Wix Video videos, the channels
    *  taking turns. Guarded on `videos`; same silent-fail contract. */
   homeVideos: (WixVideoCard & CaptionFlags)[];
@@ -549,6 +565,7 @@ interface ExtrasSignal {
   upcomingEvents: EventEntry[];
   nextEventCards: NextEventCard[];
   homePrograms: ProgramCard[];
+  memberPrograms: MemberProgramCard[];
   homeVideos: (WixVideoCard & CaptionFlags)[];
   feedHighlights: FeedHighlight[];
   memberAvatars: CoachAvatar[];
@@ -559,8 +576,17 @@ interface ExtrasSignal {
   menuCategories: MenuCategory[];
 }
 
+let homeProgramCandidates: { generation: number; programs: WixProgram[] } = { generation: 0, programs: [] };
+/** A finite number from a progress field, or `fallback` when the read left it out or sent junk. */
+function finiteOr(value: unknown, fallback: number): number {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+
+/** How many microtask turns `memberProgramsLoaded` waits for refresh's own result to land (see the action). */
+const MEMBER_PROGRAMS_APPLY_RETRIES = 50;
+
 function emptyExtrasSignal(): ExtrasSignal {
-  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
+  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], memberPrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
 }
 
 /** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
@@ -670,13 +696,13 @@ async function fetchUpcomingEvents(): Promise<{ entries: EventEntry[]; nextEvent
   }
 }
 
-async function fetchHomePrograms(): Promise<ProgramCard[]> {
+async function fetchHomePrograms(): Promise<{ cards: ProgramCard[]; programs: WixProgram[] }> {
   try {
     const response = await queryPrograms({ cursorPaging: { limit: 12 } });
-    return (response.programs ?? [])
+    const programs = (response.programs ?? [])
       .filter((p: WixProgram) => ((p.state ?? p.status ?? "").toUpperCase()) !== "DRAFT")
-      .slice(0, 6)
-      .map((p: WixProgram) => {
+      .slice(0, 12);
+    const cards = programs.slice(0, 6).map((p: WixProgram) => {
         const desc = (p as { description?: unknown }).description;
         const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
         const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
@@ -692,7 +718,112 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
           noImage: !image,
         };
       });
+    return { cards, programs };
   } catch {
+    return { cards: [], programs: [] };
+  }
+}
+
+/** Member state is best-effort Home enrichment: visitors and unsupported member sessions
+ * collapse the rail, while the public Programs section remains available. */
+async function fetchMemberProgramCards(programs: WixProgram[]): Promise<MemberProgramCard[]> {
+  try {
+    const member = await memberAccess();
+    if (!member.email) return [];
+    const memberId = (await getMyMember()).member?.id;
+    if (!memberId) return [];
+
+    const [participantResult, applicationResult] = await Promise.allSettled([
+      listMyParticipations(memberId, { maxPages: 2 }),
+      queryJoinApplications({ memberId, limit: 100 }),
+    ]);
+    // These are independent member reads. An unverified participant-query permission
+    // must not also hide applications that the member-scoped endpoint can return.
+    const participants = participantResult.status === "fulfilled" ? participantResult.value : [];
+    const applications = applicationResult.status === "fulfilled" ? applicationResult.value : { joinApplications: [] };
+    const participation = participationsByProgram(participants);
+    // An application that already became a participant keeps its status and carries `participantId`
+    // (the SDK's PENDING_JOIN_APPLICATION_STATUSES note): the participation is the standing, and a member
+    // who later left must not read as "Approved" from the application that once admitted them. Newest
+    // first, one per program, and only programs with no participation of their own — so the admitted
+    // rows a joined member accumulates never take the lookup slots of a real pending request.
+    const applicationByProgram = new Map<string, { status?: string }>();
+    for (const application of applications.joinApplications ?? []) {
+      if (!application.programId || application.participantId || participation.has(application.programId)) continue;
+      if (!applicationByProgram.has(application.programId)) applicationByProgram.set(application.programId, application);
+    }
+    // The public catalog preview is intentionally capped at 12. Resolve the
+    // member's six most recent enrolled programs and six open applications
+    // outside that window in one filtered query so both remain visible.
+    const knownIds = new Set(programs.map((program) => program.id).filter((id): id is string => !!id));
+    const participantProgramIds = [...participation.keys()].slice(0, 6);
+    const applicationProgramIds = [...applicationByProgram.keys()].filter((id) => !participantProgramIds.includes(id)).slice(0, 6);
+    const candidateIds = [...participantProgramIds, ...applicationProgramIds].slice(0, 12);
+    const missingIds = candidateIds.filter((id) => !knownIds.has(id));
+    const extraPrograms = missingIds.length
+      ? await queryPrograms({ filter: { id: { $in: missingIds } }, cursorPaging: { limit: missingIds.length } })
+          .then((response) => response.programs ?? []).catch(() => [])
+      : [];
+    const memberPrograms = [...programs, ...extraPrograms.filter((program) => !!program.id && !knownIds.has(program.id))];
+    await assertMemberAccess(member);
+
+    return memberPrograms.flatMap((program) => {
+      if (!program.id) return [];
+      const participant = participation.get(program.id);
+      const application = applicationByProgram.get(program.id);
+      if (!participant && !application) return [];
+      const desc = (program as { description?: unknown }).description;
+      const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
+      const name = cleanTitle(program.settings?.title ?? nestedTitle ?? program.title) || copyParam("home.programFallbackName", "Program");
+      const image = programImage(program);
+      // Progress may be absent (a `fields` the read did not ask for, or a program with no steps): the
+      // bar then sits at 0 and the label comes from `progressStatus`, never from NaN arithmetic.
+      const available = finiteOr(participant?.progress?.totalStepsAvailable, 0);
+      const completed = finiteOr(participant?.progress?.totalStepsCompleted, 0);
+      const percentage = finiteOr(participant?.progress?.completionPercentage, Number.NaN);
+      const hasProgress = available > 0 || Number.isFinite(percentage);
+      const rawFraction = available > 0 ? completed / available : Number.isFinite(percentage) ? percentage / 100 : 0;
+      const progressFraction = Math.max(0, Math.min(1, rawFraction));
+      let stateLabel: string;
+      if (participant) {
+        const enrollmentStatus = (participant.enrollmentStatus ?? "").toUpperCase();
+        const progressStatus = (participant.progressStatus ?? "").toUpperCase();
+        stateLabel = enrollmentStatus === "SUSPENDED"
+          ? copyParam("home.memberProgramSuspended", "Access paused")
+          : progressStatus === "COMPLETED" || enrollmentStatus === "COMPLETED"
+          ? copyParam("home.memberProgramCompleted", "Completed")
+          : progressStatus === "FAILED"
+            ? copyParam("home.memberProgramFailed", "Failed")
+          : progressStatus === "IN_PROGRESS" || (progressStatus !== "NOT_STARTED" && progressFraction > 0)
+            ? copyParam("home.memberProgramInProgress", "In progress")
+            : copyParam("home.memberProgramNotStarted", "Not started");
+      } else {
+        const status = (application?.status ?? "").toUpperCase();
+        stateLabel = status === "INVITED"
+          ? copyParam("home.memberProgramInvited", "Invitation")
+          : status === "APPROVED"
+            ? copyParam("home.memberProgramApproved", "Approved")
+            : status === "SUSPENDED"
+              ? copyParam("home.memberProgramSuspended", "Access paused")
+            : copyParam("home.memberProgramPending", "Request pending");
+      }
+      return [{
+        id: program.id,
+        name,
+        description: "",
+        image,
+        initial: initials(name),
+        hasImage: !!image,
+        noImage: !image,
+        stateLabel,
+        progressFraction,
+        hideProgress: !hasProgress || !participant || (participant.enrollmentStatus ?? "").toUpperCase() === "SUSPENDED",
+      }];
+    });
+  } catch (error) {
+    // The member rail is optional; never let a member-state refusal blank public Home.
+    const status = (error as { status?: unknown } | null)?.status ?? /\bHTTP (\d{3})\b/.exec(String(error))?.[1];
+    console.warn("[home.member-programs] member state unavailable", status !== undefined ? `HTTP ${String(status)}` : (error as { name?: string } | null)?.name ?? "unknown");
     return [];
   }
 }
@@ -747,7 +878,7 @@ function groupCard(group: WixGroup): GroupCard {
   };
 }
 
-async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
+async function fetchExtrasSignal(arg: unknown, generation: number): Promise<ExtrasSignal> {
   const verticals = parseVerticals(arg);
   const extras = emptyExtrasSignal();
   const jobs: Promise<void>[] = [];
@@ -758,7 +889,12 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
     }));
   }
   if (verticals.includes("programs")) {
-    jobs.push(fetchHomePrograms().then((cards) => { extras.homePrograms = cards; }));
+    jobs.push(fetchHomePrograms().then(({ cards, programs }) => {
+      extras.homePrograms = cards;
+      // An older refresh can finish this query after a newer one. Keep its
+      // candidates from replacing the current generation's member-read input.
+      if (generation === refreshGen) homeProgramCandidates = { generation, programs };
+    }));
   }
   if (verticals.includes("videos") && !videoSurfaceRefused) {
     const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
@@ -883,6 +1019,7 @@ function derive(state: State): State {
     noUpcomingEvents: state.upcomingEvents.length === 0,
     noNextEvent: state.nextEventCards.length === 0,
     noHomePrograms: state.homePrograms.length === 0,
+    noMemberPrograms: state.memberPrograms.length === 0,
     noHomeVideos: state.homeVideos.length === 0,
     noFeedHighlights: state.feedHighlights.length === 0,
     noMemberAvatars: state.memberAvatars.length === 0,
@@ -977,6 +1114,8 @@ function baseState(): State {
     noNextEvent: true,
     homePrograms: [],
     noHomePrograms: true,
+    memberPrograms: [],
+    noMemberPrograms: true,
     homeVideos: [],
     noHomeVideos: true,
     feedHighlights: [],
@@ -1026,7 +1165,7 @@ async function refreshPublic(state: State, arg?: unknown): Promise<State | undef
   // failure just collapses their blocks), so a store outage cannot blank them
   // and vice versa. paramValue() stashes the appear params on first read, so the
   // arg-less fallback below still resolves the stashed verticals.
-  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg), fetchSavedSignal(arg)]);
+  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg, gen), fetchSavedSignal(arg)]);
   if (gen !== refreshGen) return undefined;
   // A screen that declares no "store" vertical renders no products rail, so there is
   // nothing to fetch and nothing that could be "not loaded" — skip the call outright
@@ -1186,8 +1325,17 @@ async function refresh(state: State, arg?: unknown): Promise<State | undefined>
   void refreshPersonal(generation, arg);
   const publicState = await refreshPublic(state, arg);
   if (!publicState || generation !== personalGeneration) return undefined;
+  // The member-only read runs after public Home has landed. It is deliberately not awaited:
+  // a slow member endpoint must not hold the public catalog or hero behind authentication.
+  const programCandidates = homeProgramCandidates;
+  if (programCandidates.generation === refreshGen && parseVerticals(arg).includes("programs")) {
+    void fetchMemberProgramCards(programCandidates.programs).then((rows) => {
+      void svc.memberProgramsLoaded({ generation: programCandidates.generation, rows });
+    });
+  }
   const current = svc.getState();
-  return derive({ ...publicState, nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
+  return derive({ ...publicState, memberPrograms: current.memberPrograms, noMemberPrograms: current.noMemberPrograms,
+    nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
     memberProgressLabel: current.memberProgressLabel, memberProgressFraction: current.memberProgressFraction,
     hideMemberProgress: current.hideMemberProgress, personalError: current.personalError, hidePersonalError: current.hidePersonalError,
     // The weekly goal is PERSONAL (member bookings); the public refresh resets it, so keep it.
@@ -1214,6 +1362,7 @@ const svc = defineService<State, {
   refresh: (state: State, arg?: unknown) => Promise<State | undefined>;
   dismissOnboarding: (state: State) => State;
   clearPersonal: (state: State) => State;
+  memberProgramsLoaded: (state: State, arg: { generation: number; rows: MemberProgramCard[]; attempt?: number }) => State | undefined;
   openShopCategory: (state: State, arg?: unknown) => State;
   personalLoaded: (state: State, arg: { generation: number; rows: MemberBookingRow[]; progress: { label: string; fraction: number }; error: boolean; weekly: { count: number; fraction: number; label: string } | null }) => State;
   categoriesLoaded: (state: State, arg: { generation: number; categories: StoreCategoryCard[] }) => State | undefined;
@@ -1221,10 +1370,27 @@ const svc = defineService<State, {
   state: baseState(),
   // The host's site is read fresh at every boot: a snapshot of the last session's site must not
   // decide this one's verticals or name (an owner installs or removes one; another site opens).
-  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories"],
+  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories", "memberPrograms", "noMemberPrograms"],
+  // A member's standing never reaches the on-device snapshot either: the next boot may be another member's.
+  notPersisted: ["memberPrograms", "noMemberPrograms"],
   actions: {
-    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, personalError: false, hidePersonalError: true,
+    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, memberPrograms: [], noMemberPrograms: true, personalError: false, hidePersonalError: true,
       weeklyClassCount: 0, weeklyClassGoalFraction: 0, weeklyGoalLabel: "" }),
+    // The member read starts inside `refresh` and, for a visitor (identity answers synchronously),
+    // resolves within the same microtask turn — BEFORE the runtime has applied refresh's own result.
+    // The `state` handed here is then refresh's PRE-state (status "loading", every rail empty), and
+    // spreading it wrote a loading home over the ready one; the description-projection test caught
+    // exactly that. So an early arrival re-queues itself (a microtask at a time, bounded) until the
+    // state it would spread is the applied one. A stale generation keeps the current state
+    // (`undefined`), never its own stale snapshot.
+    memberProgramsLoaded: (state, arg) => {
+      if (arg.generation !== refreshGen) return undefined;
+      if (state.status === "loading" && (arg.attempt ?? 0) < MEMBER_PROGRAMS_APPLY_RETRIES) {
+        void Promise.resolve().then(() => svc.memberProgramsLoaded({ ...arg, attempt: (arg.attempt ?? 0) + 1 }));
+        return undefined;
+      }
+      return derive({ ...state, memberPrograms: arg.rows, noMemberPrograms: arg.rows.length === 0 });
+    },
     openShopCategory: (state, arg) => {
       const category = String((arg as { category?: unknown } | undefined)?.category ?? "");
       if (!category) return state;

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",