@wix/himalaya-cli 0.1442.0 → 0.1443.0

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

@@ -78394,7 +78394,10 @@ const SCREENS = runtimeSetting({
           "bottom": 24
         },
         "onAppear": {
-          "actionId": "tier5.himiOwnerLiteFaqQuestionForm.load"
+          "actionId": "tier5.himiOwnerLiteFaqQuestionForm.load",
+          "params": {
+            "mode": "create"
+          }
         }
       }
     },
@@ -78875,7 +78878,10 @@ const SCREENS = runtimeSetting({
           "bottom": 24
         },
         "onAppear": {
-          "actionId": "tier5.himiOwnerLiteFaqCategoryForm.load"
+          "actionId": "tier5.himiOwnerLiteFaqCategoryForm.load",
+          "params": {
+            "mode": "create"
+          }
         }
       }
     },

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

@@ -27,7 +27,9 @@ export interface CollectionQuerySource<Row> {
   cached?(criteria: CollectionQuery): Promise<CollectionPage<Row> | undefined>;
   id(row: Row): string;
   errorMessage?(error: unknown): string;
-  /** Private collections must discard prior rows when access or identity changes. */
+  /** Private collections must discard prior rows when access or identity changes. A revalidation keeps the
+   *  rows it shows through any other failure: safe because one worker never serves two identities (its pool
+   *  key carries the account, and a purge tears parked workers down). */
   clearOnError?(error: unknown): boolean;
 }
 const normalize = (q: Partial<CollectionQuery>): CollectionQuery => ({
@@ -46,8 +48,17 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   let generation = 0, disposed = false;
   let loadedPages = 0, restoringPages = 0;
   let state: CollectionQueryState<Row> = { criteria: normalize({}), items: [], nextCursor: '', status: 'idle', loadingMore: false, pageError: false, complete: false, error: '' };
+  /** The query a revalidation is running under: its snapshots are held back until it is done. */
+  let revalidating = -1;
+  /** What the screen shows: the last published state, restored when a revalidation fails. */
+  let shown: { state: CollectionQueryState<Row>; loadedPages: number } | undefined;
+  let clearedByError = false;
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
-  const emit = () => { if (!disposed) publish(snapshot()); };
+  const emit = () => {
+    if (disposed || revalidating === generation) return;
+    shown = { state: snapshot(), loadedPages };
+    publish(snapshot());
+  };
   const merge = (old: Row[], page: Row[]): Row[] => {
     const positions = new Map<string, number>(), result: Row[] = [];
     for (const item of [...old, ...page]) {
@@ -88,6 +99,8 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
     } catch (error) {
       if (disposed || generation !== revision) return;
       const clear = source.clearOnError?.(error) === true;
+      // Revoked access always ends what a revalidation showed, whether or not the source clears its rows.
+      clearedByError = clear || /HTTP 40[13]\b/.test(String(error));
       if (clear) loadedPages = 0;
       state = { ...state, ...(clear ? { items: [], nextCursor: '', total: undefined, metadata: undefined } : {}),
         status: append && !clear ? 'ready' : 'error', loadingMore: false, pageError: append && !clear, complete: false,
@@ -97,13 +110,18 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   };
   return {
     getState: snapshot,
-    async query(criteria: Partial<CollectionQuery>, restorePages = false): Promise<void> {
+    /** [revalidate]: a screen coming back re-queries the rows it shows. They stay on screen until every
+     *  page is in, and a failure keeps them; revoked access still clears them, and other criteria reset. */
+    async query(criteria: Partial<CollectionQuery>, restorePages = false, revalidate = false): Promise<void> {
       if (disposed) return Promise.resolve();
       const next = normalize(criteria);
-      const count = restorePages && JSON.stringify(next) === JSON.stringify(state.criteria)
-        ? Math.max(loadedPages, restoringPages, 1) : 1;
+      const same = JSON.stringify(next) === JSON.stringify(state.criteria);
+      const count = restorePages && same ? Math.max(loadedPages, restoringPages, 1) : 1;
+      const showing = shown && shown.state.status === 'ready' && shown.state.items.length > 0 && !shown.state.pageError
+        && !shown.state.loadingMore && JSON.stringify(shown.state.criteria) === JSON.stringify(next) ? shown : undefined;
       restoringPages = count;
       state = { ...state, criteria: next };
+      if (revalidate && showing) { revalidating = generation + 1; clearedByError = false; }
       const pending = fetch(false);
       const revision = generation;
       await pending;
@@ -112,6 +130,15 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       while (!disposed && generation === revision && loadedPages < count && state.status === 'ready'
         && !state.pageError && !state.loadingMore && state.nextCursor) await fetch(true);
       if (generation === revision) restoringPages = 0;
+      if (revalidating === revision) {
+        revalidating = -1;
+        if (generation !== revision) return;
+        if ((state.status !== 'ready' || state.pageError) && showing && !clearedByError) {
+          state = { ...showing.state, criteria: next };
+          loadedPages = showing.loadedPages;
+        }
+        emit();
+      }
     },
     refresh: () => { restoringPages = 0; return fetch(false); },
     loadMore: () => fetch(true),

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

@@ -299,7 +299,8 @@ export function decorateCollection(name: string, def: { state: State; actions?:
     actions.load = (_s, arg) => {
       stashCopy(arg); syncSaved(); applyNavigationCriteria(arg, _s);
       backend.onLoad?.(arg);
-      return backend.controller.query(criteria(), backend.restorePagesOnLoad).then(() => undefined);
+      // A load of what the screen already shows is the screen coming back: it revalidates behind its rows.
+      return backend.controller.query(criteria(), backend.restorePagesOnLoad, true).then(() => undefined);
     };
     actions.refresh = (_s, arg) => {
       stashCopy(arg); syncSaved();

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

@@ -91,6 +91,16 @@ export function editorRunKeys<K extends string>(key: K): [`${K}Json`, `${K}Pendi
   return [`${key}Json`, `${key}Pending`, `${key}Dirty`, `${key}Edits`];
 }
 
+/** Does the form already hold `target` with its editor run in progress? A `load` for it then keeps the form as
+ *  it is: on the way back to a warm worker (its refresh and onAppear) a re-read would race an edit in flight and
+ *  reset the reported edit, and the editor, which seeds once, would show another document than the state holds.
+ *  An edit form holds its record once the editor loaded; a create form holds a draft once the owner edited. */
+export function holdsLoadedForm(state: object, target: { id: string; mode: string }, key: string): boolean {
+  const s = state as Record<string, unknown>;
+  if (s.status === 'error' || s.error || s.mode !== target.mode || (s.id ?? '') !== target.id) return false;
+  return target.mode === 'create' ? s[`${key}Dirty`] === true || Number(s[`${key}Edits`] ?? 0) > 0 : s[`${key}Pending`] === false;
+}
+
 /** The same keys on a runtime that ignores `notHydrated` (a binary from before #3644, still served new
  *  bundles over the air): reset them in place, before any action runs. A no-op where the runtime
  *  honours the option (`himalaya.hydrationOptOut`). */

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

@@ -262,6 +262,8 @@ const svc = defineService<EventState, {
 }>("himiOwnerLiteEvent", {
   state: shape({ status: "loading" }),
   notHydrated: [...DELETE_RUN_KEYS],
+  // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
+  perVisit: [...DELETE_RUN_KEYS],
   actions: {
     load: async (s0, arg) => {
       const s = disarm(s0);

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 } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } 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";
@@ -176,6 +176,8 @@ const svc = defineService<EventFormState, {
   state: shape({ mode: startMode, id: initialInput.id ?? "", descriptionPending: true }),
   // [rico] #3644 — this run's editor state: a cold boot takes it from `state`, never the snapshot.
   notHydrated: editorRunKeys("description"),
+  // 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) => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
@@ -183,6 +185,7 @@ const svc = defineService<EventFormState, {
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
       // onAppear `id` param is the #570 suffixed-build fallback.
       const id = navInputId() || idFrom(arg, s.id);
+      if (id && holdsLoadedForm(s, { id, mode }, "description")) return s;
       if (!id) return shape({ ...s, mode, id: "", status: "error", error: copyParam("ownerEventForm.errorNoEvent", "No event to edit.") });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_EVENTS.find((x) => x.id === id);

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

@@ -6,4 +6,8 @@ interface State { id:string;revision:string;mode:"create"|"edit";heading: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 id=input.id||String((a as {id?:unknown})?.id??s.id);if(!id)return shape({...s,mode:"create"});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};
+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)=>{
+ // 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};

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 } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, isEmptyDocument, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
 import { parseRicosJson, type RicosDocument } from "@himalaya/wix-rich-content";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 
@@ -47,8 +47,14 @@ const shape=(s:Partial<State>):State=>({ id:s.id??input.id??"", revision:s.revis
 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}),
 // [rico] #3644 — this run's editor state: a cold boot takes it from `state`, never the snapshot.
-notHydrated:editorRunKeys("answer"),actions:{
- load:async(s,a)=>{const id=input.id||String((a as {id?:unknown})?.id??s.id);try{const cats=await categories();const options=cats.map(c=>({id:c.id??"",label:c.title?.trim()||"Untitled category"}));if(!id)return shape({...s,...ANSWER_LOADED,mode:"create",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,
+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)=>{
+ // 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)});}},
  // The editor's on_change carries `args.dirty` only; the document stays in the form bag.

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

@@ -214,6 +214,22 @@ let loadGeneration = 0;
 let newestStarted: State | undefined;
 let newestSettled: { generation: number; state: State } | undefined;
 
+/** A hub already showing its areas re-reads their summaries behind them, never back under the skeleton: the
+ *  screen coming back (a warm worker's refresh and its onAppear, at once) keeps what it shows until they land. */
+function revalidating(state: State, areas: State['areas'] = state.areas): State {
+  // The areas as delivered now (labels, routes), each still showing the summary it showed.
+  const shown = new Map(state.areas.map(area => [area.id, area]));
+  const next = areas.map(area => {
+    const was = shown.get(area.id);
+    return was ? { ...area, metricText: was.metricText, statusText: was.statusText, unavailable: was.unavailable } : area;
+  });
+  return derive({ ...state, areas: next, businessName: currentBusinessName, handoffError: '' }, next);
+}
+
+function sameAreas(shown: State['areas'], next: State['areas']): boolean {
+  return shown.length === next.length && shown.every((area, i) => area.id === next[i].id && area.metricKey === next[i].metricKey);
+}
+
 async function loadMetrics(state: State): Promise<State> {
   const generation = ++loadGeneration;
   newestStarted = state;
@@ -292,12 +308,11 @@ const svc = defineService<State, {
       // it must not settle (that derived "0 business areas" and painted the
       // filtered-empty state); once they are, it re-reads their summaries.
       if (!('areas' in read(arg))) {
-        return state.status === 'ready'
-          ? loadMetrics(derive({ ...state, isLoading: true, notLoading: false, summaryNote: '', handoffError: '' }))
-          : { ...state, businessName: currentBusinessName };
+        return state.status === 'ready' ? loadMetrics(revalidating(state)) : { ...state, businessName: currentBusinessName };
       }
       const parsed = (() => { try { return JSON.parse(str(arg, 'areas') || '[]'); } catch { return []; } })();
       const areas = parseAreas(parsed);
+      if (state.status === 'ready' && sameAreas(state.areas, areas)) return loadMetrics(revalidating(state, areas));
       return loadMetrics(derive({ ...state, status: 'ready', areas, isLoading: true, notLoading: false, summaryNote: '', handoffError: '' }, areas));
     },
     // Refresh re-reads summaries for KNOWN areas. Before the descriptor has

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

@@ -340,6 +340,8 @@ const svc = defineService<PostState, {
 }>("himiOwnerLitePost", {
   state: shape({ status: "loading" }),
   notHydrated: [...DELETE_RUN_KEYS],
+  // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
+  perVisit: [...DELETE_RUN_KEYS],
   actions: {
     load: async (s0, arg) => {
       const s = disarm(s0);

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 } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } 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";
@@ -165,18 +165,24 @@ const svc = defineService<PostFormState, {
   bodyChanged: (s: PostFormState, arg?: unknown) => PostFormState;
   submit: (s: PostFormState, values?: Record<string, unknown>) => Promise<PostFormState>;
 }>("himiOwnerLitePostForm", {
-  state: shape({ mode: startMode, id: initialInput.id ?? "", bodyPending: startMode === "edit" }),
+  // The editor stays hidden until this run's load lands, however the form was opened (an id as input or in the params).
+  state: shape({ mode: startMode, id: initialInput.id ?? "", bodyPending: true }),
   // [rico] #3644 — this run's editor state and UI: a cold boot takes these from `state`, never from
   // the persisted snapshot (the editor seeds once; last run's sheet is not this run's).
   notHydrated: [...editorRunKeys("body"), "detailsOpen"],
+  // 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) => {
       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
       // fallback. An id ⇒ edit; no id anywhere ⇒ the create shell.
-      const id = navInputId() || idFrom(arg, s.id);
-      if (!id) return shape({ ...s, ...BODY_LOADED, mode: "create", id: "", bodyJson: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
+      // The held id is for the host's bare refresh only (no argument): an onAppear without an id is a create screen.
+      const id = navInputId() || idFrom(arg, arg === undefined ? s.id : "");
+      if (holdsLoadedForm(s, { id, mode: id ? "edit" : "create" }, "body")) return s;
+      // A form that held a record (the one just saved) opens blank.
+      if (!id) return shape({ ...(s.id ? {} : s), ...BODY_LOADED, mode: "create", id: "", bodyJson: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_POSTS.find((x) => x.id === id);
           if (d) {

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

@@ -305,6 +305,8 @@ const svc = defineService<ProductState, {
 }>("himiOwnerLiteProduct", {
   state: shape({ status: "loading" }),
   notHydrated: [...DELETE_RUN_KEYS],
+  // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
+  perVisit: [...DELETE_RUN_KEYS],
   actions: {
     load: async (s0, arg) => {
       const s = disarm(s0);

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 } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } 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";
@@ -195,17 +195,23 @@ const svc = defineService<ProductFormState, {
   submit: (s: ProductFormState, values?: Record<string, unknown>) => Promise<ProductFormState>;
   remove: (s: ProductFormState) => Promise<ProductFormState>;
 }>("himiOwnerLiteProductForm", {
-  state: shape({ mode: startMode, id: initialInput.id ?? "", descriptionPending: startMode === "edit" }),
+  // The editor stays hidden until this run's load lands, however the form was opened (an id as input or in the params).
+  state: shape({ mode: startMode, id: initialInput.id ?? "", descriptionPending: true }),
   // [rico] #3644 — this run's editor state: a cold boot takes it from `state`, never the snapshot.
   notHydrated: editorRunKeys("description"),
+  // 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) => {
       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
       // fallback. An id ⇒ edit; no id anywhere ⇒ the create shell.
-      const id = navInputId() || idFrom(arg, s.id);
-      if (!id) return shape({ ...s, ...DESCRIPTION_LOADED, mode: "create", id: "", descriptionMode: "plain", descriptionJson: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
+      // The held id is for the host's bare refresh only (no argument): an onAppear without an id is a create screen.
+      const id = navInputId() || idFrom(arg, arg === undefined ? s.id : "");
+      if (holdsLoadedForm(s, { id, mode: id ? "edit" : "create" }, "description")) return s;
+      // A form that held a record (the one just saved) opens blank.
+      if (!id) return shape({ ...(s.id ? {} : s), ...DESCRIPTION_LOADED, mode: "create", id: "", descriptionMode: "plain", descriptionJson: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_PRODUCTS.find((p) => p.id === id);
           if (d) {

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

@@ -254,6 +254,8 @@ const IDLE: State = {
 
 /** Rebuilt on `load`, because the allowlist arrives with the descriptor. */
 let coordinator: ReturnType<typeof createGroupedSearch> | undefined;
+/** The allowlist the coordinator was built for. */
+let coordinatorSources = "";
 let published: State = IDLE;
 const memory = localPreferences("ownerSearch", normalizeMemory);
 
@@ -279,6 +281,15 @@ const svc = defineService<State, {
   actions: {
     load: async (_state, arg) => {
       stashCopy(arg);
+      // The screen coming back re-runs its search behind what it shows: a warm worker's refresh calls `load` bare (no allowlist),
+      // and its onAppear repeats the allowlist the coordinator was built for.
+      const sources = str(arg, "sources");
+      if (coordinator && (!sources || sources === coordinatorSources)) {
+        await coordinator.revalidate();
+        remember();
+        return published;
+      }
+      coordinatorSources = sources;
       const allowed = (() => {
         try {
           return JSON.parse(str(arg, "sources") || "[]");

package/templates/owner-lite/tier5-src/himi-owner-lite-search/logic.ts

@@ -446,7 +446,13 @@ export function createGroupedSearch(
     };
   };
 
-  const emit = () => { if (!disposed) publish(snapshot()); };
+  /** The revalidation running behind the shown rows (0: none): its snapshots are held back until it is done. */
+  let holding = 0, holds = 0;
+  /** The depth the running revalidation restores, so one that overlaps it starts from the owner's depth, not
+   *  from its reset; and the revalidation itself, which a "look further" tapped meanwhile waits for. */
+  let heldDepth: Record<string, number> = {};
+  let revalidation: Promise<void> | undefined;
+  const emit = () => { if (!disposed && !holding) publish(snapshot()); };
 
   /** Identity merge: a re-fetched row REPLACES its predecessor in place, so a
    *  refresh cannot reorder the list under the user's finger or duplicate a row
@@ -604,6 +610,7 @@ export function createGroupedSearch(
      *  the wrong result set. */
     async search(raw: unknown): Promise<void> {
       if (disposed) return;
+      holding = 0;
       const next = normalizeQuery(raw);
       query = next;
       for (const id of order) {
@@ -627,6 +634,7 @@ export function createGroupedSearch(
      */
     async restore(raw: unknown, depth: Record<string, number> = {}): Promise<void> {
       if (disposed) return;
+      holding = 0;
       const next = normalizeQuery(raw);
       query = next;
       for (const id of order) {
@@ -637,8 +645,34 @@ export function createGroupedSearch(
       if (!next) return;
       await fanOut(order, depth);
     },
+    /** A returning screen (a cached embed's warm worker): the same search re-run to the depth each group
+     *  shows, behind the rows it shows, and published once. Rows are a live claim about records, so they
+     *  are re-fetched, never repainted; a search typed meanwhile takes over at once. */
+    async revalidate(): Promise<void> {
+      if (disposed || !query) return;
+      const depth: Record<string, number> = holding ? { ...heldDepth } : {};
+      for (const id of order) { const pages = groups.get(id)?.pages ?? 0; if (pages > Math.max(1, depth[id] ?? 0)) depth[id] = pages; }
+      heldDepth = depth;
+      const held = ++holds;
+      holding = held;
+      for (const id of order) {
+        groups.set(id, idleGroup(byId.get(id)!));
+        sourceGeneration.set(id, (sourceGeneration.get(id) ?? 0) + 1);
+      }
+      const run = (async () => {
+        try {
+          await fanOut(order, depth);
+        } finally {
+          if (holding === held) { holding = 0; heldDepth = {}; emit(); }
+        }
+      })();
+      revalidation = run;
+      await run;
+    },
     /** One group's next page. */
     async loadMore(id: unknown): Promise<void> {
+      // Tapped while a revalidation re-fetches behind the shown rows: page on from what it lands.
+      while (holding && revalidation) await revalidation;
       const adapter = typeof id === "string" ? byId.get(id) : undefined;
       if (!adapter || disposed || !query) return;
       await runSource(adapter, true);

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

@@ -117,7 +117,8 @@ const svc = defineService<ServiceFormState, {
       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.
-      const id = navInputId() || idFrom(arg, s.id);
+      // The held id is for the host's bare refresh only (no argument): an onAppear without an id is a create screen.
+      const id = navInputId() || idFrom(arg, arg === undefined ? s.id : "");
       if (!id) return shape({ ...s, status: "error", error: copyParam("ownerServiceForm.errorNoService", "No service to edit.") });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_SERVICES.find((x) => x.id === id);

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

@@ -27,7 +27,9 @@ export interface CollectionQuerySource<Row> {
   cached?(criteria: CollectionQuery): Promise<CollectionPage<Row> | undefined>;
   id(row: Row): string;
   errorMessage?(error: unknown): string;
-  /** Private collections must discard prior rows when access or identity changes. */
+  /** Private collections must discard prior rows when access or identity changes. A revalidation keeps the
+   *  rows it shows through any other failure: safe because one worker never serves two identities (its pool
+   *  key carries the account, and a purge tears parked workers down). */
   clearOnError?(error: unknown): boolean;
 }
 const normalize = (q: Partial<CollectionQuery>): CollectionQuery => ({
@@ -46,8 +48,17 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   let generation = 0, disposed = false;
   let loadedPages = 0, restoringPages = 0;
   let state: CollectionQueryState<Row> = { criteria: normalize({}), items: [], nextCursor: '', status: 'idle', loadingMore: false, pageError: false, complete: false, error: '' };
+  /** The query a revalidation is running under: its snapshots are held back until it is done. */
+  let revalidating = -1;
+  /** What the screen shows: the last published state, restored when a revalidation fails. */
+  let shown: { state: CollectionQueryState<Row>; loadedPages: number } | undefined;
+  let clearedByError = false;
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
-  const emit = () => { if (!disposed) publish(snapshot()); };
+  const emit = () => {
+    if (disposed || revalidating === generation) return;
+    shown = { state: snapshot(), loadedPages };
+    publish(snapshot());
+  };
   const merge = (old: Row[], page: Row[]): Row[] => {
     const positions = new Map<string, number>(), result: Row[] = [];
     for (const item of [...old, ...page]) {
@@ -88,6 +99,8 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
     } catch (error) {
       if (disposed || generation !== revision) return;
       const clear = source.clearOnError?.(error) === true;
+      // Revoked access always ends what a revalidation showed, whether or not the source clears its rows.
+      clearedByError = clear || /HTTP 40[13]\b/.test(String(error));
       if (clear) loadedPages = 0;
       state = { ...state, ...(clear ? { items: [], nextCursor: '', total: undefined, metadata: undefined } : {}),
         status: append && !clear ? 'ready' : 'error', loadingMore: false, pageError: append && !clear, complete: false,
@@ -97,13 +110,18 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   };
   return {
     getState: snapshot,
-    async query(criteria: Partial<CollectionQuery>, restorePages = false): Promise<void> {
+    /** [revalidate]: a screen coming back re-queries the rows it shows. They stay on screen until every
+     *  page is in, and a failure keeps them; revoked access still clears them, and other criteria reset. */
+    async query(criteria: Partial<CollectionQuery>, restorePages = false, revalidate = false): Promise<void> {
       if (disposed) return Promise.resolve();
       const next = normalize(criteria);
-      const count = restorePages && JSON.stringify(next) === JSON.stringify(state.criteria)
-        ? Math.max(loadedPages, restoringPages, 1) : 1;
+      const same = JSON.stringify(next) === JSON.stringify(state.criteria);
+      const count = restorePages && same ? Math.max(loadedPages, restoringPages, 1) : 1;
+      const showing = shown && shown.state.status === 'ready' && shown.state.items.length > 0 && !shown.state.pageError
+        && !shown.state.loadingMore && JSON.stringify(shown.state.criteria) === JSON.stringify(next) ? shown : undefined;
       restoringPages = count;
       state = { ...state, criteria: next };
+      if (revalidate && showing) { revalidating = generation + 1; clearedByError = false; }
       const pending = fetch(false);
       const revision = generation;
       await pending;
@@ -112,6 +130,15 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       while (!disposed && generation === revision && loadedPages < count && state.status === 'ready'
         && !state.pageError && !state.loadingMore && state.nextCursor) await fetch(true);
       if (generation === revision) restoringPages = 0;
+      if (revalidating === revision) {
+        revalidating = -1;
+        if (generation !== revision) return;
+        if ((state.status !== 'ready' || state.pageError) && showing && !clearedByError) {
+          state = { ...showing.state, criteria: next };
+          loadedPages = showing.loadedPages;
+        }
+        emit();
+      }
     },
     refresh: () => { restoringPages = 0; return fetch(false); },
     loadMore: () => fetch(true),

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

@@ -299,7 +299,8 @@ export function decorateCollection(name: string, def: { state: State; actions?:
     actions.load = (_s, arg) => {
       stashCopy(arg); syncSaved(); applyNavigationCriteria(arg, _s);
       backend.onLoad?.(arg);
-      return backend.controller.query(criteria(), backend.restorePagesOnLoad).then(() => undefined);
+      // A load of what the screen already shows is the screen coming back: it revalidates behind its rows.
+      return backend.controller.query(criteria(), backend.restorePagesOnLoad, true).then(() => undefined);
     };
     actions.refresh = (_s, arg) => {
       stashCopy(arg); syncSaved();