@wix/himalaya-cli 0.1363.0 → 0.1365.0

package/dist/cli.mjs

@@ -7706,6 +7706,7 @@ function resolveTranslation(value, catalog3, sourceCatalog) {
 var BINDING_SIGILS, BINDING_SIGIL_RE, TRANSLATION_PREFIX, TRANSLATION_KEY_RE;
 var init_bindings = __esm({
   "../../core/ts/src/bindings.ts"() {
+    "use strict";
     BINDING_SIGILS = ["service", "flag", "item", "t"];
     BINDING_SIGIL_RE = new RegExp(
       `^\\$(?:${BINDING_SIGILS.filter((s2) => s2 !== "t").join("|")})\\b|^\\$t:`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1363.0",
+  "version": "0.1365.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": "000d7f43b6f442daf4ff499fd016c52ee6a2b3bab69dd868db3b3d71"
+  "falconPackageHash": "ba734484945c55507351443800ba12569f99c00d2324c1d84e355d00"
 }

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

@@ -12222,6 +12222,96 @@ const SCREENS = runtimeSetting({
                 "hiddenPath": "$service:himiBrandedOrders.noEmpty"
               }
             },
+            {
+              "id": "himi_orders.on_site_card",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "bag",
+                          "size": 28,
+                          "tint": "textTertiary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedOrders.emptyText",
+                          "style": "bodyEmphasis",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_orders.on_site",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "View my orders on the site",
+                          "style": "primary",
+                          "action": {
+                            "actionId": "tier5.himiBrandedOrders.openOnSite"
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedOrders.siteHint",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedOrders.noSiteHint"
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 16,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 16,
+                  "bottom": 16
+                },
+                "hiddenPath": "$service:himiBrandedOrders.notOnSite"
+              }
+            },
             {
               "id": "himi_orders.member_gate",
               "body": {

package/templates/beauty-salon/tier5-src/_shared/hosted-checkout.ts

@@ -6,7 +6,8 @@
 //
 // Classic Wix Events tickets and classic Pricing Plans have no ecom checkout: for those the
 // worker names the page by id (`himi.host.memberSitePage`) and the host opens the site's own event or
-// plans page the same way, signed in — where the member picks and pays on the site.
+// plans page the same way, signed in — where the member picks and pays on the site. A member's orders
+// are the same (Wix lists them to no member identity), so My orders opens the site's own page too.
 
 import { dispatch } from "@himalaya/dispatch";
 import { hostSiteFromInput } from "./branded-lite-hosted.js";
@@ -22,7 +23,7 @@ export const HOSTED_SITE_PAGE_ACTION = "himi.host.memberSitePage";
 
 /** A site page a hosted worker may ask its host for — ids only, never a URL: the host reads the URL
  *  from Wix itself and decides whether the member may be signed in there. */
-export type HostedSitePage = { page: "event"; eventId: string } | { page: "plans"; planId?: string };
+export type HostedSitePage = { page: "event"; eventId: string } | { page: "plans"; planId?: string } | { page: "orders" };
 
 /** Whether this worker runs inside a host that opened a site for it. */
 export function isHostedWorker(): boolean {
@@ -63,6 +64,7 @@ export function hostedCheckoutOpener(checkoutId: string): HostOpener {
 export function hostedSitePageOpener(page: HostedSitePage): HostOpener {
   const params: Record<string, string> = page.page === "event"
     ? { page: "event", eventId: page.eventId }
+    : page.page === "orders" ? { page: "orders" }
     : { page: "plans", ...(page.planId ? { planId: page.planId } : {}) };
   return hostOpener(HOSTED_SITE_PAGE_ACTION, params);
 }

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

@@ -5,6 +5,7 @@ import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { formatDateMedium } from "../_shared/engine-intl.js";
 import { orderMember, assertOrderMember, ownedOrderCache, orderAccessDenied, orderAccessChanged, type OrderMember } from "../_shared/member-orders.js";
 import { wixMediaUrl } from "@himalaya/wix-media";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 // Only ownership-tagged rows from this account/business/member can be reused.
 // Legacy untagged cache rows are deliberately ignored. Missing host scope or
@@ -60,6 +61,13 @@ interface State {
   pageError?: boolean;
   loadingMore?: boolean;
   fromCache?: boolean;
+  /** Hosted in a host shell (Spaces), signed in: the member's orders live on the site's own page. */
+  onSite?: boolean;
+  /** A search or filter narrows this page: the list (and its Clear) stays visible beside the on-site card. */
+  narrowed?: boolean;
+  notOnSite?: boolean;
+  siteHint?: string;
+  noSiteHint?: boolean;
 }
 
 function formatDate(value?: string): string {
@@ -129,9 +137,15 @@ function derive(state: State): State {
     isErrored: state.status === "error",
     notErrored: state.status !== "error",
     // A guest gets the shared member gate, not the "Browse products" empty card.
-    noEmpty: state.status !== "ready" || hasRows || state.needsSignIn === true,
+    // Never "No orders" while a next page could still hold one.
+    noEmpty: state.status !== "ready" || hasRows || state.needsSignIn === true || state.onSite === true || !!state.nextCursor,
     noSignIn: state.status !== "ready" || state.needsSignIn !== true,
-    hideList: state.status !== "ready" || state.needsSignIn === true,
+    // The on-site card replaces the list's empty state — except under a search or filter, where the list keeps
+    // its search, filters and Clear, so the member is never stranded behind criteria they cannot clear.
+    hideList: state.status !== "ready" || state.needsSignIn === true || (state.onSite === true && state.narrowed !== true),
+    notOnSite: state.status !== "ready" || state.onSite !== true || state.needsSignIn === true,
+    // Hidden outright when empty: a collapsed text still takes the card's stack spacing.
+    noSiteHint: !state.siteHint,
   };
 }
 
@@ -139,11 +153,15 @@ const FULFILLMENT: Record<string, string> = {
   "Not fulfilled": "NOT_FULFILLED", "Partially fulfilled": "PARTIALLY_FULFILLED", "Fulfilled": "FULFILLED",
 };
 let pageMember: OrderMember | undefined;
+let siteOpenInFlight = false;
+// Whose open failed: the hint belongs to that member and scope only, never to whoever signs in next.
+let siteHintOwner = "";
+const memberKey = (member: { email: string; scope?: string }) => member.email ? `${member.email}\u0000${member.scope ?? ""}` : "";
 let cacheWrite = Promise.resolve();
 const svc = defineBackendCollection("himiBrandedOrders", {
   restorePagesOnLoad: true,
   state: derive({ status: "loading", rows: [], identityLine: "", emptyText: "", isLoading: true,
-    notLoading: false, isErrored: false, notErrored: true, noEmpty: true, hideList: true }),
+    notLoading: false, isErrored: false, notErrored: true, noEmpty: true, hideList: true, siteHint: "" }),
   source: {
     id: (row: OrderRow) => row.id,
     clearOnError: orderAccessDenied,
@@ -153,11 +171,14 @@ const svc = defineBackendCollection("himiBrandedOrders", {
     async fetch(criteria, cursor) {
       const member = await orderMember();
       if (cursor && (!pageMember || member.email !== pageMember.email || member.scope !== pageMember.scope)) throw orderAccessChanged();
-      const metadata = { email: member.email, scope: member.scope, needsSignIn: !member.email, fromCache: false };
+      const narrowed = !!criteria.query.trim() || criteria.filter !== "all";
+      const metadata = { email: member.email, scope: member.scope, needsSignIn: !member.email, fromCache: false, narrowed };
       if (!member.email) return { items: [], nextCursor: "", metadata };
       const query = criteria.query.replace(/^#/, "");
       const validNumber = /^\d+$/.test(query) && Number.isSafeInteger(Number(query));
-      if ((query && !validNumber) || (criteria.filter === "saved" && !criteria.savedIds.length)) return { items: [], nextCursor: "", metadata };
+      if ((query && !validNumber) || (criteria.filter === "saved" && !criteria.savedIds.length)) {
+        return { items: [], nextCursor: "", metadata };
+      }
       const filter: Record<string, unknown> = { "buyerInfo.email": { $eq: member.email } };
       if (query) filter.number = { $eq: Number(query) };
       if (criteria.filter === "saved") filter.id = { $in: criteria.savedIds };
@@ -175,7 +196,8 @@ const svc = defineBackendCollection("himiBrandedOrders", {
         const paging = response.metadata as { hasNext?: boolean; cursors?: { next?: string | null } } | undefined;
         const nextCursor = paging?.cursors?.next ?? "";
         if (paging?.hasNext && !nextCursor) throw new Error("Orders response is missing its next-page cursor");
-        return { items: (response.orders ?? []).filter(order => !!order.id && orderEmail(order) === member.email).map(orderRow), nextCursor, metadata };
+        const items = (response.orders ?? []).filter(order => !!order.id && orderEmail(order) === member.email).map(orderRow);
+        return { items, nextCursor, metadata };
       } catch (error) {
         await assertOrderMember(member);
         // Cached rows never impersonate a backend query or survive access denial.
@@ -195,14 +217,52 @@ const svc = defineBackendCollection("himiBrandedOrders", {
       cacheWrite = cacheWrite.then(() => writeCachedOrders(page.items, member));
     }
     const status = page.status === "idle" ? "loading" : page.status;
+    // Hosted in a host shell as its signed-in member, an empty answer is not proof of no orders: Wix documents
+    // `ecom/v1/orders/search` for a Wix user or app identity only, and answers the member a successful EMPTY list.
+    // So hosted, "No orders" is never claimed — once every page is read (none left to load), whatever the criteria,
+    // the site's own My Orders page is offered, opened by the host (`himi.host.memberSitePage {page:"orders"}`).
+    // Rows Wix does return still list here.
+    const onSite = isHostedWorker() && !!member.email && status === "ready" && !page.items.length && !page.nextCursor
+      && !page.pageError && page.metadata?.fromCache !== true;
     return derive({ ...state, status, rows: page.items, nextCursor: page.nextCursor, complete: page.complete,
       pageError: page.pageError, loadingMore: page.loadingMore, fromCache: page.metadata?.fromCache === true,
       needsSignIn: page.metadata?.needsSignIn === true,
+      onSite,
+      narrowed: page.metadata?.narrowed === true,
+      siteHint: siteHintOwner && siteHintOwner === memberKey(member) && onSite ? state.siteHint : "",
       identityLine: member.email ? copyTemplate("orders.identityLine", "Signed in as {email}", { email: member.email }) : "",
       emptyText: status === "error" ? page.error : !member.email ? copyParam("orders.signInEmptyText", "Sign in to see your orders.")
+        : onSite ? copyParam("orders.onSiteText", "Your orders are on the site.")
         : page.items.length ? "" : copyParam("orders.emptyText", "No orders for this member yet."),
     });
   },
+  actions: {
+    // The site's My Orders page, opened by the host signed in as the lent member where it can (a visitor who
+    // signs in on the site otherwise). Nothing is charged, so the guard only re-checks the member is unchanged.
+    async openOnSite(s: State): Promise<State | undefined> {
+      // One host open at a time: a second tap while the first is in flight would only replace its ticket.
+      if (siteOpenInFlight || s.onSite !== true) return s;
+      siteOpenInFlight = true;
+      let opened: boolean | "withdrawn";
+      let member: OrderMember;
+      try {
+        member = await orderMember();
+        opened = await hostedSitePageOpener({ page: "orders" })(async () => {
+          const now = await orderMember();
+          return now.email === member.email && now.scope === member.scope;
+        });
+      } finally {
+        siteOpenInFlight = false;
+      }
+      // A member who changed while the host worked never inherits this answer.
+      const now = await orderMember();
+      if (memberKey(now) !== memberKey(member)) return undefined;
+      siteHintOwner = opened === false ? memberKey(member) : "";
+      const latest = svc.getState() as unknown as State;
+      return derive({ ...latest, siteHint: opened === false
+        ? copyParam("orders.onSiteFailedText", "The site's orders page could not be opened. Visit the site to see your orders.") : "" });
+    },
+  },
 });
 svc.load();
 export { svc };

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

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {

package/templates/branded-lite/dev/index.ts

@@ -13243,6 +13243,96 @@ const SCREENS = runtimeSetting({
                 "hiddenPath": "$service:himiBrandedOrders.noEmpty"
               }
             },
+            {
+              "id": "himi_orders.on_site_card",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "bag",
+                          "size": 28,
+                          "tint": "textTertiary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedOrders.emptyText",
+                          "style": "bodyEmphasis",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_orders.on_site",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "View my orders on the site",
+                          "style": "primary",
+                          "action": {
+                            "actionId": "tier5.himiBrandedOrders.openOnSite"
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedOrders.siteHint",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedOrders.noSiteHint"
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 16,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 16,
+                  "bottom": 16
+                },
+                "hiddenPath": "$service:himiBrandedOrders.notOnSite"
+              }
+            },
             {
               "id": "himi_orders.member_gate",
               "body": {

package/templates/branded-lite/tier5-src/_shared/hosted-checkout.ts

@@ -6,7 +6,8 @@
 //
 // Classic Wix Events tickets and classic Pricing Plans have no ecom checkout: for those the
 // worker names the page by id (`himi.host.memberSitePage`) and the host opens the site's own event or
-// plans page the same way, signed in — where the member picks and pays on the site.
+// plans page the same way, signed in — where the member picks and pays on the site. A member's orders
+// are the same (Wix lists them to no member identity), so My orders opens the site's own page too.
 
 import { dispatch } from "@himalaya/dispatch";
 import { hostSiteFromInput } from "./branded-lite-hosted.js";
@@ -22,7 +23,7 @@ export const HOSTED_SITE_PAGE_ACTION = "himi.host.memberSitePage";
 
 /** A site page a hosted worker may ask its host for — ids only, never a URL: the host reads the URL
  *  from Wix itself and decides whether the member may be signed in there. */
-export type HostedSitePage = { page: "event"; eventId: string } | { page: "plans"; planId?: string };
+export type HostedSitePage = { page: "event"; eventId: string } | { page: "plans"; planId?: string } | { page: "orders" };
 
 /** Whether this worker runs inside a host that opened a site for it. */
 export function isHostedWorker(): boolean {
@@ -63,6 +64,7 @@ export function hostedCheckoutOpener(checkoutId: string): HostOpener {
 export function hostedSitePageOpener(page: HostedSitePage): HostOpener {
   const params: Record<string, string> = page.page === "event"
     ? { page: "event", eventId: page.eventId }
+    : page.page === "orders" ? { page: "orders" }
     : { page: "plans", ...(page.planId ? { planId: page.planId } : {}) };
   return hostOpener(HOSTED_SITE_PAGE_ACTION, params);
 }

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

@@ -5,6 +5,7 @@ import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { formatDateMedium } from "../_shared/engine-intl.js";
 import { orderMember, assertOrderMember, ownedOrderCache, orderAccessDenied, orderAccessChanged, type OrderMember } from "../_shared/member-orders.js";
 import { wixMediaUrl } from "@himalaya/wix-media";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 // Only ownership-tagged rows from this account/business/member can be reused.
 // Legacy untagged cache rows are deliberately ignored. Missing host scope or
@@ -60,6 +61,13 @@ interface State {
   pageError?: boolean;
   loadingMore?: boolean;
   fromCache?: boolean;
+  /** Hosted in a host shell (Spaces), signed in: the member's orders live on the site's own page. */
+  onSite?: boolean;
+  /** A search or filter narrows this page: the list (and its Clear) stays visible beside the on-site card. */
+  narrowed?: boolean;
+  notOnSite?: boolean;
+  siteHint?: string;
+  noSiteHint?: boolean;
 }
 
 function formatDate(value?: string): string {
@@ -129,9 +137,15 @@ function derive(state: State): State {
     isErrored: state.status === "error",
     notErrored: state.status !== "error",
     // A guest gets the shared member gate, not the "Browse products" empty card.
-    noEmpty: state.status !== "ready" || hasRows || state.needsSignIn === true,
+    // Never "No orders" while a next page could still hold one.
+    noEmpty: state.status !== "ready" || hasRows || state.needsSignIn === true || state.onSite === true || !!state.nextCursor,
     noSignIn: state.status !== "ready" || state.needsSignIn !== true,
-    hideList: state.status !== "ready" || state.needsSignIn === true,
+    // The on-site card replaces the list's empty state — except under a search or filter, where the list keeps
+    // its search, filters and Clear, so the member is never stranded behind criteria they cannot clear.
+    hideList: state.status !== "ready" || state.needsSignIn === true || (state.onSite === true && state.narrowed !== true),
+    notOnSite: state.status !== "ready" || state.onSite !== true || state.needsSignIn === true,
+    // Hidden outright when empty: a collapsed text still takes the card's stack spacing.
+    noSiteHint: !state.siteHint,
   };
 }
 
@@ -139,11 +153,15 @@ const FULFILLMENT: Record<string, string> = {
   "Not fulfilled": "NOT_FULFILLED", "Partially fulfilled": "PARTIALLY_FULFILLED", "Fulfilled": "FULFILLED",
 };
 let pageMember: OrderMember | undefined;
+let siteOpenInFlight = false;
+// Whose open failed: the hint belongs to that member and scope only, never to whoever signs in next.
+let siteHintOwner = "";
+const memberKey = (member: { email: string; scope?: string }) => member.email ? `${member.email}\u0000${member.scope ?? ""}` : "";
 let cacheWrite = Promise.resolve();
 const svc = defineBackendCollection("himiBrandedOrders", {
   restorePagesOnLoad: true,
   state: derive({ status: "loading", rows: [], identityLine: "", emptyText: "", isLoading: true,
-    notLoading: false, isErrored: false, notErrored: true, noEmpty: true, hideList: true }),
+    notLoading: false, isErrored: false, notErrored: true, noEmpty: true, hideList: true, siteHint: "" }),
   source: {
     id: (row: OrderRow) => row.id,
     clearOnError: orderAccessDenied,
@@ -153,11 +171,14 @@ const svc = defineBackendCollection("himiBrandedOrders", {
     async fetch(criteria, cursor) {
       const member = await orderMember();
       if (cursor && (!pageMember || member.email !== pageMember.email || member.scope !== pageMember.scope)) throw orderAccessChanged();
-      const metadata = { email: member.email, scope: member.scope, needsSignIn: !member.email, fromCache: false };
+      const narrowed = !!criteria.query.trim() || criteria.filter !== "all";
+      const metadata = { email: member.email, scope: member.scope, needsSignIn: !member.email, fromCache: false, narrowed };
       if (!member.email) return { items: [], nextCursor: "", metadata };
       const query = criteria.query.replace(/^#/, "");
       const validNumber = /^\d+$/.test(query) && Number.isSafeInteger(Number(query));
-      if ((query && !validNumber) || (criteria.filter === "saved" && !criteria.savedIds.length)) return { items: [], nextCursor: "", metadata };
+      if ((query && !validNumber) || (criteria.filter === "saved" && !criteria.savedIds.length)) {
+        return { items: [], nextCursor: "", metadata };
+      }
       const filter: Record<string, unknown> = { "buyerInfo.email": { $eq: member.email } };
       if (query) filter.number = { $eq: Number(query) };
       if (criteria.filter === "saved") filter.id = { $in: criteria.savedIds };
@@ -175,7 +196,8 @@ const svc = defineBackendCollection("himiBrandedOrders", {
         const paging = response.metadata as { hasNext?: boolean; cursors?: { next?: string | null } } | undefined;
         const nextCursor = paging?.cursors?.next ?? "";
         if (paging?.hasNext && !nextCursor) throw new Error("Orders response is missing its next-page cursor");
-        return { items: (response.orders ?? []).filter(order => !!order.id && orderEmail(order) === member.email).map(orderRow), nextCursor, metadata };
+        const items = (response.orders ?? []).filter(order => !!order.id && orderEmail(order) === member.email).map(orderRow);
+        return { items, nextCursor, metadata };
       } catch (error) {
         await assertOrderMember(member);
         // Cached rows never impersonate a backend query or survive access denial.
@@ -195,14 +217,52 @@ const svc = defineBackendCollection("himiBrandedOrders", {
       cacheWrite = cacheWrite.then(() => writeCachedOrders(page.items, member));
     }
     const status = page.status === "idle" ? "loading" : page.status;
+    // Hosted in a host shell as its signed-in member, an empty answer is not proof of no orders: Wix documents
+    // `ecom/v1/orders/search` for a Wix user or app identity only, and answers the member a successful EMPTY list.
+    // So hosted, "No orders" is never claimed — once every page is read (none left to load), whatever the criteria,
+    // the site's own My Orders page is offered, opened by the host (`himi.host.memberSitePage {page:"orders"}`).
+    // Rows Wix does return still list here.
+    const onSite = isHostedWorker() && !!member.email && status === "ready" && !page.items.length && !page.nextCursor
+      && !page.pageError && page.metadata?.fromCache !== true;
     return derive({ ...state, status, rows: page.items, nextCursor: page.nextCursor, complete: page.complete,
       pageError: page.pageError, loadingMore: page.loadingMore, fromCache: page.metadata?.fromCache === true,
       needsSignIn: page.metadata?.needsSignIn === true,
+      onSite,
+      narrowed: page.metadata?.narrowed === true,
+      siteHint: siteHintOwner && siteHintOwner === memberKey(member) && onSite ? state.siteHint : "",
       identityLine: member.email ? copyTemplate("orders.identityLine", "Signed in as {email}", { email: member.email }) : "",
       emptyText: status === "error" ? page.error : !member.email ? copyParam("orders.signInEmptyText", "Sign in to see your orders.")
+        : onSite ? copyParam("orders.onSiteText", "Your orders are on the site.")
         : page.items.length ? "" : copyParam("orders.emptyText", "No orders for this member yet."),
     });
   },
+  actions: {
+    // The site's My Orders page, opened by the host signed in as the lent member where it can (a visitor who
+    // signs in on the site otherwise). Nothing is charged, so the guard only re-checks the member is unchanged.
+    async openOnSite(s: State): Promise<State | undefined> {
+      // One host open at a time: a second tap while the first is in flight would only replace its ticket.
+      if (siteOpenInFlight || s.onSite !== true) return s;
+      siteOpenInFlight = true;
+      let opened: boolean | "withdrawn";
+      let member: OrderMember;
+      try {
+        member = await orderMember();
+        opened = await hostedSitePageOpener({ page: "orders" })(async () => {
+          const now = await orderMember();
+          return now.email === member.email && now.scope === member.scope;
+        });
+      } finally {
+        siteOpenInFlight = false;
+      }
+      // A member who changed while the host worked never inherits this answer.
+      const now = await orderMember();
+      if (memberKey(now) !== memberKey(member)) return undefined;
+      siteHintOwner = opened === false ? memberKey(member) : "";
+      const latest = svc.getState() as unknown as State;
+      return derive({ ...latest, siteHint: opened === false
+        ? copyParam("orders.onSiteFailedText", "The site's orders page could not be opened. Visit the site to see your orders.") : "" });
+    },
+  },
 });
 svc.load();
 export { svc };

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

@@ -9,7 +9,7 @@ import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@him
 import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
 import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
-import { isHostedWorker } from "../_shared/hosted-checkout.js";
+import { isHostedWorker, hostedSitePageOpener } from "../_shared/hosted-checkout.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
  *  cashier order is paid under (mirrors AppDefId.PRICING_PLANS in Wix's RN apps). */
@@ -186,6 +186,8 @@ let started = false;
 let loading = 0;
 let contentReady = false;
 const joining = new Set<string>();
+/** A hosted paid plan's page is being prepared by the host (one ticket at a time). */
+let hostedPlanOpenInFlight = false;
 const memberSession = hostSessionFromGlobal();
 let regularGeneration = -1;
 let regularAccess = new Set<string>();
@@ -227,9 +229,27 @@ async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: s
   // Hosted inside a host shell (Spaces) a plan cannot be paid in-app: classic Pricing Plans is not on
   // ecom, so the host's member checkout has no checkout to open, and the redirect session needs a
   // headless OAuth client a hosted app does not have. An online order created here would only be
-  // left behind as a DRAFT, so none is — the member joins on the site. A FREE plan has nothing to
-  // pay: its online order activates at once, so it still joins in-app.
+  // left behind as a DRAFT, so none is — the member joins on the site: the HOST opens the site's own
+  // plans page signed in as the lent member (`himi.host.memberSitePage {page:"plans"}`), or this
+  // message stands when it cannot. A FREE plan has nothing to pay: its online order activates at
+  // once, so it still joins in-app.
   if (isHostedWorker() && !row.free) {
+    // One host open at a time: the host keeps a single ticket, so a second plan's prepare would replace the
+    // first's and drop it. The checkout guard is re-read right before the host opens the page.
+    if (hostedPlanOpenInFlight) return "";
+    hostedPlanOpenInFlight = true;
+    let opened: boolean | "withdrawn";
+    try {
+      opened = await hostedSitePageOpener({ page: "plans", planId: row.id })(
+        async () => commerce.pricing.continueCheckoutGuard(reference).allowed);
+    } finally {
+      hostedPlanOpenInFlight = false;
+    }
+    if (generation !== memberSession.current().generation) return "";
+    if (opened === "withdrawn") return "";
+    if (opened === true) {
+      return copyTemplate("plans.continueOnSiteMessage", "Finish joining {name} on the site.", { name: row.name });
+    }
     return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
   }
   try {