@wix/himalaya-cli 0.1565.0 → 0.1566.0

package/dist/cli.mjs

@@ -138916,6 +138916,7 @@ __export(build_exports2, {
   BAKE_OFFLINE_BASE: () => BAKE_OFFLINE_BASE,
   KNOWN_ICON_NAMES: () => KNOWN_ICON_NAMES,
   SOURCEMAP_ON_DEMAND_PATH: () => SOURCEMAP_ON_DEMAND_PATH,
+  SUPPORTED_COMPONENT_MIN_VERSION: () => SUPPORTED_COMPONENT_MIN_VERSION,
   bakeCatalogs: () => bakeCatalogs,
   bakeNeedsLiveOrigin: () => bakeNeedsLiveOrigin,
   bakeWidgets: () => bakeWidgets,
@@ -138928,6 +138929,7 @@ __export(build_exports2, {
   countingHostAnswers: () => countingHostAnswers,
   countingWixCall: () => countingWixCall,
   declaresHostProvidedIdentity: () => declaresHostProvidedIdentity,
+  explicitMinRuntimeVersion: () => explicitMinRuntimeVersion,
   gitSha: () => gitSha,
   isMonorepoCheckout: () => isMonorepoCheckout,
   l10nLintOptions: () => l10nLintOptions,
@@ -138937,6 +138939,7 @@ __export(build_exports2, {
   listBuildableApps: () => listBuildableApps,
   liveRenderServices: () => liveRenderServices,
   maximumBinaryVersion: () => maximumBinaryVersion,
+  navBundleMinBinaryVersion: () => navBundleMinBinaryVersion,
   navLogicBundleUrl: () => navLogicBundleUrl,
   pinBakedServerBaseUrl: () => pinBakedServerBaseUrl,
   pinnedReleaseFromEnv: () => pinnedReleaseFromEnv,
@@ -138947,6 +138950,7 @@ __export(build_exports2, {
   shellSha: () => shellSha,
   snapshotTokens: () => snapshotTokens,
   tokensSnapshotMessage: () => tokensSnapshotMessage,
+  unsupportedComponentMinVersions: () => unsupportedComponentMinVersions,
   withPinnedRelease: () => withPinnedRelease,
   withStoreNavBundle: () => withStoreNavBundle,
   withoutDevOnlyAppConfig: () => withoutDevOnlyAppConfig
@@ -139217,6 +139221,22 @@ function collectComponentTypes(value2, into = /* @__PURE__ */ new Set()) {
   for (const child of Object.values(obj7)) collectComponentTypes(child, into);
   return into;
 }
+function unsupportedComponentMinVersions(value2, into = []) {
+  if (!value2 || typeof value2 !== "object") return into;
+  const obj7 = value2;
+  const isComponent2 = typeof obj7.id === "string" && (obj7.body !== null && typeof obj7.body === "object" || typeof obj7.package === "string" && typeof obj7.type === "string");
+  if (isComponent2 && typeof obj7.minVersion === "number" && obj7.minVersion > SUPPORTED_COMPONENT_MIN_VERSION) {
+    into.push({ id: obj7.id, minVersion: obj7.minVersion });
+  }
+  for (const child of Object.values(obj7)) unsupportedComponentMinVersions(child, into);
+  return into;
+}
+function explicitMinRuntimeVersion(raw) {
+  if (raw === void 0 || raw.trim() === "") return null;
+  const v2 = raw.trim();
+  if (!/^\d+(?:\.\d+){0,2}$/.test(v2)) throw new Error(`invalid --min-runtime-version "${raw}": expected a numeric version like 1.7.0`);
+  return v2;
+}
 function collectNativeComponents(value2, into) {
   if (!value2 || typeof value2 !== "object") return;
   const obj7 = value2;
@@ -139239,6 +139259,21 @@ function maximumBinaryVersion(current, candidate) {
   }
   return current;
 }
+function navBundleMinBinaryVersion(text12) {
+  let cfg;
+  try {
+    cfg = JSON.parse(text12);
+  } catch {
+    return null;
+  }
+  let floor2 = null;
+  for (const ref of [cfg?.app?.logicBundle, cfg?.navigation?.navLogicBundle, cfg?.navLogicBundle]) {
+    if (!ref || typeof ref !== "object") continue;
+    floor2 = maximumBinaryVersion(floor2, ref.minBinaryVersion);
+    floor2 = maximumBinaryVersion(floor2, ref.min_binary_version);
+  }
+  return floor2;
+}
 async function withStoreNavBundle(text12, address) {
   let cfg;
   try {
@@ -139313,7 +139348,8 @@ async function buildRelease(app, dest, opts = {}) {
   return (await buildFromLoaded(loaded, dest, {
     ...tier5Dir ? { tier5Dir } : {},
     ...opts.fetchFace ? { fetchFace: opts.fetchFace } : {},
-    ...opts.keepDevOnlyAppConfig ? { keepDevOnlyAppConfig: true } : {}
+    ...opts.keepDevOnlyAppConfig ? { keepDevOnlyAppConfig: true } : {},
+    ...opts.minRuntimeVersion ? { minRuntimeVersion: opts.minRuntimeVersion } : {}
   })).manifest;
 }
 function countingWixCall(base) {
@@ -139444,6 +139480,13 @@ function readTokensForLint(preloaded) {
 }
 async function buildFromLoaded(preloaded, dest, opts = {}) {
   const app = preloaded.name;
+  const assertComponentMinVersions = (screenId, descriptor) => {
+    const bad2 = unsupportedComponentMinVersions(descriptor);
+    if (!bad2.length) return;
+    throw new Error(
+      `screen ${screenId}: component minVersion is not enforced by any runtime (supported: ${SUPPORTED_COMPONENT_MIN_VERSION}) \u2014 ` + bad2.map((c2) => `${c2.id} asks for ${c2.minVersion}`).join(", ") + `. Declare what the release needs from the runtime as its floor instead: min_binary_version on the logic bundle, or release:build --min-runtime-version.`
+    );
+  };
   const tier5Dir = opts.tier5Dir ?? TIER5_DIR;
   const bundlePath = (name) => {
     const own6 = join28(tier5Dir, `${name}.bundle.js`);
@@ -139630,7 +139673,7 @@ async function buildFromLoaded(preloaded, dest, opts = {}) {
     if (input && typeof input === "object" && !Array.isArray(input)) bundleInputs.set(bundleName, input);
   };
   let handlers;
-  let minBinaryVersion = null;
+  let minBinaryVersion = explicitMinRuntimeVersion(opts.minRuntimeVersion);
   const requiredCapabilities2 = new Set(config.capabilities ?? []);
   const capabilityUsage = {
     app: [...config.capabilities ?? []],
@@ -139869,6 +139912,7 @@ async function buildFromLoaded(preloaded, dest, opts = {}) {
         continue;
       }
       const descriptor = await res.json();
+      assertComponentMinVersions(screenId, descriptor);
       collectNativeComponents(descriptor, requiredNativeComponents);
       let bundleName = null;
       const lb = logicBundleOf(descriptor);
@@ -140039,6 +140083,7 @@ async function buildFromLoaded(preloaded, dest, opts = {}) {
             continue;
           }
           const descriptor = await res.json();
+          assertComponentMinVersions(screenId, descriptor);
           collectNativeComponents(descriptor, requiredNativeComponents);
           let bundleName = null;
           const lb = logicBundleOf(descriptor);
@@ -140164,6 +140209,7 @@ async function buildFromLoaded(preloaded, dest, opts = {}) {
       });
       await store.putAppConfig(app, text12);
       appConfigHash = sha2563(text12);
+      minBinaryVersion = maximumBinaryVersion(minBinaryVersion, navBundleMinBinaryVersion(text12));
       if (collect2?.descriptors) for (const id of linkableScreenIdsFrom(text12)) linkable.add(id);
     }
     const ahRes = await devFetch(`${base}/v1/action-handlers/${encodeURIComponent(app)}`, { headers: { "X-Himalaya-App": app } });
@@ -140369,7 +140415,7 @@ function declaresHostProvidedIdentity(auth) {
   const config = auth?.config;
   return typeof config === "object" && config !== null && config.hostProvided === true;
 }
-var BAKE_OFFLINE_BASE, KNOWN_ICON_NAMES, KNOWN_ICONS, APP_SERVICES_LINT_SCREEN, REPO_ROOT5, TIER5_DIR, requireFromHere, SOURCEMAP_ON_DEMAND_PATH, BAKED_SERVER_BASE_URL, SETTLE_TURNS;
+var BAKE_OFFLINE_BASE, KNOWN_ICON_NAMES, KNOWN_ICONS, APP_SERVICES_LINT_SCREEN, REPO_ROOT5, TIER5_DIR, requireFromHere, SOURCEMAP_ON_DEMAND_PATH, BAKED_SERVER_BASE_URL, SUPPORTED_COMPONENT_MIN_VERSION, SETTLE_TURNS;
 var init_build3 = __esm({
   "../release-build/build.ts"() {
     init_site_view_metadata();
@@ -140413,6 +140459,7 @@ var init_build3 = __esm({
     requireFromHere = createRequire3(import.meta.url);
     SOURCEMAP_ON_DEMAND_PATH = join28(REPO_ROOT5, "core/dev-server/tier5-bundles-src/sourcemap-on-demand.mjs");
     BAKED_SERVER_BASE_URL = "http://baked.himalaya.invalid";
+    SUPPORTED_COMPONENT_MIN_VERSION = 1;
     SETTLE_TURNS = 20;
   }
 });

package/guides/iap-screen-adoption.md

@@ -103,9 +103,12 @@ support." (Wix refused it, so it stays held), `restoreUpToDateText` "Your purcha
 "Couldn't reach the App Store. Try again." (also shown when the host cannot sell). A message belongs
 to the session it ran for: after a sign-in or sign-out the control shows none.
 
-**Not covered yet.** After a reinstall the native managed ledger is gone and its tenant filter hides
-the unfinished transactions, so restore finds none of them until that is fixed; it still re-reads
-access. On iOS `AppStore.sync()` errors are swallowed natively, so a failed sync currently reads as
+**Reinstall.** A reinstall deletes the native managed ledger. In an app's own bound build, an
+unfinished transaction under the app's bundle id is still the app's own, so restore resubmits it.
+In Player or an explicit host, the tenant filter hides those transactions and restore finds none;
+it still re-reads access ([transaction contract](iap-transaction-contract.md#activation-limits-and-compatibility)).
+
+**Not covered yet.** On iOS `AppStore.sync()` errors are swallowed natively, so a failed sync currently reads as
 up to date rather than the error copy.
 
 ## Migrating an existing app copy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1565.0",
+  "version": "0.1566.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": "16b866eb8f71ec4f6b11fd676bbccd286b18aa734527d15c2f337eae"
+  "falconPackageHash": "59d9f7c34824b26777859c276927fa1bde614c8f64c26db04c10bfb3"
 }

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

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/branded-lite/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

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

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/events-meetups/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/gym-fitness/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/nonprofit-cause/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/podcast-creator/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/portfolio-creative/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/restaurant/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/retail-store/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,

package/templates/yoga-studio/tier5-src/himi-store-account/index.ts

@@ -234,6 +234,9 @@ let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
+// iOS can start the arg-less boot load after the appear refresh that asks for the row; the
+// newer boot probe must not land, or be kept, without it.
+let restorePurchasesRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
 let modeSwitches = 0;
 
@@ -246,6 +249,7 @@ function appearBase(): Partial<S> {
     signInScreen: signInScreenRequested,
     standalone: standaloneRequested,
     pollIdentity: pollIdentityRequested,
+    restorePurchases: restorePurchasesRequested,
     ...(pollIdentityRequested ? { _poll: { ...IDENTITY_POLL } } : {}),
   };
 }
@@ -268,6 +272,7 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
+  restorePurchasesRequested ||= s.restorePurchases || strField(arg, "restorePurchases") === "1";
   // The form opens on the mode its route asked for each time it appears, sign-in by
   // default: a pooled worker reopened with the same params must not open on the mode the
   // last visit toggled to.
@@ -652,8 +657,7 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
   // Not the boot load: it never carries the copy, and the appear refresh that does is coming.
   if (strField(arg, "boot") !== "1") headingReady = true;
   const memberAccountLinks = memberAccountLinksRequested;
-  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
-  if (restorePurchases) enterCommerce();
+  if (restorePurchasesRequested) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -681,7 +685,6 @@ async function probe(s: S, arg?: unknown, config: AppearConfig = appearConfig(s,
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
-    restorePurchases,
     ...appearBase(),
     ...config.mode,
     ...config.visit,