@wix/himalaya-cli 0.1065.0 → 0.1067.0

package/dist/cli.mjs

@@ -764,6 +764,36 @@ var init_file_store = __esm({
         else ledger.push(entry);
         writeFileSync2(this.ledgerPath(app), JSON.stringify(ledger, null, 2));
       }
+      // ---- RFC 0061 §3.1 owner-follow `wip` pointer ----
+      // Inside the app directory, so `remove` and `reset` take it with the app. `clearWipIf` is a CAS
+      // for the way this backend is deployed — ONE writer process (serve-control; serve only reads):
+      // the read, compare and delete below are synchronous with no await between them, so no other
+      // request in that process can land in the middle. It is not a cross-process lock.
+      wipPath(app) {
+        return join2(this.appDir(app), "_wip.json");
+      }
+      readWipSync(app) {
+        const b = this.read(app, "_wip.json");
+        if (!b) return null;
+        try {
+          const wip = JSON.parse(b.toString("utf8"));
+          return wip && typeof wip.releaseId === "string" ? wip : null;
+        } catch {
+          return null;
+        }
+      }
+      async putWip(app, wip) {
+        mkdirSync2(this.appDir(app), { recursive: true });
+        writeFileSync2(this.wipPath(app), JSON.stringify(wip, null, 2));
+      }
+      async getWip(app) {
+        return this.readWipSync(app);
+      }
+      async clearWipIf(app, releaseId) {
+        if (this.readWipSync(app)?.releaseId !== releaseId) return false;
+        rmSync(this.wipPath(app), { force: true });
+        return true;
+      }
       bundleUrl(_app, sha2565) {
         return `/v1/bundles/${sha2565}.bundle.js`;
       }
@@ -1407,8 +1437,12 @@ function sentinelizeArchive(raw, fallbackName) {
   } catch {
   }
   const name = contentName ?? config.match(/\bname\s*:\s*["']([^"'\n]+)["']/)?.[1] ?? fallbackName;
+  const packageSlug = new RegExp(`\\b(const PACKAGE_SLUG = )"${escapeRe(name)}"`, "g");
   return Object.fromEntries(
-    entries.map(([rel, body]) => [rel, sentinelizeIdentity(body, { name: IDENTITY_FILES.has(rel) ? name : void 0, ids })])
+    entries.map(([rel, body]) => [
+      rel,
+      sentinelizeIdentity(body, { name: IDENTITY_FILES.has(rel) ? name : void 0, ids }).replace(packageSlug, '$1"__HIMI_APP_SLUG__"')
+    ])
   );
 }
 function materializeSource(files, name, destDir, slug = name) {
@@ -22843,7 +22877,6 @@ 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]+$/;
@@ -26444,7 +26477,6 @@ 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,
@@ -27188,6 +27220,49 @@ function sourceFragment(src) {
     return "";
   }
 }
+function cloneWithKids(el, props, kids2) {
+  if (kids2 === el.props.children) return React5.cloneElement(el, props);
+  return React5.cloneElement(el, props, ...Array.isArray(kids2) ? kids2 : [kids2]);
+}
+function editA11yParts(node, edit) {
+  if (Array.isArray(node)) {
+    let changed = false;
+    const out = node.map((child) => {
+      const next = editA11yParts(child, edit);
+      if (next !== child) changed = true;
+      return next;
+    });
+    return changed ? out : node;
+  }
+  if (!React5.isValidElement(node) || typeof node.type !== "string") return node;
+  const own3 = node.props;
+  if (own3["data-component-id"] != null) return node;
+  const part = own3[A11Y_PART];
+  const kids2 = own3.children;
+  const nextKids = kids2 == null ? kids2 : editA11yParts(kids2, edit);
+  if (typeof part !== "string" && nextKids === kids2) return node;
+  return cloneWithKids(node, typeof part === "string" ? { ...edit(part, own3), [A11Y_PART]: void 0 } : {}, nextKids);
+}
+function a11yPartEdit(routed, authoredName, onNode) {
+  return (part, own3) => {
+    if (part === "derived-name") return authoredName ? {} : { "aria-hidden": "true" };
+    if (part !== "node") return {};
+    onNode();
+    const patch = { ...routed };
+    if (typeof routed["aria-describedby"] === "string" && typeof own3["aria-describedby"] === "string") {
+      patch["aria-describedby"] = `${own3["aria-describedby"]} ${routed["aria-describedby"]}`;
+    }
+    if ("role" in routed && routed.role !== own3.role) {
+      if (!(typeof routed.role === "string" && RANGE_ROLES.has(routed.role))) {
+        patch["aria-valuenow"] = void 0;
+        patch["aria-valuemin"] = void 0;
+        patch["aria-valuemax"] = void 0;
+      }
+      if (routed.role !== "heading" && routed["aria-level"] == null) patch["aria-level"] = void 0;
+    }
+    return patch;
+  };
+}
 function isNativeInteractiveElement(el) {
   const props = el.props;
   return typeof el.type === "string" && (["button", "input", "select", "textarea"].includes(el.type) || el.type === "a" && typeof props.href === "string");
@@ -27229,9 +27304,19 @@ function withExtras(name, render) {
     const inferredDecorative = el.props[INFERRED_DECORATIVE] === true;
     const selfRenderedLeaf = el.props[SELF_RENDERED_LEAF] === true;
     const roleWhenNamed = el.props[ROLE_WHEN_NAMED];
+    const hasA11yParts = el.props[A11Y_PART] === "root";
     if (!Object.keys(pass).length) {
-      if (inferredDecorative || selfRenderedLeaf || roleWhenNamed != null) {
-        return React5.cloneElement(el, { [INFERRED_DECORATIVE]: void 0, [SELF_RENDERED_LEAF]: void 0, [ROLE_WHEN_NAMED]: void 0, [PENDING_RANGE]: void 0, ...additive ? { style: additive } : {} });
+      if (inferredDecorative || selfRenderedLeaf || roleWhenNamed != null || hasA11yParts) {
+        const kids2 = el.props.children;
+        return cloneWithKids(el, {
+          [INFERRED_DECORATIVE]: void 0,
+          [SELF_RENDERED_LEAF]: void 0,
+          [ROLE_WHEN_NAMED]: void 0,
+          [PENDING_RANGE]: void 0,
+          [A11Y_PART]: void 0,
+          ...additive ? { style: additive } : {}
+        }, hasA11yParts ? editA11yParts(kids2, a11yPartEdit({}, false, () => {
+        })) : kids2);
       }
       return additive ? React5.cloneElement(el, { style: additive }) : /* @__PURE__ */ jsx6(Fragment3, { children: el });
     }
@@ -27302,6 +27387,21 @@ function withExtras(name, render) {
         pass.onClick(e);
       };
     }
+    if (hasA11yParts) {
+      next[A11Y_PART] = void 0;
+      const routed = {};
+      const rootIsControl = (typeof pass.onClick === "function" || typeof pass.onDoubleClick === "function") && !ownsInteractiveSemantics;
+      if (!rootIsControl) {
+        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;
+      }
+      let nodeFound = false;
+      const kids2 = editA11yParts(prev.children, a11yPartEdit(routed, pass["aria-label"] != null, () => {
+        nodeFound = true;
+      }));
+      if (nodeFound) for (const k of Object.keys(routed)) delete next[k];
+      return cloneWithKids(el, next, kids2);
+    }
     return React5.cloneElement(el, next);
   };
   Wrapped.displayName = name;
@@ -27816,15 +27916,16 @@ function ariaModal(modal, dflt) {
   const on3 = modal === true || modal === false ? modal : dflt;
   return on3 ? "true" : void 0;
 }
+function a11yModifierString(v, ctx) {
+  if (v == null) return void 0;
+  const r = resolveScalarStatic(v, ctx);
+  const s = r == null ? "" : String(r).trim();
+  return s === "" ? void 0 : s;
+}
 function applyA11ySemantics(node, ctx, extra) {
   const m = node?.modifiers;
   if (!m) return void 0;
-  const str7 = (v) => {
-    if (v == null) return void 0;
-    const r = resolveScalarStatic(v, ctx);
-    const s = r == null ? "" : String(r).trim();
-    return s === "" ? void 0 : s;
-  };
+  const str7 = (v) => a11yModifierString(v, ctx);
   if ((m.accessibilityHidden ?? m.accessibility_hidden) === true) {
     extra["aria-hidden"] = "true";
     extra.inert = "";
@@ -28417,9 +28518,13 @@ function renderInner(node, ctx) {
     case "Badge": {
       const _bt = boundTokenName(props.tokenPath, props.token, ctx);
       const c = _bt ? C(_bt, "#116DFF") : sevColor(ctx, props.style ?? "info");
+      const m = modifiers;
+      const authoredRole = a11yModifierString(m?.accessibilityRole ?? m?.accessibility_role, ctx);
+      const headingLevel = m?.headingLevel ?? m?.heading_level;
+      const roleDeclared = typeof authoredRole === "string" && (authoredRole === "decorative" || Object.prototype.hasOwnProperty.call(ARIA_ROLE, authoredRole)) || typeof headingLevel === "number" && headingLevel >= 1 && headingLevel <= 6;
       const liveCount = typeof props.text === "string" && /^\$(?:service|flag)\b/.test(props.text);
-      const badgeLabel = modifiers?.accessibilityLabel;
-      const badgeRole = liveCount ? "status" : typeof badgeLabel === "string" && badgeLabel.trim() !== "" ? "img" : void 0;
+      const badgeLabel = m?.accessibilityLabel ?? m?.accessibility_label;
+      const badgeRole = roleDeclared ? void 0 : liveCount ? "status" : typeof badgeLabel === "string" && badgeLabel.trim() !== "" ? "img" : void 0;
       return /* @__PURE__ */ jsx6("span", { role: badgeRole, style: { display: "inline-flex", alignItems: "center", padding: "3px 9px", borderRadius: 999, fontSize: 12, fontWeight: 700, fontFamily: bodyFont(ctx), background: `color-mix(in srgb, ${c} 16%, ${C("surfacePrimary", "#fff")})`, color: c, ...wrap }, children: ctx.empty ? "" : txt(props.text, ctx) || "Badge" });
     }
     case "Tag": {
@@ -28764,7 +28869,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, kids, rowKids, staggeredKids, asTextL10n, asBoundText, useBoundString, InterpolatedTextView, txt, selectFragmentCase, fragmentValueHash, fragmentSlotContent, FragmentSlotNode, WorkerSubtreeNode, 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, 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, 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, initialFocusSeen, PRESENTED_SCOPE, presentedOpeners, presentedObserver, 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, kids, rowKids, staggeredKids, asTextL10n, asBoundText, useBoundString, InterpolatedTextView, txt, selectFragmentCase, fragmentValueHash, fragmentSlotContent, FragmentSlotNode, WorkerSubtreeNode, 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, 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, initialFocusSeen, PRESENTED_SCOPE, presentedOpeners, presentedObserver, A11yHintDescription, WebRenderer;
 var init_renderNode = __esm({
   "../../core/web-renderer/src/renderNode.tsx"() {
     "use strict";
@@ -30282,13 +30387,20 @@ var init_renderNode = __esm({
         if (!onChange || !ctx.onAction) return;
         ctx.onAction({ ...onChange, params: { ...onChange.params ?? {}, value: next }, args: { ...onChange.args ?? {}, value: next } });
       };
-      const bump = (delta) => {
-        const next = Math.min(max, Math.max(min, value + delta));
+      const commit = (target) => {
+        const next = Math.min(max, Math.max(min, target));
         if (next === value) return;
         setValue(next);
         setBagValue(encodeStepperFieldValue(next, { min, max }));
         dispatch(next);
       };
+      const bump = (delta) => commit(value + delta);
+      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;
+        e.preventDefault();
+        commit(target);
+      };
       const box = { display: "inline-flex", alignItems: "center", gap: 12, background: C("surfaceTertiary", "#eee"), borderRadius: ctx.radius("md", 8), padding: "4px 6px", width: "fit-content", ...wrap };
       const disabled = (at) => at === "min" ? value <= min : value >= max;
       const btn = (at) => ({
@@ -30305,25 +30417,31 @@ var init_renderNode = __esm({
         opacity: disabled(at) ? 0.4 : 1,
         userSelect: "none"
       });
-      const named = { [ROLE_WHEN_NAMED]: "group" };
+      const valueA11y = {
+        [A11Y_PART]: "node",
+        role: "spinbutton",
+        "aria-valuemin": typeof props.min === "number" ? min : void 0,
+        "aria-valuemax": typeof props.max === "number" ? max : void 0
+      };
+      const root = { [A11Y_PART]: "root" };
       if (ctx.empty) {
-        return /* @__PURE__ */ jsxs3("div", { ...named, style: box, children: [
+        return /* @__PURE__ */ jsxs3("div", { ...root, style: box, children: [
           /* @__PURE__ */ jsx6("span", { style: btn("min"), children: "\u2212" }),
-          /* @__PURE__ */ jsx6("b", { style: { fontSize: 16, minWidth: 24, textAlign: "center", color: C("textPrimary", "#111") }, children: "\u2014" }),
+          /* @__PURE__ */ jsx6("b", { ...valueA11y, style: { fontSize: 16, minWidth: 24, textAlign: "center", color: C("textPrimary", "#111") }, children: "\u2014" }),
           /* @__PURE__ */ jsx6("span", { style: btn("max"), children: "+" })
         ] });
       }
       if (!ctx.onAction) {
-        return /* @__PURE__ */ jsxs3("div", { ...named, style: box, children: [
+        return /* @__PURE__ */ jsxs3("div", { ...root, style: box, children: [
           /* @__PURE__ */ jsx6("span", { style: btn("min"), children: "\u2212" }),
-          /* @__PURE__ */ jsx6("b", { style: { fontSize: 16, minWidth: 24, textAlign: "center", color: C("textPrimary", "#111") }, children: value }),
+          /* @__PURE__ */ jsx6("b", { ...valueA11y, "aria-valuenow": value, "aria-readonly": "true", style: { fontSize: 16, minWidth: 24, textAlign: "center", color: C("textPrimary", "#111") }, children: value }),
           /* @__PURE__ */ jsx6("span", { style: btn("max"), children: "+" })
         ] });
       }
-      return /* @__PURE__ */ jsxs3("div", { ...named, style: box, children: [
-        /* @__PURE__ */ jsx6("button", { type: "button", "aria-label": "Decrease", disabled: disabled("min"), onClick: () => bump(-step), style: { ...btn("min"), font: "inherit" }, children: "\u2212" }),
-        /* @__PURE__ */ jsx6("b", { style: { fontSize: 16, minWidth: 24, textAlign: "center", color: C("textPrimary", "#111"), fontVariantNumeric: "tabular-nums" }, children: value }),
-        /* @__PURE__ */ jsx6("button", { type: "button", "aria-label": "Increase", disabled: disabled("max"), onClick: () => bump(step), style: { ...btn("max"), font: "inherit" }, children: "+" })
+      return /* @__PURE__ */ jsxs3("div", { ...root, style: box, children: [
+        /* @__PURE__ */ jsx6("button", { type: "button", tabIndex: -1, "aria-label": "Decrease", disabled: disabled("min"), onClick: () => bump(-step), style: { ...btn("min"), font: "inherit" }, children: "\u2212" }),
+        /* @__PURE__ */ jsx6("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__ */ jsx6("button", { type: "button", tabIndex: -1, "aria-label": "Increase", disabled: disabled("max"), onClick: () => bump(step), style: { ...btn("max"), font: "inherit" }, children: "+" })
       ] });
     });
     SYNTHETIC_TAP_ROLE = "data-hm-synthetic-role";
@@ -30334,6 +30452,8 @@ 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",
       "checkbox",
@@ -30916,19 +31036,21 @@ var init_renderNode = __esm({
       const count2 = shown2.length + overflow;
       const countText = count2 > 0 ? `${count2} ${count2 === 1 ? "person" : "people"}` : "";
       const groupName = [caption, countText].filter(Boolean).join(", ");
-      return /* @__PURE__ */ jsxs3("div", { role: "group", "aria-label": groupName || void 0, "data-a11y-value": countText || void 0, ...{ [SELF_RENDERED_LEAF]: true }, style: { width: "100%", ...wrap }, children: [
-        /* @__PURE__ */ jsxs3("div", { style: { display: "flex" }, children: [
+      return /* @__PURE__ */ jsxs3("div", { role: "group", "aria-label": groupName || void 0, "data-a11y-value": countText || void 0, ...{ [SELF_RENDERED_LEAF]: true, [A11Y_PART]: "root" }, style: { width: "100%", ...wrap }, children: [
+        /* @__PURE__ */ jsxs3("div", { role: "list", style: { display: "flex" }, children: [
           shown2.map((a, i) => {
             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%" };
-            return /* @__PURE__ */ jsx6("div", { style: wrapStyle, children: avatarCircle(asText2(a.initials) || "?", size, C, true, bodyFont(ctx)) }, i);
+            const who = asText2(a.initials).trim();
+            const circle = avatarCircle(who || "?", size, C, true, bodyFont(ctx));
+            return who ? /* @__PURE__ */ jsx6("div", { role: "listitem", style: wrapStyle, children: React5.cloneElement(circle, { role: "img", "aria-label": who }) }, i) : /* @__PURE__ */ jsx6("div", { "aria-hidden": "true", style: wrapStyle, children: circle }, i);
           }),
-          overflow > 0 && /* @__PURE__ */ jsxs3("div", { 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: [
+          overflow > 0 && /* @__PURE__ */ jsx6("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__ */ jsxs3("span", { role: "img", "aria-label": `${overflow} more`, children: [
             "+",
             overflow
-          ] })
+          ] }) })
         ] }),
-        props.caption && /* @__PURE__ */ jsx6("div", { style: { fontSize: 13, color: C("textSecondary", "#888"), marginTop: 8 }, children: txt(props.caption, ctx) })
+        props.caption && /* @__PURE__ */ jsx6("div", { ...{ [A11Y_PART]: "derived-name" }, style: { fontSize: 13, color: C("textSecondary", "#888"), marginTop: 8 }, children: txt(props.caption, ctx) })
       ] });
     });
     CHART_STROKE_CYCLE = ["solid", "dashed", "dotted"];
@@ -31741,11 +31863,11 @@ var init_renderNode = __esm({
       const boundImageUrl = useResolvedScalar(props.imageUrl != null && isBinding(props.imageUrl) ? props.imageUrl : void 0, ctx);
       const rawImageUrl = props.imageUrl != null && isBinding(props.imageUrl) ? boundImageUrl : props.imageUrl;
       const imageUrl = typeof rawImageUrl === "string" && rawImageUrl !== "" ? resolveAssetUrl(rawImageUrl, ctx.assetBaseUrl) : void 0;
-      return /* @__PURE__ */ jsxs3("div", { style: { width: "100%", ...wrap }, children: [
+      return /* @__PURE__ */ jsxs3("div", { ...{ [A11Y_PART]: "root" }, style: { width: "100%", ...wrap }, children: [
         /* @__PURE__ */ jsxs3("div", { style: { position: "relative", height: Math.min(props.expandedHeight ?? 120, 160), borderRadius: ctx.radius("md", 10), overflow: "hidden", background: imageUrl ? void 0 : `linear-gradient(135deg, ${C("accentPrimary", "#116DFF")}, ${C("accentSecondary", "#0E5FE3")})` }, children: [
           imageUrl && /* @__PURE__ */ jsx6("img", { src: imageUrl, alt: "", style: { width: "100%", height: "100%", objectFit: "cover" } }),
           /* @__PURE__ */ jsxs3("div", { style: { position: "absolute", left: 14, bottom: 12, color: "#fff", textShadow: "0 1px 4px rgba(0,0,0,.5)" }, children: [
-            /* @__PURE__ */ jsx6("div", { role: "heading", "aria-level": 2, style: { fontFamily: ctx.font("title1").family || ctx.idiom && ctx.idiom !== "base" ? fontStack(ctx.font("title1").family, ctx.idiom) : '"Wix Madefor Display", system-ui', fontWeight: 700, fontSize: 20 }, children: txt(props.title, ctx) }),
+            /* @__PURE__ */ jsx6("div", { ...{ [A11Y_PART]: "node" }, role: "heading", "aria-level": 2, style: { fontFamily: ctx.font("title1").family || ctx.idiom && ctx.idiom !== "base" ? fontStack(ctx.font("title1").family, ctx.idiom) : '"Wix Madefor Display", system-ui', fontWeight: 700, fontSize: 20 }, children: txt(props.title, ctx) }),
             props.subtitle && /* @__PURE__ */ jsx6("div", { style: { fontSize: 13, opacity: 0.9 }, children: txt(props.subtitle, ctx) })
           ] })
         ] }),
@@ -38069,6 +38191,12 @@ var init_src6 = __esm({
   }
 });
 
+// ../../core/serve-storage/src/wip-pointer.ts
+var init_wip_pointer = __esm({
+  "../../core/serve-storage/src/wip-pointer.ts"() {
+  }
+});
+
 // ../../core/serve-storage/src/release-patch.ts
 import { createHash as createHash17 } from "node:crypto";
 function sha256hex(b) {
@@ -38104,6 +38232,7 @@ function releaseContentId(m) {
 var init_release_patch = __esm({
   "../../core/serve-storage/src/release-patch.ts"() {
     init_widget_identity();
+    init_wip_pointer();
   }
 });
 
@@ -52942,21 +53071,21 @@ var init_preview_assets_generated = __esm({
   "../../packages/serve/src/preview-assets.generated.ts"() {
     init_preview_assets_format();
     PREVIEW_ASSET_MANIFEST = [
-      { key: "assets/index-BU6QijMM.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1060352, sha256: "f608f6d0e14dafe6c495e5df15d09d7512e0a8d87732feea4f4e8e36de7917e4" },
-      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1060360, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
-      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1064970, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
-      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1553554, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
-      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1644478, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
-      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1735462, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
-      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1826442, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
-      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1917314, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
-      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 2008294, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
-      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2116930, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
-      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2226014, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
-      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2335062, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
-      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2442762, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
-      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2530870, length: 4947, sha256: "c760d7592d0a40904bb13edaec8e8991f79fc2eb732c5dfee54fea36e6dceecb" },
-      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2535817, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
+      { key: "assets/index-RMW-OZ7N.js", contentType: "application/javascript; charset=utf-8", offset: 8, length: 1062852, sha256: "5ceea282c8f188d80853097ec1e56e9f363fcd19e5b7d0882134f326db513d89" },
+      { key: "fonts/Roboto-LICENSE.txt", contentType: "application/octet-stream", offset: 1062860, length: 4610, sha256: "994062dd7af4186a739de55dd9e151c63b6301f8e2cbafc608d35c2e87da0cd2" },
+      { key: "fonts/Roboto-Variable.ttf", contentType: "font/ttf", offset: 1067470, length: 488584, sha256: "d7598e12c5dbef095ff8272cfc55da0250bd07fbdecbac8a530b9b277872a134" },
+      { key: "fonts/WixMadeforDisplay-Bold.ttf", contentType: "font/ttf", offset: 1556054, length: 90924, sha256: "ec4c7d63772d980d6e147b2df6215fd2737e4b04cebe0cf7e11dc695fb63cdcf" },
+      { key: "fonts/WixMadeforDisplay-ExtraBold.ttf", contentType: "font/ttf", offset: 1646978, length: 90984, sha256: "bf4c16a2774edd38a921edf3099469866cd74c094fd596f3fa4e81f54a04dfaa" },
+      { key: "fonts/WixMadeforDisplay-Medium.ttf", contentType: "font/ttf", offset: 1737962, length: 90980, sha256: "368faca44fb9f7207e4af784e94750b1ee59c1098b8689e0f4a918926f244fb5" },
+      { key: "fonts/WixMadeforDisplay-Regular.ttf", contentType: "font/ttf", offset: 1828942, length: 90872, sha256: "97ed8f1a6772abe26e3d8af5cecfc4b02faa94497d585b0398b5053b739a70c1" },
+      { key: "fonts/WixMadeforDisplay-SemiBold.ttf", contentType: "font/ttf", offset: 1919814, length: 90980, sha256: "642feab8a48ddf6c7a89d7c2a7c0edfa0e6e773f671287e460e222703563191e" },
+      { key: "fonts/WixMadeforText-Bold.ttf", contentType: "font/ttf", offset: 2010794, length: 108636, sha256: "37c179b4fefb63ea9637322b84583a2df53aa226c150294eea1675c14b1b8e29" },
+      { key: "fonts/WixMadeforText-ExtraBold.ttf", contentType: "font/ttf", offset: 2119430, length: 109084, sha256: "62e2fe4718129f36ecdb0ae4de385bd6b81ecc876146447167c6c140fad699a9" },
+      { key: "fonts/WixMadeforText-Medium.ttf", contentType: "font/ttf", offset: 2228514, length: 109048, sha256: "4ecf270136af928612c76fe4ebade91d8156975e5ea4c0cf9225501dd1788e02" },
+      { key: "fonts/WixMadeforText-Regular.ttf", contentType: "font/ttf", offset: 2337562, length: 107700, sha256: "dee56f09fd3efc127c1ea95557edc74110c1460a46287da36e0af25efd341ef5" },
+      { key: "fonts/WixMadeforText-SemiBold.ttf", contentType: "font/ttf", offset: 2445262, length: 88108, sha256: "dced97a77624bc5f8b1ae65850360908297f4588e09feb6f22792d29dc7e765b" },
+      { key: "index.html", contentType: "text/html; charset=utf-8", offset: 2533370, length: 4947, sha256: "f7717e4d819fee4e0719a369ca061f514e02ff24f7f0dacaa6469a4a2fca8dcf" },
+      { key: "t5-frame.html", contentType: "text/html; charset=utf-8", offset: 2538317, length: 17209, sha256: "dffc9718e2faa63ae2cc919e0a842f585ed565aaaa7c53778e90379442c731b6" }
     ];
   }
 });

package/guides/wix-site-to-himi-app.md

@@ -178,8 +178,8 @@ book says which happened on the `cms collections:` line (`(skipped: no owner tok
 The `clientId`-is-the-binding rule above is about the **app's** runtime site binding, not this.
 
 `--apply` writes `provisioning.json` + token **values**, and patches the branded-lite
-home in `dev/index.ts`: its `onAppear` params (`ownerDefaultLayout`, `brandAccent`,
-`verticals`) and, when the analysis recognized any vertical, the Explore grid, the home
+home in `dev/index.ts`: its `onAppear` params (`ownerDefaultLayout`, `verticals`, and
+`brandAccent` in apps scaffolded before the home's brand colour followed the tokens) and, when the analysis recognized any vertical, the Explore grid, the home
 modules and — on a site without `store` — the Shop calls to action, naming what it
 removed in its notes (`himi docs wix-business-context`). It does **not** rewrite
 `config.ts` tabBar — you still set 2–4 Hebrew/RTL tabs to the site's jobs. If home still

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1065.0",
+  "version": "0.1067.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -65,5 +65,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "16dd7f4ab7b65f7c360fca033a4bfb6652609821bc7cd4c1beabb594"
+  "falconPackageHash": "0c8d3503f5ca13101d4857f4aea03d5974e1c26ac88f40e350b6d4de"
 }

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

@@ -2335,7 +2335,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"store\",\"bookings\",\"plans\",\"blog\"]",
             "homeModules": "[{\"id\":\"member_progress\",\"label\":\"This week's schedule\",\"dataSource\":\"member.bookings.schedule\",\"emptyWhen\":[\"hideMemberProgress\"]},{\"id\":\"up_next\",\"label\":\"Up next\",\"dataSource\":\"member.bookings\",\"emptyWhen\":[\"hideNextBooking\",\"hidePersonalError\"]},{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Discover 1\",\"dataSource\":\"salonLuxe.section0\",\"emptyWhen\":[\"hideHeroImage\"]},{\"id\":\"section_1\",\"label\":\"__HIMI_APP_NAME__\",\"dataSource\":\"salonLuxe.section1\"}]",
             "ownerDefaultLayout": "salonLuxe",
-            "brandAccent": "#A65E58",
             "copy": "{\"home.bookVisitCta\":\"Book a visit\",\"home.featuredTitle\":\"Salon picks\",\"home.stylistsCaption\":\"Meet your stylists\",\"home.treatmentsSubtitle\":\"Book your favorite in a couple of taps.\",\"home.treatmentsTitle\":\"Signature treatments\"}"
           }
         }
@@ -4953,10 +4952,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#A65E58"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/beauty-salon/tier5-src/_shared/himi-layouts.ts

@@ -134,12 +134,14 @@ export function isAccentId(x: unknown): x is AccentId {
   return typeof x === "string" && (ACCENT_IDS as readonly string[]).includes(x);
 }
 
-/** Resolve an accent id to a concrete hex, falling back to the app's brand color
- *  for `brand` or any unknown value — so `backgroundColorPath` always binds to a
- *  valid color. */
-export function accentColor(id: string, brandFallback: string): string {
-  if (isAccentId(id) && ACCENT_META[id].hex) return ACCENT_META[id].hex;
-  return brandFallback;
+/** Resolve an accent id to its curated hex, or "" for `brand` and any unknown value.
+ *  "" is deliberate: a bound `backgroundColorPath` that resolves empty keeps the surface's
+ *  own `accentPrimary` token on every renderer, and that token IS the brand — after a
+ *  `site analyze --apply` and after a hand edit of tokens.json alike. A brand colour copied
+ *  into the descriptor instead (the old `brandAccent` param) went stale on the second path:
+ *  the Home pill kept the template's blue after a rebrand. */
+export function accentColor(id: string): string {
+  return isAccentId(id) ? ACCENT_META[id].hex : "";
 }
 
 /** Content-derived default: booking intent > deep catalog > editorial (blog-forward) > balanced.

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

@@ -19,11 +19,10 @@ import {
 interface State {
   /** The pending accent id (persisted on Apply, re-read by the home worker). */
   pendingAccent: string;
-  /** The app's brand color (from the onAppear param) — the "brand" accent swatch
-   *  and the accent fallback resolve to it. */
-  brandAccent: string;
-  // Per-accent swatch colors. backgroundColorPath resolves `$service:` paths but
-  // NOT per-row `$item.` fields, so each static swatch binds its own flat field.
+  // Per-accent swatch colors. backgroundColorPath resolves `$service:` paths but NOT
+  // per-row `$item.` fields, so each static swatch binds its own flat field.
+  // `accentHex_brand` is "" on purpose: the swatch keeps its own accentPrimary token,
+  // which is the brand (see accentColor in _shared/himi-layouts.ts).
   accentHex_brand: string;
   accentHex_amber: string;
   accentHex_terracotta: string;
@@ -54,7 +53,7 @@ function paramValue(arg: unknown, key: string): string {
   return typeof result === "string" ? result : "";
 }
 
-function build(pendingAccent: string, brandAccent: string): State {
+function build(pendingAccent: string): State {
   const flags: Record<string, boolean> = {};
   for (const id of ACCENT_IDS) {
     flags[`selected_${id}`] = id === pendingAccent;
@@ -63,8 +62,7 @@ function build(pendingAccent: string, brandAccent: string): State {
   return {
     ...flags,
     pendingAccent,
-    brandAccent,
-    accentHex_brand: brandAccent || ACCENT_META.amber.hex,
+    accentHex_brand: "",
     accentHex_amber: ACCENT_META.amber.hex,
     accentHex_terracotta: ACCENT_META.terracotta.hex,
     accentHex_sage: ACCENT_META.sage.hex,
@@ -84,24 +82,21 @@ const svc = defineService<State, {
   apply: (state: State) => State;
   reset: (state: State) => State;
 }>("himiBrandedAppearance", {
-  state: build(initialAccent(), ""),
+  state: build(initialAccent()),
   actions: {
-    // onAppear: re-read the persisted accent + the app's brand color so the swatches
-    // reflect reality (the brand swatch tints to the app's own color).
-    sync: (state, arg) => {
-      const brandAccent = paramValue(arg, "brandAccent") || state.brandAccent;
-      return build(initialAccent(), brandAccent);
-    },
+    // onAppear: re-read the persisted accent so the swatches reflect reality. An older
+    // descriptor may still pass a `brandAccent`; it is not used (the Brand swatch is the token).
+    sync: () => build(initialAccent()),
     // Tapping an accent swatch marks it pending (persisted on Apply).
     selectAccent: (state, arg) => {
       const id = paramValue(arg, "id");
       if (!isAccentId(id)) return state;
-      return build(id, state.brandAccent);
+      return build(id);
     },
     // Apply: persist the accent; the home worker re-reads it on launch.
     apply: (state) => {
       try { storage()?.setItem(ACCENT_KEY, state.pendingAccent); } catch { /* best-effort */ }
-      return build(state.pendingAccent, state.brandAccent);
+      return build(state.pendingAccent);
     },
     // Reset: clear the override, reverting to the brand accent.
     reset: (state) => {
@@ -110,7 +105,7 @@ const svc = defineService<State, {
         if (store?.removeItem) store.removeItem(ACCENT_KEY);
         else store?.setItem(ACCENT_KEY, "");
       } catch { /* best-effort */ }
-      return build(DEFAULT_ACCENT, state.brandAccent);
+      return build(DEFAULT_ACCENT);
     },
   },
 });

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

@@ -338,11 +338,11 @@ function storedLayout(): string | null {
 function storedAccent(): string {
   try { return storage()?.getItem(ACCENT_KEY) ?? ""; } catch { return ""; }
 }
-// user accent (storage) → brand color (onAppear param) fallback. Always a valid
-// hex so backgroundColorPath binds cleanly; "" brand param at first paint just
-// falls the surface back to its accentPrimary token.
-function resolveAccent(arg: unknown): string {
-  return resolveAccentColor(storedAccent(), paramValue(arg, "brandAccent"));
+// The member's chosen accent (storage), else "" — the surface keeps its accentPrimary token,
+// which is the brand. An older descriptor's `brandAccent` param is ignored: it was a copy of
+// the brand that a hand edit of tokens.json left behind.
+function resolveAccent(_arg?: unknown): string {
+  return resolveAccentColor(storedAccent());
 }
 
 // onAppear param reader (the himi-branded-lite-cms pattern): the descriptor

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

@@ -2923,8 +2923,7 @@ const SCREENS = runtimeSetting({
           "params": {
             "verticals": "[\"store\",\"bookings\",\"restaurants\",\"programs\",\"plans\",\"feed\",\"members\",\"forum\",\"coupons\",\"notifications\",\"loyalty\",\"reviews\",\"portfolio\",\"reservations\",\"invoices\",\"badges\",\"notifsettings\",\"events\",\"blog\",\"groups\",\"cms\",\"donations\",\"giftCards\",\"videos\",\"podcasts\",\"forms\",\"galleries\",\"inbox\",\"faq\"]",
             "homeModules": "[{\"id\":\"member_progress\",\"label\":\"This week's schedule\",\"dataSource\":\"member.bookings.schedule\",\"emptyWhen\":[\"hideMemberProgress\"]},{\"id\":\"up_next\",\"label\":\"Up next\",\"dataSource\":\"member.bookings\",\"emptyWhen\":[\"hideNextBooking\",\"hidePersonalError\"]},{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Discover 1\",\"dataSource\":\"classic.section0\",\"emptyWhen\":[\"hideFeaturedSkeleton\"]},{\"id\":\"section_1\",\"label\":\"Featured products\",\"dataSource\":\"classic.section1\"}]",
-            "ownerDefaultLayout": "",
-            "brandAccent": "#0A66C2"
+            "ownerDefaultLayout": ""
           }
         }
       }
@@ -5981,10 +5980,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#0A66C2"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/branded-lite/tier5-src/_shared/himi-layouts.ts

@@ -134,12 +134,14 @@ export function isAccentId(x: unknown): x is AccentId {
   return typeof x === "string" && (ACCENT_IDS as readonly string[]).includes(x);
 }
 
-/** Resolve an accent id to a concrete hex, falling back to the app's brand color
- *  for `brand` or any unknown value — so `backgroundColorPath` always binds to a
- *  valid color. */
-export function accentColor(id: string, brandFallback: string): string {
-  if (isAccentId(id) && ACCENT_META[id].hex) return ACCENT_META[id].hex;
-  return brandFallback;
+/** Resolve an accent id to its curated hex, or "" for `brand` and any unknown value.
+ *  "" is deliberate: a bound `backgroundColorPath` that resolves empty keeps the surface's
+ *  own `accentPrimary` token on every renderer, and that token IS the brand — after a
+ *  `site analyze --apply` and after a hand edit of tokens.json alike. A brand colour copied
+ *  into the descriptor instead (the old `brandAccent` param) went stale on the second path:
+ *  the Home pill kept the template's blue after a rebrand. */
+export function accentColor(id: string): string {
+  return isAccentId(id) ? ACCENT_META[id].hex : "";
 }
 
 /** Content-derived default: booking intent > deep catalog > editorial (blog-forward) > balanced.