@wix/himalaya-cli 0.1064.0 → 0.1066.0

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

@@ -2016,7 +2016,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"plans\",\"feed\",\"events\",\"blog\",\"podcasts\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Latest episode\",\"dataSource\":\"episodeFirst.section0\",\"emptyWhen\":[\"noLatestPost\"]},{\"id\":\"section_1\",\"label\":\"All episodes\",\"dataSource\":\"episodeFirst.section1\",\"emptyWhen\":[\"noPostCards\"]},{\"id\":\"section_2\",\"label\":\"Discover 3\",\"dataSource\":\"episodeFirst.section2\"},{\"id\":\"section_3\",\"label\":\"Latest activity\",\"dataSource\":\"episodeFirst.section3\"}]",
             "ownerDefaultLayout": "episodeFirst",
-            "brandAccent": "#6E4BFF",
             "copy": "{\"home.allEpisodesCta\":\"Browse all episodes\",\"home.episodesTitle\":\"All episodes\",\"home.latestEpisodeCaption\":\"Latest episode\",\"home.listenCta\":\"Listen now\",\"home.listenersCaption\":\"Our listeners\",\"home.notesCta\":\"Read the show notes\",\"home.onboardingBody\":\"Catch the latest episode, read the show notes, meet other listeners and support the show — all in one place.\",\"home.supportSubtitle\":\"Join a membership and keep new episodes coming.\",\"home.supportTitle\":\"Support the show\"}"
           }
         }
@@ -4458,10 +4457,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#6E4BFF"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/podcast-creator/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/podcast-creator/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/podcast-creator/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/portfolio-creative/dev/index.ts

@@ -1886,7 +1886,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"store\",\"portfolio\",\"events\",\"blog\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Selected work\",\"dataSource\":\"showcaseFirst.section0\",\"emptyWhen\":[\"noPostCards\"]},{\"id\":\"section_1\",\"label\":\"Discover 2\",\"dataSource\":\"showcaseFirst.section1\"},{\"id\":\"section_2\",\"label\":\"Prints & editions\",\"dataSource\":\"showcaseFirst.section2\",\"emptyWhen\":[\"noFeaturedProducts\"]},{\"id\":\"section_3\",\"label\":\"Exhibitions & fairs\",\"dataSource\":\"showcaseFirst.section3\"}]",
             "ownerDefaultLayout": "showcaseFirst",
-            "brandAccent": "#B0511F",
             "copy": "{\"home.aboutTitle\":\"About the studio\",\"home.contactCta\":\"Get in touch\",\"home.exhibitionsTitle\":\"Exhibitions & fairs\",\"home.onboardingBody\":\"Browse the latest work, pick up a print, and catch the next exhibition — all in one place.\",\"home.printsTitle\":\"Prints & editions\",\"home.viewWorkCta\":\"View all work\",\"home.workSubtitle\":\"The latest pieces, straight from the studio.\",\"home.workTitle\":\"Selected work\"}"
           }
         }
@@ -4327,10 +4326,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#B0511F"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/portfolio-creative/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/portfolio-creative/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/portfolio-creative/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/restaurant/dev/index.ts

@@ -1941,7 +1941,6 @@ const SCREENS = runtimeSetting({
             "verticals": "[\"restaurants\",\"events\",\"blog\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"__HIMI_APP_NAME__\",\"dataSource\":\"menuFirst.section0\",\"emptyWhen\":[\"hasDishHeroImage\"]},{\"id\":\"section_1\",\"label\":\"Discover 2\",\"dataSource\":\"menuFirst.section1\",\"emptyWhen\":[\"noMenuCategories\"]},{\"id\":\"section_2\",\"label\":\"Popular dishes\",\"dataSource\":\"menuFirst.section2\",\"emptyWhen\":[\"noPopularDishes\"]},{\"id\":\"section_3\",\"label\":\"Find us\",\"dataSource\":\"menuFirst.section3\"}]",
             "ownerDefaultLayout": "menuFirst",
-            "brandAccent": "#B8544A",
             "copy": "{\"home.eventsTitle\":\"Wine nights & events\",\"home.findUsTitle\":\"Find us\",\"home.hoursTitle\":\"Opening hours\",\"home.onboardingBody\":\"Browse the menu, reserve a table, and keep up with wine nights and kitchen news — all in one place.\",\"home.popularSubtitle\":\"The plates everyone keeps coming back for.\",\"home.popularTitle\":\"Popular dishes\",\"home.reserveCta\":\"Reserve a table\"}"
           }
         }
@@ -4294,10 +4293,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#B8544A"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/restaurant/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/restaurant/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/restaurant/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/retail-store/dev/index.ts

@@ -1419,8 +1419,7 @@ const SCREENS = runtimeSetting({
           "params": {
             "verticals": "[\"store\",\"blog\"]",
             "homeModules": "[{\"id\":\"saved\",\"label\":\"Saved on this device\",\"dataSource\":\"device.saved_items\",\"emptyWhen\":[\"noSavedContent\"]},{\"id\":\"section_0\",\"label\":\"Shop the collection\",\"dataSource\":\"storeFirst.section0\"},{\"id\":\"section_1\",\"label\":\"Explore\",\"dataSource\":\"storeFirst.section1\"},{\"id\":\"section_2\",\"label\":\"Shop\",\"dataSource\":\"storeFirst.section2\"}]",
-            "ownerDefaultLayout": "storeFirst",
-            "brandAccent": "#B4552D"
+            "ownerDefaultLayout": "storeFirst"
           }
         }
       }
@@ -3772,10 +3771,7 @@ const SCREENS = runtimeSetting({
           "bottom": 28
         },
         "onAppear": {
-          "actionId": "tier5.himiBrandedAppearance.sync",
-          "params": {
-            "brandAccent": "#B4552D"
-          }
+          "actionId": "tier5.himiBrandedAppearance.sync"
         }
       }
     },

package/templates/retail-store/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.