@wix/himalaya-cli 0.1208.0 → 0.1210.0

package/templates/gym-fitness-owner/tier5-src/himi-owner-lite-sites/index.ts

@@ -1,18 +1,18 @@
 // Tier-5 bundle: __HIMI_APP_NAME__ — Sites List (multi-site chooser).
 // ACCOUNT-level: `site-list/v2/sites/query` authorizes on the owner wixSession2
 // cookie alone (no per-site signed-instance), so this loads before any business
-// is picked. Each row's `id` IS the site's metaSiteId — the shell's Router reads
-// it as the `business` param and scopes the Wix bridge to it (SiteInstanceStore
-// mints that site's User signed-instance for the management verticals).
+// is picked. Each row's `id` IS the site's metaSiteId — `pick` records the row's
+// name for the chrome and hands the shell a `business`-carrying `replace` onto Home;
+// the shell's Router scopes the Wix bridge to it (SiteInstanceStore mints that site's
+// User signed-instance for the management verticals).
 
 import { defineService } from "@himalaya/state";
 import { querySites, type WixSite } from "@himalaya/wix-site-list";
-import { site } from "@himalaya/wix-platform";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo } from "../_shared/owner-load-error.js";
 import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "../_shared/owner-local-db.js";
-import { forgetCatalogVersion } from "@himalaya/wix-stores";
+import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
 
 // Offline-first (data-offline): the owner's last-synced businesses are the
 // READ-THROUGH cache for the `sites` entity — paint them instantly (works
@@ -139,17 +139,16 @@ async function loadList(s: SitesState): Promise<SitesState> {
   }
 }
 
-function msidFrom(arg: unknown): string {
-  return typeof arg === "string"
-    ? arg
-    : String((arg as { business?: string; id?: string })?.business ?? (arg as { id?: string })?.id ?? "");
+/** The picked row's display name: the row passes it, else it is looked up in the list. */
+function nameFor(s: SitesState, msid: string, passed: string): string {
+  return passed || s.allSites.find((r) => r.id === msid)?.name || "";
 }
 
 const svc = defineService<SitesState, {
   load: (s: SitesState, arg?: unknown) => Promise<SitesState>;
   retry: (s: SitesState) => Promise<SitesState>;
   search: (s: SitesState, arg?: unknown) => Promise<SitesState>;
-  pick: (s: SitesState, arg?: unknown) => Promise<SitesState>;
+  pick: (s: SitesState, arg?: unknown) => SitesState;
 }>("himiOwnerLiteSites", {
   state: shape({ status: "loading" }),
   actions: {
@@ -158,27 +157,11 @@ const svc = defineService<SitesState, {
       return loadList(shape({ ...s, status: "loading" }));
     },
     retry: async (s) => loadList(shape({ ...s, status: "loading" })),
-    // SP-1: worker-callable active-site scoping. A row can dispatch this instead of
-    // the declarative `himi.open{business}` param to scope the wixApi bridge to the
-    // picked business via the wix_platform capability (resolves after the mint), then
-    // the shell navigates to Home. Proves the T5-worker → setActiveSite path.
-    pick: async (s, arg) => {
-      const msid = msidFrom(arg);
-      if (msid) {
-        // Scoping the bridge to another business points it at another SITE, which may
-        // run the other Stores catalog. The resolved version is persisted app-wide and
-        // routes WRITES, which have no 428 retry — so it has to be dropped here, not
-        // just on the consumer-side site picker.
-        //
-        // Cleared on BOTH sides of the await: before, in case native remounts us
-        // before it settles; after, because a read interleaving it would re-resolve
-        // against the bridge that has not been re-scoped yet and re-persist the value
-        // we just dropped.
-        forgetCatalogVersion();
-        await site.setActiveSite(msid);
-        forgetCatalogVersion();
-      }
-      return s;
+    // Picking a business (every Sites row dispatches this): record its name for the
+    // chrome, then reset to the Home root; the shell scopes the bridge.
+    pick: (s, arg) => {
+      const { msid, name } = pickedSite(arg);
+      return pickSite(s, msid, nameFor(s, msid, name));
     },
     search: async (s, arg) => {
       const q = typeof arg === "string" ? arg : String((arg as { value?: string; query?: string })?.value ?? (arg as { query?: string })?.query ?? "");

package/templates/nonprofit-cause-owner/dev/index.ts

@@ -48568,7 +48568,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "__HIMI_APP_NAME__",
+                                  "text": "$service:himiOwnerLiteHome.businessName",
                                   "style": "footnote",
                                   "color": "textSecondary",
                                   "collapseWhenEmpty": true
@@ -50409,7 +50409,8 @@ const SCREENS = runtimeSetting({
           "params": {
             "copy": "{\"ownerHome.acrossBusiness\":\"Across the organisation\",\"ownerHome.briefCta\":\"Show me the gaps\",\"ownerHome.briefSubtitle\":\"Which shifts are still unfilled, how the next fundraiser is tracking, and which update from the field hasn’t gone out.\",\"ownerHome.briefTitle\":\"Where help is needed\",\"ownerHome.errorLabel\":\"Couldn’t load the coordinator view\",\"ownerHome.headerSubtitle\":\"Programme coordinator · this week\",\"ownerHome.openManage\":\"Open programmes\",\"ownerHome.statAppointments\":\"Volunteer shifts filled\",\"ownerHome.statEvents\":\"Drives & fundraisers\",\"ownerHome.statPosts\":\"Field updates\",\"ownerHome.statSites\":\"Organisations\",\"ownerHome.switchBusiness\":\"Switch organisation\"}",
             "homeModules": "[{\"id\":\"attention\",\"label\":\"Needs attention\",\"dataSource\":\"owner-today\",\"emptyWhen\":[\"hideContent\"]},{\"id\":\"schedule\",\"label\":\"Up next\",\"dataSource\":\"owner-schedule\",\"emptyWhen\":[\"hideContent\"]},{\"id\":\"shortcuts\",\"label\":\"Quick actions\",\"dataSource\":\"owner-actions\"},{\"id\":\"metrics\",\"label\":\"Business overview\",\"dataSource\":\"dashboard\",\"emptyWhen\":[\"hideContent\"]},{\"id\":\"brief\",\"label\":\"Daily brief\",\"dataSource\":\"brief\"}]",
-            "enabledSources": "[\"posts\",\"sites\",\"bookings\",\"events\",\"members\",\"reviews\",\"reservations\"]"
+            "enabledSources": "[\"posts\",\"sites\",\"bookings\",\"events\",\"members\",\"reviews\",\"reservations\"]",
+            "businessName": "__HIMI_APP_NAME__"
           }
         }
       }
@@ -50478,7 +50479,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "__HIMI_APP_NAME__",
+                                  "text": "$service:himiOwnerLiteManage.businessName",
                                   "style": "footnote",
                                   "color": "textSecondary",
                                   "collapseWhenEmpty": true
@@ -51649,7 +51650,8 @@ const SCREENS = runtimeSetting({
           "actionId": "tier5.himiOwnerLiteManage.load",
           "params": {
             "areas": "[{\"id\":\"bookings\",\"title\":\"Volunteer roles\",\"subtitle\":\"Services and your schedule\",\"groupId\":\"scheduling\",\"group\":\"Scheduling\",\"screenId\":\"himi_owner_lite_services\",\"icon\":\"calendar\",\"metricKey\":\"services\",\"countLabel\":\"services\"},{\"id\":\"himi_owner_lite_appointments\",\"title\":\"Shifts\",\"subtitle\":\"Your upcoming appointments\",\"groupId\":\"scheduling\",\"group\":\"Scheduling\",\"screenId\":\"himi_owner_lite_appointments\",\"icon\":\"clock\",\"metricKey\":\"appointments\",\"countLabel\":\"appointments\"},{\"id\":\"events\",\"title\":\"Drives & fundraisers\",\"subtitle\":\"Events and attendance\",\"groupId\":\"scheduling\",\"group\":\"Scheduling\",\"screenId\":\"himi_owner_lite_events\",\"icon\":\"calendar\",\"metricKey\":\"events\",\"countLabel\":\"events\"},{\"id\":\"blog\",\"title\":\"Field updates\",\"subtitle\":\"Stories and publishing\",\"groupId\":\"content\",\"group\":\"Content\",\"screenId\":\"himi_owner_lite_posts\",\"icon\":\"newspaper\",\"metricKey\":\"posts\",\"countLabel\":\"posts\",\"createScreenId\":\"himi_owner_lite_post_new\",\"createLabel\":\"Write post\"},{\"id\":\"coupons\",\"title\":\"Coupons\",\"subtitle\":\"Offers, codes and usage\",\"groupId\":\"commerce\",\"group\":\"Commerce\",\"screenId\":\"himi_owner_lite_module_coupons\",\"icon\":\"tag\",\"metricKey\":\"module:coupons\",\"countLabel\":\"coupons\"},{\"id\":\"invoices\",\"title\":\"Invoices\",\"subtitle\":\"Customers, balances and payment status\",\"groupId\":\"commerce\",\"group\":\"Commerce\",\"screenId\":\"himi_owner_lite_module_invoices\",\"icon\":\"document\",\"metricKey\":\"module:invoices\",\"countLabel\":\"invoices\"},{\"id\":\"giftCards\",\"title\":\"Gift cards\",\"subtitle\":\"Balances, recipients and expiration\",\"groupId\":\"commerce\",\"group\":\"Commerce\",\"screenId\":\"himi_owner_lite_module_giftCards\",\"icon\":\"ticket\",\"metricKey\":\"module:giftCards\",\"countLabel\":\"gift cards\"},{\"id\":\"contacts\",\"title\":\"Contacts\",\"subtitle\":\"Your customer relationships\",\"groupId\":\"people-and-community\",\"group\":\"People and community\",\"screenId\":\"himi_owner_lite_module_contacts\",\"icon\":\"person\",\"metricKey\":\"module:contacts\",\"countLabel\":\"contacts\"},{\"id\":\"members\",\"title\":\"Members\",\"subtitle\":\"Membership access and profiles\",\"groupId\":\"people-and-community\",\"group\":\"People and community\",\"screenId\":\"himi_owner_lite_module_members\",\"icon\":\"person\",\"metricKey\":\"module:members\",\"countLabel\":\"members\"},{\"id\":\"groups\",\"title\":\"Groups\",\"subtitle\":\"Communities and conversations\",\"groupId\":\"people-and-community\",\"group\":\"People and community\",\"screenId\":\"himi_owner_lite_module_groups\",\"icon\":\"person\",\"metricKey\":\"module:groups\",\"countLabel\":\"groups\"},{\"id\":\"reviews\",\"title\":\"Reviews\",\"subtitle\":\"Published and pending customer feedback\",\"groupId\":\"people-and-community\",\"group\":\"People and community\",\"screenId\":\"himi_owner_lite_module_reviews\",\"icon\":\"star\",\"metricKey\":\"module:reviews\",\"countLabel\":\"reviews\"},{\"id\":\"plans\",\"title\":\"Plans\",\"subtitle\":\"Pricing, benefits and visibility\",\"groupId\":\"membership-and-learning\",\"group\":\"Membership and learning\",\"screenId\":\"himi_owner_lite_module_plans\",\"icon\":\"bookmark\",\"metricKey\":\"module:plans\",\"countLabel\":\"plans\"},{\"id\":\"subscriptions\",\"title\":\"Subscriptions\",\"subtitle\":\"Member plans and subscription status\",\"groupId\":\"membership-and-learning\",\"group\":\"Membership and learning\",\"screenId\":\"himi_owner_lite_module_subscriptions\",\"icon\":\"bookmark\",\"metricKey\":\"module:subscriptions\",\"countLabel\":\"subscriptions\"},{\"id\":\"programs\",\"title\":\"Programs\",\"subtitle\":\"Learning experiences and participation\",\"groupId\":\"membership-and-learning\",\"group\":\"Membership and learning\",\"screenId\":\"himi_owner_lite_module_programs\",\"icon\":\"play\",\"metricKey\":\"module:programs\",\"countLabel\":\"programs\"},{\"id\":\"badges\",\"title\":\"Badges\",\"subtitle\":\"Recognition, access and member badges\",\"groupId\":\"membership-and-learning\",\"group\":\"Membership and learning\",\"screenId\":\"himi_owner_lite_module_badges\",\"icon\":\"star\",\"metricKey\":\"module:badges\",\"countLabel\":\"badges\"},{\"id\":\"reservations\",\"title\":\"Reservations\",\"subtitle\":\"Guests, tables and arrival times\",\"groupId\":\"scheduling\",\"group\":\"Scheduling\",\"screenId\":\"himi_owner_lite_module_reservations\",\"icon\":\"calendar\",\"metricKey\":\"module:reservations\",\"countLabel\":\"reservations\"},{\"id\":\"forms\",\"title\":\"Forms\",\"subtitle\":\"Forms and their configuration\",\"groupId\":\"content\",\"group\":\"Content\",\"screenId\":\"himi_owner_lite_module_forms\",\"icon\":\"document\",\"metricKey\":\"module:forms\",\"countLabel\":\"forms\"},{\"id\":\"portfolio\",\"title\":\"Portfolio\",\"subtitle\":\"Projects, stories and galleries\",\"groupId\":\"content\",\"group\":\"Content\",\"screenId\":\"himi_owner_lite_module_portfolio\",\"icon\":\"image\",\"metricKey\":\"module:portfolio\",\"countLabel\":\"portfolio\"},{\"id\":\"donationCampaigns\",\"title\":\"Donation campaigns\",\"subtitle\":\"Campaign goals, status and fundraising\",\"groupId\":\"content\",\"group\":\"Content\",\"screenId\":\"himi_owner_lite_module_donationCampaigns\",\"icon\":\"heart\",\"metricKey\":\"module:donationCampaigns\",\"countLabel\":\"donation campaigns\"}]",
-            "copy": "{\"ownerManage.blogLabel\":\"Field updates\",\"ownerManage.bookingsLabel\":\"Volunteer roles\",\"ownerManage.eventsLabel\":\"Drives & fundraisers\",\"ownerManage.title\":\"Programmes\"}"
+            "copy": "{\"ownerManage.blogLabel\":\"Field updates\",\"ownerManage.bookingsLabel\":\"Volunteer roles\",\"ownerManage.eventsLabel\":\"Drives & fundraisers\",\"ownerManage.title\":\"Programmes\"}",
+            "businessName": "__HIMI_APP_NAME__"
           }
         }
       }
@@ -51768,7 +51770,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "__HIMI_APP_NAME__",
+                                  "text": "$service:himiOwnerLiteAccount.businessName",
                                   "style": "bodyEmphasis",
                                   "maxLines": 1
                                 }
@@ -52031,6 +52033,7 @@ const SCREENS = runtimeSetting({
             "supportUrl": "https://www.wix.com/support",
             "privacyUrl": "https://www.wix.com/about/privacy",
             "termsUrl": "https://www.wix.com/about/terms-of-use",
+            "businessName": "__HIMI_APP_NAME__",
             "copy": "{\"ownerAccount.planLabel\":\"Organisation plan\",\"ownerAccount.roleValue\":\"Coordinator\",\"ownerAccount.subtitle\":\"Programme coordinator\"}"
           }
         }
@@ -52578,7 +52581,10 @@ const SCREENS = runtimeSetting({
         },
         "fillMaxWidth": true,
         "onAppear": {
-          "actionId": "tier5.drawer.syncActive"
+          "actionId": "tier5.drawer.refresh",
+          "params": {
+            "businessName": "__HIMI_APP_NAME__"
+          }
         }
       }
     },
@@ -61549,10 +61555,10 @@ const SCREENS = runtimeSetting({
                                 },
                                 "fillMaxWidth": true,
                                 "onTap": {
-                                  "actionId": "himi.open",
+                                  "actionId": "tier5.himiOwnerLiteSites.pick",
                                   "params": {
-                                    "screenId": "himi_owner_lite_home",
-                                    "business": "$item.id"
+                                    "id": "$item.id",
+                                    "name": "$item.name"
                                   }
                                 },
                                 "pressFeedback": "scale",
@@ -61649,7 +61655,6 @@ const SCREENS = runtimeSetting({
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "wix_platform",
         "local_database"
       ],
       "minBinaryVersion": "0.1.0",
@@ -62110,10 +62115,10 @@ const SCREENS = runtimeSetting({
                                 },
                                 "fillMaxWidth": true,
                                 "onTap": {
-                                  "actionId": "himi.open",
+                                  "actionId": "tier5.himiOwnerLiteOverview.pick",
                                   "params": {
-                                    "screenId": "himi_owner_lite_home",
-                                    "business": "$item.id"
+                                    "id": "$item.id",
+                                    "name": "$item.name"
                                   }
                                 },
                                 "pressFeedback": "scale",

package/templates/nonprofit-cause-owner/tier5-src/_shared/himi-text.ts

@@ -0,0 +1,24 @@
+// Shared display-text helpers for himi cards: trim catalog artifacts from titles and
+// derive up-to-two-letter placeholder initials so same-first-letter lists still vary.
+
+/** Trim trailing artifact markers (stray asterisks / footnote daggers) and whitespace
+ *  that leak from test/seed catalogs, without touching interior punctuation. Falls back
+ *  to the original when trimming would empty the string. */
+export function cleanTitle(value?: string): string {
+  const raw = (value ?? "").trim();
+  const cleaned = raw.replace(/[\s*†‡]+$/u, "").trim();
+  return cleaned || raw;
+}
+
+/** Up to two significant initials for a placeholder avatar. Two-plus words → first
+ *  letter of the first two; a single word → its first two alphanumerics. Keeps a list
+ *  of similar names (e.g. many "Booking…") from collapsing to one identical glyph. */
+export function initials(value?: string): string {
+  const words = (value ?? "").trim().split(/\s+/).filter(Boolean);
+  if (words.length === 0) return "#";
+  if (words.length === 1) {
+    const alnum = words[0].replace(/[^\p{L}\p{N}]/gu, "");
+    return (alnum.slice(0, 2) || "#").toUpperCase();
+  }
+  return ((words[0][0] ?? "") + (words[1][0] ?? "")).toUpperCase();
+}

package/templates/nonprofit-cause-owner/tier5-src/_shared/owner-account.ts

@@ -3,6 +3,9 @@
 
 export interface AccountState {
   status: "loading" | "ready";
+  /** The business the "Business" row names: the one picked on Sites, else the
+   *  build-time fallback (see `owner-selected-site.ts`). */
+  businessName: string;
   /** "Name · email", the email alone, or "" (the line collapses). */
   ownerLine: string;
   /** "Version 1.2.0 (34)", or "" when the host cannot say. */
@@ -36,6 +39,7 @@ export function shapeAccount(s: Partial<AccountState>): AccountState {
   const supportUrl = safeUrl(s.supportUrl), privacyUrl = safeUrl(s.privacyUrl), termsUrl = safeUrl(s.termsUrl);
   return {
     status: s.status ?? "loading",
+    businessName: s.businessName ?? "",
     ownerLine: s.ownerLine ?? "",
     versionLine: s.versionLine ?? "",
     error: s.error ?? "",

package/templates/nonprofit-cause-owner/tier5-src/_shared/owner-selected-site.ts

@@ -0,0 +1,103 @@
+// The business the owner is managing RIGHT NOW, shared by every __HIMI_APP_NAME__ worker.
+//
+// Home, Manage, Account and the drawer used to name the business from the build-time
+// `provisioning.json` (`identity.businessName`), so after picking another site on the
+// Sites list the chrome still named the provisioning one — three different names for
+// "the current business" in one session, none of them the site actually picked.
+//
+// The picker (`owner-site-pick.ts`) is the one place that knows both the id and the
+// display name of the business being switched to, so it records them here; every
+// other worker reads them back. The channel is `himalaya.storage` — the app-scoped KV
+// every worker of the app shares on every host (UserDefaults / SharedPreferences / one
+// localStorage namespace) and that needs no capability.
+//
+// ONE key, not one per owner: the host only tells a worker who the owner is once a
+// business is scoped, so the picker (which runs before that) and the screens after it
+// would otherwise land on different keys. The owner is recorded INSIDE the entry
+// instead, and an entry written for a different owner is never shown.
+//
+// The build-time name is only ever the cold-start fallback, passed in by the
+// descriptor: a worker never hardcodes it.
+
+import { initials } from "./himi-text.js";
+
+type StorageLike = { getItem(key: string): string | null; setItem(key: string, value: string): void };
+type Host = typeof globalThis & { himalaya?: { storage?: StorageLike; input?: Record<string, unknown> } };
+
+export interface SelectedSite {
+  id: string;
+  name: string;
+}
+
+const KEY = "himi.ownerLite.selectedSite.v1";
+
+function host(): Host["himalaya"] {
+  return (globalThis as Host).himalaya;
+}
+
+function inputString(key: string): string {
+  const v = host()?.input?.[key];
+  return typeof v === "string" && v !== "default" ? v.trim() : "";
+}
+
+/** The business the owner last picked, or null when none has been picked, the host
+ *  has no storage, or the entry does not apply to this worker. Never throws. */
+export function readSelectedSite(): SelectedSite | null {
+  try {
+    const raw = host()?.storage?.getItem(KEY);
+    if (!raw) return null;
+    const parsed = JSON.parse(raw) as Partial<SelectedSite> & { account?: unknown };
+    const id = typeof parsed?.id === "string" ? parsed.id.trim() : "";
+    const name = typeof parsed?.name === "string" ? parsed.name.trim() : "";
+    if (!id || !name) return null;
+    // Another owner's pick on a shared device is never this owner's business. Fail
+    // CLOSED: an owner-tagged entry is shown only to a worker that knows it IS that
+    // owner. A worker that cannot tell who the owner is (the account-level flow before
+    // a business is scoped, or a host that cannot supply the identity) gets the
+    // fallback, never a name that may be another owner's.
+    const account = typeof parsed.account === "string" ? parsed.account : "";
+    const me = inputString("__himiPreferenceAccount");
+    if (account && account !== me) return null;
+    // An entry the picker wrote before the host knew the owner is CLAIMED by the first
+    // worker that does know it, so from then on no other owner on the device reads it.
+    if (!account && me) host()?.storage?.setItem(KEY, JSON.stringify({ id, name, account: me }));
+    // A screen opened FOR a specific business (a deep link or push carrying
+    // `business`) names that business's data; a name recorded for another one would
+    // sit over the wrong numbers, so it falls back instead.
+    const opened = inputString("business");
+    if (opened && opened !== id) return null;
+    return { id, name };
+  } catch {
+    return null; // a corrupt entry reads as "nothing picked", never as a crash
+  }
+}
+
+/** Record the business the owner just picked. Best-effort: a host without storage
+ *  simply keeps showing the fallback. */
+export function rememberSelectedSite(site: SelectedSite): void {
+  const id = site.id.trim();
+  const name = site.name.trim();
+  if (!id || !name) return;
+  const account = inputString("__himiPreferenceAccount");
+  try {
+    host()?.storage?.setItem(KEY, JSON.stringify(account ? { id, name, account } : { id, name }));
+  } catch {
+    // Quota / storage disabled: the chrome falls back to the build-time name.
+  }
+}
+
+/** Display name for "the current business": the picked one, else `fallback`. */
+export function selectedSiteName(fallback: string): string {
+  return readSelectedSite()?.name || fallback;
+}
+
+/** Badge letters for a business name ("Riverbend Market" → "RM"); Unicode-aware. */
+export function siteInitials(name: string): string {
+  return initials(name);
+}
+
+/** The fallback name a descriptor passes in its `onAppear` params (`businessName`). */
+export function fallbackNameFrom(arg: unknown, current = ""): string {
+  const v = (arg as { businessName?: unknown } | undefined)?.businessName;
+  return typeof v === "string" && v.trim() ? v.trim() : current;
+}

package/templates/nonprofit-cause-owner/tier5-src/_shared/owner-site-pick.ts

@@ -0,0 +1,74 @@
+// Switching the business an __HIMI_APP_NAME__ session manages — the one implementation
+// behind every "pick a business" row (the Sites list and the cross-business Overview).
+//
+// Previously those rows were declarative `himi.open{business}` taps: the shell scoped
+// the bridge and PUSHED Home, and nothing recorded which business was picked, so the
+// chrome kept naming the build-time one and a `‹ Back` led to the list just left. As a
+// worker action the row can record the name first, then hand the shell the same
+// `business`-carrying open — now as a `replace` onto the Home root.
+//
+// Scoping stays with the shell's router (SP-1: a `business` nav param scopes the Wix
+// bridge BEFORE navigating, on iOS and Android). It is deliberately not done here with
+// `site.setActiveSite`: owner-lite's native shells do not register the worker-facing
+// `siteSetActive` capability, so the call throws and the tap would go nowhere.
+
+import { navigate, type NavDirective } from "@himalaya/state";
+import { forgetCatalogVersion } from "@himalaya/wix-stores";
+import { rememberSelectedSite } from "./owner-selected-site.js";
+
+export const OWNER_HOME = "himi_owner_lite_home";
+
+/** Set by a pick, cleared by `settleBusinessSwitch` once the new business is scoped. */
+const SWITCH_PENDING_KEY = "himi.ownerLite.businessSwitchPending.v1";
+
+type StorageLike = { getItem(key: string): string | null; setItem(key: string, value: string): void };
+const storage = (): StorageLike | undefined =>
+  (globalThis as { himalaya?: { storage?: StorageLike } }).himalaya?.storage;
+
+/** `{ id | business, name }` from a row's action params (or a bare msid string). */
+export function pickedSite(arg: unknown): { msid: string; name: string } {
+  if (typeof arg === "string") return { msid: arg.trim(), name: "" };
+  const a = (arg ?? {}) as { business?: unknown; id?: unknown; name?: unknown };
+  const msid = typeof a.business === "string" && a.business ? a.business : typeof a.id === "string" ? a.id : "";
+  return { msid: msid.trim(), name: typeof a.name === "string" ? a.name.trim() : "" };
+}
+
+/**
+ * Record `name` as the business being managed, then return `state` carrying a
+ * `replace` onto the Home root that asks the shell to scope to `msid`. Returns `state`
+ * untouched (no navigation) when there is no msid.
+ */
+export function pickSite<S extends object>(state: S, msid: string, name: string): S | (S & { _nav: NavDirective }) {
+  if (!msid) return state;
+  // Another business may run the other Stores catalog. The resolved version is
+  // persisted app-wide and routes WRITES, which have no 428 retry, so it is dropped
+  // before the switch rather than left to be re-used against the new site.
+  forgetCatalogVersion();
+  // ...but the shell scopes the bridge to `msid` only AFTER this returns, so a warm
+  // Stores worker resolving in that gap still talks to the OLD site and can persist
+  // its version over the tombstone above. Leave a marker so the first worker that
+  // runs after scoping drops the catalog version once more (`settleBusinessSwitch`).
+  try { storage()?.setItem(SWITCH_PENDING_KEY, msid); } catch { /* no storage: the first forget stands */ }
+  if (name) rememberSelectedSite({ id: msid, name });
+  // `replace` onto Home, the tab root the pickers are reached from: the core router
+  // lands ON the root instead of stacking a second Home above the list.
+  return navigate(state, { screenId: OWNER_HOME, presentation: "replace", args: { business: msid } });
+}
+
+/**
+ * Finish a business switch: if a pick is pending, drop the Stores catalog version
+ * again and clear the marker. Call it first in a worker that runs only after the shell
+ * has scoped the bridge to the picked business (Home's `load`: the pick `replace`s
+ * onto Home, and the router scopes before it navigates), so a version persisted from
+ * the old site during the scoping gap is discarded. Never throws.
+ */
+export function settleBusinessSwitch(): void {
+  try {
+    const s = storage();
+    if (!s?.getItem(SWITCH_PENDING_KEY)) return;
+    forgetCatalogVersion();
+    s.setItem(SWITCH_PENDING_KEY, "");
+  } catch {
+    // No storage, or it failed: nothing pending can be recorded either.
+  }
+}

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

@@ -11,6 +11,11 @@
 //     from provisioning.json `identity` — so a branded template ships ITS links,
 //     and `openLink` can only ever open one of those three URLs.
 //
+//   • which business this is — the one the owner picked on Sites (see
+//     `_shared/owner-selected-site.ts`), not the build-time provisioning name,
+//     which arrives only as the cold-start `businessName` param. A local read,
+//     so it is set synchronously in the initial state and again on every load.
+//
 // Every read is best-effort: an identity or version the host cannot answer
 // collapses its line rather than rendering an error on a settings screen.
 
@@ -20,19 +25,24 @@ import { displayVersion } from "@himalaya/app-info";
 import { open } from "@himalaya/open-url";
 import { stashCopy, copyTemplate } from "../_shared/himi-copy.js";
 import { ownerLineOf, shapeAccount, type AccountState } from "../_shared/owner-account.js";
+import { fallbackNameFrom, selectedSiteName } from "../_shared/owner-selected-site.js";
 
 type LinkKind = "support" | "privacy" | "terms";
 
 const obj = (v: unknown): Record<string, unknown> => (v && typeof v === "object" ? v as Record<string, unknown> : {});
 
+let fallbackBusinessName = "";
+
 const svc = defineService<AccountState, {
   load: (s: AccountState, arg?: unknown) => Promise<AccountState>;
   openLink: (s: AccountState, arg?: unknown) => Promise<AccountState>;
 }>("himiOwnerLiteAccount", {
-  state: shapeAccount({}),
+  state: shapeAccount({ businessName: selectedSiteName(fallbackBusinessName) }),
   actions: {
     load: async (s, arg) => {
       stashCopy(arg);
+      fallbackBusinessName = fallbackNameFrom(arg, fallbackBusinessName);
+      const businessName = selectedSiteName(fallbackBusinessName);
       const p = obj(arg);
       const links = { supportUrl: String(p.supportUrl ?? s.supportUrl), privacyUrl: String(p.privacyUrl ?? s.privacyUrl), termsUrl: String(p.termsUrl ?? s.termsUrl) };
       let ownerLine = "";
@@ -54,7 +64,7 @@ const svc = defineService<AccountState, {
         const v = await displayVersion();
         versionLine = v ? copyTemplate("ownerAccount.version", "Version {version}", { version: v }) : "";
       } catch { /* host without app_info — the row collapses */ }
-      return shapeAccount({ ...s, ...links, status: "ready", ownerLine, versionLine, error });
+      return shapeAccount({ ...s, ...links, status: "ready", businessName, ownerLine, versionLine, error });
     },
     openLink: async (s, arg) => {
       const kind = String(obj(arg).kind ?? arg ?? "") as LinkKind;

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-drawer/index.ts

@@ -20,13 +20,23 @@
 import { defineService } from "@himalaya/state";
 import { serializeForAgent } from "@himalaya/agent";
 import { activeScreenFromInput, attentionRow, navRow, withDerived, type DrawerState } from "./logic.js";
+import { fallbackNameFrom, selectedSiteName } from "../_shared/owner-selected-site.js";
 
 /** The shell passes the screen it is showing as worker input, so the drawer can mark
  *  that destination selected the way the declarative drawer does. */
 const hostActiveScreen = () => activeScreenFromInput((globalThis as { himalaya?: { input?: unknown } }).himalaya?.input);
 
+/** Cold-start name from the descriptor's onAppear params (provisioning identity). */
+let fallbackBusinessName = "";
+
+/** "Which site am I on": the business picked on Sites, else the fallback. */
+const currentSiteName = () => selectedSiteName(fallbackBusinessName);
+
 const drawer = defineService<DrawerState, {
-  /** Re-read the active screen from host input (root onAppear). An explicit
+  /** The panel opened (root onAppear): re-read the live site and the active screen.
+   *  `arg.businessName` is the cold-start fallback for the site name. */
+  refresh: (s: DrawerState, arg?: unknown) => DrawerState;
+  /** Re-read the active screen from host input. An explicit
    *  `{ screenId }` wins, for a host that pushes the change instead. */
   syncActive: (s: DrawerState, args?: { screenId?: string }) => DrawerState;
   /** First tap on "Mark all handled": ask before hiding anything. */
@@ -37,7 +47,7 @@ const drawer = defineService<DrawerState, {
   clearAttention: (s: DrawerState) => DrawerState;
 }>("drawer", {
   state: withDerived({
-    siteName: "My Site",
+    siteName: currentSiteName(),
     nav: [
       navRow("drawer_home", "Home", "home", "himi_owner_lite_home"),
       // Between Home and Manage deliberately: analytics answers "how is the
@@ -55,6 +65,15 @@ const drawer = defineService<DrawerState, {
     activeScreenId: hostActiveScreen(),
   }),
   actions: {
+    refresh: (s, arg) => {
+      fallbackBusinessName = fallbackNameFrom(arg, fallbackBusinessName);
+      const screenId = (arg as { screenId?: unknown } | undefined)?.screenId;
+      return snap(withDerived({
+        ...s,
+        siteName: currentSiteName(),
+        activeScreenId: typeof screenId === "string" ? screenId : hostActiveScreen(),
+      }));
+    },
     syncActive: (s, args) => snap(withDerived({
       ...s,
       activeScreenId: typeof args?.screenId === "string" ? args.screenId : hostActiveScreen(),

package/templates/nonprofit-cause-owner/tier5-src/himi-owner-lite-home/index.ts

@@ -21,6 +21,8 @@ import { getSiteAnalytics, getSiteTimeZone, localDateRange, localDateOf, localMi
 import { ownerDisplayError, isBridgeUnavailable, isOwnerPreviewDemo } from "../_shared/owner-load-error.js";
 import { DEMO_DASHBOARD, DEMO_NOTE, DEMO_TODAY } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { fallbackNameFrom, selectedSiteName } from "../_shared/owner-selected-site.js";
+import { settleBusinessSwitch } from "../_shared/owner-site-pick.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
 import {
   attentionRecords,
@@ -51,6 +53,9 @@ interface SourceState {
 }
 
 interface HomeState {
+  /** The business the header names: the one picked on Sites, else the descriptor's
+   *  build-time fallback. */
+  businessName: string;
   attention: TodayRecord[];
   schedule: TodayRecord[];
   allSchedule: TodayRecord[];
@@ -101,11 +106,18 @@ const SOURCE_LABELS: Record<HomeSourceId, string> = {
   reviews: "Reviews", reservations: "Reservations",
 };
 
+/** Cold-start name from the descriptor's onAppear params (provisioning identity). */
+let fallbackBusinessName = "";
+/** Resolved once per load, not per shape: a storage read is a host round-trip, and the
+ *  picked business only changes between loads (the picker is another screen). */
+let currentBusinessName = selectedSiteName("");
+
 function shape(s: Partial<HomeState>): HomeState {
   const status = s.status ?? "ready";
   const isLoading = status === "loading";
   return {
     status,
+    businessName: currentBusinessName,
     attention: s.attention ?? [],
     schedule: s.schedule ?? [],
     allSchedule: s.allSchedule ?? s.schedule ?? [],
@@ -834,8 +846,19 @@ const svc = defineService<HomeState, {
   })) }),
   actions: {
     load: async (s, arg) => {
+      // FIRST, before anything reads the catalog: a business pick `replace`s onto
+      // Home, and the shell scopes the bridge to the picked business before it
+      // navigates, so this load is the first code that runs on the new site. A Stores
+      // catalog version persisted from the OLD site during that gap is dropped here.
+      settleBusinessSwitch();
       stashCopy(arg);
-      const sources = enabledSourcesFrom(arg) ?? [...HOME_SOURCE_IDS];
+      fallbackBusinessName = fallbackNameFrom(arg, fallbackBusinessName);
+      // Re-read here: Home's root is not remounted when the owner switches business,
+      // and the picker records the selection from a different worker.
+      currentBusinessName = selectedSiteName(fallbackBusinessName);
+      // An argless re-load (the host refreshing a warm root after the owner switches
+      // business) keeps the sources the descriptor enabled rather than widening to all.
+      const sources = enabledSourcesFrom(arg) ?? activeSources;
       return loadDashboard(shape({ ...s, status: "loading" }), sources);
     },
     retry: async (s) => loadDashboard(shape({ ...s, status: "loading" }), activeSources),