@wix/himalaya-cli 0.1544.0 → 0.1545.0

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

@@ -1,3 +1,4 @@
+import { withReadLifecycle, readOptions } from "../_shared/read-service.js";
 import { withOnlineWrites, offlineWritesEnabled, offlineWriteMessage } from "../_shared/online-actions.js";
 import { defineService as registerState } from "@himalaya/state";
 // Tier-5 bundle: himi-store — product detail.
@@ -6,7 +7,10 @@ import { storesAppleSalesEnabled, storesProductOrders, type IapCommerce, type Ia
 import { iapPriceCopy, iapPurchaseCopy } from "../_shared/iap-worker.js";
 import { share as shareSheet } from "@himalaya/share";
 import { addToCurrentCart, getCurrentCart } from "@himalaya/wix-ecom";
-import { get, upsert, enqueue, type DbEntity } from "@himalaya/local-db";
+import { upsert, enqueue, type DbEntity } from "@himalaya/local-db";
+
+async function cartPut(row: DbEntity): Promise<void> { try { await upsert("cart", row); } catch { /* capability not granted */ } }
+async function queueWrite(actionId: string, params: Record<string, string>): Promise<void> { try { await enqueue(actionId, params); } catch { /* capability not granted */ } }
 import { getStoreProduct, plainText, productImage, productPrice, wixMediaUrl, productGallery as sdkProductGallery, WIX_DETAIL_IMAGE, type StoreProduct,
   productOptions, defaultSelection, isSelectionComplete, selectionSummary, cartOptionsPayload,
   type StoreOption, type StoreOptionChoice, type StoreOptionSelection } from "../_shared/himi-store.js";
@@ -17,21 +21,6 @@ import { isProductSaved, toggleSavedProduct } from "../_shared/himi-store-saved.
 import { openRichLink } from "../_shared/rich-content-link.js";
 import { richBody } from "../_shared/rich-body.js";
 
-// Offline-first (data-offline): the detail is a public READ-THROUGH — when the live
-// product fetch fails (offline) fall back to the last-synced row the catalog cached
-// under the `products` entity. `addToCart` is WRITE-BEHIND against the `cart` entity —
-// the line is cached OPTIMISTICALLY, then the Wix write is attempted; if it can't
-// reach the bridge/network the add is ENQUEUED for replay on reconnect. Every local-db
-// call is wrapped so a build without the `local_database` grant behaves exactly as
-// before (online-only, no cache/queue).
-const PRODUCTS_ENTITY = "products";
-const CART_ENTITY = "cart";
-async function readCachedProduct(id: string): Promise<DbEntity | null> {
-  try { return await get(PRODUCTS_ENTITY, id); } catch { /* capability not granted → online-only */ return null; }
-}
-async function cartPut(row: DbEntity): Promise<void> { try { await upsert(CART_ENTITY, row); } catch { /* capability not granted */ } }
-async function queueWrite(actionId: string, params: Record<string, string>): Promise<void> { try { await enqueue(actionId, params); } catch { /* capability not granted */ } }
-
 /** Live cart size (sum of line-item quantities) for the top-bar cart badge.
  *  Best-effort: a cart error just yields 0 (badge hidden), never fails the screen. */
 async function cartItemCount(): Promise<number> {
@@ -95,25 +84,6 @@ function productPolicyBody(product: StoreProduct, kind: "returns" | "shipping"):
  *  DIFFERENT product (drop the picks) from the same product coming back (keep them). */
 let lastLoadedId: string | undefined;
 let productLoadSequence = 0;
-let booting = true;
-let bootLoad: { id: string; state: Promise<S> } | undefined;
-
-/** The host replays the screen's onAppear load right after the module-scope one: that one replay
- *  joins the boot load instead of reading the product, cart and App Store prices again. Any later
- *  entry loads afresh, since the cart, the saved flag or a purchase may have changed meanwhile. */
-function joinedLoad(id: string, load: () => Promise<S>): Promise<S> {
-  if (booting) {
-    booting = false;
-    const current = { id, state: load() };
-    bootLoad = current;
-    const settle = () => { if (bootLoad === current) bootLoad = undefined; };
-    current.state.then(settle, settle);
-    return current.state;
-  }
-  const replayed = bootLoad;
-  bootLoad = undefined;
-  return replayed?.id === id ? replayed.state : load();
-}
 
 interface OptionSlots {
   opt1Label: string; opt1Chips: OptionChip[]; opt1Selected: string[]; opt1SelectedId: string; opt1Placeholder: string; noOpt1: boolean;
@@ -280,6 +250,7 @@ interface S {
   emptyText: string;
   isLoading: boolean;
   notLoading: boolean;
+  hideContent: boolean;
   isErrored: boolean;
   notErrored: boolean;
   noEmpty: boolean;
@@ -435,6 +406,7 @@ function derive(s: S): S {
     notAdded: !s.added,
     isLoading: s.status === "loading",
     notLoading: s.status !== "loading",
+    hideContent: s.status !== "ready" || !s.name,
     isErrored: s.status === "error",
     notErrored: s.status !== "error",
     noEmpty: s.status === "loading" || s.status === "error" || !empty,
@@ -460,11 +432,11 @@ const NOT_APPLE: IapPurchaseFields = { appleRoute: false, accessReady: false, bu
 
 let productPricing: IapCommerce;
 let checkoutEntered = false;
-const defineService = withIapPresentation<S>({
+const registerProduct = withIapPresentation<S>({
   register: withOnlineWrites(registerState, ["beginAdd", "addToCart", "buy"], { derive, messageFields: action => action === "buy" ? ["buyNote"] : ["cartHint"] }),
   adapters: SELLS_THROUGH_APPLE ? [storesProductOrders] : [],
   onCreate: commerce => { productPricing = commerce; }, prefix: "product",
-  transientKeys: ["price", "optionsIncomplete", "cartHint", "cartHidden", "buyHidden", "buyLabel", "buyDisabled", "buyNote", "purchasedNote", "addedSheetPresented", "shareHint"], contentActions: ["load", "paintCached"], concurrentPublishActions: ["buy"],
+  transientKeys: ["price", "optionsIncomplete", "cartHint", "cartHidden", "buyHidden", "buyLabel", "buyDisabled", "buyNote", "purchasedNote", "addedSheetPresented", "shareHint"], contentActions: ["load", "readChanged"], concurrentPublishActions: ["buy"],
   items: state => inputId() ? [{ reference: { kind: "storesProduct", id: inputId() }, commerceDisplayPrice: state.price }] : [],
   present: (state, price, allowed) => {
     const purchase = applePurchase(state);
@@ -475,14 +447,33 @@ const defineService = withIapPresentation<S>({
     return {
       ...state, price: price(inputId()), ...(purchase.appleRoute ? { wasPrice: "", wasPriceEmpty: false, notOnSale: true } : {}), optionsIncomplete: derive(state).optionsIncomplete || !allowed(inputId()) || lastProduct?.productType?.toLowerCase() === "digital",
       cartHint, noCartHint: !cartHint || state.added, addDisabled: state.addDisabled || blocked,
-      cartHidden: purchase.appleRoute,
-      buyHidden: !purchase.appleRoute || purchase.accessReady, buyLabel: purchase.buyLabel, buyDisabled: purchase.buyDisabled,
+      cartHidden: state.status !== "ready" || !state.name || purchase.appleRoute,
+      buyHidden: state.status !== "ready" || !state.name || !purchase.appleRoute || purchase.accessReady, buyLabel: purchase.buyLabel, buyDisabled: purchase.buyDisabled,
       buyNote: state.buyNote === offlineWriteMessage ? state.buyNote : purchase.buyNote,
       purchasedNote: purchase.accessReady ? copyParam("product.purchasedText", "Purchased") : "",
     };
   },
 });
 
+// Read recovery commits content before IAP sidecars project prices. Cache and network
+// reads stay inside one safe read lifecycle; price publications never become read results.
+const defineService = withReadLifecycle(registerProduct, "load", {
+  // Missing route input is authored local content, not a server response or cache hit.
+  localResult: () => !inputId(),
+  onInvalidate: () => {
+    productLoadSequence++;
+    lastProduct = undefined;
+    lastLoadedId = undefined;
+    cartBadgeEpoch++;
+  },
+  unavailable: state => {
+    lastProduct = undefined;
+    lastLoadedId = undefined;
+    return { ...derive(state as unknown as S) };
+  },
+  authoredFallback: state => !inputId() ? { ...derive({ ...state, status: "ready", emptyText: copyParam("product.notFoundText", "Product not found.") } as unknown as S) } : undefined,
+});
+
 /** The App Store action, only for the one shape it sells: digital, with no options to choose, read
  *  from the product loaded for the id on screen (as Add to cart is). A cached product whose
  *  options were never read is not known to have none. */
@@ -502,7 +493,8 @@ function enterCheckout(): void {
   checkoutEntered = true;
 }
 
-const svc = defineService<S, {
+const onlineService = defineService;
+const svc = onlineService<S, {
   load: (s: S, arg?: unknown) => Promise<S>;
   setQuantity: (s: S, arg?: unknown) => S;
   toggleReturnPolicy: (s: S) => S;
@@ -510,7 +502,6 @@ const svc = defineService<S, {
   selectOption: (s: S, arg?: unknown) => S;
   addToCart: (s: S) => Promise<S>;
   beginAdd: (s: S, arg?: unknown) => S;
-  paintCached: (s: S, arg?: unknown) => S;
   setCartCount: (s: S, arg?: unknown) => S;
   share: (s: S) => Promise<S>;
   toggleSave: (s: S) => S;
@@ -565,7 +556,7 @@ const svc = defineService<S, {
     notAdded: true,
     emptyText: "",
     isLoading: true,
-    notLoading: false,
+    notLoading: false, hideContent: true,
     isErrored: false,
     notErrored: true,
     noEmpty: true,
@@ -600,146 +591,106 @@ const svc = defineService<S, {
     purchasedNote: "",
   }),
   actions: {
-    load: (s, arg): Promise<S> => {
+    load: async (s, arg): Promise<S> => {
       stashCopy(arg);
-      return joinedLoad(inputId(), async (): Promise<S> => {
-        enterCheckout();
-        const sequence = ++productLoadSequence;
+      enterCheckout();
+      const sequence = ++productLoadSequence;
+      const id = inputId();
+      // A managed refresh retains the raw product used by the still-visible snapshot.
+      // Navigation and legacy loaders keep their existing reset behavior.
+      if (!readOptions(arg) || id !== lastLoadedId) lastProduct = undefined;
+      // Storage problems must not prevent browsing or buying a product.
+      let saved = false;
+      try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
+      s = { ...s, saved, saveHint: "",
+        ...(id !== lastLoadedId ? { adding: false, added: false, shareHint: "", addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false } : {}) };
+      // A fresh navigation into the product resets any quantity left over
+      // from a previous visit to the same worker instance.
+      if (!id) {
         lastProduct = undefined;
-        const id = inputId();
-        // Storage problems must not prevent browsing or buying a product.
-        let saved = false;
-        try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
-        s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false };
-        // A fresh navigation into the product resets any quantity left over
-        // from a previous visit to the same worker instance.
-        if (!id) {
-          lastProduct = undefined;
-          lastLoadedId = undefined;
-          return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
-        }
-        // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
-        // of after it — it used to add a whole cart round trip before the page could paint.
-        const cartCount = cartItemCount();
-        // The badge must never hold the page: remember the count if it is already in, and
-        // publish it separately if it lands after the product (#3468 review).
-        let cartKnown: number | undefined;
-        void cartCount.then((n) => { cartKnown = n; }, () => {});
-        // The live product read goes out FIRST too — the local-db read below must never delay it.
-        // Settled into a value so a failure is handled where it is awaited, never unhandled.
-        // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
-        const live = getStoreProduct(id, ["DESCRIPTION"]).then(
-          (r) => ({ ok: true as const, r }),
-          () => ({ ok: false as const }),
-        );
-        // Paint at once from the row the list already synced (name, price, image) — the page used
-        // to sit on its skeleton for the product round trip even when the list had just shown it.
-        // The live read then fills in the description and gallery.
-        const synced = await readCachedProduct(id);
-        let painted = false;
-        if (synced && s.status === "loading") {
-          await svc.paintCached(synced);
-          painted = true;
-        }
-        const outcome = await live;
-        if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
-        // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
-        // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
-        // they did — overwriting it would untick a stored save, reset the quantity, and drop the
-        // in-flight add's `adding` guard (a second tap would add the line twice).
-        const base: S = painted ? (svc.getState() as S) : s;
-        const keep = painted
-          ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
-          : { cartHint: "", quantity: 1 };
-        const badge = (): number => {
-          if (painted && (base.adding || base.added)) return base.cartCount;
-          if (cartKnown !== undefined) return cartKnown;
-          const epoch = cartBadgeEpoch;
-          void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
-          return base.cartCount;
-        };
-        if (outcome.ok) {
-          const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
-          const name = cleanTitle(p.name) || "Product";
-          const image = productImage(p, WIX_DETAIL_IMAGE);
-          lastProduct = p;
-          // A group with exactly one choice is chosen for the shopper; a real choice
-          // is left blank so the pick is deliberate.
-          const optionGroups = productOptions(p);
-          const sale = productSale(p);
-          // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
-          // trip to the cart and back silently clears the size the shopper picked and
-          // re-disables the CTA with no explanation. Carry the picks when this is the SAME
-          // product, and only for a choice the product still offers — a stale id would
-          // resolve to no variant and block the cart just as silently.
-          const carried: StoreOptionSelection = {};
-          if (id === lastLoadedId) {
-            for (const g of optionGroups) {
-              const chosen = s.selection[g.id];
-              if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
-            }
+        lastLoadedId = undefined;
+        return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
+      }
+      // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
+      // of after it — it used to add a whole cart round trip before the page could paint.
+      const cartCount = readOptions(arg)?.cache === "only-if-cached" ? Promise.resolve(s.cartCount) : cartItemCount();
+      // The badge must never hold the page: remember the count if it is already in, and
+      // publish it separately if it lands after the product (#3468 review).
+      let cartKnown: number | undefined;
+      void cartCount.then((n) => { cartKnown = n; }, () => {});
+      // The live product read goes out FIRST too — the local-db read below must never delay it.
+      // Settled into a value so a failure is handled where it is awaited, never unhandled.
+      // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
+      const live = getStoreProduct(id, ["DESCRIPTION"], readOptions(arg)).then(
+        (r) => ({ ok: true as const, r }),
+        (error) => ({ ok: false as const, error }),
+      );
+      const outcome = await live;
+      if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
+      // The cache may have painted AFTER this network read started. Check the
+      // current state when the response lands, not the captured loading state.
+      const current = svc.getState() as S;
+      const painted = current.status === "ready" && lastLoadedId === id;
+      // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
+      // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
+      // they did — overwriting it would untick a stored save, reset the quantity, and drop the
+      // in-flight add's `adding` guard (a second tap would add the line twice).
+      const base: S = painted ? current : s;
+      const keep = painted
+        ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
+        : { cartHint: "", quantity: 1 };
+      const badge = (): number => {
+        if (painted && (base.adding || base.added)) return base.cartCount;
+        if (cartKnown !== undefined) return cartKnown;
+        const epoch = cartBadgeEpoch;
+        void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
+        return base.cartCount;
+      };
+      if (outcome.ok) {
+        const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
+        const name = cleanTitle(p.name) || "Product";
+        const image = productImage(p, WIX_DETAIL_IMAGE);
+        lastProduct = p;
+        // A group with exactly one choice is chosen for the shopper; a real choice
+        // is left blank so the pick is deliberate.
+        const optionGroups = productOptions(p);
+        const sale = productSale(p);
+        // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
+        // trip to the cart and back silently clears the size the shopper picked and
+        // re-disables the CTA with no explanation. Carry the picks when this is the SAME
+        // product, and only for a choice the product still offers — a stale id would
+        // resolve to no variant and block the cart just as silently.
+        const carried: StoreOptionSelection = {};
+        if (id === lastLoadedId) {
+          for (const g of optionGroups) {
+            const chosen = base.selection[g.id];
+            if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
           }
-          lastLoadedId = id;
-          return derive({
-            ...base,
-            ...keep,
-            status: "ready",
-            optionGroups,
-            selection: { ...defaultSelection(optionGroups), ...carried },
-            optionsUnknown: false,
-            name,
-            ...sale,
-            commercePrice: sale.price,
-            skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
-            returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-            shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-            ...productBody(p),
-            image,
-            gallery: productGallery(p),
-            initial: (name[0] || "#").toUpperCase(),
-            shareUrl: productShareUrl(p),
-            cartCount: badge(),
-            emptyText: "",
-          });
-        }
-        // Offline: fall back to the last-synced cached product row before the error state.
-        if (synced) {
-          const name = String(synced.name ?? "") || "Product";
-          const image = String(synced.image ?? "");
-          // The cached list row carries no options, and guessing "none" would offer
-          // a one-tap Add to cart for a product that needs a colour and a size. So
-          // the offline detail shows no picker AND marks the options UNKNOWN, which
-          // keeps `optionsIncomplete` true: the CTA stays disabled and `addToCart`
-          // refuses. `cartHint` carries the reason, because the options card is hidden
-          // on `noOptions` and would otherwise leave a dead button unexplained.
-          lastProduct = undefined;
-          lastLoadedId = undefined;
-          return derive({
-            ...base,
-            ...keep,
-            status: "ready",
-            optionGroups: [],
-            selection: {},
-            optionsUnknown: true,
-            name,
-            price: String(synced.subtitle ?? ""),
-            wasPrice: "",
-            skuLabel: "",
-            returnPolicyBody: "",
-            shippingInfoBody: "",
-            description: "",
-            descriptionJson: "",
-            image,
-            initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
-            cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
-            cartCount: badge(),
-            emptyText: "",
-          });
         }
-        lastProduct = undefined;
-        lastLoadedId = undefined;
-        return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
-      });
+        lastLoadedId = id;
+        return derive({
+          ...base,
+          ...keep,
+          status: "ready",
+          optionGroups,
+          selection: { ...defaultSelection(optionGroups), ...carried },
+          optionsUnknown: false,
+          name,
+          ...sale,
+          commercePrice: sale.price,
+          skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
+          returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+          shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+          ...productBody(p),
+          image,
+          gallery: productGallery(p),
+          initial: (name[0] || "#").toUpperCase(),
+          shareUrl: productShareUrl(p),
+          cartCount: badge(),
+          emptyText: "",
+        });
+      }
+      throw outcome.error;
     },
     // The stepper fires onChange with { value } on every tap; clamp 1–99 and
     // ignore unparsable/garbage args instead of silently zeroing the quantity.
@@ -788,29 +739,7 @@ const svc = defineService<S, {
       const n = Math.max(0, Math.floor(Number(count)));
       return Number.isFinite(n) ? derive({ ...s, cartCount: n }) : s;
     },
-    paintCached: (s, arg) => {
-      const row = (arg ?? {}) as DbEntity;
-      const name = String(row.name ?? "") || "Product";
-      return derive({
-        ...s,
-        status: "ready",
-        name,
-        price: String(row.subtitle ?? ""),
-        commercePrice: String(row.subtitle ?? ""),
-        description: "",
-        descriptionJson: "",
-        image: String(row.image ?? ""),
-        gallery: [],
-        initial: String(row.initial ?? "") || (name[0] || "#").toUpperCase(),
-        // The synced list row carries no options: until the live read says what they are,
-        // they are UNKNOWN, which keeps the CTA disabled — never a one-tap Add to cart for a
-        // product that needs a size. The live read replaces this a moment later.
-        optionGroups: [],
-        optionsUnknown: true,
-        emptyText: "",
-        quantity: 1,
-      });
-    },
+
     addToCart: async (s) => {
       const id = inputId();
       if (!productPricing.pricing.checkoutGuard({ kind: "storesProduct", id }).allowed || lastProduct?.productType?.toLowerCase() === "digital") return derive({ ...s, cartHint: iapPriceCopy("product").purchaseUnavailable });

package/templates/community-club/dev/index.ts

@@ -8270,7 +8270,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }
@@ -11836,7 +11836,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }
@@ -14914,7 +14914,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -17340,7 +17340,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }

package/templates/community-club/tier5-src/_shared/collection-service.ts

@@ -1,4 +1,3 @@
-import { withOnlineWrites } from './online-actions.js';
 import { defineService as register, type ServiceDefinition } from '@himalaya/state';
 import { COLLECTIONS, COLLECTION_CHROME_MIN_ITEMS, initialCollection, normalizeCollection, projectCollection, collectionId, collectionActionsLabel, type CollectionRow } from './collection-contract.js';
 import { localPreferences, type PreferenceRuntime } from './local-preferences.js';
@@ -95,10 +94,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       if (sort === 'default' || sort === 'az' || sort === 'za') { prefs.sort = sort; changed = true; }
     }
     if (Object.prototype.hasOwnProperty.call(input, 'collectionFilter')) {
-      const requestedFilter = String(input.collectionFilter ?? '');
-      // Old links to Saved must migrate with the stored preference when this
-      // collection no longer exposes that filter.
-      const filter = config.rowStyle === 'flat' && requestedFilter === 'saved' ? 'all' : requestedFilter;
+      const filter = String(input.collectionFilter ?? '');
       const configured = config.filterValues ?? [];
       const rows = Array.isArray(state[config.rows]) ? state[config.rows] as CollectionRow[] : [];
       const derived = config.filter ? rows.map(row => String(row[config.filter!] ?? '')).filter(Boolean) : [];
@@ -142,7 +138,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
         copyParam('collection.itemActionsFor', 'Actions for {title}'), copyParam('collection.itemActions', 'Item actions'));
     });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
-    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, ...(config.rowStyle === 'flat' ? [] : [{ id: 'saved', label: copyParam('collection.saved', 'Saved') }]),
+    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
       ...projected.filters.map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))];
     const loading = s.status === 'loading' || s.isLoading === true;
     // Older domain reducers expose `errored` rather than `isErrored`; backend
@@ -223,7 +219,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
             ? [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 && config.rowStyle !== 'flat' ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
+      chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
     } };
   };
   const actions: Record<string, Reducer> = {};
@@ -374,8 +370,9 @@ export function defineBackendCollection<S extends object, Row extends object>(na
     controller: controller as unknown as BackendCollection['controller'],
     apply: (state, page) => options.apply(state as S, page as unknown as CollectionQueryState<Row>) as State,
   });
-  const registerService = options.onlineWrites ? withOnlineWrites(options.register ?? register, ['confirmCancel', 'confirmOperation', 'retryOperation', 'commitWrite'], { messageFields: options.onlineWriteMessageFields ?? ['actionMessage'] }) : (options.register ?? register);
-  const handle = registerService(name, definition);
+  // Compatibility starters retain their existing mutation behavior; accept the
+  // current authoring contract without enabling the offline-write rollout.
+  const handle = (options.register ?? register)(name, definition);
   // Registration restored the state a cold boot saved: the page it showed is this run's, before the first load. Only
   // when the service's own rows came back with it: a bundle that keeps them out of the restore (its `notHydrated`)
   // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the

package/templates/community-club/tier5-src/_shared/iap-presentation.ts

@@ -103,6 +103,8 @@ export function withIapPresentation<S extends object>(options: {
         // scopeLanded is the completion of the active load, not a stale load result. It
         // must publish even if another overlapping onAppear load advanced contentVersion.
         if (!next || (content && action !== "scopeLanded" && version !== contentVersion)) return undefined;
+        // A committed read projection supersedes older load results still carrying a skeleton.
+        if (action === "readChanged" && definition.readLifecycle) contentVersion++;
         if (content) {
           options.onContent?.(next);
           const nextItems = options.items(next);
@@ -130,9 +132,11 @@ export function withIapPresentation<S extends object>(options: {
       };
       try {
         const next = reduce(state, ...args);
-        // Keep synchronous sidecars synchronous. Adding an await lets their old
-        // catalog snapshot commit after a newer asynchronous refresh.
-        if (content || (next && typeof (next as Promise<S | undefined>).then === "function")) {
+        // A cached read projection must commit before another onAppear can consume it.
+        // Other content actions retain their scheduling: shop filters and panels can
+        // change while a load is pending, and their existing completion order matters.
+        const synchronousReadProjection = action === "readChanged" && !!definition.readLifecycle;
+        if ((content && !synchronousReadProjection) || (next && typeof (next as Promise<S | undefined>).then === "function")) {
           return (async () => {
             try { return presentResult(await next); }
             finally { finished(); }

package/templates/community-club/tier5-src/himi-branded-lite-home/index.ts

@@ -250,7 +250,7 @@ interface State {
   hideFeaturedSkeleton: boolean;
   welcome: string;
   refreshedAt: string;
-  /** The resolved home layout preset (RFC 0045 FragmentSlot discriminator).
+  /** The resolved home layout preset (shared slot discriminator).
    *  Plain string, never a proto enum — a `$service:` casePath decodes it as a
    *  JSON string and unknown values fall through to the shipped defaultCase. */
   effectiveLayout: string;