@wix/himalaya-cli 0.1573.0 → 0.1575.0

package/guides/qa-builds.md

@@ -1193,7 +1193,8 @@ himi dist --app <app> --platform android --aab --wait --target bo
   activates a draft release: `GET /v1/admin/site/store-build-check?app=&site=[&shell=]` answers
   `200 { ok: true, android: { packageName } }` or the same refusals, through `CheckIfBuildIsAllowed`,
   so it locks nothing. It names no release, so it cannot give
-  `409 release_predates_store_builds`; a draft the editor just built is on a current commit. It never
+  `409 release_predates_store_builds`; a draft the editor just built is on a current commit. It is
+  not sent the App name and icon either, so it cannot give their refusals (below). It never
   falls back to the locking call.
 - **A Containers app's TestFlight build is an App Store build.** For an app bound to a Wix site,
   `--platform ios --destination testflight --version <x.y.z>` with no `--signing` builds the app for
@@ -1226,6 +1227,25 @@ himi dist --app <app> --platform android --aab --wait --target bo
   502 (the prepared files failed Himalaya's checks, the check's code in `reason`: a fix on Wix's
   side, not a retry), `store_builds_unavailable` 503. A named `--signing byo` keeps the
   customer-signed path above, from the site's legacy BuildSecrets.
+- **A store build ships under the owner's App name and icon.** Both store builds above (a Containers
+  app's `--aab` and its TestFlight build) need `appName` and `appIconUrl` on `POST /v1/admin/dist`
+  (`himi dist --app-name <name> --app-icon-url <url>`): the App name and App icon the owner set in
+  the Containers editor, which the Containers server reads off the project and sends. They win over
+  the release's app-config `name` and icon, which the generation agent picked. Any other build
+  takes them too when they are sent, and keeps the release's when they aren't. The name is trimmed,
+  1 to 200 characters, with no control characters and no `$` (Xcode would expand `$(NAME)` from the
+  pool's environment into the binary), and can't start with `@` or `?` (Android would read it as a
+  resource reference). The icon must be a Wix Media file, exactly
+  `https://static.wixstatic.com/media/<file>`. Its 1024x1024 PNG rendition
+  (`<url>/v1/fill/w_1024,h_1024,al_c,q_100/icon.png`) is fetched and checked last before the store
+  id is locked, and again when the pool reads its contract (`GET /v1/dist/contract`), twice at most.
+  If it can't be read then, the contract answers `503 app_icon_unavailable` and the build fails,
+  rather than baking the release's or the shell's icon. iOS gets the icon re-encoded with no alpha
+  channel, which App Store Connect refuses. The job records `appInfo`, and
+  `GET /v1/owner/rebuild-reasons` reports `app_name` and `app_icon` as `unknown` for such a build.
+  Refusals, each with `code` equal to `error`: `store_build_app_info_missing`, `app_info_incomplete`
+  (one without the other), `invalid_app_name`, `invalid_app_icon_url` and `app_icon_invalid` (not a
+  1024x1024 PNG a platform can use) 400, `app_icon_unavailable` 503 (Wix Media couldn't be read).
 
 **Why the Wix production key, and only for the bundle.** There are two Android keys: the committed
 QA keystore and the Wix production key (WixOne). WixOne is the Play **upload** key every Branded

package/guides/templates.md

@@ -106,8 +106,9 @@ details beside the app:
 | `.himi/himi-test.stub.json` | a typed-journey skeleton per form (every field, then its submit) with `<FILL>` slots |
 
 `bootsOffline` is the consent preflight: it is `false` when any screen's `onAppear` dispatches into
-a worker that can reach Wix or the network, and `bootRequests` names each one. It is static and errs
-on the safe side ("may request"). The commands behind it:
+a worker that can reach Wix or the network, or when a screen boots such a worker that calls an
+action while its module evaluates (`svc.load();` at the top level). `bootRequests` names each one,
+with `trigger: "onAppear"` or `"module-load"`. It is static and errs on the safe side ("may request"). The commands behind it:
 
 ```sh
 himi template recommend --text "a salon where clients book and buy products"   # rank the catalog (or --verticals / --book)

package/guides/testing-himi-apps.md

@@ -267,7 +267,7 @@ render, local browser, zero network. `--no-shots` opts out (sweeps should).
 
 Absence is said, never silent: without the browser the report carries
 `shots.unavailable` and the ledger names the one-time remedy —
-`npx playwright install chromium`. Web fidelity, honestly named: these are the web
+the install command `himi render --png` prints. Web fidelity, honestly named: these are the web
 renderer's pixels; native truth still comes from a device (`himi push` a preview).
 
 Hygiene: a **full** run owns `.himi/shots/` and clears it first, so a deleted screen

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1573.0",
+  "version": "0.1575.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": [
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/server": "^2.0.0",
-    "@rive-app/canvas": "^2.21.0",
+    "@rive-app/canvas": "2.38.3",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
     "cheerio": "^1.0.0",
@@ -71,5 +71,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "39a44e1a057f7d34899d550863397025bfdec7b4f241a6e45b677246"
+  "falconPackageHash": "ddd3e8a75c29cf1fa48b60d543d4ba99be00f7a8a9707e3b6c88e776"
 }

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

@@ -15589,39 +15589,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.qty_minus",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "minus",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Decrease quantity",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.decrement",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "minus",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.decrement",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Decrease quantity",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light"
                                                       }
                                                     },
@@ -15644,39 +15633,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.qty_plus",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "plus",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Increase quantity",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.increment",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "plus",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.increment",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Increase quantity",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light"
                                                       }
                                                     },
@@ -15692,39 +15670,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.save_filled",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "heart_fill",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Remove from wishlist",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.save",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "heart_fill",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.save",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Remove from wishlist",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light",
                                                         "hiddenPath": "$item.notSaved"
                                                       }
@@ -15733,39 +15700,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.save",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "heart",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Add to wishlist",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.save",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "heart",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.save",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Add to wishlist",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light",
                                                         "hiddenPath": "$item.saved"
                                                       }
@@ -15774,39 +15730,28 @@ const SCREENS = runtimeSetting({
                                                       "id": "himi_cart.remove",
                                                       "body": {
                                                         "package": "himalaya",
-                                                        "type": "ZStack",
+                                                        "type": "Button",
                                                         "props": {
-                                                          "alignment": "center",
-                                                          "children": [
-                                                            {
-                                                              "id": "",
-                                                              "body": {
-                                                                "package": "himalaya",
-                                                                "type": "Icon",
-                                                                "props": {
-                                                                  "name": "trash",
-                                                                  "size": 24,
-                                                                  "tint": "textPrimary"
-                                                                }
-                                                              },
-                                                              "modifiers": {
-                                                                "accessibilityRole": "decorative"
-                                                              }
+                                                          "title": "Remove from cart",
+                                                          "action": {
+                                                            "actionId": "tier5.himiStoreCart.remove",
+                                                            "params": {
+                                                              "id": "$item.id"
                                                             }
-                                                          ]
+                                                          },
+                                                          "style": "tertiary",
+                                                          "iconOnly": true,
+                                                          "leadingIcon": "trash",
+                                                          "cornerRadius": 22,
+                                                          "minHeight": 44,
+                                                          "disabledPath": "$service:himiStoreCart.writeBusy"
                                                         }
                                                       },
                                                       "modifiers": {
                                                         "width": 44,
                                                         "height": 44,
-                                                        "onTap": {
-                                                          "actionId": "tier5.himiStoreCart.remove",
-                                                          "params": {
-                                                            "id": "$item.id"
-                                                          }
-                                                        },
-                                                        "accessibilityRole": "button",
                                                         "accessibilityLabel": "Remove from cart",
+                                                        "accessibilityRole": "button",
                                                         "haptic": "light"
                                                       }
                                                     }
@@ -16055,7 +16000,7 @@ const SCREENS = runtimeSetting({
                           "action": {
                             "actionId": "tier5.himiStoreCart.applyPromo"
                           },
-                          "disabledPath": "$service:himiStoreCart.promoBusy"
+                          "disabledPath": "$service:himiStoreCart.writeBusy"
                         }
                       },
                       "modifiers": {
@@ -16112,7 +16057,8 @@ const SCREENS = runtimeSetting({
                                   "iconOnly": true,
                                   "leadingIcon": "close",
                                   "cornerRadius": 22,
-                                  "minHeight": 44
+                                  "minHeight": 44,
+                                  "disabledPath": "$service:himiStoreCart.writeBusy"
                                 }
                               },
                               "modifiers": {
@@ -16246,6 +16192,7 @@ const SCREENS = runtimeSetting({
                   "title": "Checkout",
                   "style": "primary",
                   "fullWidth": true,
+                  "disabledPath": "$service:himiStoreCart.writeBusy",
                   "action": {
                     "actionId": "tier5.himiStoreCart.checkout"
                   }
@@ -41003,15 +40950,31 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
 
 // Live seed-id enumeration: a published release serves only EXACT screens, so
 // `himi push` bakes each templated detail route's CURRENT catalog ids as exact
-// screens via `seedIds`. Anonymous visitor rung against this app's own clientId;
-// best-effort (offline build → no baked details, preview still live-resolves).
+// screens via `seedIds`. Anonymous visitor rung against this app's own clientId — or,
+// for an app bound through the One App visitor identity (`visitorSource: "one-app"`,
+// no client), that site's One App visitor instance. Best-effort (offline build → no
+// baked details, preview still live-resolves).
+async function liveSeedToken(WIX: string): Promise<string | undefined> {
+  const auth = (config as { auth?: { config?: { clientId?: string; visitorSource?: string; metaSiteId?: string } } }).auth?.config;
+  // A One App binding boots as the site's One App visitor, so the seed reads as that visitor too —
+  // even beside a member-login clientId, and never repointed by a stray local WIX_CLIENT_ID.
+  const oneApp = auth?.visitorSource === "one-app";
+  const clientId = oneApp ? "" : process.env.WIX_CLIENT_ID ?? auth?.clientId ?? "";
+  if (clientId && !clientId.startsWith("YOUR_")) {
+    const mint = await fetch(WIX + "/oauth2/token", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ clientId, grantType: "anonymous" }) });
+    return ((await mint.json()) as { access_token?: string }).access_token;
+  }
+  const msid = oneApp ? auth?.metaSiteId ?? "" : "";
+  if (!/^[0-9a-fA-F-]{10,64}$/.test(msid)) return undefined;
+  const mint = await fetch(`https://apps.wix.com/_api/one-app-session-web/v3/businesses/${msid}/signed-instance?signed_instance_type=Visitor`, { headers: { Accept: "application/json" }, redirect: "error" });
+  const visitor = (await mint.json()) as { signedInstance?: string; signedInstanceType?: string };
+  return visitor.signedInstanceType === "Visitor" ? visitor.signedInstance : undefined;
+}
+
 async function liveSeedIds(spec: LiveSeed): Promise<string[]> {
   try {
     const WIX = "https://www.wixapis.com";
-    const clientId = process.env.WIX_CLIENT_ID ?? (config as { auth?: { config?: { clientId?: string } } }).auth?.config?.clientId ?? "";
-    if (!clientId || clientId.startsWith("YOUR_")) return [];
-    const mint = await fetch(WIX + "/oauth2/token", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ clientId, grantType: "anonymous" }) });
-    const token = ((await mint.json()) as { access_token?: string }).access_token;
+    const token = await liveSeedToken(WIX);
     if (!token) return [];
     const res = await fetch(WIX + spec.path, { method: "POST", headers: { Authorization: token, "Content-Type": "application/json" }, body: JSON.stringify(spec.body) });
     const json = (await res.json()) as Record<string, unknown>;

package/templates/beauty-salon/tier5-src/_shared/exclusive-writes.ts

@@ -0,0 +1,66 @@
+import { defineService as register, type ServiceDefinition } from '@himalaya/state';
+
+/** Reject repeated taps until the accepted write's result is committed. A promise
+ * queue alone releases before the host applies the reducer result, so the next
+ * write can still read an old revision/id. The private synchronous reducer below
+ * publishes busy and commits completion through the ordinary service handle;
+ * awaiting that handle guarantees the host has stored the result before unlock.
+ * Skipped actions return undefined, so they cannot roll back the accepted write.
+ */
+export function withExclusiveWrites<S extends object = Record<string, unknown>>(
+  registerService: typeof register, names: readonly string[],
+  options: { prepare?: (action: string, args: readonly unknown[]) => void; coalesce?: readonly string[]; settle?: (before: S, next: S, live: S) => S } = {},
+): typeof register {
+  return ((name: string, definition: ServiceDefinition<Record<string, unknown>>) => {
+    let busy = false;
+    let activeAction = "";
+    let completion = Promise.resolve();
+    let complete = () => {};
+    let handle: { getState(): Record<string, unknown>; exclusiveWriteState(next: Record<string, unknown>): Promise<unknown> };
+    const wrapped: ServiceDefinition<Record<string, unknown>> = {
+      ...definition,
+      state: { ...definition.state, writeBusy: false },
+      notHydrated: [...(definition.notHydrated ?? []), 'writeBusy'],
+      actions: {
+        ...Object.fromEntries(Object.entries(definition.actions ?? {}).map(([action, reduce]) => [action,
+          names.includes(action) ? async (state: Record<string, unknown>, ...args: never[]) => {
+            // Intake request metadata even when its state replacement is skipped.
+            options.prepare?.(action, args);
+            if (busy) {
+              // Repeated initial loads must await the accepted load, so callers
+              // observe its committed rows rather than the initial skeleton.
+              if (activeAction === action && options.coalesce?.includes(action)) await completion;
+              return;
+            }
+            busy = true;
+            activeAction = action;
+            completion = new Promise<void>(resolve => { complete = resolve; });
+            try {
+              await handle.exclusiveWriteState({ ...handle.getState(), writeBusy: true });
+              const next = await reduce(state, ...args);
+              const live = handle.getState();
+              // Non-write actions (for example editing a draft field) can still run
+              // during I/O. Let the owning service preserve those newer edits.
+              const settled = options.settle ? options.settle(state as S, (next ?? live) as S, live as S) : next ?? live;
+              await handle.exclusiveWriteState({ ...settled, writeBusy: false });
+            } catch (error) {
+              await handle.exclusiveWriteState({ ...handle.getState(), writeBusy: false });
+              throw error;
+            } finally {
+              busy = false;
+              complete();
+            }
+          } : reduce,
+        ])),
+        exclusiveWriteState: (_state, next: Record<string, unknown>) => next,
+      },
+    };
+    const registered = registerService(name, wrapped);
+    // Registration preserves this private action, but the dynamic action map
+    // cannot express its payload to the generic service handle.
+    handle = registered as unknown as typeof handle;
+    // Older hosts ignore notHydrated. A fresh worker has no pending write.
+    handle.getState().writeBusy = false;
+    return registered;
+  }) as typeof register;
+}

package/templates/beauty-salon/tier5-src/himi-branded-lite-cart/index.ts

@@ -115,6 +115,7 @@ interface State {
   checkoutHint: string;
   itemCount: number;
   promoCode: string;
+  promoEditRevision: number;
   appliedCode: string;
   appliedLabel: string;
   couponId: string;
@@ -380,11 +381,24 @@ function couponDetails(result: unknown): { id: string; code: string } {
   return { id: coupon?.coupon?.id ?? coupon?.id ?? "", code: coupon?.coupon?.code ?? coupon?.code ?? "" };
 }
 
+import { withExclusiveWrites } from "../_shared/exclusive-writes.js";
+
 let cartPricing: IapCommerce;
 const defineService = withIapPresentation<State>({
-  register: withOnlineWrites(registerState, ["remove", "increment", "decrement", "checkout", "beginPromo", "applyPromo", "removePromo"], { derive, messageFields: action => action.includes("Promo") ? ["promoError"] : ["checkoutHint"] }),
+  register: withExclusiveWrites<State>(withOnlineWrites(registerState, ["remove", "increment", "decrement", "checkout", "beginPromo", "applyPromo", "removePromo"], { derive, messageFields: action => action.includes("Promo") ? ["promoError"] : ["checkoutHint"] }), ["load", "remove", "increment", "decrement", "checkout", "applyPromo", "removePromo", "save"], {
+    prepare: (action, args) => { if (action === "load") stashCopy(args[0]); },
+    coalesce: ["load"],
+    // Full cart reloads share the transaction, since they also replace rows and
+    // reset promo fields. Only setPromo increments the edit revision: beginPromo's internal error reset
+    // must not masquerade as a user edit when a rejected code is retried.
+    settle: (before, next, live) => {
+      if ((before.promoEditRevision ?? 0) === (live.promoEditRevision ?? 0)) return next;
+      return derive({ ...next, promoEditRevision: live.promoEditRevision,
+        ...(next.items.length ? { promoCode: live.promoCode, promoError: live.promoError } : {}) });
+    },
+  }),
   onCreate: commerce => { cartPricing = commerce; },
-  prefix: "cart", transientKeys: ["items", "subtotal", "promoBusy"], contentActions: ["load", "remove", "increment", "decrement"],
+  prefix: "cart", transientKeys: ["items", "subtotal", "promoBusy", "promoEditRevision"], contentActions: ["load", "remove", "increment", "decrement"],
   items: state => state.items.flatMap(row => row.catalogReference?.catalogItemId ? [{ reference: { kind: "storesProduct", id: row.catalogReference.catalogItemId }, commerceDisplayPrice: row.commerceTotal ?? row.total }] : []),
   present: (state, price, allowed) => ({ ...state,
     items: state.items.map(row => ({ ...row, total: row.catalogReference?.catalogItemId ? price(row.catalogReference.catalogItemId, row.commerceTotal ?? row.total) : row.total })),
@@ -404,10 +418,9 @@ const svc = defineService<State, {
   decrement: (state: State, arg?: unknown) => Promise<State>;
   checkout: (state: State) => Promise<State>;
 }>("himiStoreCart", {
-  state: derive({ status: "loading", errorKind: "", items: [], subtotal: "", subtotalLabel: "", emptyText: "", checkoutHint: "", showPaidToast: false, noPaidToast: true, itemCount: 0, promoCode: "", appliedCode: "", appliedLabel: "", couponId: "", promoError: "", promoBusy: false, noPromoError: true, hasCoupon: false, discount: "", noDiscount: true, noCheckoutHint: true, noCoupon: true, isLoading: true, notLoading: false, isErrored: false, notErrored: true, noOfflineError: true, noServerError: true, hideContent: true, noEmpty: true, noItems: true }),
+  state: derive({ status: "loading", errorKind: "", items: [], subtotal: "", subtotalLabel: "", emptyText: "", checkoutHint: "", showPaidToast: false, noPaidToast: true, itemCount: 0, promoCode: "", promoEditRevision: 0, appliedCode: "", appliedLabel: "", couponId: "", promoError: "", promoBusy: false, noPromoError: true, hasCoupon: false, discount: "", noDiscount: true, noCheckoutHint: true, noCoupon: true, isLoading: true, notLoading: false, isErrored: false, notErrored: true, noOfflineError: true, noServerError: true, hideContent: true, noEmpty: true, noItems: true }),
   actions: {
     load: async (state, arg) => {
-      stashCopy(arg);
       // 1) Instant paint from the on-device cache (offline-safe; empty on first-ever run).
       const cached = await readCachedItems();
       const base = cached.length
@@ -423,7 +436,7 @@ const svc = defineService<State, {
           : derive({ ...state, status: "error", errorKind: isOfflineFailure(error) ? "offline" : "server", items: [], subtotal: "", emptyText: copyParam("cart.loadErrorText", "Cart could not load."), checkoutHint: "" });
       }
     },
-    setPromo: (state, arg) => derive({ ...state, promoCode: (typeof arg === "string" ? arg : String((arg as { value?: unknown } | undefined)?.value ?? "")).slice(0, 100), promoError: "" }),
+    setPromo: (state, arg) => derive({ ...state, promoEditRevision: (state.promoEditRevision ?? 0) + 1, promoCode: (typeof arg === "string" ? arg : String((arg as { value?: unknown } | undefined)?.value ?? "")).slice(0, 100), promoError: "" }),
     beginPromo: state => derive({ ...state, promoBusy: true, promoError: "" }),
     applyPromo: async (state): Promise<State> => {
       const code = state.promoCode.trim();