@wix/himalaya-cli 0.1172.0 → 0.1174.0

package/templates/portfolio-creative-owner/tier5-src/_shared/owner-rich-guard.ts

@@ -2,7 +2,7 @@
 // this file adds the read-only previews the forms show for a locked body, and the FAQ's legacy DraftJS answer.
 // Inside the platform source this import is a relative path, so node test runs resolve it; an app's copy
 // imports "@himalaya/wix-rich-content".
-import { htmlIsTrivial, isPlainRicos } from "@himalaya/wix-rich-content";
+import { htmlIsTrivial } from "@himalaya/wix-rich-content";
 
 export { htmlIsTrivial };
 
@@ -16,14 +16,6 @@ export function htmlPreviewText(html: string | null | undefined): string {
     .split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
 }
 
-/** True when a plain text field can round-trip this Ricos document: no document styling, and
- *  only paragraphs of undecorated text whose paragraph data is the wire default (Events v3 sends
- *  `{ textStyle: { textAlignment: "AUTO" }, indentation: 0 }` on every paragraph). Anything else —
- *  a heading, list, link, bold run, media node, alignment or indent — is rich, and so is a missing
- *  document (callers decide what an absent body means). */
-export const ricosIsPlain = (doc: { nodes?: unknown; documentStyle?: unknown } | null | undefined): boolean =>
-  !!doc && isPlainRicos(doc);
-
 /** Preview text for a legacy DraftJS document: its `blocks[].text` joined by a blank line, or ""
  *  when the payload is not DraftJS JSON (never a throw). */
 export function draftjsText(raw: string | null | undefined): string {

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

@@ -4,8 +4,7 @@
 // screen (himiOwnerLitePost.publish). Bound by buildForm ($service:himiOwnerLitePostForm.*).
 
 import { postBodyText, plainPostBody, postCoverUrl } from "../_shared/owner-post-content.js";
-import { editorValue } from "../_shared/owner-editor-value.js";
-import { parseRicosJson } from "@himalaya/wix-rich-content";
+import { editorSubmitValue, queuedDocument, editorChanged, resetHydratedEditor } 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";
@@ -43,15 +42,10 @@ interface PostFormState {
   bodyJson: string;
   /** The "Post details" sheet (excerpt + cover) is open. */
   detailsOpen: boolean;
-  /** The editor's on_change fired since the body was last loaded or saved. The bag ALWAYS holds a
-   *  document once the editor is ready — the engine's own serialization of the seed, which is not
-   *  byte-equal to it — so only this says the owner actually edited the body. */
+  /** The editor gate (`EditorGate` in _shared/owner-editor-value.ts): the editor's on_change fired since
+   *  the body was loaded or saved, and (edit mode) the editor is hidden until this run's load lands. */
   bodyDirty: boolean;
-  /** Edit mode, until `load` lands: the descriptor hides the editor, because a provisional editor
-   *  the owner typed into keeps that text when the real document arrives (the seed latch). */
   bodyPending: boolean;
-  /** When a save last wrote the body (ms), so its own trailing on_change does not undo "Post updated.". */
-  bodySavedAt: number;
   coverUrl: string;
   originalCoverUrl: string;
   coverPreview: string;
@@ -104,9 +98,7 @@ function boolString(value: unknown, fallback: string): string {
   return fallback;
 }
 /** What every load that publishes a document resets: the editor may show it, nothing is edited yet. */
-const BODY_LOADED = { bodyPending: false, bodyDirty: false, bodySavedAt: 0, detailsOpen: false } as const;
-/** How long after a body save its own debounced on_change may still arrive (the arm waits 500 ms). */
-const TRAILING_CHANGE_MS = 1500;
+const BODY_LOADED = { bodyPending: false, bodyDirty: false, detailsOpen: false } as const;
 const valueOf = (arg: unknown): string =>
   String(typeof arg === "string" ? arg : (arg as { value?: unknown; text?: unknown } | undefined)?.value ?? (arg as { text?: unknown } | undefined)?.text ?? "");
 const docJson = (doc: unknown): string => (doc ? JSON.stringify(doc) : "");
@@ -128,7 +120,6 @@ function shape(s: Partial<PostFormState>): PostFormState {
     detailsOpen: s.detailsOpen ?? false,
     bodyDirty: s.bodyDirty ?? false,
     bodyPending: s.bodyPending ?? false,
-    bodySavedAt: s.bodySavedAt ?? 0,
     coverUrl: s.coverUrl ?? "",
     originalCoverUrl: s.originalCoverUrl ?? "",
     coverPreview: wixMediaUrl(s.coverUrl ?? "", WIX_DETAIL_IMAGE),
@@ -244,13 +235,8 @@ const svc = defineService<PostFormState, {
     setExcerpt: (s, arg) => shape({ ...s, excerpt: valueOf(arg), error: "" }),
     detailsOpen: (s) => shape({ ...s, detailsOpen: true }),
     detailsClose: (s) => shape({ ...s, detailsOpen: false }),
-    // The editor's debounced `on_change` carries `args.dirty` only; the document stays in the form
-    // bag. A body edited after a save is no longer saved, so drop the stale confirmation — unless
-    // this is the trailing on_change of the very edit that save wrote.
-    bodyChanged: (s) => {
-      const trailing = s.status === "saved" && s.bodySavedAt > 0 && Date.now() - s.bodySavedAt < TRAILING_CHANGE_MS;
-      return shape({ ...s, bodyDirty: true, ...(trailing ? {} : { savedMessage: "", status: s.status === "saved" ? "idle" : s.status }) });
-    },
+    // The editor's `on_change` carries `args.dirty` only; the document stays in the form bag.
+    bodyChanged: (s) => shape({ ...s, bodyDirty: true, ...editorChanged(s) }),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
@@ -277,14 +263,15 @@ const svc = defineService<PostFormState, {
       let bodyRaw = "";
       let bodyTooLarge = false;
       if (replay) {
-        const queued = typeof v.richContentJson === "string" ? parseRicosJson(v.richContentJson) : null;
-        if (queued) { richContent = queued as unknown as WixRichContent; bodyRaw = String(v.richContentJson); }
+        const queued = queuedDocument(v.richContentJson);
+        // A queued body that no longer reads (or is past the limits) writes NOTHING, and says so.
+        if (queued.kind === "invalid" || queued.kind === "too_large") return shape({ ...s, status: "error", error: copyParam("ownerPostForm.queuedBodyError", "The post body saved offline could not be read, so nothing was written. Edit it again."), savedMessage: "" });
+        if (queued.kind === "doc") { richContent = queued.doc as unknown as WixRichContent; bodyRaw = queued.json; }
         else if (v.preserveBody === "false") { richContent = plainPostBody(String(v.body ?? "")); bodyRaw = docJson(richContent); }
       } else {
-        // Only an edit the editor reported counts: before load lands the editor is hidden (a body
-        // here was typed into the provisional empty editor), and an untouched bag holds the engine's
-        // re-serialization of the seed, which must not be written back.
-        const ev = s.bodyPending || !s.bodyDirty ? { kind: "absent" as const } : editorValue(v.body, s.bodyJson);
+        // Only an edit the editor reported counts (EditorGate): before load lands the editor is hidden,
+        // and an untouched bag holds the engine's re-serialization of the seed.
+        const ev = editorSubmitValue(v.body, s.bodyJson, { pending: s.bodyPending, dirty: s.bodyDirty });
         if (ev.kind === "invalid") return shape({ ...s, status: "error", error: copyParam("ownerPostForm.bodyInvalid", "Couldn’t read the post body from the editor. Nothing was saved; try again."), savedMessage: "" });
         if (ev.kind === "doc") { richContent = ev.doc as unknown as WixRichContent; bodyRaw = ev.json; }
         // A body past the rich-content limits is not written (every viewer would show its
@@ -308,7 +295,7 @@ const svc = defineService<PostFormState, {
       const savedState = (id: string, savedMessage: string) => shape({
         ...s, mode: "edit", id, heading: copyParam("ownerPostForm.headingEdit", "Edit post"),
         title, excerpt, body: postBodyText(kept), richContent: kept, bodyJson: bodyEdited ? bodyRaw : s.bodyJson,
-        bodyDirty: bodyEdited ? false : s.bodyDirty, bodySavedAt: bodyEdited ? Date.now() : 0,
+        bodyDirty: bodyEdited ? false : s.bodyDirty,
         coverUrl, originalCoverUrl: coverUrl, isFeatured: isFeatured ? "true" : "false",
         status: "saved", savedMessage, savedId: id,
         error: bodyTooLarge ? copyParam("ownerPostForm.bodyTooLarge", "The post body is too long to save, so it was left as it was. Your other changes were saved.") : "",
@@ -366,20 +353,8 @@ const svc = defineService<PostFormState, {
   },
 });
 
-// [rico] #3371 — adopter contract (#3368's review): the editor seeds ONCE, from the first
-// document `bodyJson` holds. A cold boot hydrates this service from its last persisted snapshot, so
-// that first value would be the document as it was when this screen last ran — and a Save after
-// typing would write it over whatever the post holds now. Blank the hydrated seed before anything
-// renders: the editor stays provisional (writes nothing) until `load` publishes the fresh document.
-// In place, at boot, because no action has run yet; the state object is the runtime's own merge.
-{
-  const booted = (svc as { getState?: () => Partial<PostFormState> | undefined }).getState?.();
-  if (booted && typeof booted === "object") {
-    if (booted.bodyJson) booted.bodyJson = "";
-    // Nor does it carry this run's UI over: the editor waits for this run's load, the sheet is shut.
-    booted.bodyPending = startMode === "edit";
-    booted.detailsOpen = false;
-  }
-}
+// [rico] #3371 — adopter contract: the editor seeds once, so a cold boot must not seed it with the last
+// run's document. Nor does it carry this run's UI over: the details sheet is shut.
+resetHydratedEditor(svc, { json: "bodyJson", pending: "bodyPending", dirty: "bodyDirty" }, startMode === "edit", { detailsOpen: false });
 
 export { svc };

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

@@ -17,6 +17,10 @@ import {
 } from "@himalaya/wix-stores";
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, 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, resetHydratedEditor } from "../_shared/owner-editor-value.js";
+import { parseRicosJson } from "@himalaya/wix-rich-content";
+import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch, editablePrice } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
@@ -45,12 +49,27 @@ interface ProductFormState {
   name: string;
   price: string;
   sku: string;
+  /** The description as text: the plain field's value, the locked preview, and the cached row's mirror. */
   description: string;
-  /** [rico] #3363 — the description as loaded (or last saved). A save sends `description` only
-   *  when the submitted value differs from it, so an untouched body is never re-written. */
+  /** The description as loaded (or last saved). The plain field sends `description` only when the
+   *  submitted value differs from it, so an untouched body is never re-written. */
   originalDescription: string;
-  /** A rich HTML description (more than one bare `<p>`) the plain field would flatten: it loads
-   *  locked, the descriptor shows `description` as a preview + `descriptionNote`, and an edit is refused. */
+  /** How THIS record's description is edited:
+   *  "editor" — the RichContentEditor, seeded with `descriptionJson`: a Catalog-V3 product (its Ricos
+   *             document, or trivial HTML as paragraphs), and sample data;
+   *  "plain"  — the plain text field: a new product, a V1 product with trivial HTML;
+   *  "locked" — neither: V1 rich HTML, or a V3 product whose Ricos document did not come back. */
+  descriptionMode: "editor" | "plain" | "locked";
+  /** The V3 Ricos description as a JSON string: the editor's seed ("" when none, and until this run's
+   *  load lands — see the boot reset below). Re-based to the saved document after a save. */
+  descriptionJson: string;
+  descriptionFieldHidden: boolean;   // the plain text field (bag key `descriptionText`)
+  descriptionEditorHidden: boolean;  // the RichContentEditor (bag key `description`)
+  /** The editor gate (`EditorGate` in _shared/owner-editor-value.ts): edited since load/save, and
+   *  hidden until this run's load lands. */
+  descriptionDirty: boolean;
+  descriptionPending: boolean;
+  /** Derived from the mode: "locked" shows the preview + `descriptionNote`, and refuses an edit. */
   descriptionProtected: boolean;
   descriptionEditable: boolean;
   descriptionNote: string;
@@ -111,10 +130,15 @@ function priceOf(p: WixProduct): string {
 }
 
 
+/** What every load that publishes a description resets: the editor may show it, nothing is edited yet. */
+const DESCRIPTION_LOADED = { descriptionPending: false, descriptionDirty: false } as const;
+const docJson = (doc: unknown): string => (doc ? JSON.stringify(doc) : "");
+
 function shape(s: Partial<ProductFormState>): ProductFormState {
   const mode: Mode = s.mode ?? "create";
   const id = typeof s.id === "string" ? s.id : "";
   const savedId = typeof s.savedId === "string" ? s.savedId : id;
+  const dMode = s.descriptionMode ?? (mode === "edit" ? "editor" : "plain");
   return {
     mode,
     id,
@@ -124,9 +148,15 @@ function shape(s: Partial<ProductFormState>): ProductFormState {
     sku: s.sku ?? "",
     description: s.description ?? "",
     originalDescription: s.originalDescription ?? s.description ?? "",
-    descriptionProtected: s.descriptionProtected ?? false,
-    descriptionEditable: !(s.descriptionProtected ?? false),
-    descriptionNote: s.descriptionProtected ? copyParam("ownerProductForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; name, price and SKU can be changed here.") : "",
+    descriptionMode: dMode,
+    descriptionJson: s.descriptionJson ?? "",
+    descriptionFieldHidden: dMode !== "plain",
+    descriptionEditorHidden: dMode !== "editor",
+    descriptionDirty: s.descriptionDirty ?? false,
+    descriptionPending: s.descriptionPending ?? false,
+    descriptionProtected: dMode === "locked",
+    descriptionEditable: dMode !== "locked",
+    descriptionNote: dMode === "locked" ? copyParam("ownerProductForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; name, price and SKU can be changed here.") : "",
     visible: s.visible ?? "true",
     status: s.status ?? "idle",
     error: s.error ?? "",
@@ -151,12 +181,19 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
   return shape({ ...s, ...demoRefusalPatch(copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE)) });
 }
 
+// The RichContentEditor's image tool (the editor's upload contract). The component picks and PUTs
+// the bytes; this service mints the signed Wix Media URL with the worker's own wixApi, so no token
+// reaches the page. Registered BEFORE the form's service on purpose: the worker test harnesses treat a
+// bundle's LAST defineService as its service.
+ricosUploadService("himiOwnerLiteProductFormUploads");
+
 const svc = defineService<ProductFormState, {
   load: (s: ProductFormState, arg?: unknown) => Promise<ProductFormState>;
+  descriptionChanged: (s: ProductFormState, arg?: unknown) => ProductFormState;
   submit: (s: ProductFormState, values?: Record<string, unknown>) => Promise<ProductFormState>;
   remove: (s: ProductFormState) => Promise<ProductFormState>;
 }>("himiOwnerLiteProductForm", {
-  state: shape({ mode: startMode, id: initialInput.id ?? "" }),
+  state: shape({ mode: startMode, id: initialInput.id ?? "", descriptionPending: startMode === "edit" }),
   actions: {
     load: async (s, arg) => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
@@ -164,13 +201,14 @@ const svc = defineService<ProductFormState, {
       // 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, mode: "create", id: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
+      if (!id) return shape({ ...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) {
             return shape({
               ...s, mode: "edit", id, heading: copyParam("ownerProductForm.headingEdit", "Edit product"),
               name: d.name, price: editablePrice(d.price), sku: d.sku, description: d.description,
+              ...DESCRIPTION_LOADED, descriptionMode: "editor", descriptionJson: docJson(plainPostBody(d.description)),
               visible: d.visible ? "true" : "false",
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
@@ -179,7 +217,9 @@ const svc = defineService<ProductFormState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        const p = (await getProduct(id)).product as WixProduct;
+        // `richDescription` (Catalog V3): the Ricos description beside the HTML one. An SDK without the
+        // option ignores it, and the key is absent: the form then keeps the plain/locked split.
+        const p = (await (getProduct as (id: string, opts?: { richDescription?: boolean }) => ReturnType<typeof getProduct>)(id, { richDescription: true })).product as WixProduct;
         if (!p || !(p as any).id) return shape({ ...s, mode: "edit", id, status: "error", error: copyParam("ownerProductForm.errorNotFound", "Product not found") });
         return shape({
           ...s,
@@ -189,7 +229,19 @@ const svc = defineService<ProductFormState, {
           name: (p as any).name ?? "",
           price: priceOf(p),
           sku: (p as any).sku ?? "",
-          ...((html: string) => ({ description: htmlPreviewText(html), originalDescription: htmlPreviewText(html), descriptionProtected: !htmlIsTrivial(html) }))(String((p as any).description ?? "")),
+          ...((html: string, rich: unknown) => {
+            // `richDescription` is present only on a Catalog V3 site. V3 is edited in the RichContentEditor;
+            // a V3 product whose Ricos document did not come back is edited only when its HTML is trivial
+            // (seeded as paragraphs), else locked — fail closed. V1 keeps the plain/locked split: the
+            // editor writes Ricos, and a V1 description is HTML.
+            const doc = rich === undefined || rich === null ? null : parseRicosJson(rich);
+            const hasDoc = !!doc && doc.nodes.length > 0;
+            const text = htmlPreviewText(html);
+            const descriptionMode = rich === undefined ? (htmlIsTrivial(html) ? "plain" as const : "locked" as const)
+              : hasDoc || htmlIsTrivial(html) ? "editor" as const : "locked" as const;
+            const descriptionJson = descriptionMode !== "editor" ? "" : hasDoc ? JSON.stringify(rich) : text ? docJson(plainPostBody(text)) : "";
+            return { ...DESCRIPTION_LOADED, description: text, originalDescription: text, descriptionMode, descriptionJson };
+          })(String((p as any).description ?? ""), (p as { richDescription?: unknown }).richDescription),
           visible: (p as any).visible !== false ? "true" : "false",
           status: "idle",
           error: "",
@@ -202,8 +254,11 @@ const svc = defineService<ProductFormState, {
           return shape({
             ...s, mode: "edit", id, heading: "Edit product",
             name: String(cached.name ?? ""), price: editablePrice(String(cached.price ?? "")), sku: String(cached.sku ?? ""),
-            // An older cached row carries no verdict, so it stays locked: fail closed.
-            description: String(cached.description ?? ""), originalDescription: String(cached.description ?? ""), descriptionProtected: cached.descriptionProtected !== "false",
+            description: String(cached.description ?? ""), originalDescription: String(cached.description ?? ""), ...DESCRIPTION_LOADED,
+            // A row cached with its document reopens in the editor. An older row has none, so its verdict
+            // decides: plain when it was plain, else locked (it carries no verdict either: fail closed).
+            ...(cached.descriptionJson ? { descriptionMode: "editor" as const, descriptionJson: String(cached.descriptionJson) }
+              : { descriptionMode: cached.descriptionProtected === "false" ? "plain" as const : "locked" as const, descriptionJson: "" }),
             visible: cached.visible === "false" ? "false" : "true",
             status: "idle", error: "", savedMessage: "",
           });
@@ -214,6 +269,7 @@ const svc = defineService<ProductFormState, {
             return shape({
               ...s, mode: "edit", id, heading: copyParam("ownerProductForm.headingEdit", "Edit product"),
               name: d.name, price: editablePrice(d.price), sku: d.sku, description: d.description,
+              ...DESCRIPTION_LOADED, descriptionMode: "editor", descriptionJson: docJson(plainPostBody(d.description)),
               visible: d.visible ? "true" : "false",
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
@@ -222,6 +278,8 @@ 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, ...editorChanged(s) }),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
@@ -230,10 +288,34 @@ const svc = defineService<ProductFormState, {
       // "12,50" (comma-decimal keypad) is accepted and written as 12.50.
       const price = editablePrice(rawPrice);
       const sku = String(v.sku ?? s.sku).trim();
-      const description = String(v.description ?? s.description).trim();
-      // A queue replay boots a FRESH worker (empty baseline), so it carries the original verdict.
-      const descriptionEdited = typeof v.descriptionEdited === "string" ? v.descriptionEdited === "true" : description !== s.originalDescription.trim();
-      if (descriptionEdited && s.descriptionProtected) return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerProductForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
+      // The description, per record mode. A queue replay (a FRESH worker) says so with
+      // `descriptionEdited`; this bundle's V3 editor items add the document as `descriptionJson`.
+      const replay = typeof v.descriptionEdited === "string";
+      let richDescription: { nodes: unknown[] } | null = null;   // the V3 Ricos description to WRITE
+      let docRaw = "";
+      let tooLarge = false;
+      let description = s.description;                            // the plain text (V1 / create), or the mirror
+      let descriptionEdited = false;                              // write the PLAIN description (V1 / create)
+      if (replay) {
+        const queued = queuedDocument(v.descriptionJson);
+        // A queued document that no longer reads (or is past the limits) writes NOTHING, and says so.
+        if (queued.kind === "invalid" || queued.kind === "too_large") return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerProductForm.queuedDescriptionError", "The description saved offline could not be read, so nothing was written. Edit it again.") });
+        if (queued.kind === "doc") { richDescription = queued.doc as { nodes: unknown[] }; docRaw = queued.json; }
+        else if (v.descriptionEdited === "true") { description = String(v.description ?? "").trim(); descriptionEdited = true; }
+      } else if (s.descriptionMode === "editor") {
+        // Only an edit the editor reported counts (EditorGate). Absent (the editor never became ready):
+        // save the rest and leave the description as it is.
+        const ev = editorSubmitValue(v.description, s.descriptionJson, { pending: s.descriptionPending, dirty: s.descriptionDirty });
+        if (ev.kind === "invalid") return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerProductForm.editorReadError", "Couldn’t read the description from the editor. Nothing was saved; try again.") });
+        if (ev.kind === "doc") { richDescription = ev.doc as { nodes: unknown[] }; docRaw = ev.json; }
+        tooLarge = ev.kind === "too_large";
+      } else {
+        // Plain or locked: the plain text field, under its own bag key.
+        description = String(v.descriptionText ?? s.description).trim();
+        descriptionEdited = description !== s.originalDescription.trim();
+        if (descriptionEdited && s.descriptionMode === "locked") return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerProductForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
+      }
+      if (richDescription) description = postBodyText(richDescription as never);
       const visible = boolString(v.visible, s.visible) === "true";
       if (!name) return shape({ ...s, status: "error", error: copyParam("ownerProductForm.nameRequired", "Name is required"), savedMessage: "" });
       const priceNum = Number(price);
@@ -244,23 +326,41 @@ const svc = defineService<ProductFormState, {
         return shape({ ...s, name, price, sku, description, visible: visible ? "true" : "false", status: "error", error: copyParam("ownerProductForm.priceInvalid", "Enter a price of 0 or more."), savedMessage: "" });
       }
 
-      const write: WixProductWrite = {
+      // A local structural type for `richDescription`: templates compile against the PUBLISHED SDK.
+      const write: WixProductWrite & { richDescription?: { nodes: unknown[] } } = {
         name,
         priceData: { price: priceNum, currency: CURRENCY },
         visible,
         ...(sku ? { sku } : {}),
         ...(descriptionEdited ? { description } : {}),
+        ...(richDescription ? { richDescription } : {}),
         ...(s.mode === "edit" && s.id ? {} : { productType: "physical" }),
       };
+      // The document the record now holds, when known: an offline reopen seeds the editor with it.
+      const loadedJson = s.descriptionMode === "editor" && !s.descriptionPending ? s.descriptionJson : "";
+      const heldJson = docRaw || loadedJson;
+      // The cache's verdict comes from the CONTENT (a rolled-back bundle reads it to decide whether its
+      // plain field may overwrite the body): from the document when known; plain only when the record
+      // loaded as plain, or a new product's plain text. Before load lands it stays protected.
+      const heldDoc = richDescription ?? (loadedJson ? parseRicosJson(loadedJson) : null);
+      const knownPlain = s.descriptionMode === "plain" || (s.descriptionMode === "editor" && !s.descriptionPending && s.descriptionJson === "");
+      const descriptionProtected = cachedRichVerdict(heldDoc as never, knownPlain);
 
       // Optimistic local write — the list repaints from cache immediately (offline or not).
-      const localRow = (id: string): DbEntity => ({ id, name, price, sku, description, descriptionProtected: s.descriptionProtected ? "true" : "false", visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
+      const localRow = (id: string): DbEntity => ({ id, name, price, sku, description, descriptionProtected, ...(heldJson ? { descriptionJson: heldJson } : {}), visible: visible ? "true" : "false", statusLabel: visible ? "Visible" : "Hidden" });
+      const wrote = richDescription !== null;
+      const savedDescription = {
+        description, originalDescription: descriptionEdited || wrote ? description : s.originalDescription,
+        ...(docRaw ? { descriptionJson: docRaw } : {}),
+        descriptionDirty: wrote ? false : s.descriptionDirty,
+        error: tooLarge ? copyParam("ownerProductForm.descriptionTooLarge", "The description is too long to save, so it was left as it was. Your other changes were saved.") : "",
+      };
       const localId = s.mode === "edit" && s.id ? s.id : `local-${Date.now()}`;
       await cachePut(localRow(localId));
       try {
         let id = s.id;
         if (s.mode === "edit" && s.id) {
-          await updateProduct(s.id, write);
+          await updateProduct(s.id, write as WixProductWrite);
         } else {
           const r = await createProduct(write);
           id = r.product?.id || localId;
@@ -275,11 +375,9 @@ const svc = defineService<ProductFormState, {
           name,
           price,
           sku,
-          description,
-          originalDescription: descriptionEdited ? description : s.originalDescription,
           visible: visible ? "true" : "false",
           status: "saved",
-          error: "",
+          ...savedDescription,
           savedMessage: copyParam("ownerProductForm.savedMessage", "Product saved."),
           savedId: id,
         });
@@ -291,11 +389,13 @@ const svc = defineService<ProductFormState, {
           if (s.demoNote) return demoRefusal(s);
           // Real device offline: the optimistic cache row already shows; queue the
           // write to replay (WriteQueue, idempotent) when connectivity returns.
-          await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, description, descriptionEdited: String(descriptionEdited), visible: String(visible), mode: s.mode });
+          // A document rides as `descriptionJson` with descriptionEdited "false", so a bundle rolled back
+          // past this change leaves the description rather than flattening it to text.
+          await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, description, visible: String(visible), mode: s.mode,
+            ...(docRaw ? { descriptionJson: docRaw, descriptionEdited: "false" } : { descriptionEdited: String(descriptionEdited) }) });
           return shape({
-            ...s, mode: "edit", id: localId, name, price, sku, description,
-            originalDescription: descriptionEdited ? description : s.originalDescription,
-            visible: visible ? "true" : "false", status: "saved", error: "",
+            ...s, mode: "edit", id: localId, name, price, sku, ...savedDescription,
+            visible: visible ? "true" : "false", status: "saved",
             savedMessage: copyParam("ownerProductForm.savedOffline", "Saved offline — will sync when you reconnect."),
             savedId: localId,
           });
@@ -323,4 +423,7 @@ const svc = defineService<ProductFormState, {
   },
 });
 
+// Adopter contract: the editor seeds once, so a cold boot must not seed it with the last run's document.
+resetHydratedEditor(svc, { json: "descriptionJson", pending: "descriptionPending", dirty: "descriptionDirty" }, startMode === "edit");
+
 export { svc };