@wix/himalaya-cli 0.1471.0 → 0.1473.0

package/templates/nonprofit-cause-owner/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   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.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/nonprofit-cause-owner/tier5-src/_shared/owner-editor-value.ts

@@ -140,6 +140,20 @@ export function liveState(svc: unknown): Record<string, unknown> | undefined {
  *  state it started from) are written, so anything the owner did while it awaited — an edit, a field in
  *  the details sheet, closing the sheet — survives a save that lands after it, success or failure. A
  *  key both changed goes to the action. Where the host gives no live state, the result as it is. */
+/** An awaited load's result, unless the form moved to another record while it read. On a warm return the host's bare
+ *  refresh and the screen's onAppear run together: after a save the refresh fetches the record just saved while the
+ *  onAppear of a create screen opens a blank form, and the refresh landing last turned the new form into that record's
+ *  edit. Nothing lands then (`undefined`, the runtime's no-op), nor from a load that changes nothing: started with the
+ *  same state as the onAppear, it would put back the record that one replaced. A load for the record the form still
+ *  holds lands as it is; so does any load where the host gives no live state. */
+export function landsOnLive<S extends object>(svc: unknown, start: S, result: S): S | undefined {
+  if (result === start) return undefined;
+  const now = liveState(svc);
+  if (!now || now === start) return result;
+  const s0 = start as Record<string, unknown>;
+  return now.id !== s0.id || now.mode !== s0.mode ? undefined : result;
+}
+
 export function settleOverLive<S extends object>(svc: unknown, start: S, result: S): S {
   const now = liveState(svc) as S | undefined;
   if (!now || now === start || now === result) return result;

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -10,7 +10,7 @@ import { defineService } from "@himalaya/state";
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent } from "../_shared/himi-events.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
-import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { parseRicosJson } from "@himalaya/wix-rich-content";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -169,7 +169,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLiteEventFormUploads");
 
 const svc = defineService<EventFormState, {
-  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState>;
+  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState | undefined>;
   descriptionChanged: (s: EventFormState, arg?: unknown) => EventFormState;
   submit: (s: EventFormState, values?: Record<string, unknown>) => Promise<EventFormState>;
 }>("himiOwnerLiteEventForm", {
@@ -179,7 +179,7 @@ const svc = defineService<EventFormState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: editorRunKeys("description"),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<EventFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const mode = modeFrom(arg, s.mode);
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
@@ -262,7 +262,7 @@ const svc = defineService<EventFormState, {
         }
         return shape({ ...s, mode, id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     // The editor's on_change carries `args.dirty` only; the document stays in the form bag.
     descriptionChanged: (s) => shape({ ...s, descriptionDirty: true, descriptionEdits: s.descriptionEdits + 1, ...editorChanged(s) }),
     // Laid over the live state ([rico] #3644): what the owner did while the save awaited survives it.

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-post-form/index.ts

@@ -4,7 +4,7 @@
 // screen (himiOwnerLitePost.publish). Bound by buildForm ($service:himiOwnerLitePostForm.*).
 
 import { postBodyText, plainPostBody, postCoverUrl } from "../_shared/owner-post-content.js";
-import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { wixCall } from "@himalaya/wix-site-media";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
@@ -157,7 +157,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLitePostFormUploads");
 
 const svc = defineService<PostFormState, {
-  load: (s: PostFormState, arg?: unknown) => Promise<PostFormState>;
+  load: (s: PostFormState, arg?: unknown) => Promise<PostFormState | undefined>;
   setCover: (s: PostFormState, arg?: unknown) => PostFormState;
   setExcerpt: (s: PostFormState, arg?: unknown) => PostFormState;
   detailsOpen: (s: PostFormState) => PostFormState;
@@ -173,7 +173,7 @@ const svc = defineService<PostFormState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: [...editorRunKeys("body"), "detailsOpen"],
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<PostFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       // WS-C — nav-param input is PRIMARY (the canonical create-or-edit shell
       // bakes no id/mode); the onAppear `id` param is the #570 suffixed-build
@@ -240,7 +240,7 @@ const svc = defineService<PostFormState, {
         }
         return shape({ ...s, mode: "edit", id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     setCover: (s, arg) => shape({ ...s, coverUrl: valueOf(arg).trim(), error: "" }),
     setExcerpt: (s, arg) => shape({ ...s, excerpt: valueOf(arg), error: "" }),
     detailsOpen: (s) => shape({ ...s, detailsOpen: true }),

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-service-form/index.ts

@@ -4,6 +4,7 @@
 // expose, so this form only edits an existing service's name/description via
 // updateService. Bound by buildForm ($service:himiOwnerLiteServiceForm.*).
 
+import { landsOnLive } from "../_shared/owner-editor-value.js";
 import { defineService } from "@himalaya/state";
 import { getService, updateService, type WixService } from "@himalaya/wix-bookings";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -108,12 +109,12 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 }
 
 const svc = defineService<ServiceFormState, {
-  load: (s: ServiceFormState, arg?: unknown) => Promise<ServiceFormState>;
+  load: (s: ServiceFormState, arg?: unknown) => Promise<ServiceFormState | undefined>;
   submit: (s: ServiceFormState, values?: Record<string, unknown>) => Promise<ServiceFormState>;
 }>("himiOwnerLiteServiceForm", {
   state: shape({ id: initialId }),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<ServiceFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
       // onAppear `id` param is the #570 suffixed-build fallback.
@@ -167,7 +168,7 @@ const svc = defineService<ServiceFormState, {
         }
         return shape({ ...s, id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};

package/templates/owner-lite/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

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

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   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.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/owner-lite/tier5-src/_shared/owner-editor-value.ts

@@ -140,6 +140,20 @@ export function liveState(svc: unknown): Record<string, unknown> | undefined {
  *  state it started from) are written, so anything the owner did while it awaited — an edit, a field in
  *  the details sheet, closing the sheet — survives a save that lands after it, success or failure. A
  *  key both changed goes to the action. Where the host gives no live state, the result as it is. */
+/** An awaited load's result, unless the form moved to another record while it read. On a warm return the host's bare
+ *  refresh and the screen's onAppear run together: after a save the refresh fetches the record just saved while the
+ *  onAppear of a create screen opens a blank form, and the refresh landing last turned the new form into that record's
+ *  edit. Nothing lands then (`undefined`, the runtime's no-op), nor from a load that changes nothing: started with the
+ *  same state as the onAppear, it would put back the record that one replaced. A load for the record the form still
+ *  holds lands as it is; so does any load where the host gives no live state. */
+export function landsOnLive<S extends object>(svc: unknown, start: S, result: S): S | undefined {
+  if (result === start) return undefined;
+  const now = liveState(svc);
+  if (!now || now === start) return result;
+  const s0 = start as Record<string, unknown>;
+  return now.id !== s0.id || now.mode !== s0.mode ? undefined : result;
+}
+
 export function settleOverLive<S extends object>(svc: unknown, start: S, result: S): S {
   const now = liveState(svc) as S | undefined;
   if (!now || now === start || now === result) return result;

package/templates/owner-lite/tier5-src/himi-owner-lite-event-form/index.ts

@@ -10,7 +10,7 @@ import { defineService } from "@himalaya/state";
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent } from "../_shared/himi-events.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
-import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { parseRicosJson } from "@himalaya/wix-rich-content";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -169,7 +169,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLiteEventFormUploads");
 
 const svc = defineService<EventFormState, {
-  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState>;
+  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState | undefined>;
   descriptionChanged: (s: EventFormState, arg?: unknown) => EventFormState;
   submit: (s: EventFormState, values?: Record<string, unknown>) => Promise<EventFormState>;
 }>("himiOwnerLiteEventForm", {
@@ -179,7 +179,7 @@ const svc = defineService<EventFormState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: editorRunKeys("description"),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<EventFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const mode = modeFrom(arg, s.mode);
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
@@ -262,7 +262,7 @@ const svc = defineService<EventFormState, {
         }
         return shape({ ...s, mode, id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     // The editor's on_change carries `args.dirty` only; the document stays in the form bag.
     descriptionChanged: (s) => shape({ ...s, descriptionDirty: true, descriptionEdits: s.descriptionEdits + 1, ...editorChanged(s) }),
     // Laid over the live state ([rico] #3644): what the owner did while the save awaited survives it.

package/templates/owner-lite/tier5-src/himi-owner-lite-faq-category-form/index.ts

@@ -1,13 +1,14 @@
 // Paging loops carry a seen-cursor guard: a server that repeats a cursor would
 // otherwise spin forever and leave a create/submit permanently pending.
+import { landsOnLive } from "../_shared/owner-editor-value.js";
 import { defineService } from "@himalaya/state";
 import { createCategory, getCategory, queryCategories, updateCategory } from "@himalaya/wix-faq";
 interface State { id:string;revision:string;mode:"create"|"edit";heading:string;title:string;error:string;conflict:boolean;noConflict:boolean;savedMessage:string;savedId:string; }
 const input=((globalThis as {himalaya?:{input?:{id?:string}}}).himalaya?.input)??{}; const msg=(e:unknown)=>String((e as {message?:unknown})?.message??e); const conflict=(e:unknown)=>/\b409\b|conflict|revision/i.test(msg(e)); const offline=(e:unknown)=>/offline|network|connect|bridge|fetch/i.test(msg(e));
 async function appendOrder():Promise<number>{let max=-1,cursor="";const seen=new Set<string>();do{const r=await queryCategories({query:{cursorPaging:{limit:100,...(cursor?{cursor}:{})}}});for(const c of r.categories??[])max=Math.max(max,c.sortOrder??-1);const next=r.pagingMetadata?.cursors?.next??"";if(!next||seen.has(next))break;seen.add(next);cursor=next;}while(cursor);return max+1;}
 const shape=(s:Partial<State>):State=>({id:s.id??input.id??"",revision:s.revision??"",mode:s.mode??((s.id??input.id)?"edit":"create"),heading:s.heading??((s.id??input.id)?"Edit category":"New category"),title:s.title??"",error:s.error??"",conflict:s.conflict??false,noConflict:!(s.conflict??false),savedMessage:s.savedMessage??"",savedId:s.savedId??""});
-const svc=defineService<State,{load:(s:State,a?:unknown)=>Promise<State>;submit:(s:State,v?:Record<string,unknown>)=>Promise<State>}>("himiOwnerLiteFaqCategoryForm",{state:shape({}),actions:{load:async(s,a)=>{
+const svc=defineService<State,{load:(s:State,a?:unknown)=>Promise<State | undefined>;submit:(s:State,v?:Record<string,unknown>)=>Promise<State>}>("himiOwnerLiteFaqCategoryForm",{state:shape({}),actions:{load: async (s,a): Promise<State | undefined> => landsOnLive(svc, s, await (async () => {
  // The held id is for the host's bare refresh only (no argument): an onAppear without an id is a create screen.
  const id=input.id||String((a as {id?:unknown})?.id??(a===undefined?s.id:""));
  // A form that held a record (the one just saved) opens blank.
- if(!id)return shape({...(s.id?{}:s),mode:"create",id:""});try{const c=(await getCategory(id)).category;if(!c)return shape({...s,id,error:"Category not found"});return shape({...s,id,revision:c.revision??"",mode:"edit",heading:"Edit category",title:c.title??"",error:"",conflict:false});}catch(e){return shape({...s,id,error:offline(e)?"Connect to the internet to load this category.":msg(e)});}},submit:async(s,v)=>{const title=String(v?.title??s.title).trim();if(!title)return shape({...s,error:"Category name is required.",savedMessage:""});try{if(s.mode==="edit"){if(!s.revision)return shape({...s,error:"Refresh before saving; this category has no current revision.",conflict:true});const r=await updateCategory(s.id,{category:{id:s.id,revision:s.revision,title},fieldMask:["title"]});return shape({...s,revision:r.category?.revision??s.revision,title,error:"",conflict:false,savedMessage:"Category saved.",savedId:s.id});}const r=await createCategory({category:{title,sortOrder:await appendOrder()}});return shape({...s,id:r.category?.id??"",revision:r.category?.revision??"",mode:"edit",heading:"Edit category",title,error:"",savedMessage:"Category created.",savedId:r.category?.id??""});}catch(e){if(conflict(e))return shape({...s,error:"This category changed elsewhere. Refresh before saving again.",conflict:true,savedMessage:""});return shape({...s,error:offline(e)?"Connect to the internet and try again. This change was not queued.":msg(e),savedMessage:""});}}}});export{svc,appendOrder};
+ if(!id)return shape({...(s.id?{}:s),mode:"create",id:""});try{const c=(await getCategory(id)).category;if(!c)return shape({...s,id,error:"Category not found"});return shape({...s,id,revision:c.revision??"",mode:"edit",heading:"Edit category",title:c.title??"",error:"",conflict:false});}catch(e){return shape({...s,id,error:offline(e)?"Connect to the internet to load this category.":msg(e)});}})()),submit:async(s,v)=>{const title=String(v?.title??s.title).trim();if(!title)return shape({...s,error:"Category name is required.",savedMessage:""});try{if(s.mode==="edit"){if(!s.revision)return shape({...s,error:"Refresh before saving; this category has no current revision.",conflict:true});const r=await updateCategory(s.id,{category:{id:s.id,revision:s.revision,title},fieldMask:["title"]});return shape({...s,revision:r.category?.revision??s.revision,title,error:"",conflict:false,savedMessage:"Category saved.",savedId:s.id});}const r=await createCategory({category:{title,sortOrder:await appendOrder()}});return shape({...s,id:r.category?.id??"",revision:r.category?.revision??"",mode:"edit",heading:"Edit category",title,error:"",savedMessage:"Category created.",savedId:r.category?.id??""});}catch(e){if(conflict(e))return shape({...s,error:"This category changed elsewhere. Refresh before saving again.",conflict:true,savedMessage:""});return shape({...s,error:offline(e)?"Connect to the internet and try again. This change was not queued.":msg(e),savedMessage:""});}}}});export{svc,appendOrder};

package/templates/owner-lite/tier5-src/himi-owner-lite-faq-question-form/index.ts

@@ -4,7 +4,7 @@ import { defineService } from "@himalaya/state";
 import { createQuestionEntry, getQuestionEntry, queryCategories, queryQuestionEntries, updateQuestionEntry, type WixCategory, type WixQuestionEntry } from "@himalaya/wix-faq";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
 import { draftjsText } from "../_shared/owner-rich-guard.js";
-import { editorSubmitValue, isEmptyDocument, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, isEmptyDocument, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { parseRicosJson, type RicosDocument } from "@himalaya/wix-rich-content";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 
@@ -45,18 +45,18 @@ const shape=(s:Partial<State>):State=>({ id:s.id??input.id??"", revision:s.revis
    answerProtected: mode === "locked", answerEditable: mode !== "locked", answerNote: mode === "locked" ? RICH_ANSWER_NOTE : "" }; })() });
 // The RichContentEditor's image tool: this service mints the signed Wix Media URL with the worker's own wixApi.
 ricosUploadService("himiOwnerLiteFaqQuestionFormUploads");
-const svc=defineService<State,{load:(s:State,a?:unknown)=>Promise<State>;answerChanged:(s:State,a?:unknown)=>State;submit:(s:State,v?:Record<string,unknown>)=>Promise<State>}>("himiOwnerLiteFaqQuestionForm",{state:shape({answerPending:!!input.id}),
+const svc=defineService<State,{load:(s:State,a?:unknown)=>Promise<State | undefined>;answerChanged:(s:State,a?:unknown)=>State;submit:(s:State,v?:Record<string,unknown>)=>Promise<State>}>("himiOwnerLiteFaqQuestionForm",{state:shape({answerPending:!!input.id}),
 // [rico] #3644 — this run's editor state: a cold boot takes it from `state`, never the snapshot.
 notHydrated:editorRunKeys("answer"),
 // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
 perVisit:editorRunKeys("answer"),actions:{
- load:async(s,a)=>{
+ load: async (s,a): Promise<State | undefined> => landsOnLive(svc, s, await (async () => {
  // The held id is for the host's bare refresh only (no argument): an onAppear without an id is a create screen.
  const id=input.id||String((a as {id?:unknown})?.id??(a===undefined?s.id:""));if(holdsLoadedForm(s,{id,mode:id?"edit":"create"},"answer"))return s;try{const cats=await categories();const options=cats.map(c=>({id:c.id??"",label:c.title?.trim()||"Untitled category"}));
   // A form that held a record (the one just saved) opens blank.
   if(!id)return shape({...(s.id?{}:s),...ANSWER_LOADED,mode:"create",id:"",answerMode:"plain",answerJson:"",categoryOptions:options,statusValue:"HIDDEN"});const q=(await getQuestionEntry(id)).questionEntry;if(!q) return shape({...s,id,error:"Question not found",categoryOptions:options});return shape({...s,id,revision:q.revision??"",mode:"edit",heading:"Edit question",question:q.question??"",...((a)=>({...a,...ANSWER_LOADED,answerMode:a.answerFormat==="draftjs"?"locked" as const:"editor" as const,
   // The seed is the stored document byte for byte (never re-encoded); a plain answer seeds as paragraphs.
-  answerJson:a.answerFormat==="draftjs"?"":q.richContent?JSON.stringify(q.richContent):q.plainText?JSON.stringify(plainPostBody(q.plainText)):""}))(answerOf(q)),categoryId:q.categoryId??"",statusValue:q.status==="VISIBLE"?"VISIBLE":"HIDDEN",categoryOptions:options,error:"",conflict:false});}catch(e){return shape({...s,id,error:offline(e)?"Connect to the internet to load this question.":msg(e)});}},
+  answerJson:a.answerFormat==="draftjs"?"":q.richContent?JSON.stringify(q.richContent):q.plainText?JSON.stringify(plainPostBody(q.plainText)):""}))(answerOf(q)),categoryId:q.categoryId??"",statusValue:q.status==="VISIBLE"?"VISIBLE":"HIDDEN",categoryOptions:options,error:"",conflict:false});}catch(e){return shape({...s,id,error:offline(e)?"Connect to the internet to load this question.":msg(e)});}})()),
  // The editor's on_change carries `args.dirty` only; the document stays in the form bag.
  // Any on_change after a save is an edit that save did not write (every arm fires the pending on_change
  // before releasing a submit), so the confirmation goes.

package/templates/owner-lite/tier5-src/himi-owner-lite-post-form/index.ts

@@ -4,7 +4,7 @@
 // screen (himiOwnerLitePost.publish). Bound by buildForm ($service:himiOwnerLitePostForm.*).
 
 import { postBodyText, plainPostBody, postCoverUrl } from "../_shared/owner-post-content.js";
-import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { wixCall } from "@himalaya/wix-site-media";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
@@ -157,7 +157,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLitePostFormUploads");
 
 const svc = defineService<PostFormState, {
-  load: (s: PostFormState, arg?: unknown) => Promise<PostFormState>;
+  load: (s: PostFormState, arg?: unknown) => Promise<PostFormState | undefined>;
   setCover: (s: PostFormState, arg?: unknown) => PostFormState;
   setExcerpt: (s: PostFormState, arg?: unknown) => PostFormState;
   detailsOpen: (s: PostFormState) => PostFormState;
@@ -173,7 +173,7 @@ const svc = defineService<PostFormState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: [...editorRunKeys("body"), "detailsOpen"],
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<PostFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       // WS-C — nav-param input is PRIMARY (the canonical create-or-edit shell
       // bakes no id/mode); the onAppear `id` param is the #570 suffixed-build
@@ -240,7 +240,7 @@ const svc = defineService<PostFormState, {
         }
         return shape({ ...s, mode: "edit", id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     setCover: (s, arg) => shape({ ...s, coverUrl: valueOf(arg).trim(), error: "" }),
     setExcerpt: (s, arg) => shape({ ...s, excerpt: valueOf(arg), error: "" }),
     detailsOpen: (s) => shape({ ...s, detailsOpen: true }),

package/templates/owner-lite/tier5-src/himi-owner-lite-product-form/index.ts

@@ -18,7 +18,7 @@ import {
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, type DbEntity } from "../_shared/owner-local-db.js";
 import { htmlIsTrivial, htmlPreviewText } from "../_shared/owner-rich-guard.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
-import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { parseRicosJson } from "@himalaya/wix-rich-content";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -190,7 +190,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLiteProductFormUploads");
 
 const svc = defineService<ProductFormState, {
-  load: (s: ProductFormState, arg?: unknown) => Promise<ProductFormState>;
+  load: (s: ProductFormState, arg?: unknown) => Promise<ProductFormState | undefined>;
   descriptionChanged: (s: ProductFormState, arg?: unknown) => ProductFormState;
   submit: (s: ProductFormState, values?: Record<string, unknown>) => Promise<ProductFormState>;
   remove: (s: ProductFormState) => Promise<ProductFormState>;
@@ -202,7 +202,7 @@ const svc = defineService<ProductFormState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: editorRunKeys("description"),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<ProductFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       // WS-C — nav-param input is PRIMARY (the canonical create-or-edit shell
       // bakes no id/mode); the onAppear `id` param is the #570 suffixed-build
@@ -287,7 +287,7 @@ const svc = defineService<ProductFormState, {
         }
         return shape({ ...s, mode: "edit", id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     // The editor's on_change carries `args.dirty` only; the document stays in the form bag.
     descriptionChanged: (s) => shape({ ...s, descriptionDirty: true, descriptionEdits: s.descriptionEdits + 1, ...editorChanged(s) }),
     // Laid over the live state ([rico] #3644): what the owner did while the save awaited survives it.

package/templates/owner-lite/tier5-src/himi-owner-lite-service-form/index.ts

@@ -4,6 +4,7 @@
 // expose, so this form only edits an existing service's name/description via
 // updateService. Bound by buildForm ($service:himiOwnerLiteServiceForm.*).
 
+import { landsOnLive } from "../_shared/owner-editor-value.js";
 import { defineService } from "@himalaya/state";
 import { getService, updateService, type WixService } from "@himalaya/wix-bookings";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -108,12 +109,12 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 }
 
 const svc = defineService<ServiceFormState, {
-  load: (s: ServiceFormState, arg?: unknown) => Promise<ServiceFormState>;
+  load: (s: ServiceFormState, arg?: unknown) => Promise<ServiceFormState | undefined>;
   submit: (s: ServiceFormState, values?: Record<string, unknown>) => Promise<ServiceFormState>;
 }>("himiOwnerLiteServiceForm", {
   state: shape({ id: initialId }),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<ServiceFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
       // onAppear `id` param is the #570 suffixed-build fallback.
@@ -167,7 +168,7 @@ const svc = defineService<ServiceFormState, {
         }
         return shape({ ...s, id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};

package/templates/podcast-creator/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

package/templates/podcast-creator/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   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.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/podcast-creator-owner/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

package/templates/podcast-creator-owner/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   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.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/podcast-creator-owner/tier5-src/_shared/owner-editor-value.ts

@@ -140,6 +140,20 @@ export function liveState(svc: unknown): Record<string, unknown> | undefined {
  *  state it started from) are written, so anything the owner did while it awaited — an edit, a field in
  *  the details sheet, closing the sheet — survives a save that lands after it, success or failure. A
  *  key both changed goes to the action. Where the host gives no live state, the result as it is. */
+/** An awaited load's result, unless the form moved to another record while it read. On a warm return the host's bare
+ *  refresh and the screen's onAppear run together: after a save the refresh fetches the record just saved while the
+ *  onAppear of a create screen opens a blank form, and the refresh landing last turned the new form into that record's
+ *  edit. Nothing lands then (`undefined`, the runtime's no-op), nor from a load that changes nothing: started with the
+ *  same state as the onAppear, it would put back the record that one replaced. A load for the record the form still
+ *  holds lands as it is; so does any load where the host gives no live state. */
+export function landsOnLive<S extends object>(svc: unknown, start: S, result: S): S | undefined {
+  if (result === start) return undefined;
+  const now = liveState(svc);
+  if (!now || now === start) return result;
+  const s0 = start as Record<string, unknown>;
+  return now.id !== s0.id || now.mode !== s0.mode ? undefined : result;
+}
+
 export function settleOverLive<S extends object>(svc: unknown, start: S, result: S): S {
   const now = liveState(svc) as S | undefined;
   if (!now || now === start || now === result) return result;

package/templates/podcast-creator-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -10,7 +10,7 @@ import { defineService } from "@himalaya/state";
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent } from "../_shared/himi-events.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
-import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { parseRicosJson } from "@himalaya/wix-rich-content";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -169,7 +169,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLiteEventFormUploads");
 
 const svc = defineService<EventFormState, {
-  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState>;
+  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState | undefined>;
   descriptionChanged: (s: EventFormState, arg?: unknown) => EventFormState;
   submit: (s: EventFormState, values?: Record<string, unknown>) => Promise<EventFormState>;
 }>("himiOwnerLiteEventForm", {
@@ -179,7 +179,7 @@ const svc = defineService<EventFormState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: editorRunKeys("description"),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<EventFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const mode = modeFrom(arg, s.mode);
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
@@ -262,7 +262,7 @@ const svc = defineService<EventFormState, {
         }
         return shape({ ...s, mode, id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     // The editor's on_change carries `args.dirty` only; the document stays in the form bag.
     descriptionChanged: (s) => shape({ ...s, descriptionDirty: true, descriptionEdits: s.descriptionEdits + 1, ...editorChanged(s) }),
     // Laid over the live state ([rico] #3644): what the owner did while the save awaited survives it.