@wix/himalaya-cli 0.1034.0 → 0.1036.0

package/templates/yoga-studio-owner/tier5-src/_shared/aria-chat.ts

@@ -68,6 +68,7 @@ import { isWebUrl, stripMarkdown } from "./aria-widget-model.js";
 import { NO_WIDGET, activeWidgetOf, asyncAdvanced, type SubtreeSlot, type WidgetOptionRow, type WidgetView }
   from "./aria-widget-view.js";
 import { substituteSelection } from "./aria-widget-model.js";
+import { isTransportFailure, ownerTransportFailureText } from "./owner-load-error.js";
 import { LOCAL_ID_PREFIX, createRowMemo, mintLocalId, transcriptKeys, type RowMemo } from "./aria-hot-path.js";
 
 // ---------------------------------------------------------------------------
@@ -117,8 +118,18 @@ export interface AriaBubble {
 }
 
 /** An empty-state suggestion card: emoji + title + hint, and the text that is
- *  actually submitted when it is tapped. */
-export interface AriaPromptChip { id: string; emoji: string; title: string; sub: string; text: string; }
+ *  actually submitted when it is tapped.
+ *
+ *  `label` is the card's ACCESSIBLE NAME, derived by the machine (`promptLabel`)
+ *  — callers never supply it. The emoji is decoration: named by it, the card
+ *  read as "writing hand" to VoiceOver instead of what it does. */
+export interface AriaPromptChip { id: string; emoji: string; title: string; sub: string; text: string; label?: string; }
+
+/** "Write a blog post, Draft a post about my business" — title then hint, never
+ *  the emoji, and no dangling separator when a copy pack blanks the hint. */
+export function promptLabel(p: Pick<AriaPromptChip, "title" | "sub">): string {
+  return [p.title, p.sub].map((s) => String(s ?? "").trim()).filter(Boolean).join(", ");
+}
 
 export interface AriaChatState {
   status: "loading" | "ready" | "sending" | "error";
@@ -558,9 +569,14 @@ export function isWixAccountUnreachable(e: unknown): boolean {
  *  clears any stale status line, and the signed-out sentence clears any red text
  *  left over from an earlier failure. */
 function failureSlots(e: unknown, unavailable: () => string): { error: string; statusText: string } {
-  return isWixAccountUnreachable(e)
-    ? { error: "", statusText: unavailable() }
-    : { error: String((e as Error)?.message ?? e), statusText: "" };
+  if (isWixAccountUnreachable(e)) return { error: "", statusText: unavailable() };
+  // A request that never reached Wix is still a failure (red), but its wire text
+  // is a platform dump — iOS hands over the NSError description, domain, code and
+  // the local server's URL included. The owner gets one sentence instead.
+  // Everything else keeps its diagnostic: see the "UNKNOWN bridge error stays
+  // loud" test, which is why this is not a blanket `humanWireError`.
+  if (isTransportFailure(e)) return { error: ownerTransportFailureText(), statusText: "" };
+  return { error: String((e as Error)?.message ?? e), statusText: "" };
 }
 
 /** Is this url somewhere Wix itself serves?
@@ -1233,7 +1249,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
     return s.statusText && notices.includes(s.statusText) ? { ...s, statusText: "" } : s;
   };
   const toolFailedText = () => res(o.labels?.toolFailed ?? `${assistant()} couldn't finish that. Try again.`);
-  const promptList = () => res(o.prompts);
+  const promptList = () => res(o.prompts).map((p) => ({ ...p, label: promptLabel(p) }));
   const siteOf = o.siteId ?? (() => "");
   const resumeOf = o.resumeConversationId ?? inputConversationId;
   const historyKeyFor = (site: string) => scopedKey(o.historyKey, site);

package/templates/yoga-studio-owner/tier5-src/_shared/collection-contract.ts

@@ -26,6 +26,13 @@ export interface CollectionConfig {
   reviewSelectedAction?: string;
   /** Optional comfortable grid media height for immersive visual catalogs. */
   gridImageHeight?: number;
+  /** What the count summary counts — ["dish", "dishes"] reads "12 dishes". Default "item(s)". */
+  countNoun?: [string, string];
+  /** Phone grid columns (default 2). A card carrying a paragraph of benefits and a CTA — a
+   *  pricing plan — is unreadable at half width, so it opts into one. */
+  gridColumns?: number;
+  /** Lines of the meta caption a comfortable row may use (default 2). */
+  metaMaxLines?: number;
   /** The card's primary verb, shown as a visible button beside the overflow.
    * `screenId` opens that screen with the row id; without it the verb reuses the
    * row's own tap action (the detail screen that owns the verb). */
@@ -38,28 +45,28 @@ export interface CollectionConfig {
  * page, the list/grid toggle, Refine, chips, search and count are noise. */
 export const COLLECTION_CHROME_MIN_ITEMS = 4;
 export const COLLECTIONS: Record<string, CollectionConfig> = {
-  himiStoreShop: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', view: 'grid', backendQuery: true },
-  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Service name starts with…', primaryVerb: { label: 'Book', screenId: 'himi_time' } },
+  himiStoreShop: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', view: 'grid', backendQuery: true, countNoun: ['product', 'products'] },
+  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Search services', countNoun: ['service', 'services'], primaryVerb: { label: 'Book', screenId: 'himi_time' } },
   himiBookingBookings: { rows: 'rows', title: 'title', subtitle: 'subtitle', metadata: ['status'], view: 'list', backendQuery: true,
-    defaultFilter: 'value:Upcoming', searchPlaceholder: 'Exact booking ID', filterValues: ['Upcoming', 'Past', 'Cancelled'],
+    defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search by booking ID', countNoun: ['booking', 'bookings'], filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
-  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
+  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, defaultFilter: 'value:Upcoming', searchPlaceholder: 'Search events', countNoun: ['event', 'events'], filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
   himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid', narrowedBy: 'selectedCategoryId' },
-  himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true },
+  himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true, countNoun: ['product', 'products'] },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
   himiOwnerLiteServices: { rows: 'services', title: 'name', subtitle: 'subtitle', view: 'list', backendQuery: true, searchPlaceholder: 'Service name starts with…' },
   himiOwnerLiteEvents: { rows: 'events', title: 'title', subtitle: 'dateLine', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' } },
   himiOwnerLitePosts: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', view: 'grid' },
-  himiOwnerLiteOrders: { rows: 'orders', title: 'buyer', subtitle: 'meta', filter: 'statusLabel', view: 'list', backendQuery: true,
+  himiOwnerLiteOrders: { rows: 'orders', title: 'buyer', subtitle: 'meta', filter: 'statusLabel', view: 'list', backendQuery: true, countNoun: ['order', 'orders'],
     searchPlaceholder: 'Customer name, email or order #', sortLabels: { default: 'Newest', az: 'Customer A–Z', za: 'Customer Z–A' },
     filterValues: ['Recent 7 days', 'Paid', 'Unpaid', 'Partially paid', 'Pending', 'Refunded', 'Partly refunded'] },
   himiBrandedGroups: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCms: { rows: 'rows', title: 'name', subtitle: 'subtitle', view: 'grid' },
   himiBrandedCmsCollection: { instanceInput: 'collection', rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list' },
   himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list', backendQuery: true,
-    searchPlaceholder: 'Exact order number', filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
+    searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
-  himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3'], view: 'grid' },
+  himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
   himiBrandedPrograms: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list', primaryVerb: { label: 'Get code' } },
   himiBrandedNotifications: { rows: 'items', title: 'name', subtitle: 'subtitle', image: 'photo', metadata: ['unreadDot'], view: 'list' },
@@ -75,7 +82,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedForms: { rows: 'forms', title: 'name', subtitle: 'description', view: 'list' },
   himiBrandedGalleries: { rows: 'galleries', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedInbox: { rows: 'conversations', title: 'title', subtitle: 'preview', view: 'list' },
-  himiBrandedMenus: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', sectioned: true, filter: 'collectionCategory', metadata: ['collectionCategory', 'priceLine', 'label1', 'label2', 'label3'], view: 'grid' },
+  himiBrandedMenus: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', sectioned: true, filter: 'collectionCategory', metadata: ['collectionCategory', 'priceLine', 'label1', 'label2', 'label3'], view: 'grid', searchPlaceholder: 'Search the menu', countNoun: ['dish', 'dishes'] },
 };
 export interface CollectionPreferences {
   view: 'list' | 'grid';

package/templates/yoga-studio-owner/tier5-src/_shared/collection-service.ts

@@ -18,6 +18,20 @@ type Reducer = (s: State, ...args: unknown[]) => State | undefined | Promise<Sta
 const object = (x: unknown): State => x && typeof x === 'object' && !Array.isArray(x) ? x as State : {};
 const str = (arg: unknown, key: string): string => typeof arg === 'string' ? arg : String(object(arg)[key] ?? '');
 
+/** The toolbar count line — "12 dishes", or "3 of 12 dishes" while a filter narrows the list.
+ *
+ *  It used to read "12 / 12 loaded" and "2 / 2 results" ([branded-lite-qa] #3002): the numbers
+ *  described the implementation (a client-side filter over a fetched page) rather than what the
+ *  customer is looking at, and the slash-and-suffix wrapped onto two lines on web. When the
+ *  backend total is unknown the count shown is simply what is shown; the "Load more" button is
+ *  what says there is more. */
+export function collectionSummary(o: { shown: number; loaded: number; total?: number; backend?: boolean; noun?: [string, string] }): string {
+  const [one, many] = o.noun ?? [copyParam('collection.itemOne', 'item'), copyParam('collection.itemMany', 'items')];
+  const whole = o.backend ? (typeof o.total === 'number' ? o.total : o.shown) : o.loaded;
+  const noun = (whole === 1 ? one : many);
+  return o.shown < whole ? `${o.shown} ${copyParam('collection.of', 'of')} ${whole} ${noun}` : `${o.shown} ${o.shown === 1 ? one : many}`;
+}
+
 /** Opt-in decorator. Domain reducers remain authoritative; collection preferences
  * survive reducers which replace their entire state, including async refreshes. */
 export function decorateCollection(name: string, def: { state: State; actions?: Record<string, Reducer> }, saving?: CollectionSaving, backend?: BackendCollection) {
@@ -179,11 +193,11 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       filtersPresented, previewPresented: !!previewId, preview: projected.items.filter(row => row.collectionId === previewId),
       persistenceLabel: persisted.available ? copyParam('collection.onDevice', 'Saved on this device') : copyParam('collection.sessionOnly', 'Choices last for this session'),
       noEmpty: loading || errored || sourceEmpty || domainNarrowed || projected.items.length > 0,
-      summary: backend && config.backendQuery
-        ? (s.fromCache ? copyParam('collection.cached', 'Saved offline · may be outdated')
-          : typeof s.total === 'number' ? `${projected.items.length} / ${s.total} ${copyParam('collection.results', 'results')}`
-          : `${projected.items.length} ${s.complete ? copyParam('collection.results', 'results') : copyParam('collection.loaded', 'loaded')}`)
-        : `${projected.items.length} / ${projected.loaded} ${copyParam('collection.loaded', 'loaded')}`,
+      summary: backend && config.backendQuery && s.fromCache
+        ? copyParam('collection.cached', 'Saved offline · may be outdated')
+        : collectionSummary({ shown: projected.items.length, loaded: projected.loaded, backend: !!(backend && config.backendQuery),
+          total: typeof s.total === 'number' ? s.total : undefined, noun: config.countNoun
+            ? [copyParam(`collection.${name}.countOne`, config.countNoun[0]), copyParam(`collection.${name}.countMany`, config.countNoun[1])] : undefined }),
       selectedSummary: `${prefs.selectedIds.length} ${copyParam('collection.selected', 'selected')}`,
       filterChoices,
       chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,

package/templates/yoga-studio-owner/tier5-src/_shared/engine-intl.ts

@@ -352,3 +352,54 @@ export function compareDateDesc(a: string, b: string): number {
   if (bBad) return -1;
   return tb - ta;
 }
+
+// --- [branded-lite-qa] #3079: one pattern per fact ---------------------------------------
+//
+// Before these existed, four screens formatted the same money four ways — Shop "69.00 ₪" (Wix's
+// pre-formatted string), Services "₪70" (0 decimals), Menu "₪32.00", Plans "$24" — and two
+// screens formatted the same clock two ways (Events "9:00 PM-11:00 PM", Reserve "20:00").
+// Customers read that as sloppiness, and a whole "₪70" beside "₪69.50" reads as a different
+// kind of number. So: one money pattern, one clock, one range.
+
+// Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
+// ("₪70.00", "¥500"). Passing 0 fraction digits for whole amounts is what made a list read
+// "₪70 · ₪69.50".
+
+const KNOWN_SYMBOLS = new Set(Object.values(CURRENCY_SYMBOL));
+
+/** Wix hands some prices over PRE-formatted in the site's regional style — "69.00 ₪" with the
+ *  symbol trailing, often wrapped in bidi marks. Reorder those to the house pattern ("₪69.00") so
+ *  they match every price we format ourselves. Only an en-shaped number ("69.00", "1,234.50") with
+ *  a known trailing symbol is reordered: a comma-decimal or space-grouped string ("69,00 €",
+ *  "1 234,56 €") is kept as Wix wrote it, because half-converting it would be worse. Anything else
+ *  ("Market price") is returned trimmed. The store SDK's product price applies the same rule. */
+export function normalizeFormattedPrice(formatted: string): string {
+  const raw = (formatted || "").replace(/[‎‏]/g, "").trim();
+  const m = /^(-?)(\d{1,3}(?:,\d{3})*(?:\.\d+)?|\d+(?:\.\d+)?)[\s  ]*(\S+)$/.exec(raw);
+  if (!m || !KNOWN_SYMBOLS.has(m[3])) return raw;
+  return `${m[1]}${m[3]}${m[2]}`;
+}
+
+function clockParts(d: Date, locale: string): { time: string; meridiem: string } {
+  const full = hasIntl()
+    ? new Intl.DateTimeFormat(locale, { hour: "numeric", minute: "2-digit", hour12: true }).format(d)
+    : clock12(d);
+  // ICU puts a narrow no-break space before the meridiem; normalize so callers can split on it.
+  const clean = full.replace(/[  ]/g, " ");
+  const m = /^(.*?)\s*([AP]\.?M\.?)$/i.exec(clean);
+  return m ? { time: m[1], meridiem: m[2] } : { time: clean, meridiem: "" };
+}
+
+/** "8:00 PM" — the one clock every customer screen uses (12-hour, en-US shape). */
+export function formatClock(date: Date, locale = "en-US"): string {
+  const { time, meridiem } = clockParts(date, locale);
+  return meridiem ? `${time} ${meridiem}` : time;
+}
+
+/** Is this ISO instant before `now`? A missing or unparseable value is NOT past — "no expiry"
+ *  must never classify an offer as expired. */
+export function isPastDate(iso: string | undefined | null, now: number = Date.now()): boolean {
+  if (!iso) return false;
+  const t = Date.parse(iso);
+  return !Number.isNaN(t) && t < now;
+}

package/templates/yoga-studio-owner/tier5-src/_shared/owner-load-error.ts

@@ -74,6 +74,54 @@ const SITE_CONTEXT_CODES = ["MISSING_METASITE_ID", "MISSING_REQUEST_SITE_CONTEXT
  *  message and starts being a payload dump. */
 const MAX_RAW = 200;
 
+/**
+ * A TRANSPORT failure: the request never got an HTTP answer at all.
+ *
+ * Each host describes one in its own platform's words, and every one of them is a
+ * diagnostic dump rather than a message. iOS's JSWorker hands a worker the Swift
+ * description of the `NSError` —
+ *   `Error Domain=NSURLErrorDomain Code=-1004 "Could not connect to the server."
+ *    UserInfo={… NSErrorFailingURLStringKey=http://127.0.0.1:8178/__dev/wix/proxy, …}`
+ * — which Aria painted verbatim: the domain, the code, and the local server's
+ * own URL. Android's bridge carries the `java.net` exception text, and a browser's
+ * fetch rejects with "Failed to fetch" / "Load failed" / "NetworkError …".
+ *
+ * Only a message with NO HTTP status qualifies: a status means Wix answered, and
+ * that case keeps its own reductions below.
+ */
+const TRANSPORT = [
+  /\bError Domain=\w+/,                       // any Cocoa NSError description
+  /\bNSURLErrorDomain\b/,
+  /\bjava\.(?:net|io)\.\w+(?:Exception|Error)\b/,
+  /\b(?:UnknownHost|Connect|SocketTimeout|NoRouteToHost|SSLHandshake)Exception\b/,
+  // Android's WebViewJSWorker bridges `e.message ?: e.javaClass.simpleName`, so
+  // the class name is usually absent and only OkHttp's own message arrives.
+  /^Failed to connect to \S/,
+  /^Unable to resolve host\b/,
+  /\b(?:Connection refused|Network is unreachable|Software caused connection abort)\b/,
+  /^(?:timeout|Read timed out|connect timed out)$/i,
+  /\bFailed to fetch\b/,
+  /\bNetworkError when attempting to fetch\b/,
+  /^(?:TypeError: )?Load failed$/,
+  /\bnet::ERR_[A-Z_]+/,
+];
+
+/** Did this failure happen below HTTP — no answer from Wix at all? */
+export function isTransportFailure(e: unknown): boolean {
+  const msg = String((e as Error)?.message ?? e ?? "");
+  if (STATUS.test(msg)) return false;
+  return TRANSPORT.some((re) => re.test(msg));
+}
+
+/** The one sentence for a transport failure. Copy-as-configuration: the key is
+ *  under `ownerCommon.`, which every owner screen (Aria included) forwards. */
+export function ownerTransportFailureText(): string {
+  return copyParam(
+    "ownerCommon.networkUnreachable",
+    "Couldn’t reach Wix. Check your connection and try again.",
+  );
+}
+
 /**
  * Reduce a wire failure to something a PERSON can read.
  *
@@ -85,6 +133,7 @@ const MAX_RAW = 200;
  * markup; a long non-HTML body is truncated for the same reason.
  */
 function humanWireError(msg: string): string {
+  if (isTransportFailure(msg)) return ownerTransportFailureText();
   const status = STATUS.exec(msg)?.[1];
   // A JSON ENVELOPE or a NAMED REASON CODE is the machine's word for it, and the
   // owner gets neither. Both reductions used to live in `ownerDisplayError` only,

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-events/index.ts

@@ -95,6 +95,7 @@ function demoList(s: EventsState, upcoming = false): EventsState {
     dateLine: d.dateLine,
     location: d.location,
     status: d.statusLabel,
+    statusLabel: "",
     image: "",
     hasImage: false,
     noImage: true,