@wix/himalaya-cli 0.1159.0 → 0.1161.0

package/dist/cli.mjs

@@ -505,8 +505,8 @@ async function readWip(store, app) {
   if (!wipSupported(store)) return "unsupported";
   const { wip, promoted } = normalizeWipRecord(await store.getWipRecord(app));
   if (!wip || promoted.some((p) => p.id === wip.releaseId)) return null;
-  const live2 = await store.getManifest(app);
-  return live2?.releaseId === wip.releaseId ? null : wip;
+  const live3 = await store.getManifest(app);
+  return live3?.releaseId === wip.releaseId ? null : wip;
 }
 var storedTime;
 var init_wip_pointer = __esm({
@@ -6834,6 +6834,7 @@ function resolveTranslation(value, catalog, 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((s) => s !== "t").join("|")})\\b|^\\$t:`
@@ -8254,7 +8255,10 @@ var init_a11y_contract = __esm({
       ListItem: { role: "listitem", name: "required", state: ["selected", "disabled", "position"], decorative: false },
       // ---- Navigation and progress structures ---------------------------------------------
       DisclosureGroup: { role: "button", name: "required", state: ["expanded/collapsed"], decorative: false },
-      CollapsingHeader: { role: "heading", name: "required", state: ["expanded/collapsed"], decorative: false },
+      // NO state (#3433): the header collapses as the content under it scrolls, not because the user
+      // toggled it — it is not a disclosure, and "collapsed" would describe a scroll offset as if it
+      // were a control's setting. Every arm exposes the title as a heading and nothing more.
+      CollapsingHeader: { role: "heading", name: "required", state: [], decorative: false },
       Carousel: { role: "list", name: "required", state: ["item N of M"], decorative: false },
       Pager: { role: "list", name: "required", state: ["item N of M"], decorative: false },
       PageControl: { role: "adjustable", name: "required", state: ["page N of M"], decorative: false },
@@ -11896,7 +11900,7 @@ function inputJson(input) {
   const json6 = JSON.stringify(input ?? {});
   return json6 === void 0 ? "{}" : json6;
 }
-function timerGlobals(hide, live2) {
+function timerGlobals(hide, live3) {
   const hidden = new Set(hide ?? []);
   const stubs = {
     setTimeout: "  globalThis.setTimeout = function () { return 0; };",
@@ -11922,7 +11926,7 @@ function timerGlobals(hide, live2) {
     setInterval: "  globalThis.setInterval = function () { return 0; };",
     clearInterval: "  globalThis.clearInterval = function () {};"
   };
-  const decls = live2 ? real : stubs;
+  const decls = live3 ? real : stubs;
   return Object.entries(decls).filter(([name]) => !hidden.has(name)).map(([, src]) => src).join("\n");
 }
 function preludeFor(opts) {
@@ -13252,6 +13256,7 @@ function resolveIdiom(tokens2, ctx = {}) {
 var IDIOM_CONTEXTS, UNSAFE_KEYS;
 var init_idiom = __esm({
   "../../core/ts/src/idiom.ts"() {
+    "use strict";
     IDIOM_CONTEXTS = {
       ios: { native: ["ios"] },
       android: { native: ["material"] },
@@ -18222,12 +18227,12 @@ function genNativeConfig(app, opts = {}) {
   const embedManaged = hasMarkers(project, "yaml", LABEL_LIVE_EMBED);
   if (targetManaged !== embedManaged) throw new Error(`${app}: Live Activity target and embedding markers must be installed together`);
   const drainsWidgetActions = hostAppliesDeferredWidgetActions(app);
-  const live2 = targetManaged ? liveActivityPlan(project, ids.includes("live_activity"), drainsWidgetActions) : void 0;
-  if (live2?.appGroupId) {
+  const live3 = targetManaged ? liveActivityPlan(project, ids.includes("live_activity"), drainsWidgetActions) : void 0;
+  if (live3?.appGroupId) {
     const key2 = "com.apple.security.application-groups";
     const existing = ios.entitlements[key2];
     const groups = Array.isArray(existing) ? [...existing] : existing === void 0 ? [] : [existing];
-    if (!groups.includes(live2.appGroupId)) groups.push(live2.appGroupId);
+    if (!groups.includes(live3.appGroupId)) groups.push(live3.appGroupId);
     ios.entitlements[key2] = groups;
   }
   const files = [
@@ -18275,7 +18280,7 @@ function genNativeConfig(app, opts = {}) {
     files.push(r);
   }
   if (targetManaged) {
-    const plan = live2;
+    const plan = live3;
     files.push(applyToFile(iosYml, "yaml", LABEL_LIVE_TARGET, (i) => plan.target.map((line) => i + line), check));
     files.push(applyToFile(iosYml, "yaml", LABEL_LIVE_EMBED, (i) => plan.embed.map((line) => i + line), check));
     const source = join29(dirname16(iosYml), LIVE_SOURCE_PATH);
@@ -24512,6 +24517,7 @@ function shouldRevealError(args) {
 var EMAIL_RE, URL_HOST_RE, INTEGER_RE, NUMBER_RE;
 var init_validation = __esm({
   "../../core/ts/src/validation.ts"() {
+    "use strict";
     EMAIL_RE = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*\.[A-Za-z]{2,}$/;
     URL_HOST_RE = /^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(:[0-9]+)?$/;
     INTEGER_RE = /^[+-]?[0-9]+$/;
@@ -25171,6 +25177,7 @@ function validateWorkerSubtree(raw, slotId, policy, actionCatalog) {
 var WORKER_SUBTREE_CEILINGS, ID_PART, ACTION_ID;
 var init_worker_subtree = __esm({
   "../../core/ts/src/worker-subtree.ts"() {
+    "use strict";
     init_worker_subtree_safe_types_generated();
     WORKER_SUBTREE_CEILINGS = Object.freeze({
       maxEncodedBytes: 65536,
@@ -31591,7 +31598,7 @@ function RichContentEditorView({ props, ctx, wrap, nodeId, renderChild, ...dom }
   const C = ctx.color;
   const name = typeof props.name === "string" && props.name ? props.name : void 0;
   const bag = React3.useContext(FormValuesContext);
-  const live2 = !!ctx.onAction;
+  const live3 = !!ctx.onAction;
   const toolsKey = JSON.stringify(props.tools ?? null);
   const tools = React3.useMemo(() => effectiveTools(props.tools, props.uploadService), [toolsKey, props.uploadService]);
   const seedMode = typeof props.documentJson === "string" ? "literal" : typeof props.documentPath === "string" && props.documentPath ? "binding" : "none";
@@ -31630,11 +31637,11 @@ function RichContentEditorView({ props, ctx, wrap, nodeId, renderChild, ...dom }
   const fireOnChangeRef = React3.useRef(fireOnChange);
   fireOnChangeRef.current = fireOnChange;
   React3.useEffect(() => {
-    if (live2) setSrc(new URL(ENGINE_PAGE_PATH, document.baseURI).toString());
-  }, [live2]);
+    if (live3) setSrc(new URL(ENGINE_PAGE_PATH, document.baseURI).toString());
+  }, [live3]);
   React3.useEffect(() => {
     const frame = iframeRef.current;
-    if (!live2 || !src || !frame) return;
+    if (!live3 || !src || !frame) return;
     const t = ricosEditorWebTimings;
     const session = createRicosHostSession({
       send: (msg) => frame.contentWindow?.postMessage({ ricos: 1, msg }, "*"),
@@ -31679,7 +31686,7 @@ function RichContentEditorView({ props, ctx, wrap, nodeId, renderChild, ...dom }
       session.dispose();
       sessionRef.current = null;
     };
-  }, [live2, src]);
+  }, [live3, src]);
   React3.useEffect(() => {
     sessionRef.current?.setSeed(seedMode === "literal" ? props.documentJson : seedMode === "binding" ? boundSeed : "");
   }, [seedMode, props.documentJson, boundSeed, src]);
@@ -31735,7 +31742,7 @@ function RichContentEditorView({ props, ctx, wrap, nodeId, renderChild, ...dom }
     setLink(null);
   };
   const root = { position: "relative", display: "flex", flexDirection: "column", width: "100%", ...fill ? { flex: "1 1 auto", minHeight: 0 } : { minHeight }, ...wrap };
-  if (!live2) {
+  if (!live3) {
     const { paddingTop: _t, paddingBottom: _b, paddingLeft: _l, paddingRight: _r, ...rootNoSides } = root;
     const own3 = { ...rootNoSides, border: `1px solid ${C("border", "#e3e3e3")}`, borderRadius: 8, padding: 12, boxSizing: "border-box" };
     return /* @__PURE__ */ jsx4("div", { ...dom, style: addIntrinsicPadding(own3, wrap) ?? own3, children: /* @__PURE__ */ jsx4("span", { style: { color: C("textSecondary", "#636B78") }, children: placeholder2 || "Rich text editor" }) });
@@ -31905,7 +31912,17 @@ function labelText(label2, ctx) {
   }
   return asText2(label2);
 }
-var useResolvedId, FONT, rowShareFloor, A11ySwitch, A11ySlider, A11ySelectionControl, actOf, withSelection, resolveItemDeep, A11yTabs, A11ySegmented, disclosureSeq, A11yDisclosure;
+function resolveRowAction(action, ctx) {
+  const resolved2 = resolveItemDeep(action, ctx);
+  if (!resolved2 || typeof resolved2 !== "object" || Array.isArray(resolved2)) return resolved2;
+  const params = resolved2.params;
+  if (!params || typeof params !== "object" || Array.isArray(params)) return resolved2;
+  return {
+    ...resolved2,
+    params: Object.fromEntries(Object.entries(params).map(([k, v]) => [k, typeof v === "number" || typeof v === "boolean" ? String(v) : v]))
+  };
+}
+var useResolvedId, FONT, rowShareFloor, A11ySwitch, A11Y_PART, A11ySlider, A11ySelectionControl, actOf, withSelection, resolveItemDeep, A11yTabs, A11ySegmented, disclosureSeq, A11yDisclosure;
 var init_controls = __esm({
   "../../core/web-renderer/src/a11y/controls.tsx"() {
     "use strict";
@@ -31972,7 +31989,7 @@ var init_controls = __esm({
         }
         const toggleAct = act;
         if (ctx.onAction && toggleAct) {
-          const resolved3 = resolveItemDeep(toggleAct, ctx);
+          const resolved3 = resolveRowAction(toggleAct, ctx);
           ctx.onAction({ ...resolved3, args: { ...resolved3.args ?? {}, value: next } });
         }
       } : void 0;
@@ -31994,6 +32011,7 @@ var init_controls = __esm({
         )
       ] });
     };
+    A11Y_PART = "data-hm-a11y-part";
     A11ySlider = ({ props, ctx, wrap }) => {
       const C = ctx.color;
       const min = props.min ?? 0, max = props.max ?? 1;
@@ -32007,13 +32025,72 @@ var init_controls = __esm({
       React4.useEffect(() => {
         setVal(bound);
       }, [bound]);
-      const fire = ctx.onAction && props.onChange && !props.disabled ? () => ctx.onAction(props.onChange) : void 0;
+      const dragging = React4.useRef(false);
+      const canFire = !!(ctx.onAction && props.onChange && !props.disabled);
+      const commit = (nv) => {
+        setVal(nv);
+        if (!canFire) return;
+        const act = resolveRowAction(props.onChange, ctx);
+        ctx.onAction({ ...act, args: { ...act.args ?? {}, value: nv } });
+      };
       const clampPct = (n) => max > min ? Math.max(0, Math.min(1, (n - min) / (max - min))) : 0;
+      const [pair, setPair] = React4.useState(() => [Math.min(bound, props.upperValue ?? bound), Math.max(bound, props.upperValue ?? bound)]);
+      React4.useEffect(() => {
+        if (range) setPair([Math.min(bound, props.upperValue), Math.max(bound, props.upperValue)]);
+      }, [range, bound, props.upperValue]);
       if (range) {
-        const lo = Math.min(bound, props.upperValue), hi = Math.max(bound, props.upperValue);
-        return /* @__PURE__ */ jsx5("div", { style: { width: "100%", padding: "12px 9px", boxSizing: "border-box", opacity: props.disabled ? 0.5 : 1, ...wrap }, children: /* @__PURE__ */ jsxs2("div", { style: { position: "relative", height: 4, borderRadius: 999, background: C("surfaceTertiary", "#e3e6ea") }, children: [
+        const [lo, hi] = pair;
+        const thumbKey = (which) => (e) => {
+          if (props.disabled) return;
+          const at2 = pair[which];
+          const floor = which === 0 ? min : lo, ceil = which === 0 ? hi : max;
+          let nv = at2;
+          switch (e.key) {
+            case "ArrowRight":
+            case "ArrowUp":
+              nv = Math.min(ceil, at2 + step);
+              break;
+            case "ArrowLeft":
+            case "ArrowDown":
+              nv = Math.max(floor, at2 - step);
+              break;
+            case "Home":
+              nv = floor;
+              break;
+            case "End":
+              nv = ceil;
+              break;
+            default:
+              return;
+          }
+          e.preventDefault();
+          const next = which === 0 ? [nv, hi] : [lo, nv];
+          setPair(next);
+          if (canFire) {
+            const act = resolveRowAction(props.onChange, ctx);
+            ctx.onAction({ ...act, args: { ...act.args ?? {}, value: next[0], upperValue: next[1] } });
+          }
+        };
+        const groupName = labelText(props.label, ctx) || void 0;
+        return /* @__PURE__ */ jsx5("div", { ...{ [A11Y_PART]: "root" }, role: "group", "aria-label": groupName, style: { width: "100%", padding: "12px 9px", boxSizing: "border-box", opacity: props.disabled ? 0.5 : 1, ...wrap }, children: /* @__PURE__ */ jsxs2("div", { style: { position: "relative", height: 4, borderRadius: 999, background: C("surfaceTertiary", "#e3e6ea") }, children: [
           /* @__PURE__ */ jsx5("div", { style: { position: "absolute", left: `${clampPct(lo) * 100}%`, right: `${(1 - clampPct(hi)) * 100}%`, top: 0, bottom: 0, borderRadius: 999, background: tint } }),
-          [lo, hi].map((p, i) => /* @__PURE__ */ jsx5("span", { role: "slider", "aria-valuenow": p, "aria-valuemin": min, "aria-valuemax": max, "aria-orientation": "horizontal", style: { position: "absolute", left: `${clampPct(p) * 100}%`, top: "50%", width: 18, height: 18, borderRadius: "50%", background: "#fff", border: `2px solid ${tint}`, transform: "translate(-50%, -50%)", boxShadow: "0 1px 3px rgba(0,0,0,.25)" } }, i))
+          [lo, hi].map((p, i) => /* @__PURE__ */ jsx5(
+            "span",
+            {
+              ...i === 0 ? { [A11Y_PART]: "focus" } : {},
+              role: "slider",
+              tabIndex: props.disabled ? -1 : 0,
+              "aria-label": i === 0 ? "Minimum" : "Maximum",
+              "aria-valuenow": p,
+              "aria-valuemin": i === 0 ? min : lo,
+              "aria-valuemax": i === 0 ? hi : max,
+              "aria-orientation": "horizontal",
+              "aria-disabled": props.disabled ? true : void 0,
+              onKeyDown: thumbKey(i),
+              style: { position: "absolute", left: `${clampPct(p) * 100}%`, top: "50%", width: 18, height: 18, borderRadius: "50%", background: "#fff", border: `2px solid ${tint}`, transform: "translate(-50%, -50%)", boxShadow: "0 1px 3px rgba(0,0,0,.25)", outlineOffset: 3, cursor: props.disabled ? "default" : "pointer" }
+            },
+            i
+          ))
         ] }) });
       }
       const pct = clampPct(val);
@@ -32039,12 +32116,38 @@ var init_controls = __esm({
             return;
         }
         e.preventDefault();
+        commit(nv);
+      };
+      const valueAt = (e) => {
+        const r = e.currentTarget.getBoundingClientRect();
+        if (!(r.width > 0)) return void 0;
+        const f = Math.max(0, Math.min(1, (e.clientX - r.left) / r.width));
+        const raw2 = min + f * (max - min);
+        const grid = Math.max(min, Math.min(max, Number((min + Math.round((raw2 - min) / step) * step).toFixed(10))));
+        return Math.abs(max - raw2) < Math.abs(grid - raw2) ? max : grid;
+      };
+      const onPointerDown = (e) => {
+        if (props.disabled) return;
+        const nv = valueAt(e);
+        if (nv === void 0) return;
+        dragging.current = true;
+        e.currentTarget.setPointerCapture?.(e.pointerId);
         setVal(nv);
-        if (fire) fire();
       };
-      return /* @__PURE__ */ jsx5("div", { style: { width: "100%", padding: "12px 9px", boxSizing: "border-box", opacity: props.disabled ? 0.5 : 1, ...wrap }, children: /* @__PURE__ */ jsx5(
+      const onPointerMove = (e) => {
+        if (!dragging.current) return;
+        const nv = valueAt(e);
+        if (nv !== void 0) setVal(nv);
+      };
+      const onPointerUp = (e) => {
+        if (!dragging.current) return;
+        dragging.current = false;
+        commit(valueAt(e) ?? val);
+      };
+      return /* @__PURE__ */ jsx5("div", { ...{ [A11Y_PART]: "root" }, style: { width: "100%", padding: "12px 9px", boxSizing: "border-box", opacity: props.disabled ? 0.5 : 1, ...wrap }, children: /* @__PURE__ */ jsx5(
         "div",
         {
+          ...{ [A11Y_PART]: "node" },
           role: "slider",
           tabIndex: props.disabled ? -1 : 0,
           "aria-valuenow": val,
@@ -32054,7 +32157,10 @@ var init_controls = __esm({
           "aria-label": labelText(props.label, ctx) || void 0,
           "aria-disabled": props.disabled ? true : void 0,
           onKeyDown,
-          style: { position: "relative", height: 18, display: "flex", alignItems: "center", outlineOffset: 4, cursor: props.disabled ? "default" : "pointer" },
+          onPointerDown,
+          onPointerMove,
+          onPointerUp,
+          style: { position: "relative", height: 18, display: "flex", alignItems: "center", outlineOffset: 4, cursor: props.disabled ? "default" : "pointer", touchAction: "pan-y" },
           children: /* @__PURE__ */ jsxs2("div", { style: { position: "relative", height: 4, width: "100%", borderRadius: 999, background: C("surfaceTertiary", "#e3e6ea") }, children: [
             /* @__PURE__ */ jsx5("div", { style: { position: "absolute", left: 0, width: `${pct * 100}%`, top: 0, bottom: 0, borderRadius: 999, background: tint } }),
             /* @__PURE__ */ jsx5("span", { "aria-hidden": true, style: { position: "absolute", left: `${pct * 100}%`, top: "50%", width: 18, height: 18, borderRadius: "50%", background: "#fff", border: `2px solid ${tint}`, transform: "translate(-50%, -50%)", boxShadow: "0 1px 3px rgba(0,0,0,.25)" } })
@@ -32071,7 +32177,7 @@ var init_controls = __esm({
       const accent = C("accentPrimary", "#116DFF");
       const fire = ctx.onAction && props.onChange && !props.disabled ? (e) => {
         e?.stopPropagation?.();
-        const act = resolveItemDeep(props.onChange, ctx);
+        const act = resolveRowAction(props.onChange, ctx);
         const next = isRadio ? true : !on3;
         ctx.onAction({ ...act, args: { ...act.args ?? {}, value: next } });
       } : void 0;
@@ -32211,7 +32317,7 @@ var init_controls = __esm({
       const subtitle = useResolvedScalar(props.subtitle, ctx);
       const expanded = useResolvedScalar(props.expandedPath ?? props.expanded, ctx);
       const open = expanded === true;
-      const fire = ctx.onAction && props.onToggle ? () => ctx.onAction(resolveItemDeep(props.onToggle, ctx)) : void 0;
+      const fire = ctx.onAction && props.onToggle ? () => ctx.onAction(resolveRowAction(props.onToggle, ctx)) : void 0;
       const regionId = React4.useMemo(() => `himi-disclosure-${++disclosureSeq}`, []);
       return /* @__PURE__ */ jsxs2("div", { style: { width: "100%", ...wrap }, children: [
         /* @__PURE__ */ jsxs2(
@@ -32238,12 +32344,15 @@ var init_controls = __esm({
 });
 
 // ../../core/web-renderer/src/a11y/modalStack.ts
-function pushModalLayer(el) {
-  const layer = { el: typeof el === "function" ? el : () => el };
+function pushModalLayer(el, opts = {}) {
+  const layer = { el: typeof el === "function" ? el : () => el, host: opts.host === true, seq: pushes++ };
   layers.push(layer);
   sync();
   return {
-    isTop: () => layers[layers.length - 1] === layer,
+    isTop: () => {
+      const own3 = layer.el();
+      return own3 != null && own3.isConnected && topLayerOver(own3) === layer;
+    },
     release: () => {
       const i = layers.indexOf(layer);
       if (i < 0) return;
@@ -32253,43 +32362,75 @@ function pushModalLayer(el) {
   };
 }
 function isWithinTopModal(el) {
-  const top = topElement();
-  return top == null || top.contains(el);
+  const top = topOver(el);
+  return top == null || top.el.contains(el);
 }
-function topElement() {
-  for (let i = layers.length - 1; i >= 0; i--) {
-    const el = layers[i].el();
-    if (el?.isConnected) return el;
+function live() {
+  const out2 = [];
+  for (const layer of layers) {
+    const el = layer.el();
+    if (el?.isConnected) out2.push({ layer, el, scope: el.parentElement?.closest(`[${MODAL_SCOPE_ATTR}]`) ?? el.ownerDocument.body });
   }
-  return null;
+  return out2;
+}
+function rootOf(l, all) {
+  for (let root = l; ; ) {
+    const outer = all.find((o) => o.el !== root.el && o.el.contains(root.el));
+    if (!outer) return root;
+    root = outer;
+  }
+}
+function above(a, b, all) {
+  if (a.el !== b.el) {
+    if (b.el.contains(a.el)) return true;
+    if (a.el.contains(b.el)) return false;
+  }
+  const ra = rootOf(a, all);
+  const rb = rootOf(b, all);
+  if (ra !== rb) return ra.layer.host !== rb.layer.host ? ra.layer.host : ra.layer.seq > rb.layer.seq;
+  return a.layer.seq > b.layer.seq;
+}
+function topOf(candidates, all) {
+  let top = null;
+  for (const c of candidates) if (!top || above(c, top, all)) top = c;
+  return top;
+}
+function topOver(target) {
+  const all = live();
+  return topOf(all.filter((l) => l.scope.contains(target) || target.contains(l.el)), all);
+}
+function topLayerOver(target) {
+  return topOver(target)?.layer ?? null;
 }
 function sync() {
   watcher?.disconnect();
   watcher = null;
   for (const el of madeInert) el.removeAttribute("inert");
   madeInert.clear();
-  const top = topElement();
-  if (!top) return;
-  const scope = top.parentElement?.closest(`[${MODAL_SCOPE_ATTR}]`) ?? top.ownerDocument.body;
-  const levels = [];
-  let node = top;
-  while (node !== scope && node.parentElement) {
-    const parent = node.parentElement;
-    levels.push(parent);
-    for (const sibling of Array.from(parent.children)) {
-      if (sibling === node || SKIP.has(sibling.tagName) || sibling.hasAttribute("inert")) continue;
-      sibling.setAttribute("inert", "");
-      madeInert.add(sibling);
-    }
-    node = parent;
-  }
-  const Observer = top.ownerDocument.defaultView?.MutationObserver;
-  if (Observer && levels.length) {
+  const all = live();
+  if (!all.length) return;
+  const levels = /* @__PURE__ */ new Set();
+  for (const scope of new Set(all.map((l) => l.scope))) {
+    const top = topOf(all.filter((l) => l.scope === scope), all);
+    let node = top.el;
+    while (node !== scope && node.parentElement) {
+      const parent = node.parentElement;
+      levels.add(parent);
+      for (const sibling of Array.from(parent.children)) {
+        if (sibling === node || SKIP.has(sibling.tagName) || sibling.hasAttribute("inert")) continue;
+        sibling.setAttribute("inert", "");
+        madeInert.add(sibling);
+      }
+      node = parent;
+    }
+  }
+  const Observer = all[0].el.ownerDocument.defaultView?.MutationObserver;
+  if (Observer && levels.size) {
     watcher = new Observer(() => sync());
     for (const level of levels) watcher.observe(level, { childList: true });
   }
 }
-var MODAL_SCOPE_ATTR, SKIP, layers, madeInert, watcher;
+var MODAL_SCOPE_ATTR, SKIP, layers, madeInert, watcher, pushes;
 var init_modalStack = __esm({
   "../../core/web-renderer/src/a11y/modalStack.ts"() {
     MODAL_SCOPE_ATTR = "data-himi-modal-scope";
@@ -32297,6 +32438,7 @@ var init_modalStack = __esm({
     layers = [];
     madeInert = /* @__PURE__ */ new Set();
     watcher = null;
+    pushes = 0;
   }
 });
 
@@ -33466,12 +33608,22 @@ function editA11yParts(node, edit) {
   if (typeof part !== "string" && nextKids === kids3) return node;
   return cloneWithKids(node, typeof part === "string" ? { ...edit(part, own3), [A11Y_PART]: void 0 } : {}, nextKids);
 }
-function a11yPartEdit(routed, authoredName, onNode) {
+function a11yPartEdit(routed, authoredName, onNode, focus) {
   return (part, own3) => {
     if (part === "derived-name") return authoredName ? {} : { "aria-hidden": "true" };
+    const focusable = typeof own3.tabIndex === "number" && own3.tabIndex >= 0;
+    if (part === "focus") {
+      if (!focus || !focusable) return {};
+      focus.onRouted();
+      return { ...focus.carried };
+    }
     if (part !== "node") return {};
     onNode();
     const patch = { ...routed };
+    if (focus && focusable) {
+      Object.assign(patch, focus.carried);
+      focus.onRouted();
+    }
     if (typeof routed["aria-describedby"] === "string" && typeof own3["aria-describedby"] === "string") {
       patch["aria-describedby"] = `${own3["aria-describedby"]} ${routed["aria-describedby"]}`;
     }
@@ -33618,11 +33770,28 @@ function withExtras(name, render) {
         for (const k of NODE_A11Y_ATTRS) if (next[k] !== void 0) routed[k] = next[k];
         if (pass[AUTHORED_ROLE] === true || pass["aria-level"] != null) routed.role = next.role;
       }
+      const focus = {};
+      if (!rootIsControl) {
+        if (next.tabIndex !== void 0 && !tabIndexIsSynthetic) focus.tabIndex = next.tabIndex;
+        if (next["data-himalaya-initial-focus"] !== void 0) focus["data-himalaya-initial-focus"] = next["data-himalaya-initial-focus"];
+      }
       let nodeFound = false;
-      const kids3 = editA11yParts(prev.children, a11yPartEdit(routed, pass["aria-label"] != null, () => {
-        nodeFound = true;
-      }));
+      let focusRouted = false;
+      const kids3 = editA11yParts(prev.children, a11yPartEdit(
+        routed,
+        pass["aria-label"] != null,
+        () => {
+          nodeFound = true;
+        },
+        Object.keys(focus).length ? { carried: focus, onRouted: () => {
+          focusRouted = true;
+        } } : void 0
+      ));
       if (nodeFound) for (const k of Object.keys(routed)) delete next[k];
+      if (focusRouted) {
+        delete next.tabIndex;
+        delete next["data-himalaya-initial-focus"];
+      }
       return cloneWithKids(el, next, kids3);
     }
     return React7.cloneElement(el, next);
@@ -35133,13 +35302,15 @@ function renderInner(node, ctx) {
       ] });
     }
     // RFC 0058 §4 — an INLINE card, drawn where the descriptor puts it, as iOS (`AlertDialogPreview`)
-    // and Android (`SDUIAlertDialogPreview`) draw it: only its semantics are modal (`aria-modal`,
-    // from the one table). It is not presented over the screen, so a screen that shows one inline (a
-    // cart's high-value confirm, a component gallery) keeps the rest of itself usable, tab bar
-    // included. A presented alert is `presentation: "alert"` on a navigating Action, which the web
-    // host draws as its own modal dialog.
+    // and Android (`SDUIAlertDialogPreview`) draw it. It is not presented over the screen, so a
+    // screen that shows one inline (a cart's high-value confirm, a component gallery) keeps the rest
+    // of itself usable, tab bar included — and it is NOT modal, whatever `modal` says (#3428):
+    // `modal` applies only while an alert is presented, and `aria-modal` on a card in the screen's
+    // own flow told assistive technology that every sibling was unavailable, with no way to dismiss
+    // it. A presented alert is `presentation: "alert"` on a navigating Action, which the web host
+    // draws as its own modal dialog.
     case "AlertDialog":
-      return /* @__PURE__ */ jsxs5("div", { role: "alertdialog", "aria-modal": isOverlayModal("AlertDialog", props.modal) ? "true" : void 0, "aria-label": props.title != null ? asBoundText(props.title, ctx) : "Alert", style: { background: C("surfacePrimary", "#fff"), borderRadius: ctx.radius("lg", 14), padding: 18, width: "100%", boxSizing: "border-box", border: `1px solid ${C("border", "#e3e3e3")}`, boxShadow: "0 12px 30px -12px rgba(0,0,0,.4)", ...wrap }, children: [
+      return /* @__PURE__ */ jsxs5("div", { role: "alertdialog", "aria-label": props.title != null ? asBoundText(props.title, ctx) : "Alert", style: { background: C("surfacePrimary", "#fff"), borderRadius: ctx.radius("lg", 14), padding: 18, width: "100%", boxSizing: "border-box", border: `1px solid ${C("border", "#e3e3e3")}`, boxShadow: "0 12px 30px -12px rgba(0,0,0,.4)", ...wrap }, children: [
         /* @__PURE__ */ jsx8("div", { style: { fontFamily: bodyFont(ctx), fontWeight: 700, fontSize: 17, color: C("textPrimary", "#111") }, children: txt(props.title, ctx) }),
         /* @__PURE__ */ jsx8("div", { style: { fontFamily: bodyFont(ctx), fontSize: 14, lineHeight: 1.45, color: C("textSecondary", "#666"), margin: "6px 0 16px" }, children: txt(props.message, ctx) }),
         /* @__PURE__ */ jsxs5("div", { style: { display: "flex", gap: 10 }, children: [
@@ -35162,7 +35333,7 @@ function renderInner(node, ctx) {
     }
   }
 }
-var useIsomorphicLayoutEffect, ResponsiveGrid, SPLIT_EXPANDED_MIN_WIDTH, SPLIT_COLUMN_GAP, ResponsiveSplitView, ABSOLUTE_URL_RE, appearKeyframesInjected, pressStylesInjected, FOCUS_RING_CSS, focusStylesInjected, HLIST_CHILD_CSS, hListStylesInjected, listAnimateRuntimeInstalled, transitionKeyframesInjected, countUpRuntimeInjected, MEASURE_PREFIX, measureRuntimeInjected, revealRuntimeInjected, vectorAnimStylesInjected, scrollProgressRuntimeInjected, confettiRuntimeInjected, lottieRuntimeInjected, riveRuntimeInjected, gradientKeyframesInjected, parallaxRuntimeInjected, spinKeyframesInjected, marqueeKeyframesInjected, alignItems, zJustifyItems, hAlignItems, bodyFont, kids2, rowKidCtx, rowKids, staggeredKids, asTextL10n, asBoundText, useBoundString, InterpolatedTextView, txt, selectFragmentCase, fragmentValueHash, fragmentSlotContent, FragmentSlotNode, RichContentEditorNode, WorkerSubtreeNode, RichContentNode, resolveItemDeep2, resolveSwipeActions, resolveModBindings, resolvedComponentId, directServiceBindings, ReactiveDirectScalars, HiddenGate, KEYBOARD_INPUT_MODES, AUTOCAPITALIZE_VALUES, ENTER_KEY_HINTS, AUTOGROW_CEILING, EditableField, MenuNode, LoadMoreSentinel, FieldErrorNode, FormView, MediaSlotProvider, MEDIA_ITEM_BINDABLE, MediaPlayerView, VideoNode, PdfViewNode, WebViewNode, InteractivePicker, InteractiveDatePicker, InteractiveSearchField, InteractiveStepper, SYNTHETIC_TAP_ROLE, SYNTHETIC_TABINDEX, INFERRED_DECORATIVE, SELF_RENDERED_LEAF, ROLE_WHEN_NAMED, AUTHORED_ROLE, PENDING_RANGE, RANGE_ROLES, A11Y_PART, NODE_A11Y_ATTRS, INTERACTIVE_ROLES, ALWAYS_INTERACTIVE_COMPONENT_TYPES, controlNode, ToggleNode, SliderNode, SelectionControlNode, TabsNode, SegmentedControlNode, DisclosureGroupNode, GridNode, SplitViewNode, TextNode, ImageNode, ANIMATION_LEAF, LottieNode, RiveNode, AvatarNode, IconNode, ButtonNode, OtpInputNode, ProgressBarNode, ActivityIndicatorNode, NATIVELY_TABBABLE, BottomSheetNode, PRESENTED_OVERLAY_ATTR, PopoverNode, ChipsInputNode, ChipNode, TableNode, GaugeRing, GaugeNode, RATING_METRICS, ratingMetrics, RatingNode, AvatarStripNode, CHART_STROKE_CYCLE, chartStrokeAt, chartBarCenter, ChartNode, donutSliceOpacity, DonutChartNode, LegendMarker, LegendNode, cellAlign, DataTableNode, voiceNoteState, voiceNoteDelivery, VOICE_NOTE_DEFAULT_BARS, clampBarCount, VoiceNoteNode, TimelineNode, WheelPickerNode, ColorPickerNode, FilterChipsNode, TILE_PX, MAX_MERCATOR_LAT, DEFAULT_TILE_MAX_ZOOM, CIRCLE_SEGMENTS, METRES_PER_DEG_LAT, MARKER_HIT_RADIUS, SHAPE_HIT_RADIUS, MapNode, CollapsingHeaderNode, UnsupportedOnSurface, CALENDAR_DATE_ONLY_RE, CAL_DEFAULT_MAX_DOTS, CAL_AGENDA_INITIAL_DAYS, CAL_AGENDA_PAGE_DAYS, CAL_DEFAULT_SNAP_MINUTES, CAL_UNASSIGNED_LANE_ID, MonthCalendarNode, TimeGridNode, AgendaNode, ARIA_ROLE, initialFocusScheduled, PRESENTED_SCOPE, focusRoots, A11yHintDescription, WebRenderer;
+var useIsomorphicLayoutEffect, ResponsiveGrid, SPLIT_EXPANDED_MIN_WIDTH, SPLIT_COLUMN_GAP, ResponsiveSplitView, ABSOLUTE_URL_RE, appearKeyframesInjected, pressStylesInjected, FOCUS_RING_CSS, focusStylesInjected, HLIST_CHILD_CSS, hListStylesInjected, listAnimateRuntimeInstalled, transitionKeyframesInjected, countUpRuntimeInjected, MEASURE_PREFIX, measureRuntimeInjected, revealRuntimeInjected, vectorAnimStylesInjected, scrollProgressRuntimeInjected, confettiRuntimeInjected, lottieRuntimeInjected, riveRuntimeInjected, gradientKeyframesInjected, parallaxRuntimeInjected, spinKeyframesInjected, marqueeKeyframesInjected, alignItems, zJustifyItems, hAlignItems, bodyFont, kids2, rowKidCtx, rowKids, staggeredKids, asTextL10n, asBoundText, useBoundString, InterpolatedTextView, txt, selectFragmentCase, fragmentValueHash, fragmentSlotContent, FragmentSlotNode, RichContentEditorNode, WorkerSubtreeNode, RichContentNode, resolveItemDeep2, resolveSwipeActions, resolveModBindings, resolvedComponentId, directServiceBindings, ReactiveDirectScalars, HiddenGate, KEYBOARD_INPUT_MODES, AUTOCAPITALIZE_VALUES, ENTER_KEY_HINTS, AUTOGROW_CEILING, EditableField, MenuNode, LoadMoreSentinel, FieldErrorNode, FormView, MediaSlotProvider, MEDIA_ITEM_BINDABLE, MediaPlayerView, VideoNode, PdfViewNode, WebViewNode, InteractivePicker, InteractiveDatePicker, InteractiveSearchField, InteractiveStepper, SYNTHETIC_TAP_ROLE, SYNTHETIC_TABINDEX, INFERRED_DECORATIVE, SELF_RENDERED_LEAF, ROLE_WHEN_NAMED, AUTHORED_ROLE, PENDING_RANGE, RANGE_ROLES, NODE_A11Y_ATTRS, INTERACTIVE_ROLES, ALWAYS_INTERACTIVE_COMPONENT_TYPES, controlNode, ToggleNode, SliderNode, SelectionControlNode, TabsNode, SegmentedControlNode, DisclosureGroupNode, GridNode, SplitViewNode, TextNode, ImageNode, ANIMATION_LEAF, LottieNode, RiveNode, AvatarNode, IconNode, ButtonNode, OtpInputNode, ProgressBarNode, ActivityIndicatorNode, NATIVELY_TABBABLE, BottomSheetNode, PRESENTED_OVERLAY_ATTR, PopoverNode, ChipsInputNode, ChipNode, TableNode, GaugeRing, GaugeNode, RATING_METRICS, ratingMetrics, RatingNode, AvatarStripNode, CHART_STROKE_CYCLE, chartStrokeAt, chartBarCenter, ChartNode, donutSliceOpacity, DonutChartNode, LegendMarker, LegendNode, cellAlign, DataTableNode, voiceNoteState, voiceNoteDelivery, VOICE_NOTE_DEFAULT_BARS, clampBarCount, VoiceNoteNode, TimelineNode, WheelPickerNode, ColorPickerNode, FilterChipsNode, TILE_PX, MAX_MERCATOR_LAT, DEFAULT_TILE_MAX_ZOOM, CIRCLE_SEGMENTS, METRES_PER_DEG_LAT, MARKER_HIT_RADIUS, SHAPE_HIT_RADIUS, MapNode, CollapsingHeaderNode, UnsupportedOnSurface, CALENDAR_DATE_ONLY_RE, CAL_DEFAULT_MAX_DOTS, CAL_AGENDA_INITIAL_DAYS, CAL_AGENDA_PAGE_DAYS, CAL_DEFAULT_SNAP_MINUTES, CAL_UNASSIGNED_LANE_ID, MonthCalendarNode, TimeGridNode, AgendaNode, ARIA_ROLE, initialFocusScheduled, PRESENTED_SCOPE, focusRoots, A11yHintDescription, WebRenderer;
 var init_renderNode = __esm({
   "../../core/web-renderer/src/renderNode.tsx"() {
     "use strict";
@@ -35325,7 +35496,7 @@ var init_renderNode = __esm({
       const bound = Object.entries(params).filter(
         ([, v]) => typeof v === "string" && v.startsWith("$service:")
       );
-      const [live2, setLive] = React7.useState(() => {
+      const [live3, setLive] = React7.useState(() => {
         const seed2 = {};
         if (ctx.provider) for (const [k, p] of bound) seed2[k] = ctx.provider.value(servicePath(p));
         return seed2;
@@ -35339,7 +35510,7 @@ var init_renderNode = __esm({
         );
         return () => unsubs.forEach((u) => u());
       }, [ctx.provider, subKey]);
-      const resolved2 = { ...live2 };
+      const resolved2 = { ...live3 };
       for (const [k, v] of Object.entries(params)) {
         if (typeof v === "string" && v.startsWith("$item")) resolved2[k] = resolveScalarStatic(v, ctx);
       }
@@ -35732,18 +35903,21 @@ var init_renderNode = __esm({
       const C = ctx.color;
       React7.useEffect(() => {
         if (!open) return;
+        const onTop = () => menuRef.current != null && isWithinTopModal(menuRef.current);
         const onDown = (e) => {
-          if (hostRef.current && !hostRef.current.contains(e.target)) setOpen(false);
+          if (hostRef.current && !hostRef.current.contains(e.target) && onTop()) setOpen(false);
         };
         const onKey = (e) => {
-          if (e.key === "Escape") setOpen(false);
+          if (e.key !== "Escape" || !onTop()) return;
+          e.stopPropagation();
+          setOpen(false);
         };
         const kinds = ["pointerdown", "touchstart", "mousedown"];
-        for (const k of kinds) document.addEventListener(k, onDown);
-        document.addEventListener("keydown", onKey);
+        for (const k of kinds) document.addEventListener(k, onDown, true);
+        document.addEventListener("keydown", onKey, true);
         return () => {
-          for (const k of kinds) document.removeEventListener(k, onDown);
-          document.removeEventListener("keydown", onKey);
+          for (const k of kinds) document.removeEventListener(k, onDown, true);
+          document.removeEventListener("keydown", onKey, true);
         };
       }, [open]);
       const modal = isOverlayModal("Menu", props.modal);
@@ -36401,11 +36575,11 @@ var init_renderNode = __esm({
       const [retyped, setRetyped] = React7.useState(null);
       React7.useEffect(() => {
         if (!retypeSrc) return;
-        let live2 = true;
+        let live3 = true;
         let made = null;
         const settle = (u) => {
           made = u;
-          if (!live2) {
+          if (!live3) {
             if (u) URL.revokeObjectURL(u);
             return;
           }
@@ -36413,7 +36587,7 @@ var init_renderNode = __esm({
         };
         retypeAsPdf(retypeSrc).then(settle, () => settle(null));
         return () => {
-          live2 = false;
+          live3 = false;
           if (made) URL.revokeObjectURL(made);
           setRetyped((cur) => cur?.from === retypeSrc ? null : cur);
         };
@@ -36713,12 +36887,18 @@ var init_renderNode = __esm({
       };
       const commit = (target) => {
         const next = Math.min(max, Math.max(min, target));
-        if (next === value) return;
+        if (next === value) return void 0;
         setValue(next);
         setBagValue(encodeStepperFieldValue(next, { min, max }));
         dispatch(next);
+        return next;
       };
+      const [pressed, setPressed] = React7.useState({ text: "", count: 0 });
       const bump = (delta) => commit(value + delta);
+      const press = (delta) => {
+        const next = bump(delta);
+        if (next !== void 0) setPressed((p) => ({ text: String(next), count: p.count + 1 }));
+      };
       const onValueKeyDown = (e) => {
         const target = e.key === "ArrowUp" ? value + step : e.key === "ArrowDown" ? value - step : e.key === "Home" && typeof props.min === "number" ? min : e.key === "End" && typeof props.max === "number" ? max : void 0;
         if (target === void 0) return;
@@ -36764,9 +36944,10 @@ var init_renderNode = __esm({
         ] });
       }
       return /* @__PURE__ */ jsxs5("div", { ...root, style: box, children: [
-        /* @__PURE__ */ jsx8("button", { type: "button", tabIndex: -1, "aria-label": "Decrease", disabled: disabled("min"), onClick: () => bump(-step), style: { ...btn("min"), font: "inherit" }, children: "\u2212" }),
+        /* @__PURE__ */ jsx8("button", { type: "button", tabIndex: -1, "aria-label": "Decrease", disabled: disabled("min"), onClick: () => press(-step), style: { ...btn("min"), font: "inherit" }, children: "\u2212" }),
         /* @__PURE__ */ jsx8("b", { ...valueA11y, "aria-valuenow": value, tabIndex: 0, onKeyDown: onValueKeyDown, style: { fontSize: 16, minWidth: 24, textAlign: "center", color: C("textPrimary", "#111"), fontVariantNumeric: "tabular-nums" }, children: value }),
-        /* @__PURE__ */ jsx8("button", { type: "button", tabIndex: -1, "aria-label": "Increase", disabled: disabled("max"), onClick: () => bump(step), style: { ...btn("max"), font: "inherit" }, children: "+" })
+        /* @__PURE__ */ jsx8("button", { type: "button", tabIndex: -1, "aria-label": "Increase", disabled: disabled("max"), onClick: () => press(step), style: { ...btn("max"), font: "inherit" }, children: "+" }),
+        /* @__PURE__ */ jsx8("span", { "aria-live": "polite", style: { position: "absolute", width: 1, height: 1, padding: 0, margin: -1, overflow: "hidden", clip: "rect(0, 0, 0, 0)", whiteSpace: "nowrap", border: 0 }, children: pressed.text + (pressed.count % 2 ? "\xA0" : "") })
       ] });
     });
     SYNTHETIC_TAP_ROLE = "data-hm-synthetic-role";
@@ -36777,7 +36958,6 @@ var init_renderNode = __esm({
     AUTHORED_ROLE = "data-hm-authored-role";
     PENDING_RANGE = "data-hm-pending-range";
     RANGE_ROLES = /* @__PURE__ */ new Set(["progressbar", "slider", "scrollbar", "spinbutton", "meter"]);
-    A11Y_PART = "data-hm-a11y-part";
     NODE_A11Y_ATTRS = ["aria-label", "aria-valuetext", "aria-level", "aria-describedby", "aria-disabled", "aria-selected"];
     INTERACTIVE_ROLES = /* @__PURE__ */ new Set([
       "button",
@@ -37318,7 +37498,8 @@ var init_renderNode = __esm({
       const C = ctx.color;
       const min = props.min ?? 0, max = props.max ?? 1;
       const bound = useResolvedScalar(props.valuePath, ctx);
-      const gRaw = props.valuePath != null ? bound : props.value;
+      const gSource = props.valuePath != null ? bound : props.value;
+      const gRaw = typeof gSource === "string" && gSource.trim() !== "" && Number.isFinite(Number(gSource)) ? Number(gSource) : gSource;
       const v = typeof gRaw === "number" ? gRaw : (min + max) / 2;
       const pct = max > min ? Math.max(0, Math.min(1, (v - min) / (max - min))) : 0;
       const tint = C(props.tint ?? "accentPrimary", "#116DFF");
@@ -37327,8 +37508,7 @@ var init_renderNode = __esm({
       const labelName = useBoundString(props.label, ctx).trim();
       const hasValue = typeof gRaw === "number" && Number.isFinite(gRaw);
       const named = labelName ? { "aria-label": labelName } : hasValue && max > min ? { "aria-label": `${Math.round(pct * 100)}%` } : {};
-      const fractionScale = min === 0 && max === 1;
-      const range = max > min ? { "aria-valuemin": min, "aria-valuemax": max, ...hasValue ? { "aria-valuenow": Math.max(min, Math.min(max, v)), ...fractionScale ? { "aria-valuetext": `${Math.round(pct * 100)}%` } : {} } : {} } : {};
+      const range = max > min ? { "aria-valuemin": min, "aria-valuemax": max, ...hasValue ? { "aria-valuenow": Math.max(min, Math.min(max, v)), "aria-valuetext": `${Math.round(pct * 100)}%` } : {} } : {};
       const a11y = labelName || hasValue && max > min ? { role: "progressbar", ...named, ...range, [SELF_RENDERED_LEAF]: true } : { "aria-hidden": "true", [INFERRED_DECORATIVE]: true, [ROLE_WHEN_NAMED]: "progressbar", [PENDING_RANGE]: range, [SELF_RENDERED_LEAF]: true };
       if (Array.isArray(props.rings) && props.rings.length) {
         const size = 96, thick = 9, step = 22;
@@ -37379,7 +37559,7 @@ var init_renderNode = __esm({
       const size = props.size ?? 36;
       const maxVisible = props.maxVisible ?? 4;
       const shown2 = avatars.slice(0, maxVisible);
-      const overflow = props.overflowCount || Math.max(0, avatars.length - maxVisible);
+      const overflow = (props.showOverflow ?? props.show_overflow) === false ? 0 : props.overflowCount || Math.max(0, avatars.length - maxVisible);
       const shift = Math.round(size * (1 - (props.overlapRatio ?? 0.67)));
       const caption = useBoundString(props.caption, ctx).trim();
       const count2 = shown2.length + overflow;
@@ -37391,7 +37571,16 @@ var init_renderNode = __esm({
             const ring = props.ringGradient ? ctx.gradient(props.ringGradient) : void 0;
             const wrapStyle = ring ? { marginLeft: i === 0 ? 0 : -(size - shift), background: ring, padding: 2.5, borderRadius: "50%" } : { marginLeft: i === 0 ? 0 : -(size - shift), border: `2px solid ${C("surfacePrimary", "#fff")}`, borderRadius: "50%" };
             const who = asText2(a.initials).trim();
-            const circle = avatarCircle(who || "?", size, C, true, bodyFont(ctx));
+            const initials = avatarCircle(who || "?", size, C, true, bodyFont(ctx));
+            const photo = typeof a.imageUrl === "string" && a.imageUrl && !isBinding(a.imageUrl) ? a.imageUrl : "";
+            const circle = photo ? React7.cloneElement(
+              initials,
+              { style: { ...initials.props.style, position: "relative", overflow: "hidden" } },
+              initials.props.children,
+              /* @__PURE__ */ jsx8("img", { src: photo, alt: "", onError: (e) => {
+                e.currentTarget.style.display = "none";
+              }, style: { position: "absolute", inset: 0, width: "100%", height: "100%", objectFit: "cover" } })
+            ) : initials;
             return who ? /* @__PURE__ */ jsx8("div", { role: "listitem", style: wrapStyle, children: React7.cloneElement(circle, { role: "img", "aria-label": who }) }, i) : /* @__PURE__ */ jsx8("div", { "aria-hidden": "true", style: wrapStyle, children: circle }, i);
           }),
           overflow > 0 && /* @__PURE__ */ jsx8("div", { role: "listitem", style: { marginLeft: -(size - shift), width: size, height: size, borderRadius: "50%", border: `2px solid ${C("surfacePrimary", "#fff")}`, background: C("surfaceTertiary", "#e6e6e6"), color: C("textPrimary", "#111"), display: "grid", placeItems: "center", fontSize: size * 0.32, fontWeight: 700, fontFamily: bodyFont(ctx) }, children: /* @__PURE__ */ jsxs5("span", { role: "img", "aria-label": `${overflow} more`, children: [
@@ -40977,9 +41166,9 @@ async function handleOwnerSitesRequest(req, res) {
   try {
     const { fetchLiveOwnerSites } = await import("./apps/wix-owner-clone-live.js");
     const { buildWixOwnerCloneSites } = await import("./apps/wix-owner-clone-app.js");
-    const live2 = await fetchLiveOwnerSites();
-    if (live2) {
-      payload = { sites: live2 };
+    const live3 = await fetchLiveOwnerSites();
+    if (live3) {
+      payload = { sites: live3 };
     } else {
       source = "fallback";
       payload = buildWixOwnerCloneSites();
@@ -47210,17 +47399,17 @@ async function buildFromLoaded(preloaded, dest, opts = {}) {
         base2 = null;
       } else {
         const counting = countingWixCall(await ensureLiveWixCall());
-        const live2 = await liveRenderServices(bundleJs, {
+        const live3 = await liveRenderServices(bundleJs, {
           wixCall: counting.call,
           input,
           budgetMs: collect2.render.loadBudgetMs ?? LIVE_LOAD_BUDGET_MS,
           localDbSchema: appLocalDbSchema,
           descriptor
         });
-        base2 = live2.services;
-        liveCalls = [...live2.calls];
+        base2 = live3.services;
+        liveCalls = [...live3.calls];
         liveReturned = counting.returned();
-        liveErrors = live2.errors;
+        liveErrors = live3.errors;
       }
     } else if (collect2?.render?.mocks && collect2.render.hydrate !== false && bundleName && readBuiltBundle(tier5Dir, bundleName)) {
       const calls = [];
@@ -49473,12 +49662,12 @@ function planFromPayload(payload, base, selectors) {
   }
   return { ok: true, plan: { patch, touched, included, rebound } };
 }
-function regressionDiff(base, live2, touched) {
+function regressionDiff(base, live3, touched) {
   const moves = new Set(touched);
   const rows = [];
-  for (const id of /* @__PURE__ */ new Set([...Object.keys(live2.screens ?? {}), ...Object.keys(base.screens ?? {})])) {
+  for (const id of /* @__PURE__ */ new Set([...Object.keys(live3.screens ?? {}), ...Object.keys(base.screens ?? {})])) {
     if (moves.has(`screen:${id}`)) continue;
-    const l = live2.screens?.[id];
+    const l = live3.screens?.[id];
     const b = base.screens?.[id];
     if (!b) {
       rows.push({ item: `screen:${id}`, live: l?.descriptorHash ?? null, base: null, effect: `${id} DISAPPEARS \u2014 it was added after ${base.releaseId}` });
@@ -49492,13 +49681,13 @@ function regressionDiff(base, live2, touched) {
       rows.push({ item: `screen:${id}`, live: l.descriptorHash, base: b.descriptorHash, effect: `${id} reverts to its ${base.releaseId} descriptor` });
       continue;
     }
-    if (resolveBundleSha(live2, l.bundle) !== resolveBundleSha(base, b.bundle)) {
-      rows.push({ item: `screen:${id}`, live: resolveBundleSha(live2, l.bundle), base: resolveBundleSha(base, b.bundle), effect: `${id} rebinds to its ${base.releaseId} worker bundle` });
+    if (resolveBundleSha(live3, l.bundle) !== resolveBundleSha(base, b.bundle)) {
+      rows.push({ item: `screen:${id}`, live: resolveBundleSha(live3, l.bundle), base: resolveBundleSha(base, b.bundle), effect: `${id} rebinds to its ${base.releaseId} worker bundle` });
     }
   }
   const scalar4 = (key2, item, what) => {
     if (moves.has(item)) return;
-    const l = live2[key2] ?? null;
+    const l = live3[key2] ?? null;
     const b = base[key2] ?? null;
     if (l !== b) rows.push({ item, live: l, base: b, effect: `${what} reverts to ${base.releaseId}` });
   };
@@ -49506,8 +49695,8 @@ function regressionDiff(base, live2, touched) {
   scalar4("appConfigHash", "app-config", "app-config");
   scalar4("iconHash", "icon", "the launcher icon");
   scalar4("minBinaryVersion", "minBinaryVersion", "the minimum binary version");
-  for (const name of /* @__PURE__ */ new Set([...Object.keys(live2.assets ?? {}), ...Object.keys(base.assets ?? {})])) {
-    const l = live2.assets?.[name]?.sha256 ?? null;
+  for (const name of /* @__PURE__ */ new Set([...Object.keys(live3.assets ?? {}), ...Object.keys(base.assets ?? {})])) {
+    const l = live3.assets?.[name]?.sha256 ?? null;
     const b = base.assets?.[name]?.sha256 ?? null;
     if (l === b) continue;
     rows.push({
@@ -49517,16 +49706,16 @@ function regressionDiff(base, live2, touched) {
       effect: b === null ? `asset:${name} record DISAPPEARS \u2014 references fall back to the baked copy or render empty` : `asset:${name} reverts to ${base.releaseId}`
     });
   }
-  for (const name of /* @__PURE__ */ new Set([...Object.keys(live2.authoringDocs ?? {}), ...Object.keys(base.authoringDocs ?? {})])) {
-    const l = live2.authoringDocs?.[name]?.sha256 ?? null;
+  for (const name of /* @__PURE__ */ new Set([...Object.keys(live3.authoringDocs ?? {}), ...Object.keys(base.authoringDocs ?? {})])) {
+    const l = live3.authoringDocs?.[name]?.sha256 ?? null;
     const b = base.authoringDocs?.[name]?.sha256 ?? null;
     if (l !== b) rows.push({ item: `doc:${name}`, live: l, base: b, effect: `${name} reverts to ${base.releaseId}` });
   }
   const PROVENANCE = /* @__PURE__ */ new Set(["releaseId", "gitSha", "shellSha", "label", "notes", "publishedAt", "publishedBy", "attestation", "forcedPastErrors"]);
   const REPORTED_IN_DETAIL = /* @__PURE__ */ new Set(["app", "screens", "bundles", "tokensHash", "appConfigHash", "iconHash", "minBinaryVersion", "assets", "authoringDocs"]);
-  for (const key2 of /* @__PURE__ */ new Set([...Object.keys(live2), ...Object.keys(base)])) {
+  for (const key2 of /* @__PURE__ */ new Set([...Object.keys(live3), ...Object.keys(base)])) {
     if (PROVENANCE.has(key2) || REPORTED_IN_DETAIL.has(key2) || moves.has(key2)) continue;
-    const l = live2[key2] ?? null;
+    const l = live3[key2] ?? null;
     const b = base[key2] ?? null;
     const ls = JSON.stringify(l) ?? "null";
     const bs = JSON.stringify(b) ?? "null";
@@ -50576,7 +50765,7 @@ async function runNotifySetup(pos, flags, io, deps = {}) {
   if (ownership.state !== "owned") return refuse3(io, "app_ownership_unverified", void 0, 1);
   input.app = ownership.slug;
   const common = { target, wixToken, previewTag, fetchImpl: deps.fetchImpl };
-  const readStatus = (live2 = false) => pushSetupRequest({ ...common, operation: "status", query: { app: input.app, site: input.site, ...live2 ? { verify: "live" } : {} } });
+  const readStatus = (live3 = false) => pushSetupRequest({ ...common, operation: "status", query: { app: input.app, site: input.site, ...live3 ? { verify: "live" } : {} } });
   if (operation === "status") return report(await readStatus(flags.refresh === true), flags, io, dir);
   const previous = await readStatus();
   if (!previous.ok || !STATES.has(String(previous.body?.state))) return report(previous, flags, io, dir);
@@ -52572,7 +52761,7 @@ function watchReminder(dir, opts = {}) {
   try {
     if (!existsSync50(join51(dir, "himalaya.content.json"))) return void 0;
     const nowDate = opts.now ?? /* @__PURE__ */ new Date();
-    const live2 = liveWatch(dir, opts.isAlive, nowDate);
+    const live3 = liveWatch(dir, opts.isAlive, nowDate);
     const now = nowDate.getTime();
     const file = join51(dir, REMINDERS_FILE);
     let last = Number.NaN;
@@ -52584,8 +52773,8 @@ function watchReminder(dir, opts = {}) {
     if (!realDirIn(dir, ".himi")) return void 0;
     writeFileAtomic(file, `${JSON.stringify({ watch: new Date(now).toISOString() })}
 `);
-    if (live2) {
-      return `the live preview is running at ${live2.url} (pid ${live2.pid}${live2.by === "init" ? ", started by himi init" : ""}) \u2014 it repaints on every save, and the build board is ${live2.board}; give the owner that link to click around while you work, and do not start another`;
+    if (live3) {
+      return `the live preview is running at ${live3.url} (pid ${live3.pid}${live3.by === "init" ? ", started by himi init" : ""}) \u2014 it repaints on every save, and the build board is ${live3.board}; give the owner that link to click around while you work, and do not start another`;
     }
     const content = opts.content ?? displayPath(dir);
     const remote = readInitSource(dir)?.source === "remote" ? "init did not start it because this template came off the serve plane \u2014 once you have read its code, " : "";
@@ -52632,9 +52821,9 @@ async function startWatchAtInit(dir, opts) {
   const note = given.length ? { note: watchOptOutIgnoredNote(given) } : {};
   const deps = { ...defaultStartWatchDeps, ...opts.deps };
   const now = opts.now ?? /* @__PURE__ */ new Date();
-  const live2 = liveWatch(dir, deps.isAlive, now);
-  if (live2 && (live2.by === "init" || await deps.previewRunning(dir))) {
-    return { skipped: `a live preview of this app is already running (pid ${live2.pid})`, url: live2.url, board: live2.board, pid: live2.pid, ...note };
+  const live3 = liveWatch(dir, deps.isAlive, now);
+  if (live3 && (live3.by === "init" || await deps.previewRunning(dir))) {
+    return { skipped: `a live preview of this app is already running (pid ${live3.pid})`, url: live3.url, board: live3.board, pid: live3.pid, ...note };
   }
   try {
     const port = await deps.freePort(previewPortForDir(dir));
@@ -55973,9 +56162,9 @@ function makeFunctionsHandler(options) {
     const target = resolveTarget3(new URL(request.url).pathname);
     if (!target) return errorResponse(404, "not_found", "function route not found", id);
     if (request.method === "OPTIONS") return new Response(null, { status: 204, headers: { "access-control-allow-origin": "*", "access-control-allow-methods": "GET,POST,PUT,PATCH,DELETE,OPTIONS", "access-control-allow-headers": "authorization,content-type,x-request-id,x-himalaya-release,x-himalaya-preview-token", "x-request-id": id } });
-    const live2 = await options.store.getManifest(target.app);
+    const live3 = await options.store.getManifest(target.app);
     const pin = new URL(request.url).searchParams.get("release") || request.headers.get("x-himalaya-release");
-    let selected = live2;
+    let selected = live3;
     if (pin && !options.previewTokenSecret) return errorResponse(501, "preview_token_unavailable", "pinned release access requires preview token validation", id);
     let previewClaims;
     if (pin && options.previewTokenSecret) {
@@ -58355,19 +58544,19 @@ function publicRecord(value) {
   const { archiveBase64: _archiveBase64, ...record2 } = value;
   return record2;
 }
-function live(value, now) {
+function live2(value, now) {
   if (!value || value.revokedAt) return null;
   if (value.expiresAt && Date.parse(value.expiresAt) <= now.getTime()) return null;
   return value;
 }
 async function resolvePackageShareMetadata(store, id, now = /* @__PURE__ */ new Date()) {
   if (!PACKAGE_SHARE_ID_PATTERN2.test(id) || !store.getDoc) return null;
-  const value = live(parseStored(await store.getDoc(PACKAGE_SHARE_NAMESPACE, id), id), now);
+  const value = live2(parseStored(await store.getDoc(PACKAGE_SHARE_NAMESPACE, id), id), now);
   return value ? publicRecord(value) : null;
 }
 async function resolvePackageShare(store, id, now = /* @__PURE__ */ new Date()) {
   if (!PACKAGE_SHARE_ID_PATTERN2.test(id) || !store.getDoc) return null;
-  const value = live(parseStored(await store.getDoc(PACKAGE_SHARE_NAMESPACE, id), id), now);
+  const value = live2(parseStored(await store.getDoc(PACKAGE_SHARE_NAMESPACE, id), id), now);
   if (!value) return null;
   const archive = await decodeArchive(value, id);
   return archive ? { share: publicRecord(value), archive } : null;
@@ -58725,8 +58914,8 @@ ${releaseId}`;
     if (/^\/v1\/app-config\/[^/]+$/.test(url.pathname)) return drop();
     let servable;
     try {
-      const live2 = await manifest(app);
-      const eligible = live2?.releaseId === pin || await isRingRelease(app, pin);
+      const live3 = await manifest(app);
+      const eligible = live3?.releaseId === pin || await isRingRelease(app, pin);
       const pinned = eligible ? await pinnedManifest(app, pin) : null;
       servable = pinned !== null;
       const screenId = /^\/v1\/screen\/([^/]+)$/.exec(url.pathname)?.[1];
@@ -59249,7 +59438,7 @@ ${releaseId}`;
           if (!m) return json4(404, { error: "app_not_found", app });
         }
         const mm = m;
-        const readDoc = (hash, live2) => pin ? hash ? pinnedBody(app, hash, live2) : Promise.resolve(null) : live2();
+        const readDoc = (hash, live3) => pin ? hash ? pinnedBody(app, hash, live3) : Promise.resolve(null) : live3();
         const ringPinned = pin !== null && request.headers.get(RELEASE_SOURCE_HEADER) === "ring";
         const cfgBytes = ringPinned ? await store.getAppConfig(app) : await readDoc(mm.appConfigHash, () => store.getAppConfig(app));
         if (!cfgBytes) return json4(404, { error: "app_config_not_found", app });
@@ -59279,9 +59468,9 @@ ${releaseId}`;
         let homeFrom = mm;
         let readHome = readDoc;
         if (ringPinned && homeScreenId && !mm.screens[homeScreenId]) {
-          const live2 = await manifest(app);
-          if (live2?.screens[homeScreenId]) {
-            homeFrom = live2;
+          const live3 = await manifest(app);
+          if (live3?.screens[homeScreenId]) {
+            homeFrom = live3;
             readHome = (_hash, liveSlot) => liveSlot();
           }
         }
@@ -59951,21 +60140,21 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-CKwdlTbT.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1127499, sha256: "24d1f9f9ee47c8d4ea8f88ebfca0b78f46d3e64d26b2dd202ae97cbdcf3ede2b" },
-      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1127507, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
-      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1132117, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1620701, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1711625, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1802609, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1893589, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1984461, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 2075441, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2184077, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2293161, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2402209, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2509909, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2598017, length: 4947, sha256: "1d32807684d4cf8de017b14f9b1c6faf05c08f04a8d5d19372d4122c0c66b0bf" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2602964, length: 17344, sha256: "d057298d75e7373e5e2c4d11b7d1bcbea88e03af555ba63d97641c78509c58e4" }
+      { key: "assets/index-C5pLAEVw.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1131202, sha256: "227bc4e092810f75d1b156bbef6e9409b36bd0f92370b33864ff3f309f6fe771" },
+      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1131210, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
+      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1135820, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1624404, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1715328, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1806312, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1897292, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1988164, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 2079144, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2187780, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2296864, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2405912, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2513612, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2601720, length: 4947, sha256: "946631b440fc9601c829ef9cc7aa28a02a1ef6f0de48ac76f88cafdfcb04563c" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2606667, length: 17344, sha256: "d057298d75e7373e5e2c4d11b7d1bcbea88e03af555ba63d97641c78509c58e4" }
     ];
   }
 });
@@ -61677,14 +61866,14 @@ function assertSameAccount(planned, current) {
     `the plan was made with profile "${planned.profile}" (team ${planned.team}, key ${planned.fingerprint}) but this run resolved profile "${current.profile}" (team ${current.team}, key ${current.fingerprint}). Make a new plan with the account you mean.`
   );
 }
-function driftOf(planned, live2) {
+function driftOf(planned, live3) {
   if (planned.decision === "conflict") return void 0;
-  if (live2.decision === "conflict") return `${live2.productId} now conflicts: ${live2.conflicts.join("; ")}`;
-  const unplanned = live2.ops.filter((op) => !planned.ops.some((p) => sameOp(p, op)));
-  return unplanned.length ? `${live2.productId} now needs ${unplanned.map(describeOp).join(", ")}, which the plan did not list` : void 0;
+  if (live3.decision === "conflict") return `${live3.productId} now conflicts: ${live3.conflicts.join("; ")}`;
+  const unplanned = live3.ops.filter((op) => !planned.ops.some((p) => sameOp(p, op)));
+  return unplanned.length ? `${live3.productId} now needs ${unplanned.map(describeOp).join(", ")}, which the plan did not list` : void 0;
 }
-function assertNoDrift(plan, live2) {
-  const drift = [...live2].map(([i, current]) => driftOf(plan.items[i], current)).filter((d) => d !== void 0);
+function assertNoDrift(plan, live3) {
+  const drift = [...live3].map(([i, current]) => driftOf(plan.items[i], current)).filter((d) => d !== void 0);
   if (!drift.length) return;
   throw new IapProvisionError("drift", `App Store Connect changed since the plan was made \u2014 nothing was written:
   - ${drift.join("\n  - ")}
@@ -61854,27 +62043,27 @@ async function knownUnmetFor(item, planned, context) {
   if (!planned.observed) return [];
   return metadataDiffs(item, planned.observed, planned.targetPrice ?? await context.pricing.targetAmount(item.price));
 }
-async function applyItem(item, live2, context, manifest) {
+async function applyItem(item, live3, context, manifest) {
   const base = { target: manifest.target, item, readAt: context.now() };
-  if (live2.decision === "conflict") {
-    const unmet2 = await knownUnmetFor(item, live2, context);
-    return itemResult({ ...base, observed: live2.observed, outcome: "conflict", conflicts: live2.conflicts, unmet: unmet2 });
+  if (live3.decision === "conflict") {
+    const unmet2 = await knownUnmetFor(item, live3, context);
+    return itemResult({ ...base, observed: live3.observed, outcome: "conflict", conflicts: live3.conflicts, unmet: unmet2 });
   }
   const run2 = {
     item,
-    resourceId: live2.observed?.resourceId,
-    versionId: live2.observed?.draftVersionId,
-    localizations: live2.observed?.draftVersionId ? live2.observed.localizations : []
+    resourceId: live3.observed?.resourceId,
+    versionId: live3.observed?.draftVersionId,
+    localizations: live3.observed?.draftVersionId ? live3.observed.localizations : []
   };
-  const steps = await runOps(run2, live2.ops, context, manifest);
+  const steps = await runOps(run2, live3.ops, context, manifest);
   const { observed, failure } = await readBack(run2, context, manifest);
   const unmet = failure ? [`could not read the product back: ${failure}`] : await unmetFor(item, observed, context);
-  const outcome = outcomeOf(live2.ops, steps, unmet);
+  const outcome = outcomeOf(live3.ops, steps, unmet);
   return itemResult({ ...base, readAt: context.now(), observed, outcome, steps, unmet, appleResourceId: run2.resourceId });
 }
-function deferredResult(item, live2, context, manifest) {
-  const steps = live2.ops.map((op) => stepFor(op, "notRun"));
-  return itemResult({ target: manifest.target, item, observed: live2.observed, outcome: "deferred", steps, requirements: [DEFERRED_REQUIREMENT], readAt: context.now() });
+function deferredResult(item, live3, context, manifest) {
+  const steps = live3.ops.map((op) => stepFor(op, "notRun"));
+  return itemResult({ target: manifest.target, item, observed: live3.observed, outcome: "deferred", steps, requirements: [DEFERRED_REQUIREMENT], readAt: context.now() });
 }
 function needsRefresh(planned) {
   return planned.decision !== "conflict" && planned.ops.length > 0;
@@ -61889,12 +62078,12 @@ async function applyIap(planDoc, applyContext) {
   const context = { ...applyContext, pricing: applyContext.pricing ?? new PriceGrid(applyContext.api) };
   const manifest = plan.manifest;
   const refresh = plan.items.flatMap((planned, i) => needsRefresh(planned) ? [i] : []);
-  const live2 = await planItemsAt(context, manifest, refresh);
-  assertNoDrift(plan, live2);
+  const live3 = await planItemsAt(context, manifest, refresh);
+  assertNoDrift(plan, live3);
   const items = [];
   let created = 0;
   for (const [i, item] of manifest.items.entries()) {
-    const itemPlan2 = live2.get(i);
+    const itemPlan2 = live3.get(i);
     if (!itemPlan2) {
       items.push(await plannedResult(item, plan.items[i], plan, context, manifest));
       continue;
@@ -74035,13 +74224,13 @@ async function snapshotAndPublish(fetchImpl, token, msid, opts = {}) {
     timeoutMs: 45e3,
     body: { label: "WIX_CLI", useUniqueLabel: true }
   });
-  const live2 = production ? await veloCall(fetchImpl, "POST", SITE_PUBLISH_URL, { token, msid, timeoutMs: 45e3, body: {} }) : void 0;
+  const live3 = production ? await veloCall(fetchImpl, "POST", SITE_PUBLISH_URL, { token, msid, timeoutMs: 45e3, body: {} }) : void 0;
   return {
     revision: revisionFrom(rev.json),
     codeAppId: codeAppIdFromRevision(rev.json),
     rev,
     rc,
-    live: live2
+    live: live3
   };
 }
 function httpOk(r) {
@@ -80270,9 +80459,9 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
         io.error(JSON.stringify(liveFound));
         return 1;
       }
-      const live2 = liveFound.manifest;
-      if (live2 && live2.releaseId !== base.releaseId) {
-        regressions = regressionDiff2(base, live2, plan.touched);
+      const live3 = liveFound.manifest;
+      if (live3 && live3.releaseId !== base.releaseId) {
+        regressions = regressionDiff2(base, live3, plan.touched);
         if (regressions.length > 0 && !opts.acceptRegressions) {
           io.error(JSON.stringify({
             ok: false,
@@ -80280,7 +80469,7 @@ himi v${cliVersion()} \u2014 run \`himi --version\`. If authoring commands fail
             error: "would_regress",
             app,
             base: { releaseId: base.releaseId, publishedAt: base.publishedAt ?? null },
-            live: { releaseId: live2.releaseId, publishedAt: live2.publishedAt ?? null },
+            live: { releaseId: live3.releaseId, publishedAt: live3.publishedAt ?? null },
             message: `a branch does not merge. Activating a release derived from ${base.releaseId} reverts every item this patch does not move.`,
             wouldRegress: regressions,
             moves: plan.touched,
@@ -81961,9 +82150,9 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
         const scheme = str9(flags.scheme) === "dark" ? "dark" : "light";
         const wantPng = flags.png === true || typeof flags.png === "string";
         const hydrate = flags.static !== true;
-        const live2 = flags.live === true;
+        const live3 = flags.live === true;
         const strict = flags.strict === true;
-        if (live2 && flags.static === true) {
+        if (live3 && flags.static === true) {
           io.error(JSON.stringify({ error: "--static and --live are mutually exclusive: --static renders raw bindings, --live renders real Wix data" }));
           return 2;
         }
@@ -81971,8 +82160,8 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
           io.error(JSON.stringify({ error: `--mocks takes no value (got "${String(flags.mocks)}") \u2014 pass it bare` }));
           return 2;
         }
-        if (flags.mocks === true && (live2 || flags.static === true)) {
-          io.error(JSON.stringify({ error: `--mocks and ${live2 ? "--live" : "--static"} are mutually exclusive: --mocks loads the app's recorded data, ${live2 ? "--live real Wix data" : "--static no data at all"}` }));
+        if (flags.mocks === true && (live3 || flags.static === true)) {
+          io.error(JSON.stringify({ error: `--mocks and ${live3 ? "--live" : "--static"} are mutually exclusive: --mocks loads the app's recorded data, ${live3 ? "--live real Wix data" : "--static no data at all"}` }));
           return 2;
         }
         if (flags.mocks === true && flags["no-mocks"] === true) {
@@ -82051,7 +82240,7 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
         }
         let mocks;
         let mocksNote;
-        const mocksByDefault = flags.mocks !== true && flags["no-mocks"] !== true && !live2 && flags.static !== true && injectedState === void 0;
+        const mocksByDefault = flags.mocks !== true && flags["no-mocks"] !== true && !live3 && flags.static !== true && injectedState === void 0;
         if (flags.mocks === true || mocksByDefault) {
           let rules = null;
           let bad2;
@@ -82074,7 +82263,7 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
           ...hasWorkers ? { tier5Dir: bundleOutDir2(dir) } : {},
           // The settled state is always kept (printed only under --dump-state): it is what says whether
           // the picture landed on the screen's content or on its error, loading or empty state.
-          collect: { lint: true, strict, render: { screenId, scheme, png: wantPng, hydrate, dumpState: true, ...live2 ? { live: true } : {}, ...injectedState ? { state: injectedState } : {}, ...injectedInput ? { input: injectedInput } : {}, ...renderWidth ? { width: renderWidth } : {}, ...flags.rtl === true ? { rtl: true } : {}, ...loadBudgetMs ? { loadBudgetMs } : {}, ...mocks ? { mocks: { rules: mocks.rules, cmsSeed: mocks.cmsSeed } } : {} } }
+          collect: { lint: true, strict, render: { screenId, scheme, png: wantPng, hydrate, dumpState: true, ...live3 ? { live: true } : {}, ...injectedState ? { state: injectedState } : {}, ...injectedInput ? { input: injectedInput } : {}, ...renderWidth ? { width: renderWidth } : {}, ...flags.rtl === true ? { rtl: true } : {}, ...loadBudgetMs ? { loadBudgetMs } : {}, ...mocks ? { mocks: { rules: mocks.rules, cmsSeed: mocks.cmsSeed } } : {} } }
         });
         const r = (outcome.renders ?? [])[0];
         if (!r) {
@@ -82103,11 +82292,11 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
           screenId,
           scheme,
           renderable: r.renderable,
-          hydrated: live2 ? "live" : hydrate,
-          dataSource: renderDataSource({ live: live2, hydrate, liveCalls: r.liveCalls, liveReturned: r.liveReturned, mocked: !!r.mockCalls }),
+          hydrated: live3 ? "live" : hydrate,
+          dataSource: renderDataSource({ live: live3, hydrate, liveCalls: r.liveCalls, liveReturned: r.liveReturned, mocked: !!r.mockCalls }),
           // What --mocks loaded from, how many requests the load made, and the ones no layer held.
           ...r.mockCalls && mocks ? { mocks: { used: true, from: mocks.from, calls: r.mockCalls.length, ...r.mockUnserved?.length ? { unserved: r.mockUnserved } : {}, ...mocks.ignored ? { ignored: mocks.ignored } : {}, ...mocksByDefault ? { default: true, hint: "the app's recorded data loaded by default; --no-mocks renders the offline initial state, --live the real site" } : {} } } : mocksNote ? { mocks: mocksNote } : mocks ? { mocks: { used: false, reason: r.mockBootFailed ? "the screen's worker failed to boot against the recorded data, so its initial state was rendered" : "the screen has no worker bundle to load data into", ...mocks.ignored ? { ignored: mocks.ignored } : {} } } : {},
-          ...live2 ? {
+          ...live3 ? {
             liveCalls: r.liveCalls?.length ?? 0,
             // Beside the attempt count, because the two coming apart IS the signal (#1883).
             liveReturned: r.liveReturned ?? 0,
@@ -82159,7 +82348,7 @@ ${[...afterRun.next, ...testReminder ? [testReminder] : []].join("\n")}`);
         if (pngFile && r.renderable) {
           const { recordShotState: recordShotState2, screenStateOf: screenStateOf2 } = await Promise.resolve().then(() => (init_screen_state(), screen_state_exports));
           const mocked = !!r.mockCalls;
-          landed = screenStateOf2(r.serviceState, r.html, { initial: !live2 && !mocked, offline: mocked && (r.mockUnserved?.length ?? 0) > 0 });
+          landed = screenStateOf2(r.serviceState, r.html, { initial: !live3 && !mocked, offline: mocked && (r.mockUnserved?.length ?? 0) > 0 });
           recordShotState2(dir, screenId, pngFile, landed);
         }
         const autoSkip = process.env.HIMI_AUTO_RENDER === "validate" && landed !== null && (landed.state === "loading" || landed.state === "empty" || landed.state === "error" && landed.offline === true) ? `the picture shows the home screen's ${landed.state} state${landed.initial || landed.offline ? " (an offline preview: the site's data is not loaded offline)" : ""}, so no postcard was journaled from it` : void 0;
@@ -83554,9 +83743,9 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
             await announce(running);
             if (watchKit && bus) {
               const { buildContentBundles: buildContentBundles2, buildReleaseFromContent: buildReleaseFromContent2, bundleOutDir: bundleOutDir2 } = await loadAuthoring();
-              const live2 = join74(running.releaseRoot, running.app);
+              const live3 = join74(running.releaseRoot, running.app);
               const manifestOf = (tree) => JSON.parse(readFileSync90(join74(tree, "release-manifest.json"), "utf8"));
-              let current = manifestOf(live2);
+              let current = manifestOf(live3);
               const failed2 = async (message) => {
                 if (stopping) return;
                 bus.publish("build.failed", { message });
@@ -83586,13 +83775,13 @@ default (no --glyph): ${DEFAULT_GLYPH2} \u2014 a mark that claims nothing, so th
                   const fresh = manifestOf(join74(next, running.app));
                   const diff = watchKit.diffReleases(current, fresh);
                   const { describeChanges: describeChanges2, headline: headline2 } = await Promise.resolve().then(() => (init_build_changes(), build_changes_exports));
-                  const changes = describeChanges2(live2, join74(next, running.app), diff);
-                  const retired = `${live2}.retired-${Date.now()}`;
-                  renameSync9(live2, retired);
+                  const changes = describeChanges2(live3, join74(next, running.app), diff);
+                  const retired = `${live3}.retired-${Date.now()}`;
+                  renameSync9(live3, retired);
                   try {
-                    renameSync9(join74(next, running.app), live2);
+                    renameSync9(join74(next, running.app), live3);
                   } catch {
-                    cpSync3(join74(next, running.app), live2, { recursive: true });
+                    cpSync3(join74(next, running.app), live3, { recursive: true });
                   }
                   rmSync20(retired, { recursive: true, force: true });
                   current = fresh;