@wix/himalaya-cli 0.1544.0 → 0.1546.0

package/templates/podcast-creator-owner/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/podcast-creator-owner/tier5-src/_shared/owner-module-data.ts

@@ -45,7 +45,7 @@ const LIMIT = 50;
 let zoneLookup: Promise<string | undefined> | undefined;
 function siteZone(): Promise<string | undefined> {
   // `Promise.resolve().then` so a bridge that throws synchronously is caught here too.
-  zoneLookup ??= Promise.resolve().then(getSiteTimeZone).catch(() => undefined);
+  zoneLookup ??= Promise.resolve().then(() => getSiteTimeZone()).catch(() => undefined);
   return zoneLookup;
 }
 

package/templates/portfolio-creative/dev/index.ts

@@ -7374,7 +7374,8 @@ const SCREENS = runtimeSetting({
                           "style": "body",
                           "color": "textSecondary"
                         }
-                      }
+                      },
+                      "modifiers": {}
                     },
                     {
                       "id": "himi_shop.retry",
@@ -18965,7 +18966,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"
                         }
@@ -22254,7 +22255,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"
                                 }
@@ -25820,7 +25821,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/portfolio-creative/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/portfolio-creative/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/portfolio-creative/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;

package/templates/portfolio-creative/tier5-src/himi-branded-lite-orders/index.ts

@@ -161,6 +161,9 @@ function derive(state: State): State {
   });
   return {
     ...state,
+    nextCursor: state.nextCursor ?? "",
+    filterOptions: state.filterOptions ?? [{ id: "all", label: copyParam("collection.all", "All"), selected: true },
+      ...Object.keys(FULFILLMENT).map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label), selected: false }))],
     displayRows: rows.map((row, index, rows) => {
       // Older owned cache rows retain their original date in meta. Group only
       // adjacent days so pagination and an explicit backend sort remain authoritative.

package/templates/portfolio-creative-owner/dev/index.ts

@@ -584,7 +584,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"
                         }
@@ -3938,7 +3938,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"
                         }
@@ -7205,7 +7205,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"
                         }
@@ -10379,7 +10379,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"
                         }
@@ -13733,7 +13733,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"
                         }
@@ -17087,7 +17087,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"
                         }
@@ -20441,7 +20441,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"
                         }
@@ -23795,7 +23795,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"
                         }
@@ -27149,7 +27149,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"
                         }
@@ -30503,7 +30503,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"
                         }
@@ -33770,7 +33770,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"
                         }
@@ -36944,7 +36944,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"
                         }
@@ -40298,7 +40298,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"
                         }
@@ -43652,7 +43652,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"
                         }
@@ -46919,7 +46919,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"
                         }
@@ -68518,7 +68518,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"
                                 }
@@ -71248,7 +71248,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"
                                 }
@@ -73752,7 +73752,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"
                                 }
@@ -76434,7 +76434,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/portfolio-creative-owner/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/portfolio-creative-owner/tier5-src/_shared/owner-module-data.ts

@@ -45,7 +45,7 @@ const LIMIT = 50;
 let zoneLookup: Promise<string | undefined> | undefined;
 function siteZone(): Promise<string | undefined> {
   // `Promise.resolve().then` so a bridge that throws synchronously is caught here too.
-  zoneLookup ??= Promise.resolve().then(getSiteTimeZone).catch(() => undefined);
+  zoneLookup ??= Promise.resolve().then(() => getSiteTimeZone()).catch(() => undefined);
   return zoneLookup;
 }
 

package/templates/restaurant/dev/index.ts

@@ -9825,7 +9825,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"
                         }
@@ -13324,7 +13324,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"
                                 }
@@ -16890,7 +16890,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/restaurant/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/restaurant/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/restaurant/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;