@wix/himalaya-cli 0.1065.0 → 0.1066.0

package/templates/branded-lite/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/branded-lite/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/community-club/dev/index.ts

@@ -1958,7 +1958,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"feed\",\"events\",\"blog\",\"groups\",\"cms\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Discover 1\",\"dataSource\":\"communityPulse.section0\",\"emptyWhen\":[\"noMemberAvatars\"]},{\"id\":\"section_1\",\"label\":\"Announcement\",\"dataSource\":\"communityPulse.section1\",\"emptyWhen\":[\"noAnnouncement\",\"noUpcomingEvents\"]},{\"id\":\"section_2\",\"label\":\"Groups\",\"dataSource\":\"communityPulse.section2\",\"emptyWhen\":[\"noGroupCards\"]},{\"id\":\"section_3\",\"label\":\"Latest activity\",\"dataSource\":\"communityPulse.section3\"}]",
             "ownerDefaultLayout": "communityPulse",
-            "brandAccent": "#6C3FC4",
             "copy": "{\"home.activityTitle\":\"Latest activity\",\"home.announcementCaption\":\"Announcement\",\"home.eventsTitle\":\"Upcoming events\",\"home.groupsSubtitle\":\"Find your people.\",\"home.groupsTitle\":\"Groups\",\"home.membersCaption\":\"Our members\",\"home.onboardingBody\":\"Join groups, RSVP to events, and keep up with the community feed — all in one place.\"}"
           }
         }
@@ -4223,10 +4222,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#6C3FC4"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/community-club/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/community-club/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/community-club/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/events-meetups/dev/index.ts

@@ -2142,7 +2142,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"feed\",\"events\",\"blog\",\"groups\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Next up\",\"dataSource\":\"eventsFirst.section0\",\"emptyWhen\":[\"noNextEvent\"]},{\"id\":\"section_1\",\"label\":\"This season\",\"dataSource\":\"eventsFirst.section1\",\"emptyWhen\":[\"noUpcomingEvents\"]},{\"id\":\"section_2\",\"label\":\"Discover 3\",\"dataSource\":\"eventsFirst.section2\"},{\"id\":\"section_3\",\"label\":\"Latest from the community\",\"dataSource\":\"eventsFirst.section3\"}]",
             "ownerDefaultLayout": "eventsFirst",
-            "brandAccent": "#5B3E96",
             "copy": "{\"home.activityTitle\":\"Latest from the community\",\"home.agendaTitle\":\"This season\",\"home.allEventsCta\":\"All events\",\"home.eventsTitle\":\"Upcoming events\",\"home.groupsSubtitle\":\"Find your crew.\",\"home.groupsTitle\":\"Groups\",\"home.membersCaption\":\"Who's coming\",\"home.nextUpCaption\":\"Next up\",\"home.onboardingBody\":\"See what's next, RSVP in a couple of taps, and keep up with the community between events — all in one place.\",\"home.recapsCaption\":\"Event recaps\",\"home.rsvpCta\":\"View event & RSVP\"}"
           }
         }
@@ -4407,10 +4406,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#5B3E96"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/events-meetups/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/events-meetups/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/events-meetups/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/gym-fitness/dev/index.ts

@@ -2423,7 +2423,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"store\",\"bookings\",\"plans\",\"events\",\"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\":\"trainingFirst.section0\",\"emptyWhen\":[\"hideHeroImage\"]},{\"id\":\"section_1\",\"label\":\"__HIMI_APP_NAME__\",\"dataSource\":\"trainingFirst.section1\"}]",
             "ownerDefaultLayout": "trainingFirst",
-            "brandAccent": "#C1552F",
             "copy": "{\"home.storeFeaturedTitle\":\"Shop the gear\"}"
           }
         }
@@ -5129,10 +5128,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#C1552F"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/gym-fitness/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/gym-fitness/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/gym-fitness/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/nonprofit-cause/dev/index.ts

@@ -2078,7 +2078,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"plans\",\"feed\",\"events\",\"blog\",\"groups\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Discover 1\",\"dataSource\":\"communityPulse.section0\",\"emptyWhen\":[\"noMemberAvatars\"]},{\"id\":\"section_1\",\"label\":\"From the field\",\"dataSource\":\"communityPulse.section1\",\"emptyWhen\":[\"noAnnouncement\",\"noUpcomingEvents\"]},{\"id\":\"section_2\",\"label\":\"Chapters & teams\",\"dataSource\":\"communityPulse.section2\",\"emptyWhen\":[\"noGroupCards\"]},{\"id\":\"section_3\",\"label\":\"Latest from the community\",\"dataSource\":\"communityPulse.section3\"}]",
             "ownerDefaultLayout": "communityPulse",
-            "brandAccent": "#0F6B5C",
             "copy": "{\"home.activityTitle\":\"Latest from the community\",\"home.announcementCaption\":\"From the field\",\"home.eventsTitle\":\"Volunteer opportunities\",\"home.groupsSubtitle\":\"Find your cause and pitch in.\",\"home.groupsTitle\":\"Chapters & teams\",\"home.joinConversationCta\":\"Share your story\",\"home.membersCaption\":\"Our volunteers\",\"home.onboardingBody\":\"Find a way to give, sign up to volunteer, and follow the mission's impact — all in one place.\"}"
           }
         }
@@ -4520,10 +4519,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#0F6B5C"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/nonprofit-cause/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.