@wix/himalaya-cli 0.1211.0 → 0.1213.0

package/dist/cli.mjs

@@ -34745,10 +34745,8 @@ function withTheme(ctx, theme) {
     radius: { ...base.radius ?? {}, ...theme.radius ?? {} },
     spacing: { ...base.spacing ?? {}, ...theme.spacing ?? {} }
   };
-  const themed = makeCtx(merged, ctx.scheme, { provider: ctx.provider, onAction: ctx.onAction, intents: ctx.intents, empty: ctx.empty, screenId: ctx.screenId, emitTelemetry: ctx.emitTelemetry, previewSurface: ctx.previewSurface, idiomContext: ctx.idiomContext });
-  themed.itemScope = ctx.itemScope;
-  if (ctx.rowDivider) themed.rowDivider = true;
-  return themed;
+  const tk = makeTokenResolvers(merged, ctx.scheme, ctx.idiomContext);
+  return { ...ctx, ...tk, modStyle: makeModStyle(tk) };
 }
 function ensureAppearKeyframes() {
   if (appearKeyframesInjected || typeof document === "undefined") return;
@@ -37833,7 +37831,8 @@ var init_renderNode = __esm({
       const rawPlaceholder = props.placeholder ?? cfg.placeholder;
       const resolvedPlaceholder = useResolvedScalar(rawPlaceholder, ctx);
       const placeholderIsBinding = isBinding(rawPlaceholder);
-      const placeholder2 = rawPlaceholder == null || placeholderIsBinding && resolvedPlaceholder == null ? "Type here\u2026" : placeholderIsBinding ? asTextL10n(resolvedPlaceholder, ctx) : asText2(rawPlaceholder);
+      const placeholder2 = rawPlaceholder == null || placeholderIsBinding && resolvedPlaceholder == null ? "" : placeholderIsBinding ? asTextL10n(resolvedPlaceholder, ctx) : asText2(rawPlaceholder);
+      const placeholderName = placeholder2 || void 0;
       const prefixText = useBoundString(props.prefix, ctx);
       const suffixText = useBoundString(props.suffix, ctx);
       const valueBinding = typeof ctrl === "string" ? ctrl : cfg.value;
@@ -38039,7 +38038,7 @@ var init_renderNode = __esm({
         /* @__PURE__ */ jsxs5("div", { style: composedBox, children: [
           props.leadingIcon && accIcon(props.leadingIcon),
           prefixText && /* @__PURE__ */ jsx8("span", { style: { color: muted, flex: "none" }, children: prefixText }),
-          multilineBox ? /* @__PURE__ */ jsx8("textarea", { "data-component-id": componentId, id: fieldDomId, "data-component-type": componentType, ...a11yFwd, ref: inputRef, value: local, onChange: onInput, onKeyDown, onFocus: onFieldFocus, onBlur: onFieldBlur, placeholder: placeholder2, rows: 2, "aria-label": ariaLabelProp ?? placeholder2, "aria-invalid": errored || void 0, "aria-describedby": [errorId, describedByProp].filter(Boolean).join(" ") || void 0, inputMode, autoCapitalize, maxLength, autoCorrect: suggestOff ? "off" : suggestOn ? "on" : void 0, spellCheck: suggestOff ? false : suggestOn ? true : void 0, autoComplete: suggestOff ? "off" : void 0, style: inputBase }) : /* @__PURE__ */ jsx8("input", { "data-component-id": componentId, id: htmlId, "data-component-type": componentType, ...a11yFwd, ref: inputRef, type: secure ? "password" : "text", value: local, onChange: onInput, onKeyDown, onFocus: onFieldFocus, onBlur: onFieldBlur, placeholder: placeholder2, "aria-label": ariaLabelProp ?? placeholder2, "aria-invalid": errored || void 0, "aria-describedby": [errorId, describedByProp].filter(Boolean).join(" ") || void 0, inputMode, autoCapitalize, maxLength, autoCorrect: suggestOff ? "off" : suggestOn ? "on" : void 0, spellCheck: suggestOff ? false : suggestOn ? true : void 0, autoComplete: suggestOff ? "off" : void 0, enterKeyHint, style: inputBase }),
+          multilineBox ? /* @__PURE__ */ jsx8("textarea", { "data-component-id": componentId, id: fieldDomId, "data-component-type": componentType, ...a11yFwd, ref: inputRef, value: local, onChange: onInput, onKeyDown, onFocus: onFieldFocus, onBlur: onFieldBlur, placeholder: placeholder2, rows: 2, "aria-label": ariaLabelProp ?? placeholderName, "aria-invalid": errored || void 0, "aria-describedby": [errorId, describedByProp].filter(Boolean).join(" ") || void 0, inputMode, autoCapitalize, maxLength, autoCorrect: suggestOff ? "off" : suggestOn ? "on" : void 0, spellCheck: suggestOff ? false : suggestOn ? true : void 0, autoComplete: suggestOff ? "off" : void 0, style: inputBase }) : /* @__PURE__ */ jsx8("input", { "data-component-id": componentId, id: htmlId, "data-component-type": componentType, ...a11yFwd, ref: inputRef, type: secure ? "password" : "text", value: local, onChange: onInput, onKeyDown, onFocus: onFieldFocus, onBlur: onFieldBlur, placeholder: placeholder2, "aria-label": ariaLabelProp ?? placeholderName, "aria-invalid": errored || void 0, "aria-describedby": [errorId, describedByProp].filter(Boolean).join(" ") || void 0, inputMode, autoCapitalize, maxLength, autoCorrect: suggestOff ? "off" : suggestOn ? "on" : void 0, spellCheck: suggestOff ? false : suggestOn ? true : void 0, autoComplete: suggestOff ? "off" : void 0, enterKeyHint, style: inputBase }),
           suffixText && /* @__PURE__ */ jsx8("span", { style: { color: muted, flex: "none" }, children: suffixText }),
           props.clearButton && local && /* @__PURE__ */ jsx8("span", { onClick: () => {
             setLocal("");
@@ -62639,21 +62638,21 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-CRDm5E9l.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1184658, sha256: "e00b8e526ebcd4dd07db3a03ee7bb81e401575c162498b42bb9aca49d60a6918" },
-      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1184666, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
-      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1189276, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1677860, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1768784, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1859768, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1950748, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 2041620, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 2132600, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2241236, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2350320, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2459368, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2567068, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2655176, length: 4947, sha256: "094afa56a8e94767674ee8fd7ca3290f67f64930f8e2c6cc874d6d101e35fd7d" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2660123, length: 17344, sha256: "d057298d75e7373e5e2c4d11b7d1bcbea88e03af555ba63d97641c78509c58e4" }
+      { key: "assets/index-C7Hu2ZVY.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1184477, sha256: "467121778a7bc69ac19ec6c77f6f2ca7ea80d7fc2915e8981ba0219b5c2fe61d" },
+      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1184485, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
+      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1189095, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1677679, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1768603, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1859587, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1950567, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 2041439, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 2132419, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2241055, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2350139, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2459187, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2566887, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2654995, length: 4947, sha256: "b6f3f19b28b680a734bcf73bfb6e3690e478affe9f3c10a3c5c5d8f3e674c9b0" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2659942, length: 17344, sha256: "d057298d75e7373e5e2c4d11b7d1bcbea88e03af555ba63d97641c78509c58e4" }
     ];
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1211.0",
+  "version": "0.1213.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -67,5 +67,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "e396c1bc4ed2c787b443d9987dc1a0b6f0fb7ada7b1f8cf2ed2b2439"
+  "falconPackageHash": "85a85909eb5f201a49f5414ffcc4d36dbf9a3dcf7acca4a0b3eec160"
 }

package/templates/beauty-salon-owner/dev/index.ts

@@ -77509,6 +77509,115 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 }
                               }
                             },
+                            {
+                              "id": "product_delete_confirmation",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 10,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "product_delete_confirmation.title",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Delete this retail line?",
+                                          "style": "bodyEmphasis"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "product_delete_confirmation.record",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiOwnerLiteProduct.title",
+                                          "style": "body",
+                                          "color": "textSecondary",
+                                          "maxLines": 2
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "This cannot be undone.",
+                                          "style": "footnote",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "children": [
+                                            {
+                                              "id": "product_delete_cancel",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Cancel",
+                                                  "style": "secondary",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLiteProduct.cancelDelete"
+                                                  }
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "product_delete_confirm",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Delete",
+                                                  "style": "destructive",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLiteProduct.confirmDelete"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "background": {
+                                  "token": "surfaceElevated"
+                                },
+                                "border": {
+                                  "width": 1,
+                                  "color": {
+                                    "token": "danger"
+                                  }
+                                },
+                                "cornerRadius": 12,
+                                "padding": {
+                                  "leading": 14,
+                                  "trailing": 14,
+                                  "top": 14,
+                                  "bottom": 14
+                                },
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$service:himiOwnerLiteProduct.noDeleteConfirmation"
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -79136,6 +79245,115 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 }
                               }
                             },
+                            {
+                              "id": "post_delete_confirmation",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 10,
+                                  "alignment": "leading",
+                                  "children": [
+                                    {
+                                      "id": "post_delete_confirmation.title",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "Delete this post?",
+                                          "style": "bodyEmphasis"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "post_delete_confirmation.record",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiOwnerLitePost.title",
+                                          "style": "body",
+                                          "color": "textSecondary",
+                                          "maxLines": 2
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "This cannot be undone.",
+                                          "style": "footnote",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "HStack",
+                                        "props": {
+                                          "spacing": 8,
+                                          "children": [
+                                            {
+                                              "id": "post_delete_cancel",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Cancel",
+                                                  "style": "secondary",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLitePost.cancelDelete"
+                                                  }
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "post_delete_confirm",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "Button",
+                                                "props": {
+                                                  "title": "Delete",
+                                                  "style": "destructive",
+                                                  "action": {
+                                                    "actionId": "tier5.himiOwnerLitePost.confirmDelete"
+                                                  }
+                                                }
+                                              }
+                                            }
+                                          ]
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "background": {
+                                  "token": "surfaceElevated"
+                                },
+                                "border": {
+                                  "width": 1,
+                                  "color": {
+                                    "token": "danger"
+                                  }
+                                },
+                                "cornerRadius": 12,
+                                "padding": {
+                                  "leading": 14,
+                                  "trailing": 14,
+                                  "top": 14,
+                                  "bottom": 14
+                                },
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$service:himiOwnerLitePost.noDeleteConfirmation"
+                              }
+                            },
                             {
                               "id": "",
                               "body": {

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

@@ -80,6 +80,9 @@ interface PostState {
   /** Non-empty when showing owner-preview-demo sample data (web preview, no owner bridge). */
   demoNote: string;
   notDemo: boolean;
+  /** #3158 — Delete ARMS a confirmation; only confirmDelete reaches the API. */
+  deletePending: boolean;
+  noDeleteConfirmation: boolean;
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -159,6 +162,9 @@ function shape(s: Partial<PostState>): PostState {
     hideUnpublish: !published || status !== "ready",
     demoNote: s.demoNote ?? "",
     notDemo: !s.demoNote,
+    // Only a loaded entity can be pending deletion; every other action disarms it (`disarm`).
+    deletePending: !!s.deletePending && hasEntity,
+    noDeleteConfirmation: !(s.deletePending && hasEntity),
   };
 }
 
@@ -276,18 +282,35 @@ async function refresh(prev: PostState, id: string, actionMessage = ""): Promise
   });
 }
 
+/** #3158 — a confirmed delete in flight. Synchronous and module-level on purpose: two
+ *  confirmDelete dispatches (a double tap) both start from a state that says "armed", and only a
+ *  flag set BEFORE the first await stops the second from issuing its own DELETE — whose late 404
+ *  would otherwise land after, and overwrite, the first one's "deleted". */
+let deleteInFlight = false;
+
+/** #3158 — the confirmation describes THIS visit. Never take it from a persisted snapshot, or a
+ *  reopened record comes back with "Delete this …?" already armed. */
+const DELETE_RUN_KEYS = ["deletePending", "noDeleteConfirmation"] as const;
+
+/** #3158 — clear an armed delete confirmation. */
+const disarm = <T extends { deletePending: boolean }>(s: T): T => ({ ...s, deletePending: false });
+
 const svc = defineService<PostState, {
   load: (s: PostState, arg?: unknown) => Promise<PostState>;
   retry: (s: PostState) => Promise<PostState>;
   publish: (s: PostState) => Promise<PostState>;
   unpublish: (s: PostState) => Promise<PostState>;
   delete: (s: PostState) => Promise<PostState>;
+  cancelDelete: (s: PostState) => Promise<PostState>;
+  confirmDelete: (s: PostState) => Promise<PostState | undefined>;
   /** [rico] #3370 — RichContent's on_link: `{ url }` of the tapped link. */
   openLink: (s: PostState, arg?: unknown) => Promise<PostState>;
 }>("himiOwnerLitePost", {
   state: shape({ status: "loading" }),
+  notHydrated: [...DELETE_RUN_KEYS],
   actions: {
-    load: async (s, arg) => {
+    load: async (s0, arg) => {
+      const s = disarm(s0);
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const id = idFrom(arg, s.id) || inputId();
       if (!id) return shape({ ...s, status: "error", error: copyParam("ownerPost.errorNoId", "no post id") });
@@ -312,7 +335,8 @@ const svc = defineService<PostState, {
         return shape({ ...s, id, status: "error", error: ownerLoadError(e) });
       }
     },
-    retry: async (s) => {
+    retry: async (s0) => {
+      const s = disarm(s0);
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerPost.errorNoId", "no post id") });
       if (isOwnerPreviewDemo()) {
           const demo = demoDetail(s, s.id);
@@ -334,7 +358,8 @@ const svc = defineService<PostState, {
         return shape({ ...s, status: "error", error: ownerLoadError(e) });
       }
     },
-    publish: async (s) => {
+    publish: async (s0) => {
+      const s = disarm(s0);
       if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
       if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerPost.noIdMessage", "No post id.") });
       if (s.postStatusRaw === "PUBLISHED") return shape({ ...s, actionMessage: copyParam("ownerPost.alreadyPublished", "Post is already published.") });
@@ -352,7 +377,8 @@ const svc = defineService<PostState, {
         return shape({ ...s, actionMessage: ownerLoadError(e) });
       }
     },
-    unpublish: async (s) => {
+    unpublish: async (s0) => {
+      const s = disarm(s0);
       if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
       if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerPost.noIdMessage", "No post id.") });
       if (s.postStatusRaw !== "PUBLISHED" && s.postStatusRaw !== "SCHEDULED") {
@@ -372,20 +398,35 @@ const svc = defineService<PostState, {
         return shape({ ...s, actionMessage: ownerLoadError(e) });
       }
     },
-    delete: async (s) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
-      if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerPost.noIdMessage", "No post id.") });
-      // Optimistic local delete — the list drops the row immediately.
-      await cacheDrop(s.id);
+    // #3158 — destructive, so two steps. `delete` (the Manage card's Delete button)
+    // only ARMS the inline confirmation, which names the record and says it cannot
+    // be undone; `cancelDelete` disarms it; only `confirmDelete` deletes. Anything
+    // that dispatches `delete` directly therefore still asks first.
+    delete: async (s) => shape({ ...s, deletePending: true, actionMessage: "" }),
+    cancelDelete: async (s) => shape({ ...s, deletePending: false }),
+    confirmDelete: async (s0) => {
+      // Nothing armed (a stray dispatch, a rehydrated snapshot) or a delete already running
+      // (a second tap): ignore it — `undefined` leaves the state exactly as it is.
+      if (!s0.deletePending || deleteInFlight) return undefined;
+      deleteInFlight = true;
       try {
-        await deleteDraftPost(s.id);
-        return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerPost.deletedEmpty", "Post deleted."), actionMessage: "" });
-      } catch (e) {
-        if (shouldQueueOwnerWrite(e)) {
-          await queueWrite("tier5.himiOwnerLitePost.delete", { id: s.id });
-          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerPost.deletedEmpty", "Post deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        const s = disarm(s0);
+        if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerPost.noIdMessage", "No post id.") });
+        // Optimistic local delete — the list drops the row immediately.
+        await cacheDrop(s.id);
+        try {
+          await deleteDraftPost(s.id);
+          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerPost.deletedEmpty", "Post deleted."), actionMessage: "" });
+        } catch (e) {
+          if (shouldQueueOwnerWrite(e)) {
+            await queueWrite("tier5.himiOwnerLitePost.delete", { id: s.id });
+            return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerPost.deletedEmpty", "Post deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+          }
+          return shape({ ...s, actionMessage: ownerLoadError(e) });
         }
-        return shape({ ...s, actionMessage: ownerLoadError(e) });
+      } finally {
+        deleteInFlight = false;
       }
     },
     // Only http(s), mailto and tel links reach open_url; a refused link, or one nothing opened, says so, and
@@ -397,4 +438,10 @@ const svc = defineService<PostState, {
   },
 });
 
+// The same reset on a runtime from before `notHydrated` (an older binary on a new bundle).
+if ((globalThis as { himalaya?: { hydrationOptOut?: unknown } }).himalaya?.hydrationOptOut !== true) {
+  const booted = svc.getState?.() as unknown as Record<string, unknown> | undefined;
+  if (booted && typeof booted === "object") Object.assign(booted, { deletePending: false, noDeleteConfirmation: true });
+}
+
 export { svc };

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

@@ -59,6 +59,9 @@ interface ProductState {
   /** Non-empty when showing owner-preview-demo sample data (web preview, no owner bridge). */
   demoNote: string;
   notDemo: boolean;
+  /** #3158 — Delete ARMS a confirmation; only confirmDelete reaches the API. */
+  deletePending: boolean;
+  noDeleteConfirmation: boolean;
 }
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -143,6 +146,9 @@ function shape(s: Partial<ProductState>): ProductState {
     hideHide: !visible || status !== "ready",
     demoNote: s.demoNote ?? "",
     notDemo: !s.demoNote,
+    // Only a loaded entity can be pending deletion; every other action disarms it (`disarm`).
+    deletePending: !!s.deletePending && hasEntity,
+    noDeleteConfirmation: !(s.deletePending && hasEntity),
   };
 }
 
@@ -265,16 +271,33 @@ async function setVisibility(s: ProductState, visible: boolean, msg: string): Pr
   }
 }
 
+/** #3158 — a confirmed delete in flight. Synchronous and module-level on purpose: two
+ *  confirmDelete dispatches (a double tap) both start from a state that says "armed", and only a
+ *  flag set BEFORE the first await stops the second from issuing its own DELETE — whose late 404
+ *  would otherwise land after, and overwrite, the first one's "deleted". */
+let deleteInFlight = false;
+
+/** #3158 — the confirmation describes THIS visit. Never take it from a persisted snapshot, or a
+ *  reopened record comes back with "Delete this …?" already armed. */
+const DELETE_RUN_KEYS = ["deletePending", "noDeleteConfirmation"] as const;
+
+/** #3158 — clear an armed delete confirmation. */
+const disarm = <T extends { deletePending: boolean }>(s: T): T => ({ ...s, deletePending: false });
+
 const svc = defineService<ProductState, {
   load: (s: ProductState, arg?: unknown) => Promise<ProductState>;
   retry: (s: ProductState) => Promise<ProductState>;
   show: (s: ProductState) => Promise<ProductState>;
   hide: (s: ProductState) => Promise<ProductState>;
   delete: (s: ProductState) => Promise<ProductState>;
+  cancelDelete: (s: ProductState) => Promise<ProductState>;
+  confirmDelete: (s: ProductState) => Promise<ProductState | undefined>;
 }>("himiOwnerLiteProduct", {
   state: shape({ status: "loading" }),
+  notHydrated: [...DELETE_RUN_KEYS],
   actions: {
-    load: async (s, arg) => {
+    load: async (s0, arg) => {
+      const s = disarm(s0);
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const id = idFrom(arg, s.id) || inputId();
       if (!id) return shape({ ...s, status: "error", error: copyParam("ownerProduct.errorNoId", "no product id") });
@@ -297,7 +320,8 @@ const svc = defineService<ProductState, {
         return shape({ ...s, id, status: "error", error: ownerLoadError(e) });
       }
     },
-    retry: async (s) => {
+    retry: async (s0) => {
+      const s = disarm(s0);
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerProduct.errorNoId", "no product id") });
       if (isOwnerPreviewDemo()) {
           const demo = demoDetail(s, s.id);
@@ -317,25 +341,46 @@ const svc = defineService<ProductState, {
         return shape({ ...s, status: "error", error: ownerLoadError(e) });
       }
     },
-    show: async (s) => setVisibility(s, true, copyParam("ownerProduct.shownMessage", "Product is now visible in your store.")),
-    hide: async (s) => setVisibility(s, false, copyParam("ownerProduct.hiddenMessage", "Product hidden from your store.")),
-    delete: async (s) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
-      if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerProduct.noIdMessage", "No product id.") });
-      // Optimistic local delete — the list drops the row immediately.
-      await cacheDrop(s.id);
+    show: async (s0) => { const s = disarm(s0); return setVisibility(s, true, copyParam("ownerProduct.shownMessage", "Product is now visible in your store.")); },
+    hide: async (s0) => { const s = disarm(s0); return setVisibility(s, false, copyParam("ownerProduct.hiddenMessage", "Product hidden from your store.")); },
+    // #3158 — destructive, so two steps. `delete` (the Manage card's Delete button)
+    // only ARMS the inline confirmation, which names the record and says it cannot
+    // be undone; `cancelDelete` disarms it; only `confirmDelete` deletes. Anything
+    // that dispatches `delete` directly therefore still asks first.
+    delete: async (s) => shape({ ...s, deletePending: true, actionMessage: "" }),
+    cancelDelete: async (s) => shape({ ...s, deletePending: false }),
+    confirmDelete: async (s0) => {
+      // Nothing armed (a stray dispatch, a rehydrated snapshot) or a delete already running
+      // (a second tap): ignore it — `undefined` leaves the state exactly as it is.
+      if (!s0.deletePending || deleteInFlight) return undefined;
+      deleteInFlight = true;
       try {
-        await deleteProduct(s.id);
-        return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: "" });
-      } catch (e) {
-        if (shouldQueueOwnerWrite(e)) {
-          await queueWrite("tier5.himiOwnerLiteProduct.delete", { id: s.id });
-          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        const s = disarm(s0);
+        if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+        if (!s.id) return shape({ ...s, actionMessage: copyParam("ownerProduct.noIdMessage", "No product id.") });
+        // Optimistic local delete — the list drops the row immediately.
+        await cacheDrop(s.id);
+        try {
+          await deleteProduct(s.id);
+          return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: "" });
+        } catch (e) {
+          if (shouldQueueOwnerWrite(e)) {
+            await queueWrite("tier5.himiOwnerLiteProduct.delete", { id: s.id });
+            return shape({ ...s, status: "deleted", title: "", emptyText: copyParam("ownerProduct.deletedEmpty", "Product deleted."), actionMessage: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+          }
+          return shape({ ...s, actionMessage: ownerLoadError(e) });
         }
-        return shape({ ...s, actionMessage: ownerLoadError(e) });
+      } finally {
+        deleteInFlight = false;
       }
     },
   },
 });
 
+// The same reset on a runtime from before `notHydrated` (an older binary on a new bundle).
+if ((globalThis as { himalaya?: { hydrationOptOut?: unknown } }).himalaya?.hydrationOptOut !== true) {
+  const booted = svc.getState?.() as unknown as Record<string, unknown> | undefined;
+  if (booted && typeof booted === "object") Object.assign(booted, { deletePending: false, noDeleteConfirmation: true });
+}
+
 export { svc };