@wix/himalaya-cli 0.1524.0 → 0.1525.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/flows/iap-checkout/src/apple-iap-contract.d.ts

@@ -76,10 +76,14 @@ export type IapEligibility = {
 };
 /** `open`: a pending order the cashier can charge. `granted`: the vertical already gives the
  *  member access, so nothing is sold. */
-export type OrderAttempt = ({
+export type OrderAttempt = (
+/** `placed`: the order was created by this call, so it cannot have a charge yet. Only an adapter
+ *  that never returns an existing order may say so; an order it reuses must be listed first. */
+{
     status: "open";
     cashierOrderId: string;
     verticalRef: VerticalRef;
+    placed?: boolean;
 } | {
     status: "granted";
 } | {

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/flows/iap-checkout/src/cashier-charges.d.ts

@@ -15,6 +15,9 @@ export type AppleIapChargeResult = {
     status: "closed" | "inOtherPayment" | "refused" | "notConfigured" | "invalidResponse" | "unavailable" | "notEnabled" | "sessionChanged";
 };
 export declare function ensureAppleIapCharge(bridge: SessionBoundBridge, route: CashierRoute, orderId: string): Promise<AppleIapChargeResult>;
+/** An order created in this same call has no charges, so List would only cost a round trip. A
+ *  lost answer is still reconciled through List. */
+export declare function chargePlacedOrder(bridge: SessionBoundBridge, route: CashierRoute, orderId: string): Promise<AppleIapChargeResult>;
 export declare function listOrderCharges(bridge: SessionBoundBridge, route: CashierRoute, orderId: string): Promise<{
     status: "ok";
     charges: CashierCharge[];

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap-checkout.mjs

@@ -810,10 +810,23 @@ function enabledPricing(source, deps) {
   let selling = "active";
   let lookupRevision = 0;
   let answeredRoutes;
+  let inFlight;
+  const sharedAnswer = (request) => {
+    const key = JSON.stringify(request);
+    if (inFlight?.key === key) return inFlight.answer;
+    const answer = Promise.resolve(source.mapping.resolve(request));
+    const asked = { key, answer };
+    inFlight = asked;
+    const settle = () => {
+      if (inFlight === asked) inFlight = void 0;
+    };
+    answer.then(settle, settle);
+    return answer;
+  };
   const mapping = {
     resolve: async (request) => {
       const asked = lookupRevision;
-      const answer = await source.mapping.resolve(request);
+      const answer = await sharedAnswer(request);
       if (asked === lookupRevision) answeredRoutes = routesAnswered(answer);
       return answer;
     }
@@ -1570,12 +1583,19 @@ function storesAppleSalesEnabled() {
 
 // ../../stdlib/flows/iap-checkout/src/cashier-charges.ts
 async function ensureAppleIapCharge(bridge, route, orderId) {
-  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
-  if (!orderId) return { status: "invalidResponse" };
+  const invalid = invalidRequest(route, orderId);
+  if (invalid) return invalid;
   const listed = await listOrderCharges(bridge, route, orderId);
   if (listed.status !== "ok") return listed;
   return decideFromCharges(listed.charges) ?? chargeThenReconcile(bridge, route, orderId);
 }
+async function chargePlacedOrder(bridge, route, orderId) {
+  return invalidRequest(route, orderId) ?? chargeThenReconcile(bridge, route, orderId);
+}
+function invalidRequest(route, orderId) {
+  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
+  return orderId ? null : { status: "invalidResponse" };
+}
 async function listOrderCharges(bridge, route, orderId) {
   const answer = await bridge.call("GET", chargesPath(route, orderId));
   if (answer.status !== "ok") return failureOf(answer);
@@ -1892,7 +1912,7 @@ function createWixOrderBackend(deps) {
   async function startOrderFor(sale) {
     const ordered = await orderFor(sale);
     if (isStop(ordered)) return contextResult(sale.catalogRef, ordered);
-    const charged = await chargeFor(sale, ordered, { reordered: false });
+    const charged = await chargeFor(sale, ordered.ref, { reordered: false, placed: ordered.placed });
     if (isStop(charged)) return contextResult(sale.catalogRef, charged);
     return startFor(sale, charged);
   }
@@ -1952,7 +1972,9 @@ function createWixOrderBackend(deps) {
       return true;
     };
     const attempt3 = existing?.cashierOrderId && existing.verticalRef ? await reopenOrOpen(sale, { cashierOrderId: existing.cashierOrderId, verticalRef: existing.verticalRef }) : await sale.adapter.openOrder(sale.item, sale.bridge, beforeCreate);
-    return prevented ?? recordOrder(sale, existing, attempt3);
+    if (prevented) return prevented;
+    const ref = recordOrder(sale, existing, attempt3);
+    return isStop(ref) ? ref : { ref, placed: isPlaced(attempt3) };
   }
   async function reopenOrOpen(sale, order) {
     const reopened = await sale.adapter.reopenOrder(order, sale.bridge);
@@ -1978,7 +2000,7 @@ function createWixOrderBackend(deps) {
     });
   }
   async function chargeFor(sale, ref, options) {
-    const charge = await ensureAppleIapCharge(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
+    const charge = await (options.placed ? chargePlacedOrder : ensureAppleIapCharge)(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
     switch (charge.status) {
       case "pending":
         return persist(sale, { ...ref, stage: "charged", wixTransactionId: charge.transactionId, updatedAt: now() });
@@ -2002,8 +2024,9 @@ function createWixOrderBackend(deps) {
   async function reorder(sale) {
     if (sale.adapter.repeatable) return stopWith("rejected", "orderClosed");
     if (!forget(sale, sale.catalogRef)) return stopWith("rejected", "storageUnavailable");
-    const recorded = recordOrder(sale, void 0, await sale.adapter.openOrder(sale.item, sale.bridge));
-    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true });
+    const attempt3 = await sale.adapter.openOrder(sale.item, sale.bridge);
+    const recorded = recordOrder(sale, void 0, attempt3);
+    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true, placed: isPlaced(attempt3) });
   }
   async function alreadyPaid(sale, ref) {
     const access = await sale.adapter.readAccess(ref.verticalRef ?? {}, sale.bridge);
@@ -2237,6 +2260,9 @@ function unassociatedHold(transaction, updatedAt) {
 function acknowledgementOf(transaction, scopeKey) {
   return { transactionId: transaction.transactionId, productId: transaction.productId, environment: transaction.environment, scopeKey };
 }
+function isPlaced(attempt3) {
+  return attempt3.status === "open" && attempt3.placed === true;
+}
 function refAt(partition, key) {
   return partition.refs().find((ref) => ref.key === key);
 }
@@ -3267,7 +3293,7 @@ async function readAccess3(verticalRef, bridge) {
 async function placedOrder(body, bridge) {
   if (!isObject7(body) || !isNonEmpty3(body.orderId)) return ORDER_REFUSED;
   const verticalRef = { orderId: body.orderId };
-  if (isNonEmpty3(body.paymentGatewayOrderId)) return { status: "open", cashierOrderId: body.paymentGatewayOrderId, verticalRef };
+  if (isNonEmpty3(body.paymentGatewayOrderId)) return { status: "open", cashierOrderId: body.paymentGatewayOrderId, verticalRef, placed: true };
   const access = await readAccess3(verticalRef, bridge);
   if (access === "granted") return GRANTED;
   return access === "sessionChanged" || access === "unavailable" ? { status: access } : ORDER_REFUSED;

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap.mjs

@@ -787,10 +787,23 @@ function enabledPricing(source, deps) {
   let selling = "active";
   let lookupRevision = 0;
   let answeredRoutes;
+  let inFlight;
+  const sharedAnswer = (request) => {
+    const key = JSON.stringify(request);
+    if (inFlight?.key === key) return inFlight.answer;
+    const answer = Promise.resolve(source.mapping.resolve(request));
+    const asked = { key, answer };
+    inFlight = asked;
+    const settle = () => {
+      if (inFlight === asked) inFlight = void 0;
+    };
+    answer.then(settle, settle);
+    return answer;
+  };
   const mapping = {
     resolve: async (request) => {
       const asked = lookupRevision;
-      const answer = await source.mapping.resolve(request);
+      const answer = await sharedAnswer(request);
       if (asked === lookupRevision) answeredRoutes = routesAnswered(answer);
       return answer;
     }

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/screens.mjs

@@ -1352,10 +1352,23 @@ function enabledPricing(source, deps) {
   let selling = "active";
   let lookupRevision = 0;
   let answeredRoutes;
+  let inFlight;
+  const sharedAnswer = (request) => {
+    const key = JSON.stringify(request);
+    if (inFlight?.key === key) return inFlight.answer;
+    const answer = Promise.resolve(source.mapping.resolve(request));
+    const asked = { key, answer };
+    inFlight = asked;
+    const settle = () => {
+      if (inFlight === asked) inFlight = void 0;
+    };
+    answer.then(settle, settle);
+    return answer;
+  };
   const mapping = {
     resolve: async (request) => {
       const asked = lookupRevision;
-      const answer = await source.mapping.resolve(request);
+      const answer = await sharedAnswer(request);
       if (asked === lookupRevision) answeredRoutes = routesAnswered(answer);
       return answer;
     }
@@ -2130,12 +2143,19 @@ function itemPaymentEnabled() {
 
 // ../../stdlib/flows/iap-checkout/src/cashier-charges.ts
 async function ensureAppleIapCharge(bridge, route, orderId) {
-  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
-  if (!orderId) return { status: "invalidResponse" };
+  const invalid = invalidRequest(route, orderId);
+  if (invalid) return invalid;
   const listed = await listOrderCharges(bridge, route, orderId);
   if (listed.status !== "ok") return listed;
   return decideFromCharges(listed.charges) ?? chargeThenReconcile(bridge, route, orderId);
 }
+async function chargePlacedOrder(bridge, route, orderId) {
+  return invalidRequest(route, orderId) ?? chargeThenReconcile(bridge, route, orderId);
+}
+function invalidRequest(route, orderId) {
+  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
+  return orderId ? null : { status: "invalidResponse" };
+}
 async function listOrderCharges(bridge, route, orderId) {
   const answer = await bridge.call("GET", chargesPath(route, orderId));
   if (answer.status !== "ok") return failureOf(answer);
@@ -2452,7 +2472,7 @@ function createWixOrderBackend(deps) {
   async function startOrderFor(sale) {
     const ordered = await orderFor(sale);
     if (isStop(ordered)) return contextResult(sale.catalogRef, ordered);
-    const charged = await chargeFor(sale, ordered, { reordered: false });
+    const charged = await chargeFor(sale, ordered.ref, { reordered: false, placed: ordered.placed });
     if (isStop(charged)) return contextResult(sale.catalogRef, charged);
     return startFor(sale, charged);
   }
@@ -2512,7 +2532,9 @@ function createWixOrderBackend(deps) {
       return true;
     };
     const attempt4 = existing?.cashierOrderId && existing.verticalRef ? await reopenOrOpen(sale, { cashierOrderId: existing.cashierOrderId, verticalRef: existing.verticalRef }) : await sale.adapter.openOrder(sale.item, sale.bridge, beforeCreate);
-    return prevented ?? recordOrder(sale, existing, attempt4);
+    if (prevented) return prevented;
+    const ref = recordOrder(sale, existing, attempt4);
+    return isStop(ref) ? ref : { ref, placed: isPlaced(attempt4) };
   }
   async function reopenOrOpen(sale, order) {
     const reopened = await sale.adapter.reopenOrder(order, sale.bridge);
@@ -2538,7 +2560,7 @@ function createWixOrderBackend(deps) {
     });
   }
   async function chargeFor(sale, ref, options) {
-    const charge = await ensureAppleIapCharge(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
+    const charge = await (options.placed ? chargePlacedOrder : ensureAppleIapCharge)(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
     switch (charge.status) {
       case "pending":
         return persist(sale, { ...ref, stage: "charged", wixTransactionId: charge.transactionId, updatedAt: now() });
@@ -2562,8 +2584,9 @@ function createWixOrderBackend(deps) {
   async function reorder(sale) {
     if (sale.adapter.repeatable) return stopWith("rejected", "orderClosed");
     if (!forget(sale, sale.catalogRef)) return stopWith("rejected", "storageUnavailable");
-    const recorded = recordOrder(sale, void 0, await sale.adapter.openOrder(sale.item, sale.bridge));
-    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true });
+    const attempt4 = await sale.adapter.openOrder(sale.item, sale.bridge);
+    const recorded = recordOrder(sale, void 0, attempt4);
+    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true, placed: isPlaced(attempt4) });
   }
   async function alreadyPaid(sale, ref) {
     const access = await sale.adapter.readAccess(ref.verticalRef ?? {}, sale.bridge);
@@ -2797,6 +2820,9 @@ function unassociatedHold(transaction, updatedAt) {
 function acknowledgementOf(transaction, scopeKey) {
   return { transactionId: transaction.transactionId, productId: transaction.productId, environment: transaction.environment, scopeKey };
 }
+function isPlaced(attempt4) {
+  return attempt4.status === "open" && attempt4.placed === true;
+}
 function refAt(partition, key) {
   return partition.refs().find((ref) => ref.key === key);
 }

package/dist/cli.mjs

@@ -22307,7 +22307,6 @@ function resolveIdiom(tokens2, ctx = {}) {
 var IDIOM_CONTEXTS, UNSAFE_KEYS;
 var init_idiom = __esm({
   "../../core/ts/src/idiom.ts"() {
-    "use strict";
     IDIOM_CONTEXTS = {
       ios: { native: ["ios"] },
       android: { native: ["material"] },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1524.0",
+  "version": "0.1525.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": [
@@ -71,5 +71,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "037d302a249b672119cfc06ca2812967fd324fba0991df155e11cb97"
+  "falconPackageHash": "4d57d913fdf7e7ed0944f6605a9a5093b4fe45fb1efa09885218796d"
 }

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

@@ -93,6 +93,25 @@ function productPolicyBody(product: StoreProduct, kind: "returns" | "shipping"):
  *  DIFFERENT product (drop the picks) from the same product coming back (keep them). */
 let lastLoadedId: string | undefined;
 let productLoadSequence = 0;
+let booting = true;
+let bootLoad: { id: string; state: Promise<S> } | undefined;
+
+/** The host replays the screen's onAppear load right after the module-scope one: that one replay
+ *  joins the boot load instead of reading the product, cart and App Store prices again. Any later
+ *  entry loads afresh, since the cart, the saved flag or a purchase may have changed meanwhile. */
+function joinedLoad(id: string, load: () => Promise<S>): Promise<S> {
+  if (booting) {
+    booting = false;
+    const current = { id, state: load() };
+    bootLoad = current;
+    const settle = () => { if (bootLoad === current) bootLoad = undefined; };
+    current.state.then(settle, settle);
+    return current.state;
+  }
+  const replayed = bootLoad;
+  bootLoad = undefined;
+  return replayed?.id === id ? replayed.state : load();
+}
 
 interface OptionSlots {
   opt1Label: string; opt1Chips: OptionChip[]; opt1Selected: string[]; opt1SelectedId: string; opt1Placeholder: string; noOpt1: boolean;
@@ -576,144 +595,146 @@ const svc = defineService<S, {
     purchasedNote: "",
   }),
   actions: {
-    load: async (s, arg): Promise<S> => {
+    load: (s, arg): Promise<S> => {
       stashCopy(arg);
-      enterCheckout();
-      const sequence = ++productLoadSequence;
-      lastProduct = undefined;
-      const id = inputId();
-      // Storage problems must not prevent browsing or buying a product.
-      let saved = false;
-      try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
-      s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false };
-      // A fresh navigation into the product resets any quantity left over
-      // from a previous visit to the same worker instance.
-      if (!id) {
+      return joinedLoad(inputId(), async (): Promise<S> => {
+        enterCheckout();
+        const sequence = ++productLoadSequence;
         lastProduct = undefined;
-        lastLoadedId = undefined;
-        return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
-      }
-      // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
-      // of after it — it used to add a whole cart round trip before the page could paint.
-      const cartCount = cartItemCount();
-      // The badge must never hold the page: remember the count if it is already in, and
-      // publish it separately if it lands after the product (#3468 review).
-      let cartKnown: number | undefined;
-      void cartCount.then((n) => { cartKnown = n; }, () => {});
-      // The live product read goes out FIRST too — the local-db read below must never delay it.
-      // Settled into a value so a failure is handled where it is awaited, never unhandled.
-      // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
-      const live = getStoreProduct(id, ["DESCRIPTION"]).then(
-        (r) => ({ ok: true as const, r }),
-        () => ({ ok: false as const }),
-      );
-      // Paint at once from the row the list already synced (name, price, image) — the page used
-      // to sit on its skeleton for the product round trip even when the list had just shown it.
-      // The live read then fills in the description and gallery.
-      const synced = await readCachedProduct(id);
-      let painted = false;
-      if (synced && s.status === "loading") {
-        await svc.paintCached(synced);
-        painted = true;
-      }
-      const outcome = await live;
-      if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
-      // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
-      // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
-      // they did — overwriting it would untick a stored save, reset the quantity, and drop the
-      // in-flight add's `adding` guard (a second tap would add the line twice).
-      const base: S = painted ? (svc.getState() as S) : s;
-      const keep = painted
-        ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
-        : { cartHint: "", quantity: 1 };
-      const badge = (): number => {
-        if (painted && (base.adding || base.added)) return base.cartCount;
-        if (cartKnown !== undefined) return cartKnown;
-        const epoch = cartBadgeEpoch;
-        void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
-        return base.cartCount;
-      };
-      if (outcome.ok) {
-        const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
-        const name = cleanTitle(p.name) || "Product";
-        const image = productImage(p, WIX_DETAIL_IMAGE);
-        lastProduct = p;
-        // A group with exactly one choice is chosen for the shopper; a real choice
-        // is left blank so the pick is deliberate.
-        const optionGroups = productOptions(p);
-        const sale = productSale(p);
-        // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
-        // trip to the cart and back silently clears the size the shopper picked and
-        // re-disables the CTA with no explanation. Carry the picks when this is the SAME
-        // product, and only for a choice the product still offers — a stale id would
-        // resolve to no variant and block the cart just as silently.
-        const carried: StoreOptionSelection = {};
-        if (id === lastLoadedId) {
-          for (const g of optionGroups) {
-            const chosen = s.selection[g.id];
-            if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
+        const id = inputId();
+        // Storage problems must not prevent browsing or buying a product.
+        let saved = false;
+        try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
+        s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false };
+        // A fresh navigation into the product resets any quantity left over
+        // from a previous visit to the same worker instance.
+        if (!id) {
+          lastProduct = undefined;
+          lastLoadedId = undefined;
+          return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
+        }
+        // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
+        // of after it — it used to add a whole cart round trip before the page could paint.
+        const cartCount = cartItemCount();
+        // The badge must never hold the page: remember the count if it is already in, and
+        // publish it separately if it lands after the product (#3468 review).
+        let cartKnown: number | undefined;
+        void cartCount.then((n) => { cartKnown = n; }, () => {});
+        // The live product read goes out FIRST too — the local-db read below must never delay it.
+        // Settled into a value so a failure is handled where it is awaited, never unhandled.
+        // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
+        const live = getStoreProduct(id, ["DESCRIPTION"]).then(
+          (r) => ({ ok: true as const, r }),
+          () => ({ ok: false as const }),
+        );
+        // Paint at once from the row the list already synced (name, price, image) — the page used
+        // to sit on its skeleton for the product round trip even when the list had just shown it.
+        // The live read then fills in the description and gallery.
+        const synced = await readCachedProduct(id);
+        let painted = false;
+        if (synced && s.status === "loading") {
+          await svc.paintCached(synced);
+          painted = true;
+        }
+        const outcome = await live;
+        if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
+        // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
+        // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
+        // they did — overwriting it would untick a stored save, reset the quantity, and drop the
+        // in-flight add's `adding` guard (a second tap would add the line twice).
+        const base: S = painted ? (svc.getState() as S) : s;
+        const keep = painted
+          ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
+          : { cartHint: "", quantity: 1 };
+        const badge = (): number => {
+          if (painted && (base.adding || base.added)) return base.cartCount;
+          if (cartKnown !== undefined) return cartKnown;
+          const epoch = cartBadgeEpoch;
+          void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
+          return base.cartCount;
+        };
+        if (outcome.ok) {
+          const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
+          const name = cleanTitle(p.name) || "Product";
+          const image = productImage(p, WIX_DETAIL_IMAGE);
+          lastProduct = p;
+          // A group with exactly one choice is chosen for the shopper; a real choice
+          // is left blank so the pick is deliberate.
+          const optionGroups = productOptions(p);
+          const sale = productSale(p);
+          // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
+          // trip to the cart and back silently clears the size the shopper picked and
+          // re-disables the CTA with no explanation. Carry the picks when this is the SAME
+          // product, and only for a choice the product still offers — a stale id would
+          // resolve to no variant and block the cart just as silently.
+          const carried: StoreOptionSelection = {};
+          if (id === lastLoadedId) {
+            for (const g of optionGroups) {
+              const chosen = s.selection[g.id];
+              if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
+            }
           }
+          lastLoadedId = id;
+          return derive({
+            ...base,
+            ...keep,
+            status: "ready",
+            optionGroups,
+            selection: { ...defaultSelection(optionGroups), ...carried },
+            optionsUnknown: false,
+            name,
+            ...sale,
+            commercePrice: sale.price,
+            skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
+            returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+            shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+            ...productBody(p),
+            image,
+            gallery: productGallery(p),
+            initial: (name[0] || "#").toUpperCase(),
+            shareUrl: productShareUrl(p),
+            cartCount: badge(),
+            emptyText: "",
+          });
+        }
+        // Offline: fall back to the last-synced cached product row before the error state.
+        if (synced) {
+          const name = String(synced.name ?? "") || "Product";
+          const image = String(synced.image ?? "");
+          // The cached list row carries no options, and guessing "none" would offer
+          // a one-tap Add to cart for a product that needs a colour and a size. So
+          // the offline detail shows no picker AND marks the options UNKNOWN, which
+          // keeps `optionsIncomplete` true: the CTA stays disabled and `addToCart`
+          // refuses. `cartHint` carries the reason, because the options card is hidden
+          // on `noOptions` and would otherwise leave a dead button unexplained.
+          lastProduct = undefined;
+          lastLoadedId = undefined;
+          return derive({
+            ...base,
+            ...keep,
+            status: "ready",
+            optionGroups: [],
+            selection: {},
+            optionsUnknown: true,
+            name,
+            price: String(synced.subtitle ?? ""),
+            wasPrice: "",
+            skuLabel: "",
+            returnPolicyBody: "",
+            shippingInfoBody: "",
+            description: "",
+            descriptionJson: "",
+            image,
+            initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
+            cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
+            cartCount: badge(),
+            emptyText: "",
+          });
         }
-        lastLoadedId = id;
-        return derive({
-          ...base,
-          ...keep,
-          status: "ready",
-          optionGroups,
-          selection: { ...defaultSelection(optionGroups), ...carried },
-          optionsUnknown: false,
-          name,
-          ...sale,
-          commercePrice: sale.price,
-          skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
-          returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-          shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-          ...productBody(p),
-          image,
-          gallery: productGallery(p),
-          initial: (name[0] || "#").toUpperCase(),
-          shareUrl: productShareUrl(p),
-          cartCount: badge(),
-          emptyText: "",
-        });
-      }
-      // Offline: fall back to the last-synced cached product row before the error state.
-      if (synced) {
-        const name = String(synced.name ?? "") || "Product";
-        const image = String(synced.image ?? "");
-        // The cached list row carries no options, and guessing "none" would offer
-        // a one-tap Add to cart for a product that needs a colour and a size. So
-        // the offline detail shows no picker AND marks the options UNKNOWN, which
-        // keeps `optionsIncomplete` true: the CTA stays disabled and `addToCart`
-        // refuses. `cartHint` carries the reason, because the options card is hidden
-        // on `noOptions` and would otherwise leave a dead button unexplained.
         lastProduct = undefined;
         lastLoadedId = undefined;
-        return derive({
-          ...base,
-          ...keep,
-          status: "ready",
-          optionGroups: [],
-          selection: {},
-          optionsUnknown: true,
-          name,
-          price: String(synced.subtitle ?? ""),
-          wasPrice: "",
-          skuLabel: "",
-          returnPolicyBody: "",
-          shippingInfoBody: "",
-          description: "",
-          descriptionJson: "",
-          image,
-          initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
-          cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
-          cartCount: badge(),
-          emptyText: "",
-        });
-      }
-      lastProduct = undefined;
-      lastLoadedId = undefined;
-      return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
+        return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
+      });
     },
     // The stepper fires onChange with { value } on every tap; clamp 1–99 and
     // ignore unparsable/garbage args instead of silently zeroing the quantity.