@wix/himalaya-cli 0.1040.0 → 0.1041.0

package/templates/community-club-owner/tier5-src/_shared/collection-contract.ts

@@ -168,6 +168,8 @@ export function projectCollection(source: CollectionRow[], config: CollectionCon
     items: visible.map(row => ({ ...row, collectionId: collectionId(row), collectionTitle: collectionTitle(row, config),
       collectionMeta: [...new Set((config.metadata ?? ['total', 'statusLabel', 'price', 'priceLine', 'dateLine', 'meta']).filter(key => key !== config.subtitle).map(key => scalar(row[key])).filter(Boolean))].join(' · '),
       collectionSelectLabel: prefs.selectedIds.includes(collectionId(row)) ? 'Selected' : 'Select',
+      // The save toggle names the action it WILL take (the service localizes it).
+      collectionSaveLabel: prefs.savedIds.includes(collectionId(row)) ? 'Remove from saved' : 'Save',
       collectionSubtitle: scalar(row[config.subtitle ?? '']) || scalar(row.subtitle) || scalar(row.description) || scalar(row.meta),
       collectionImage: scalar(row[config.image ?? '']), collectionNoImage: !scalar(row[config.image ?? '']), collectionHasImage: !!scalar(row[config.image ?? '']),
       collectionSaved: prefs.savedIds.includes(collectionId(row)), collectionNotSaved: !prefs.savedIds.includes(collectionId(row)), collectionSelected: prefs.selectedIds.includes(collectionId(row)),

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

@@ -123,7 +123,12 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       pendingFilter = '';
     }
     const projected = projectCollection(rows, config, prefs, !!backend && config.backendQuery === true, known);
-    projected.items.forEach(row => { row.collectionSelectLabel = row.collectionSelected ? copyParam('collection.selected', 'Selected') : copyParam('collection.select', 'Select'); });
+    projected.items.forEach(row => {
+      row.collectionSelectLabel = row.collectionSelected ? copyParam('collection.selected', 'Selected') : copyParam('collection.select', 'Select');
+      // the save toggle names the action it WILL take for this row. The
+      // old static "Save / unsave" made the owner work out the row's state.
+      row.collectionSaveLabel = row.collectionSaved ? copyParam('collection.unsave', 'Remove from saved') : copyParam('collection.save', 'Save');
+    });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
     const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
       ...projected.filters.map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))];

package/templates/community-club-owner/tier5-src/_shared/owner-account.ts

@@ -0,0 +1,45 @@
+// Pure seams of the owner-lite Account worker — no @himalaya/* imports, so a
+// plain node test can load them without the bundle build's module aliases.
+
+export interface AccountState {
+  status: "loading" | "ready";
+  /** "Name · email", the email alone, or "" (the line collapses). */
+  ownerLine: string;
+  /** "Version 1.2.0 (34)", or "" when the host cannot say. */
+  versionLine: string;
+  /** Why the owner line is empty, when the identity read failed; "" otherwise. */
+  error: string;
+  supportUrl: string;
+  privacyUrl: string;
+  termsUrl: string;
+  /** hiddenPath flags — TRUE hides, so each is phrased negatively. */
+  noSupport: boolean;
+  noPrivacy: boolean;
+  noTerms: boolean;
+}
+
+/** Only absolute http(s) URLs are openable; anything else is treated as absent. */
+export function safeUrl(v: unknown): string {
+  if (typeof v !== "string") return "";
+  const t = v.trim();
+  return /^https?:\/\/[^\s]+$/i.test(t) ? t : "";
+}
+
+/** "Name · email" when both are known, whichever one is when only one is, else "". */
+export function ownerLineOf(name: string, email: string): string {
+  const n = name.trim(), e = email.trim();
+  if (n && e && n !== e) return `${n} · ${e}`;
+  return n || e;
+}
+
+export function shapeAccount(s: Partial<AccountState>): AccountState {
+  const supportUrl = safeUrl(s.supportUrl), privacyUrl = safeUrl(s.privacyUrl), termsUrl = safeUrl(s.termsUrl);
+  return {
+    status: s.status ?? "loading",
+    ownerLine: s.ownerLine ?? "",
+    versionLine: s.versionLine ?? "",
+    error: s.error ?? "",
+    supportUrl, privacyUrl, termsUrl,
+    noSupport: !supportUrl, noPrivacy: !privacyUrl, noTerms: !termsUrl,
+  };
+}

package/templates/community-club-owner/tier5-src/_shared/owner-preview-demo.ts

@@ -18,6 +18,27 @@ export const DEMO_NOTE =
 
 export const DEMO_SAVE_NOTE = "Demo mode — changes aren’t saved in this preview.";
 
+/** The state patch for a write refused because this is the demo preview. A demo
+ *  refusal is a MODE, not an error: no red error line — the neutral info banner
+ *  (already on screen before the owner typed anything) switches to the save
+ *  note, so the tap still visibly answers. `saveNote` is the (copy-pack) text. */
+export function demoRefusalPatch(saveNote: string = DEMO_SAVE_NOTE): { status: "idle"; error: ""; savedMessage: ""; demoNote: string } {
+  return { status: "idle", error: "", savedMessage: "", demoNote: saveNote || DEMO_SAVE_NOTE };
+}
+
+/** "€1,234.50" / "12,50" / " 10 " → "1234.50" / "12.50" / "10": digits and one
+ *  decimal point — what an editable price field accepts and a price write needs.
+ *  A separator followed by exactly 1–2 digits is the decimal; any other groups. */
+export function editablePrice(raw: string): string {
+  const t = raw.replace(/[^\d.,]/g, "");
+  if (!t) return "";
+  const lastSep = Math.max(t.lastIndexOf("."), t.lastIndexOf(","));
+  if (lastSep >= 0 && /^\d{1,2}$/.test(t.slice(lastSep + 1))) {
+    return `${t.slice(0, lastSep).replace(/[.,]/g, "")}.${t.slice(lastSep + 1)}`;
+  }
+  return t.replace(/[.,]/g, "");
+}
+
 export const DEMO_IDS = ["demo-1", "demo-2", "demo-3"] as const;
 
 export interface DemoProduct {

package/templates/community-club-owner/tier5-src/himi-owner-lite-account/index.ts

@@ -0,0 +1,68 @@
+// Tier-5 bundle: __HIMI_APP_NAME__ — Account.
+//
+// The Account screen used to be a static SDUI descriptor whose subtitle was the
+// literal "Wix owner (user)" — a role string, not a person. A descriptor cannot
+// know who is signed in; a worker can. This one reads:
+//   • the signed-in Wix user (`getMyData`, the same users.wix.com read
+//     wix-owner-profile uses) → "Name · email" under the title;
+//   • the app's real version through @himalaya/app-info (never a baked literal,
+//     which goes stale the moment the binary is bumped);
+//   • the help / privacy / terms links, which arrive as onAppear params baked
+//     from provisioning.json `identity` — so a branded template ships ITS links,
+//     and `openLink` can only ever open one of those three URLs.
+//
+// Every read is best-effort: an identity or version the host cannot answer
+// collapses its line rather than rendering an error on a settings screen.
+
+import { defineService } from "@himalaya/state";
+import { getMyData } from "@himalaya/wix-users";
+import { displayVersion } from "@himalaya/app-info";
+import { open } from "@himalaya/open-url";
+import { stashCopy, copyTemplate } from "../_shared/himi-copy.js";
+import { ownerLineOf, shapeAccount, type AccountState } from "../_shared/owner-account.js";
+
+type LinkKind = "support" | "privacy" | "terms";
+
+const obj = (v: unknown): Record<string, unknown> => (v && typeof v === "object" ? v as Record<string, unknown> : {});
+
+const svc = defineService<AccountState, {
+  load: (s: AccountState, arg?: unknown) => Promise<AccountState>;
+  openLink: (s: AccountState, arg?: unknown) => Promise<AccountState>;
+}>("himiOwnerLiteAccount", {
+  state: shapeAccount({}),
+  actions: {
+    load: async (s, arg) => {
+      stashCopy(arg);
+      const p = obj(arg);
+      const links = { supportUrl: String(p.supportUrl ?? s.supportUrl), privacyUrl: String(p.privacyUrl ?? s.privacyUrl), termsUrl: String(p.termsUrl ?? s.termsUrl) };
+      let ownerLine = "";
+      // Why the identity line is missing, when it is. Kept in state (the failure is
+      // modelled, not swallowed) but not painted: a settings screen that cannot name
+      // its owner still works, so the line collapses rather than showing an error.
+      let error: string = "";
+      try {
+        const d = await getMyData();
+        // The PROFILE name only — never the userName handle, an account nickname
+        // ("apptestercoowner"): exactly the kind of placeholder this line replaces.
+        const name = [d.profile?.firstName, d.profile?.lastName].filter(Boolean).join(" ");
+        ownerLine = ownerLineOf(name, String(d.email || d.contactEmail || ""));
+      } catch (e) {
+        error = String((e as Error)?.message ?? e);
+      }
+      let versionLine = "";
+      try {
+        const v = await displayVersion();
+        versionLine = v ? copyTemplate("ownerAccount.version", "Version {version}", { version: v }) : "";
+      } catch { /* host without app_info — the row collapses */ }
+      return shapeAccount({ ...s, ...links, status: "ready", ownerLine, versionLine, error });
+    },
+    openLink: async (s, arg) => {
+      const kind = String(obj(arg).kind ?? arg ?? "") as LinkKind;
+      const url = kind === "support" ? s.supportUrl : kind === "privacy" ? s.privacyUrl : kind === "terms" ? s.termsUrl : "";
+      if (url) await open(url);
+      return s;
+    },
+  },
+});
+
+export { svc };

package/templates/community-club-owner/tier5-src/himi-owner-lite-ask/index.ts

@@ -111,7 +111,8 @@ const STARTER: Node = {
             props: {
               title: "Ask about your business",
               subtitle: "Try “which products are out of stock”, “unpaid orders”, or “what's coming up”.",
-              icon: "search",
+              // Not `search`: Ask is not search, and a magnifier says it is.
+              icon: "ai",
             },
           },
         },
@@ -129,7 +130,7 @@ const enc = (n: Node): string => encodeSubtree(n as unknown as Parameters<typeof
 const initialState: AskState = {
   status: "idle",
   intent: "",
-  headline: "Ask",
+  headline: "",
   note: "",
   customerNotice: "",
   repairs: "",
@@ -267,7 +268,7 @@ function failed(state: AskState, headline: string, note: string): AskState {
           body: {
             package: "himalaya",
             type: "EmptyState",
-            props: { title: headline, subtitle: note, icon: "search" },
+            props: { title: headline, subtitle: note, icon: "ai" },
           },
         }],
       },

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

@@ -10,7 +10,7 @@ import { defineService } from "@himalaya/state";
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent, eventDescription } from "../_shared/himi-events.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
-import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
+import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { get as dbGet, upsert as dbUpsert, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
 
@@ -113,6 +113,12 @@ function shape(s: Partial<EventFormState>): EventFormState {
 
 const startMode: Mode = "edit";
 
+
+/** A demo-preview write refusal: see demoRefusalPatch (a mode, not an error). */
+function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
+  return shape({ ...s, ...demoRefusalPatch(copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE)) });
+}
+
 const svc = defineService<EventFormState, {
   load: (s: EventFormState, arg?: unknown) => Promise<EventFormState>;
   submit: (s: EventFormState, values?: Record<string, unknown>) => Promise<EventFormState>;
@@ -185,7 +191,7 @@ const svc = defineService<EventFormState, {
       }
     },
     submit: async (s, values) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+      if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
       const title = String(v.title ?? s.title).trim();
       const description = String(v.description ?? s.description).trim();
@@ -221,7 +227,7 @@ const svc = defineService<EventFormState, {
           // Demo / web-preview (no owner bridge; the record came from demo sample
           // data, marked by demoNote): a queued write could never replay, so answer
           // with the demo save note instead of the real-offline write-behind.
-          if (s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE), savedMessage: "" });
+          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.himiOwnerLiteEventForm.submit", { id: s.id, title, description });

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

@@ -9,7 +9,7 @@ import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
 import { defineService } from "@himalaya/state";
 import { getDraftPost, createDraftPost, updateDraftPost, type WixDraftPostWrite, type WixRichContent } from "@himalaya/wix-blog";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
-import { DEMO_POSTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
+import { DEMO_POSTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
 
@@ -127,6 +127,12 @@ function shape(s: Partial<PostFormState>): PostFormState {
 
 const startMode: Mode = initialInput.mode === "edit" || initialInput.id ? "edit" : "create";
 
+
+/** A demo-preview write refusal: see demoRefusalPatch (a mode, not an error). */
+function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
+  return shape({ ...s, ...demoRefusalPatch(copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE)) });
+}
+
 const svc = defineService<PostFormState, {
   load: (s: PostFormState, arg?: unknown) => Promise<PostFormState>;
   setCover: (s: PostFormState, arg?: unknown) => PostFormState;
@@ -140,7 +146,7 @@ const svc = defineService<PostFormState, {
       // 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: "" });
+      if (!id) return shape({ ...s, mode: "create", id: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_POSTS.find((x) => x.id === id);
           if (d) {
@@ -203,7 +209,7 @@ const svc = defineService<PostFormState, {
       return shape({ ...s, coverUrl, error: "" });
     },
     submit: async (s, values) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+      if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
       const title = String(v.title ?? s.title).trim();
       const excerpt = String(v.excerpt ?? s.excerpt).trim();
@@ -272,7 +278,7 @@ const svc = defineService<PostFormState, {
           // Demo / web-preview (no owner bridge; the record came from demo sample
           // data, marked by demoNote): a queued write could never replay, so answer
           // with the demo save note instead of the real-offline write-behind.
-          if (s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE), savedMessage: "" });
+          if (s.demoNote) return demoRefusal(s);
           // Real device offline: cache and queue the edit for reconnect.
           await cachePut(localRow(localId));
           await queueWrite("tier5.himiOwnerLitePostForm.submit", { id: targetId, title, excerpt, body, coverUrl, coverChanged: String(coverChanged), preserveBody: String(preserveBody), isFeatured: String(isFeatured), mode: editing ? "edit" : "create" });

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

@@ -18,7 +18,7 @@ import {
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
 import { plainText } from "../_shared/himi-store.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
-import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.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";
 
 type Mode = "create" | "edit";
@@ -95,9 +95,14 @@ function boolString(value: unknown, fallback: string): string {
 // fall back to the raw numeric if the formatted string is missing.
 function priceOf(p: WixProduct): string {
   const pr = (p as any).price;
-  return (pr?.formatted?.price || (pr?.price != null ? String(pr.price) : "")) as string;
+  // The field is EDITABLE and renderer-validated as an amount, so prefill the
+  // raw number — never the display string ("€10.00"), which would fail the rule
+  // and disable Save before the owner typed anything.
+  if (typeof pr?.price === "number" && Number.isFinite(pr.price)) return pr.price.toFixed(2);
+  return editablePrice(String(pr?.formatted?.price ?? pr?.price ?? ""));
 }
 
+
 function shape(s: Partial<ProductFormState>): ProductFormState {
   const mode: Mode = s.mode ?? "create";
   const id = typeof s.id === "string" ? s.id : "";
@@ -128,6 +133,12 @@ function shape(s: Partial<ProductFormState>): ProductFormState {
 
 const startMode: Mode = initialInput.mode === "edit" || initialInput.id ? "edit" : "create";
 
+
+/** A demo-preview write refusal: see demoRefusalPatch (a mode, not an error). */
+function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
+  return shape({ ...s, ...demoRefusalPatch(copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE)) });
+}
+
 const svc = defineService<ProductFormState, {
   load: (s: ProductFormState, arg?: unknown) => Promise<ProductFormState>;
   submit: (s: ProductFormState, values?: Record<string, unknown>) => Promise<ProductFormState>;
@@ -141,13 +152,13 @@ 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: "" });
+      if (!id) return shape({ ...s, mode: "create", id: "", 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: d.price.replace(/[^\d.]/g, ""), sku: d.sku, description: d.description,
+              name: d.name, price: editablePrice(d.price), sku: d.sku, description: d.description,
               visible: d.visible ? "true" : "false",
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
@@ -178,7 +189,7 @@ const svc = defineService<ProductFormState, {
         if (cached) {
           return shape({
             ...s, mode: "edit", id, heading: "Edit product",
-            name: String(cached.name ?? ""), price: String(cached.price ?? ""), sku: String(cached.sku ?? ""),
+            name: String(cached.name ?? ""), price: editablePrice(String(cached.price ?? "")), sku: String(cached.sku ?? ""),
             visible: cached.visible === "false" ? "false" : "true",
             status: "idle", error: "", savedMessage: "",
           });
@@ -188,7 +199,7 @@ const svc = defineService<ProductFormState, {
           if (d) {
             return shape({
               ...s, mode: "edit", id, heading: copyParam("ownerProductForm.headingEdit", "Edit product"),
-              name: d.name, price: d.price.replace(/[^\d.]/g, ""), sku: d.sku, description: d.description,
+              name: d.name, price: editablePrice(d.price), sku: d.sku, description: d.description,
               visible: d.visible ? "true" : "false",
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
@@ -198,17 +209,22 @@ const svc = defineService<ProductFormState, {
       }
     },
     submit: async (s, values) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+      if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
       const name = String(v.name ?? s.name).trim();
-      const price = String(v.price ?? s.price).trim();
+      const rawPrice = String(v.price ?? s.price).trim();
+      // "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();
       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);
-      if (!price || !Number.isFinite(priceNum)) {
-        return shape({ ...s, name, price, sku, description, visible: visible ? "true" : "false", status: "error", error: copyParam("ownerProductForm.priceInvalid", "Enter a valid price (a number)."), savedMessage: "" });
+      // The renderer already blocks these (declarative `validation`); this is the
+      // worker's own guard for a host or queue replay that skips it. Checked on the
+      // RAW value, so "-5" is refused rather than normalized into "5".
+      if (!/^\d+([.,]\d{1,2})?$/.test(rawPrice) || !Number.isFinite(priceNum)) {
+        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 = {
@@ -254,7 +270,7 @@ const svc = defineService<ProductFormState, {
           // Demo / web-preview (no owner bridge; the record came from DEMO_PRODUCTS,
           // marked by demoNote): a queued write could never replay, so answer with
           // the demo save note instead of the real-offline write-behind.
-          if (s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE), savedMessage: "" });
+          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, visible: String(visible), mode: s.mode });
@@ -269,7 +285,7 @@ const svc = defineService<ProductFormState, {
       }
     },
     remove: async (s) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+      if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerProductForm.errorNoDelete", "No product to delete."), savedMessage: "" });
       // Optimistic local delete — the list drops the row immediately.
       await cacheDrop(s.id);
@@ -278,7 +294,7 @@ const svc = defineService<ProductFormState, {
         return shape({ ...s, id: "", status: "saved", error: "", savedMessage: copyParam("ownerProductForm.deletedMessage", "Product deleted."), savedId: "" });
       } catch (e) {
         if (shouldQueueOwnerWrite(e)) {
-          if (s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE), savedMessage: "" });
+          if (s.demoNote) return demoRefusal(s);
           await queueWrite("tier5.himiOwnerLiteProductForm.remove", { id: s.id });
           return shape({ ...s, id: "", status: "saved", error: "", savedMessage: copyParam("ownerProductForm.deletedOffline", "Deleted offline — will sync when you reconnect."), savedId: "" });
         }

package/templates/events-meetups/dev/index.ts

@@ -6889,7 +6889,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiEvents.collectionSave",
@@ -6961,7 +6961,7 @@ const SCREENS = runtimeSetting({
                                           "rowSwipeActions": {
                                             "trailing": [
                                               {
-                                                "label": "Save / unsave",
+                                                "label": "$item.collectionSaveLabel",
                                                 "icon": "bookmark",
                                                 "action": {
                                                   "actionId": "tier5.himiEvents.collectionSave",
@@ -7245,7 +7245,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiEvents.collectionSave",
@@ -7564,7 +7564,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiEvents.collectionSave",
@@ -7636,7 +7636,7 @@ const SCREENS = runtimeSetting({
                                           "rowSwipeActions": {
                                             "trailing": [
                                               {
-                                                "label": "Save / unsave",
+                                                "label": "$item.collectionSaveLabel",
                                                 "icon": "bookmark",
                                                 "action": {
                                                   "actionId": "tier5.himiEvents.collectionSave",
@@ -7920,7 +7920,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiEvents.collectionSave",
@@ -8611,7 +8611,7 @@ const SCREENS = runtimeSetting({
                                                                   },
                                                                   {
                                                                     "id": "save",
-                                                                    "label": "Save / unsave",
+                                                                    "label": "$item.collectionSaveLabel",
                                                                     "icon": "bookmark",
                                                                     "action": {
                                                                       "actionId": "tier5.himiEvents.collectionSave",
@@ -10157,7 +10157,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiBlogFeed.collectionSave",
@@ -10239,7 +10239,7 @@ const SCREENS = runtimeSetting({
                                           "rowSwipeActions": {
                                             "trailing": [
                                               {
-                                                "label": "Save / unsave",
+                                                "label": "$item.collectionSaveLabel",
                                                 "icon": "bookmark",
                                                 "action": {
                                                   "actionId": "tier5.himiBlogFeed.collectionSave",
@@ -10504,7 +10504,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiBlogFeed.collectionSave",
@@ -10794,7 +10794,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiBlogFeed.collectionSave",
@@ -10876,7 +10876,7 @@ const SCREENS = runtimeSetting({
                                           "rowSwipeActions": {
                                             "trailing": [
                                               {
-                                                "label": "Save / unsave",
+                                                "label": "$item.collectionSaveLabel",
                                                 "icon": "bookmark",
                                                 "action": {
                                                   "actionId": "tier5.himiBlogFeed.collectionSave",
@@ -11141,7 +11141,7 @@ const SCREENS = runtimeSetting({
                                                                             },
                                                                             {
                                                                               "id": "save",
-                                                                              "label": "Save / unsave",
+                                                                              "label": "$item.collectionSaveLabel",
                                                                               "icon": "bookmark",
                                                                               "action": {
                                                                                 "actionId": "tier5.himiBlogFeed.collectionSave",
@@ -11782,7 +11782,7 @@ const SCREENS = runtimeSetting({
                                                                   },
                                                                   {
                                                                     "id": "save",
-                                                                    "label": "Save / unsave",
+                                                                    "label": "$item.collectionSaveLabel",
                                                                     "icon": "bookmark",
                                                                     "action": {
                                                                       "actionId": "tier5.himiBlogFeed.collectionSave",
@@ -13217,7 +13217,7 @@ const SCREENS = runtimeSetting({
                                                                     },
                                                                     {
                                                                       "id": "save",
-                                                                      "label": "Save / unsave",
+                                                                      "label": "$item.collectionSaveLabel",
                                                                       "icon": "bookmark",
                                                                       "action": {
                                                                         "actionId": "tier5.himiBrandedGroups.collectionSave",
@@ -13289,7 +13289,7 @@ const SCREENS = runtimeSetting({
                                   "rowSwipeActions": {
                                     "trailing": [
                                       {
-                                        "label": "Save / unsave",
+                                        "label": "$item.collectionSaveLabel",
                                         "icon": "bookmark",
                                         "action": {
                                           "actionId": "tier5.himiBrandedGroups.collectionSave",
@@ -13554,7 +13554,7 @@ const SCREENS = runtimeSetting({
                                                                     },
                                                                     {
                                                                       "id": "save",
-                                                                      "label": "Save / unsave",
+                                                                      "label": "$item.collectionSaveLabel",
                                                                       "icon": "bookmark",
                                                                       "action": {
                                                                         "actionId": "tier5.himiBrandedGroups.collectionSave",
@@ -13828,7 +13828,7 @@ const SCREENS = runtimeSetting({
                                                                     },
                                                                     {
                                                                       "id": "save",
-                                                                      "label": "Save / unsave",
+                                                                      "label": "$item.collectionSaveLabel",
                                                                       "icon": "bookmark",
                                                                       "action": {
                                                                         "actionId": "tier5.himiBrandedGroups.collectionSave",
@@ -13900,7 +13900,7 @@ const SCREENS = runtimeSetting({
                                   "rowSwipeActions": {
                                     "trailing": [
                                       {
-                                        "label": "Save / unsave",
+                                        "label": "$item.collectionSaveLabel",
                                         "icon": "bookmark",
                                         "action": {
                                           "actionId": "tier5.himiBrandedGroups.collectionSave",
@@ -14165,7 +14165,7 @@ const SCREENS = runtimeSetting({
                                                                     },
                                                                     {
                                                                       "id": "save",
-                                                                      "label": "Save / unsave",
+                                                                      "label": "$item.collectionSaveLabel",
                                                                       "icon": "bookmark",
                                                                       "action": {
                                                                         "actionId": "tier5.himiBrandedGroups.collectionSave",
@@ -14789,7 +14789,7 @@ const SCREENS = runtimeSetting({
                                                           },
                                                           {
                                                             "id": "save",
-                                                            "label": "Save / unsave",
+                                                            "label": "$item.collectionSaveLabel",
                                                             "icon": "bookmark",
                                                             "action": {
                                                               "actionId": "tier5.himiBrandedGroups.collectionSave",

package/templates/events-meetups/tier5-src/_shared/collection-contract.ts

@@ -168,6 +168,8 @@ export function projectCollection(source: CollectionRow[], config: CollectionCon
     items: visible.map(row => ({ ...row, collectionId: collectionId(row), collectionTitle: collectionTitle(row, config),
       collectionMeta: [...new Set((config.metadata ?? ['total', 'statusLabel', 'price', 'priceLine', 'dateLine', 'meta']).filter(key => key !== config.subtitle).map(key => scalar(row[key])).filter(Boolean))].join(' · '),
       collectionSelectLabel: prefs.selectedIds.includes(collectionId(row)) ? 'Selected' : 'Select',
+      // The save toggle names the action it WILL take (the service localizes it).
+      collectionSaveLabel: prefs.savedIds.includes(collectionId(row)) ? 'Remove from saved' : 'Save',
       collectionSubtitle: scalar(row[config.subtitle ?? '']) || scalar(row.subtitle) || scalar(row.description) || scalar(row.meta),
       collectionImage: scalar(row[config.image ?? '']), collectionNoImage: !scalar(row[config.image ?? '']), collectionHasImage: !!scalar(row[config.image ?? '']),
       collectionSaved: prefs.savedIds.includes(collectionId(row)), collectionNotSaved: !prefs.savedIds.includes(collectionId(row)), collectionSelected: prefs.selectedIds.includes(collectionId(row)),