@wix/himalaya-cli 0.1578.0 → 0.1579.0

package/guides/web-page-sdk-reference.md

@@ -19,7 +19,7 @@ the SDK sources, so it matches the shipped SDKs.
 - [`base44`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fbase44?format=md) — A Base44 app's backend. 11 methods · Brandy: conditional.
 - [`biometrics`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fbiometrics?format=md) — Biometric authentication capability. 2 methods.
 - [`browser_auth`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fbrowser_auth?format=md) — Native browser SSO. 1 method.
-- [`calendar`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fcalendar?format=md) — Device calendar. 6 methods.
+- [`calendar`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fcalendar?format=md) — Device calendar. 10 methods.
 - [`calls`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fcalls?format=md) — Real-time 1:1 audio calls (Stage 1). 16 methods.
 - [`camera`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fcamera?format=md) — Camera capability. 4 methods · returns FileHandles.
 - [`clipboard`](https://apps.wix.com/_api/himi-serve/authoring/resource/web-sdk%2Fclipboard?format=md) — System clipboard. 5 methods.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1578.0",
+  "version": "0.1579.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -71,5 +71,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "0a206d4a3d13e9f1302334dcaeb9d70a507f8c916a8ac190fe8bfd8e"
+  "falconPackageHash": "939c5230409902d493ec5b28c46a83496669032bc8f663eabd42dcf6"
 }

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

@@ -20977,6 +20977,20 @@ const SCREENS = runtimeSetting({
                                                 "hiddenPath": "$item.noTypeTag"
                                               }
                                             },
+                                            {
+                                              "id": "himi_services.row.$item.id/ended",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$item.endedText",
+                                                  "style": "caption",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 1,
+                                                  "collapseWhenEmpty": true
+                                                }
+                                              }
+                                            },
                                             {
                                               "id": "",
                                               "body": {

package/templates/beauty-salon/tier5-src/_shared/himi-bookings.ts

@@ -80,6 +80,19 @@ type CoursePolicyShape = {
   };
 };
 
+/** A completed course, independent of whether bookings are currently allowed. Missing,
+ *  invalid or reversed dates are unknown, never evidence that a course has ended. */
+export function courseHasEnded(service: CoursePolicyShape, now: number): boolean {
+  const start = service.schedule?.firstSessionStart ?? "";
+  const end = service.schedule?.lastSessionEnd ?? "";
+  // The schedule has no zone beside these fields. A local wall time must not be interpreted
+  // in the device's zone and presented as a confirmed business end instant.
+  if (!HAS_OFFSET.test(start) || !HAS_OFFSET.test(end)) return false;
+  const first = validDate(start)?.getTime() ?? NaN;
+  const last = validDate(end)?.getTime() ?? NaN;
+  return Number.isFinite(now) && Number.isFinite(first) && Number.isFinite(last) && first <= last && last <= now;
+}
+
 /** Whether the business takes course bookings at `now` (ms): the course has not ended, has not
  *  started (unless the policy lets people join late), and `now` is inside its booking window —
  *  which the early and late limits count from the first session. */
@@ -238,6 +251,14 @@ export function serviceDurationText(service: PricedServiceShape, label: BookingL
 
 function validDate(value: string | undefined): Date | undefined {
   if (!value) return undefined;
+  const parts = /^(\d{4})-(\d{2})-(\d{2})(?:T|$)/i.exec(value);
+  if (!parts) return undefined;
+  const year = Number(parts[1]), month = Number(parts[2]) - 1, day = Number(parts[3]);
+  // Date accepts February 30 by rolling into March. Check the stated calendar day first;
+  // setUTCFullYear also preserves years 0–99, which Date.UTC would reinterpret as 1900–1999.
+  const calendar = new Date(0);
+  calendar.setUTCFullYear(year, month, day);
+  if (calendar.getUTCFullYear() !== year || calendar.getUTCMonth() !== month || calendar.getUTCDate() !== day) return undefined;
   const date = new Date(value);
   return Number.isFinite(date.getTime()) ? date : undefined;
 }

package/templates/beauty-salon/tier5-src/_shared/himi-copy.ts

@@ -21,6 +21,7 @@
 export type CopyPackValue = string | { source: string; translation: string };
 
 let stashedCopy: Record<string, CopyPackValue> = Object.create(null);
+let copyReceived = false;
 
 /** Absorb the `copy` onAppear param (customer strings or stock translation records)
  *  from an action arg. Call first in every action that can receive onAppear
@@ -44,15 +45,19 @@ export function stashCopy(arg: unknown): void {
       }
     }
     stashedCopy = next;
+    copyReceived = true;
   } catch {
     // Malformed pack param — keep the stock copy rather than dying mid-action.
   }
 }
 
-/** The provisioned override for `key`, or `fallback` (the stock copy) when no
- *  pack / no such key reached this worker. */
-export function copyParam(key: string, fallback: string): string {
+/** The provisioned override for `key`, or `fallback` (the stock copy). An optional
+ *  restored label survives only until a current copy pack arrives. */
+export function copyParam(key: string, fallback: string, restoredFallback = fallback): string {
   const value = stashedCopy[key];
+  // A disk-restored row may paint before onAppear supplies its copy pack. Keep its
+  // last label only before a pack arrives; even an empty current pack selects stock copy.
+  if (value === undefined) return copyReceived ? fallback : restoredFallback;
   if (typeof value === "string") return value !== "" ? value : fallback;
   return value?.source === fallback && value.translation !== "" ? value.translation : fallback;
 }

package/templates/beauty-salon/tier5-src/himi-booking-services/index.ts

@@ -10,7 +10,7 @@
 import { defineBackendCollection } from "../_shared/collection-service.js";
 import { COLLECTION_CHROME_MIN_ITEMS } from "../_shared/collection-contract.js";
 import { queryServiceCategories, queryServices, type WixService } from "@himalaya/wix-bookings";
-import { categoryName, courseDatesText, serviceDurationText, servicePriceLine, type BookingLabel } from "../_shared/himi-bookings.js";
+import { categoryName, courseDatesText, courseHasEnded, serviceDurationText, servicePriceLine, type BookingLabel } from "../_shared/himi-bookings.js";
 import { formatServicePrice } from "../_shared/wix-service-price.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { initials } from "../_shared/himi-text.js";
@@ -60,6 +60,9 @@ interface Row {
   /** "Class" or "Course"; "" for an appointment. */
   typeTag: string;
   noTypeTag: boolean;
+  endedText: string;
+  /** Retain course dates so a cached catalog can refresh its status after the course ends. */
+  courseSchedule?: { firstSessionStart?: string; lastSessionEnd?: string };
   /** "1 hr · ₪70"; a course: "Nov 3 – Dec 15, 2026 · ₪1,200". "" when the record has neither. */
   meta: string;
   /** Online booking by time is possible: online booking is on and the service is not a course. */
@@ -186,8 +189,8 @@ function typeTagOf(type: unknown): string {
   return "";
 }
 
-function spokenName(row: Pick<Row, "name" | "typeTag" | "tagline" | "meta">): string {
-  return [row.name, row.typeTag, row.tagline, row.meta].filter(Boolean).join(", ");
+function spokenName(row: Pick<Row, "name" | "typeTag" | "tagline" | "meta" | "endedText">): string {
+  return [row.name, row.typeTag, row.endedText, row.tagline, row.meta].filter(Boolean).join(", ");
 }
 
 function bookCtaFor(request: boolean): string {
@@ -212,6 +215,11 @@ function norm(service: WixService): Row {
   ].filter(Boolean);
   const image = imageUrl(service);
   const isCourse = service.type === "COURSE";
+  const courseSchedule = isCourse ? {
+    firstSessionStart: service.schedule?.firstSessionStart,
+    lastSessionEnd: service.schedule?.lastSessionEnd,
+  } : undefined;
+  const endedText = isCourse && courseHasEnded(service, Date.now()) ? copyParam("services.ended", "Ended") : "";
   const price = servicePriceLine(service, listLabel).text;
   const meta = [isCourse ? courseDatesText(service) : serviceDurationText(service, listLabel), price].filter(Boolean).join(" · ");
   const typeTag = typeTagOf(service.type);
@@ -234,18 +242,20 @@ function norm(service: WixService): Row {
     tagline,
     typeTag,
     noTypeTag: !typeTag,
+    endedText,
+    courseSchedule,
     meta,
     canBook,
     noBook: !canBook,
     bookCta: bookCtaFor(request),
     bookA11y: bookLabel(name, request),
-    a11y: spokenName({ name, typeTag, tagline, meta }),
+    a11y: spokenName({ name, typeTag, endedText, tagline, meta }),
   };
 }
 
 /** A row saved by an older worker (offline cache, restored state) has none of the new
  *  fields: it renders with no tagline, meta or tag, and no Book pill until the live read. */
-function withRowDefaults(row: Partial<Row>): Row {
+function withRowDefaults(row: Partial<Row>, shownEnded?: string): Row {
   const name = typeof row.name === "string" && row.name ? row.name : "Service";
   const str = (v: unknown) => (typeof v === "string" ? v : "");
   const image = str(row.image);
@@ -253,6 +263,9 @@ function withRowDefaults(row: Partial<Row>): Row {
   const tagline = str(row.tagline);
   const meta = str(row.meta);
   const canBook = row.canBook === true;
+  const courseSchedule = row.courseSchedule;
+  const endedText = courseSchedule && courseHasEnded({ schedule: courseSchedule }, Date.now())
+    ? copyParam("services.ended", "Ended", shownEnded || str(row.endedText) || "Ended") : "";
   return {
     ...row,
     id: str(row.id),
@@ -268,12 +281,13 @@ function withRowDefaults(row: Partial<Row>): Row {
     tagline,
     typeTag,
     noTypeTag: !typeTag,
+    endedText,
     meta,
     canBook,
     noBook: !canBook,
     bookCta: str(row.bookCta) || bookCtaFor(false),
     bookA11y: str(row.bookA11y) || bookLabel(name),
-    a11y: str(row.a11y) || spokenName({ name, typeTag, tagline, meta }),
+    a11y: spokenName({ name, typeTag, endedText, tagline, meta }),
   };
 }
 
@@ -287,6 +301,9 @@ let categoriesInFlight = false;
 let categoriesFailedAt = 0;
 const CATEGORY_RETRY_MS = 60_000;
 const rowCategories = new Map<string, number>();
+/** A restored Ended label bridges only the first live page after boot, because an app that sends no
+ *  copy pack gives no sign that none is coming: after it, current copy (pack or stock) decides. */
+let restoredEndedBridge = true;
 
 /** Repaint the chips only, on the state already shown. Re-deriving from the query controller
  *  would publish its working state, which a revalidation deliberately holds back (a restored list
@@ -302,7 +319,7 @@ function withChips(s: S): S {
   // rows of the whole list (no category, no query), or the stand-in would be one category.
   const whole = filter === "all" && !(typeof collection?.query === "string" && collection.query.trim());
   // Not while a load is out: the rows on screen may still be a previous search's.
-  if (!siteCategories?.length && rowCategories.size === 0 && whole && s.isLoading !== true) rememberRowCategories((s.results ?? []).map(withRowDefaults));
+  if (!siteCategories?.length && rowCategories.size === 0 && whole && s.isLoading !== true) rememberRowCategories((s.results ?? []).map((row) => withRowDefaults(row)));
   const chips = categoryChips(filter);
   return { ...s, categoryChips: chips, hideCategories: collection?.hideChrome === true || (chips.length < 3 && !filter.startsWith("value:")) };
 }
@@ -345,6 +362,11 @@ function categoryChips(filter: string): CategoryChip[] {
 
 const svc = defineBackendCollection<S, Row>("himiBookingServices", {
   restorePagesOnLoad: true,
+  onLoad() {
+    // Copy is stashed before this hook. Repaint restored labels immediately, even
+    // when the background query holds the old page through a slow or failed read.
+    (svc as unknown as { normalizeRestored?: () => unknown }).normalizeRestored?.();
+  },
   state: { status: "loading", query: "", all: [], results: [], emptyText: "", countLabel: "", errored: false,
     notErrored: true, isLoading: true, notLoading: false, hasResults: false, noEmpty: true,
     categoryChips: [], hideCategories: true, hideRows: false, noMatchText: "", hasQuery: false, noQuery: true, categoriesLabel: "" },
@@ -377,11 +399,10 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
   },
   actions: {
     categoriesLanded: (s) => withChips(s),
-    // A snapshot saved by an older worker comes back without the new row fields; a missing
-    // `noBook` would show Book on a course until the live read. Give restored rows the defaults.
+    // Normalize old snapshots and refresh Ended/copy before revalidation settles.
+    // A missing `noBook` must never show Book on a restored course.
     normalizeRestored: (s) => {
       const rows = Array.isArray(s.results) ? s.results : [];
-      if (rows.every((row) => typeof (row as Partial<Row>).noBook === "boolean")) return s;
       const fixed = rows.map((row) => withRowDefaults(row as Partial<Row>));
       return { ...s, results: fixed, all: fixed };
     },
@@ -389,7 +410,11 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
   apply(s, page) {
     const loading = page.status === "loading";
     const errored = page.status === "error";
-    const rows = page.items.map(withRowDefaults);
+    // A live row is built before a cold boot's copy pack arrives: the first live page keeps the
+    // Ended label the restored row for the same course showed, until a current pack replaces it.
+    const shown = new Map((restoredEndedBridge && Array.isArray(s.results) ? s.results : []).map((row) => [row.id, row.endedText]));
+    const rows = page.items.map((item) => withRowDefaults(item, shown.get(item.id)));
+    if (page.metadata?.fromCache === false && !loading && !errored) restoredEndedBridge = false;
     // The stand-in categories come from the accepted rows of the whole list (a superseded
     // response never reaches apply): a live page replaces them, the device's copy only fills a gap.
     if (!page.criteria.query && page.criteria.filter === "all" && rows.length > 0) {
@@ -427,7 +452,6 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
 // (there is no Refine now): both go back to the business's own view before the first read.
 type Retired = { getState?: () => { collection?: { filter?: unknown; sort?: unknown } };
   collectionFilter?: (arg: unknown) => unknown; collectionSort?: (arg: unknown) => unknown };
-(svc as unknown as { normalizeRestored?: () => unknown }).normalizeRestored?.();
 const retired = svc as unknown as Retired;
 const persisted = retired.getState?.()?.collection;
 if (persisted?.filter === "saved") void retired.collectionFilter?.({ selectedIds: ["all"] });

package/templates/beauty-salon-owner/tier5-src/_shared/himi-copy.ts

@@ -21,6 +21,7 @@
 export type CopyPackValue = string | { source: string; translation: string };
 
 let stashedCopy: Record<string, CopyPackValue> = Object.create(null);
+let copyReceived = false;
 
 /** Absorb the `copy` onAppear param (customer strings or stock translation records)
  *  from an action arg. Call first in every action that can receive onAppear
@@ -44,15 +45,19 @@ export function stashCopy(arg: unknown): void {
       }
     }
     stashedCopy = next;
+    copyReceived = true;
   } catch {
     // Malformed pack param — keep the stock copy rather than dying mid-action.
   }
 }
 
-/** The provisioned override for `key`, or `fallback` (the stock copy) when no
- *  pack / no such key reached this worker. */
-export function copyParam(key: string, fallback: string): string {
+/** The provisioned override for `key`, or `fallback` (the stock copy). An optional
+ *  restored label survives only until a current copy pack arrives. */
+export function copyParam(key: string, fallback: string, restoredFallback = fallback): string {
   const value = stashedCopy[key];
+  // A disk-restored row may paint before onAppear supplies its copy pack. Keep its
+  // last label only before a pack arrives; even an empty current pack selects stock copy.
+  if (value === undefined) return copyReceived ? fallback : restoredFallback;
   if (typeof value === "string") return value !== "" ? value : fallback;
   return value?.source === fallback && value.translation !== "" ? value.translation : fallback;
 }

package/templates/branded-lite/dev/index.ts

@@ -22326,6 +22326,20 @@ const SCREENS = runtimeSetting({
                                                 "hiddenPath": "$item.noTypeTag"
                                               }
                                             },
+                                            {
+                                              "id": "himi_services.row.$item.id/ended",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Text",
+                                                "props": {
+                                                  "text": "$item.endedText",
+                                                  "style": "caption",
+                                                  "color": "textSecondary",
+                                                  "maxLines": 1,
+                                                  "collapseWhenEmpty": true
+                                                }
+                                              }
+                                            },
                                             {
                                               "id": "",
                                               "body": {

package/templates/branded-lite/tier5-src/_shared/himi-bookings.ts

@@ -80,6 +80,19 @@ type CoursePolicyShape = {
   };
 };
 
+/** A completed course, independent of whether bookings are currently allowed. Missing,
+ *  invalid or reversed dates are unknown, never evidence that a course has ended. */
+export function courseHasEnded(service: CoursePolicyShape, now: number): boolean {
+  const start = service.schedule?.firstSessionStart ?? "";
+  const end = service.schedule?.lastSessionEnd ?? "";
+  // The schedule has no zone beside these fields. A local wall time must not be interpreted
+  // in the device's zone and presented as a confirmed business end instant.
+  if (!HAS_OFFSET.test(start) || !HAS_OFFSET.test(end)) return false;
+  const first = validDate(start)?.getTime() ?? NaN;
+  const last = validDate(end)?.getTime() ?? NaN;
+  return Number.isFinite(now) && Number.isFinite(first) && Number.isFinite(last) && first <= last && last <= now;
+}
+
 /** Whether the business takes course bookings at `now` (ms): the course has not ended, has not
  *  started (unless the policy lets people join late), and `now` is inside its booking window —
  *  which the early and late limits count from the first session. */
@@ -238,6 +251,14 @@ export function serviceDurationText(service: PricedServiceShape, label: BookingL
 
 function validDate(value: string | undefined): Date | undefined {
   if (!value) return undefined;
+  const parts = /^(\d{4})-(\d{2})-(\d{2})(?:T|$)/i.exec(value);
+  if (!parts) return undefined;
+  const year = Number(parts[1]), month = Number(parts[2]) - 1, day = Number(parts[3]);
+  // Date accepts February 30 by rolling into March. Check the stated calendar day first;
+  // setUTCFullYear also preserves years 0–99, which Date.UTC would reinterpret as 1900–1999.
+  const calendar = new Date(0);
+  calendar.setUTCFullYear(year, month, day);
+  if (calendar.getUTCFullYear() !== year || calendar.getUTCMonth() !== month || calendar.getUTCDate() !== day) return undefined;
   const date = new Date(value);
   return Number.isFinite(date.getTime()) ? date : undefined;
 }

package/templates/branded-lite/tier5-src/_shared/himi-copy.ts

@@ -21,6 +21,7 @@
 export type CopyPackValue = string | { source: string; translation: string };
 
 let stashedCopy: Record<string, CopyPackValue> = Object.create(null);
+let copyReceived = false;
 
 /** Absorb the `copy` onAppear param (customer strings or stock translation records)
  *  from an action arg. Call first in every action that can receive onAppear
@@ -44,15 +45,19 @@ export function stashCopy(arg: unknown): void {
       }
     }
     stashedCopy = next;
+    copyReceived = true;
   } catch {
     // Malformed pack param — keep the stock copy rather than dying mid-action.
   }
 }
 
-/** The provisioned override for `key`, or `fallback` (the stock copy) when no
- *  pack / no such key reached this worker. */
-export function copyParam(key: string, fallback: string): string {
+/** The provisioned override for `key`, or `fallback` (the stock copy). An optional
+ *  restored label survives only until a current copy pack arrives. */
+export function copyParam(key: string, fallback: string, restoredFallback = fallback): string {
   const value = stashedCopy[key];
+  // A disk-restored row may paint before onAppear supplies its copy pack. Keep its
+  // last label only before a pack arrives; even an empty current pack selects stock copy.
+  if (value === undefined) return copyReceived ? fallback : restoredFallback;
   if (typeof value === "string") return value !== "" ? value : fallback;
   return value?.source === fallback && value.translation !== "" ? value.translation : fallback;
 }

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

@@ -10,7 +10,7 @@
 import { defineBackendCollection } from "../_shared/collection-service.js";
 import { COLLECTION_CHROME_MIN_ITEMS } from "../_shared/collection-contract.js";
 import { queryServiceCategories, queryServices, type WixService } from "@himalaya/wix-bookings";
-import { categoryName, courseDatesText, serviceDurationText, servicePriceLine, type BookingLabel } from "../_shared/himi-bookings.js";
+import { categoryName, courseDatesText, courseHasEnded, serviceDurationText, servicePriceLine, type BookingLabel } from "../_shared/himi-bookings.js";
 import { formatServicePrice } from "../_shared/wix-service-price.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { initials } from "../_shared/himi-text.js";
@@ -60,6 +60,9 @@ interface Row {
   /** "Class" or "Course"; "" for an appointment. */
   typeTag: string;
   noTypeTag: boolean;
+  endedText: string;
+  /** Retain course dates so a cached catalog can refresh its status after the course ends. */
+  courseSchedule?: { firstSessionStart?: string; lastSessionEnd?: string };
   /** "1 hr · ₪70"; a course: "Nov 3 – Dec 15, 2026 · ₪1,200". "" when the record has neither. */
   meta: string;
   /** Online booking by time is possible: online booking is on and the service is not a course. */
@@ -186,8 +189,8 @@ function typeTagOf(type: unknown): string {
   return "";
 }
 
-function spokenName(row: Pick<Row, "name" | "typeTag" | "tagline" | "meta">): string {
-  return [row.name, row.typeTag, row.tagline, row.meta].filter(Boolean).join(", ");
+function spokenName(row: Pick<Row, "name" | "typeTag" | "tagline" | "meta" | "endedText">): string {
+  return [row.name, row.typeTag, row.endedText, row.tagline, row.meta].filter(Boolean).join(", ");
 }
 
 function bookCtaFor(request: boolean): string {
@@ -212,6 +215,11 @@ function norm(service: WixService): Row {
   ].filter(Boolean);
   const image = imageUrl(service);
   const isCourse = service.type === "COURSE";
+  const courseSchedule = isCourse ? {
+    firstSessionStart: service.schedule?.firstSessionStart,
+    lastSessionEnd: service.schedule?.lastSessionEnd,
+  } : undefined;
+  const endedText = isCourse && courseHasEnded(service, Date.now()) ? copyParam("services.ended", "Ended") : "";
   const price = servicePriceLine(service, listLabel).text;
   const meta = [isCourse ? courseDatesText(service) : serviceDurationText(service, listLabel), price].filter(Boolean).join(" · ");
   const typeTag = typeTagOf(service.type);
@@ -234,18 +242,20 @@ function norm(service: WixService): Row {
     tagline,
     typeTag,
     noTypeTag: !typeTag,
+    endedText,
+    courseSchedule,
     meta,
     canBook,
     noBook: !canBook,
     bookCta: bookCtaFor(request),
     bookA11y: bookLabel(name, request),
-    a11y: spokenName({ name, typeTag, tagline, meta }),
+    a11y: spokenName({ name, typeTag, endedText, tagline, meta }),
   };
 }
 
 /** A row saved by an older worker (offline cache, restored state) has none of the new
  *  fields: it renders with no tagline, meta or tag, and no Book pill until the live read. */
-function withRowDefaults(row: Partial<Row>): Row {
+function withRowDefaults(row: Partial<Row>, shownEnded?: string): Row {
   const name = typeof row.name === "string" && row.name ? row.name : "Service";
   const str = (v: unknown) => (typeof v === "string" ? v : "");
   const image = str(row.image);
@@ -253,6 +263,9 @@ function withRowDefaults(row: Partial<Row>): Row {
   const tagline = str(row.tagline);
   const meta = str(row.meta);
   const canBook = row.canBook === true;
+  const courseSchedule = row.courseSchedule;
+  const endedText = courseSchedule && courseHasEnded({ schedule: courseSchedule }, Date.now())
+    ? copyParam("services.ended", "Ended", shownEnded || str(row.endedText) || "Ended") : "";
   return {
     ...row,
     id: str(row.id),
@@ -268,12 +281,13 @@ function withRowDefaults(row: Partial<Row>): Row {
     tagline,
     typeTag,
     noTypeTag: !typeTag,
+    endedText,
     meta,
     canBook,
     noBook: !canBook,
     bookCta: str(row.bookCta) || bookCtaFor(false),
     bookA11y: str(row.bookA11y) || bookLabel(name),
-    a11y: str(row.a11y) || spokenName({ name, typeTag, tagline, meta }),
+    a11y: spokenName({ name, typeTag, endedText, tagline, meta }),
   };
 }
 
@@ -287,6 +301,9 @@ let categoriesInFlight = false;
 let categoriesFailedAt = 0;
 const CATEGORY_RETRY_MS = 60_000;
 const rowCategories = new Map<string, number>();
+/** A restored Ended label bridges only the first live page after boot, because an app that sends no
+ *  copy pack gives no sign that none is coming: after it, current copy (pack or stock) decides. */
+let restoredEndedBridge = true;
 
 /** Repaint the chips only, on the state already shown. Re-deriving from the query controller
  *  would publish its working state, which a revalidation deliberately holds back (a restored list
@@ -302,7 +319,7 @@ function withChips(s: S): S {
   // rows of the whole list (no category, no query), or the stand-in would be one category.
   const whole = filter === "all" && !(typeof collection?.query === "string" && collection.query.trim());
   // Not while a load is out: the rows on screen may still be a previous search's.
-  if (!siteCategories?.length && rowCategories.size === 0 && whole && s.isLoading !== true) rememberRowCategories((s.results ?? []).map(withRowDefaults));
+  if (!siteCategories?.length && rowCategories.size === 0 && whole && s.isLoading !== true) rememberRowCategories((s.results ?? []).map((row) => withRowDefaults(row)));
   const chips = categoryChips(filter);
   return { ...s, categoryChips: chips, hideCategories: collection?.hideChrome === true || (chips.length < 3 && !filter.startsWith("value:")) };
 }
@@ -345,6 +362,11 @@ function categoryChips(filter: string): CategoryChip[] {
 
 const svc = defineBackendCollection<S, Row>("himiBookingServices", {
   restorePagesOnLoad: true,
+  onLoad() {
+    // Copy is stashed before this hook. Repaint restored labels immediately, even
+    // when the background query holds the old page through a slow or failed read.
+    (svc as unknown as { normalizeRestored?: () => unknown }).normalizeRestored?.();
+  },
   state: { status: "loading", query: "", all: [], results: [], emptyText: "", countLabel: "", errored: false,
     notErrored: true, isLoading: true, notLoading: false, hasResults: false, noEmpty: true,
     categoryChips: [], hideCategories: true, hideRows: false, noMatchText: "", hasQuery: false, noQuery: true, categoriesLabel: "" },
@@ -377,11 +399,10 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
   },
   actions: {
     categoriesLanded: (s) => withChips(s),
-    // A snapshot saved by an older worker comes back without the new row fields; a missing
-    // `noBook` would show Book on a course until the live read. Give restored rows the defaults.
+    // Normalize old snapshots and refresh Ended/copy before revalidation settles.
+    // A missing `noBook` must never show Book on a restored course.
     normalizeRestored: (s) => {
       const rows = Array.isArray(s.results) ? s.results : [];
-      if (rows.every((row) => typeof (row as Partial<Row>).noBook === "boolean")) return s;
       const fixed = rows.map((row) => withRowDefaults(row as Partial<Row>));
       return { ...s, results: fixed, all: fixed };
     },
@@ -389,7 +410,11 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
   apply(s, page) {
     const loading = page.status === "loading";
     const errored = page.status === "error";
-    const rows = page.items.map(withRowDefaults);
+    // A live row is built before a cold boot's copy pack arrives: the first live page keeps the
+    // Ended label the restored row for the same course showed, until a current pack replaces it.
+    const shown = new Map((restoredEndedBridge && Array.isArray(s.results) ? s.results : []).map((row) => [row.id, row.endedText]));
+    const rows = page.items.map((item) => withRowDefaults(item, shown.get(item.id)));
+    if (page.metadata?.fromCache === false && !loading && !errored) restoredEndedBridge = false;
     // The stand-in categories come from the accepted rows of the whole list (a superseded
     // response never reaches apply): a live page replaces them, the device's copy only fills a gap.
     if (!page.criteria.query && page.criteria.filter === "all" && rows.length > 0) {
@@ -427,7 +452,6 @@ const svc = defineBackendCollection<S, Row>("himiBookingServices", {
 // (there is no Refine now): both go back to the business's own view before the first read.
 type Retired = { getState?: () => { collection?: { filter?: unknown; sort?: unknown } };
   collectionFilter?: (arg: unknown) => unknown; collectionSort?: (arg: unknown) => unknown };
-(svc as unknown as { normalizeRestored?: () => unknown }).normalizeRestored?.();
 const retired = svc as unknown as Retired;
 const persisted = retired.getState?.()?.collection;
 if (persisted?.filter === "saved") void retired.collectionFilter?.({ selectedIds: ["all"] });

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

@@ -193,9 +193,47 @@ const PRICING_NOT_HYDRATED = ["rows", "collection", "hidePriceRetry"] as const;
 let content: { status: State["status"]; programs: ProgramContent[] } = { status: "loading", programs: [] };
 let scopeIncomplete = false;
 let loadSeq = 0;
+const object = (value: unknown): Record<string, unknown> => value && typeof value === "object" && !Array.isArray(value) ? value as Record<string, unknown> : {};
+function sectionOrder(value: unknown): string[] {
+  try { if (typeof value === "string") value = JSON.parse(value); } catch { return []; }
+  const settings = object(object(value).settings);
+  const sorting = object(settings.sortingSettings);
+  return sorting.ordering === "MANUAL" && Array.isArray(sorting.challengesOrder)
+    ? sorting.challengesOrder.filter((id): id is string => typeof id === "string" && !!id)
+    : [];
+}
+const routeInput = () => (globalThis as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input;
+/** The whole route input identifies the route, so a change to any field ends the previous section's order. */
+const inputKey = () => { try { return JSON.stringify(routeInput() ?? {}); } catch { return ""; } };
+let lastInputKey = inputKey();
+let manualOrder = sectionOrder(routeInput()?.programsSection);
+
+/** Source ordering promotes configured IDs; it never selects a subset of the catalog. */
+function orderRows(rows: ProgramRow[]): ProgramRow[] {
+  if (!manualOrder.length) return rows;
+  const remaining = new Map(rows.map(row => [row.id, row]));
+  const ordered: ProgramRow[] = [];
+  for (const id of manualOrder) {
+    const row = remaining.get(id);
+    if (row) { ordered.push(row); remaining.delete(id); }
+  }
+  return [...ordered, ...remaining.values()];
+}
 
 async function load(_state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
+  const params = object(arg);
+  const hasSection = Object.prototype.hasOwnProperty.call(params, "programsSection");
+  const nextInputKey = inputKey();
+  const inputChanged = nextInputKey !== lastInputKey;
+  if (inputChanged) {
+    lastInputKey = nextInputKey;
+    manualOrder = sectionOrder(routeInput()?.programsSection);
+  }
+  if (hasSection) {
+    manualOrder = sectionOrder(params.programsSection);
+  }
+  if (inputChanged || hasSection) void svc.pricingPublish();
   const seq = ++loadSeq;
   const programs = await fetchPrograms(() => seq === loadSeq).catch(() => undefined);
   if (seq !== loadSeq) return undefined;
@@ -220,8 +258,8 @@ function pricedState(state: State): State {
     const item = onlineProgramItem({ id: program.wixId });
     return item ? pricing.view(item.reference) : undefined;
   });
-  const rows = content.programs.map(({ wixId: _wixId, ...row }, i) =>
-    ({ ...row, priceLine: views[i] ? iapPriceFields(views[i]!, copy).priceText : "" }));
+  const rows = orderRows(content.programs.map(({ wixId: _wixId, ...row }, i) =>
+    ({ ...row, priceLine: views[i] ? iapPriceFields(views[i]!, copy).priceText : "" })));
   const shown = content.status === "ready" ? ready(rows) : content.status === "error" ? errored({ ...state, rows }) : INITIAL_STATE;
   return {
     ...state, ...shown, programs: content.programs,

package/templates/brandy/tier5-src/_shared/himi-copy.ts

@@ -21,6 +21,7 @@
 export type CopyPackValue = string | { source: string; translation: string };
 
 let stashedCopy: Record<string, CopyPackValue> = Object.create(null);
+let copyReceived = false;
 
 /** Absorb the `copy` onAppear param (customer strings or stock translation records)
  *  from an action arg. Call first in every action that can receive onAppear
@@ -44,15 +45,19 @@ export function stashCopy(arg: unknown): void {
       }
     }
     stashedCopy = next;
+    copyReceived = true;
   } catch {
     // Malformed pack param — keep the stock copy rather than dying mid-action.
   }
 }
 
-/** The provisioned override for `key`, or `fallback` (the stock copy) when no
- *  pack / no such key reached this worker. */
-export function copyParam(key: string, fallback: string): string {
+/** The provisioned override for `key`, or `fallback` (the stock copy). An optional
+ *  restored label survives only until a current copy pack arrives. */
+export function copyParam(key: string, fallback: string, restoredFallback = fallback): string {
   const value = stashedCopy[key];
+  // A disk-restored row may paint before onAppear supplies its copy pack. Keep its
+  // last label only before a pack arrives; even an empty current pack selects stock copy.
+  if (value === undefined) return copyReceived ? fallback : restoredFallback;
   if (typeof value === "string") return value !== "" ? value : fallback;
   return value?.source === fallback && value.translation !== "" ? value.translation : fallback;
 }