@helixui/library 3.2.0 → 3.3.0-next.112

package/dist/css/helix-core.css

@@ -395,10 +395,7 @@
 
   .button:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-button-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-500, #429797))
-      );
+      var(--hx-button-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
   }
 
@@ -436,21 +433,24 @@
   /* ─── Style Variants ─── */
 
   .button--primary {
-    --hx-button-bg: var(--hx-color-primary-500, #429797);
-    --hx-button-color: var(--hx-color-text-on-primary, #ffffff);
+    --hx-button-bg: var(--hx-color-action-primary-bg, #429797);
+    /* Inline #0d1825 matches text.on-primary's resolved primitive (neutral-900);
+       cold-start without the semantic still paints AA-tuned dark-on-primary
+       rather than white-on-primary (3.43:1 fail). */
+    --hx-button-color: var(--hx-color-text-on-primary, #0d1825);
     --hx-button-border-color: transparent;
   }
 
   .button--secondary {
     --hx-button-bg: transparent;
-    /* primary-500 (#429797) text on white surface = 3.43:1 — fails AA.
-       primary-600 (#0F7078) on white = 6.06:1 — AA pass. */
-    --hx-button-color: var(--hx-color-primary-600, #0f7078);
-    --hx-button-border-color: var(--hx-color-primary-600, #0f7078);
+    /* primary-500 (#429797) text on white surface = 3.44:1 — fails AA.
+       primary-600 (#0F7078) on white = 5.82:1 — AA pass. */
+    --hx-button-color: var(--hx-color-action-secondary-fg, #0f7078);
+    --hx-button-border-color: var(--hx-color-action-secondary-border, #0f7078);
   }
 
   .button--secondary:hover {
-    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-surface-raised, #f5f8f3));
+    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-action-secondary-bg-hover, #ebf8f8));
   }
 
   .button--tertiary {
@@ -464,36 +464,52 @@
   }
 
   .button--danger {
-    --hx-button-bg: var(--hx-color-error-500, #e5493e);
-    --hx-button-color: var(--hx-color-text-on-error, #ffffff);
+    --hx-button-bg: var(--hx-color-action-danger-bg, #e5493e);
+    /* Inline #0d1825 matches text.on-error's resolved primitive (neutral-900);
+       cold-start without the semantic still paints AA-tuned dark-on-error
+       rather than white-on-error (3.92:1 fail). */
+    --hx-button-color: var(--hx-color-text-on-error, #0d1825);
     --hx-button-border-color: transparent;
   }
 
   /* on-error tokens are tuned for error-500 (neutral-900 on #E5493E ≈ 4.59:1).
-     error-600 (#C92A2A) drops that to 2.25:1 — AA fail. Hold fg at neutral-0
-     directly so darker hover fills stay legible. Mirrors hx-toast precedent
-     (commit 300e21ab0). */
+     error-600 (#C92A2A) drops that to 3.28:1 — AA fail. text.on-error-strong
+     resolves to neutral-0 across modes (no dark flip) so the darker hover fill
+     stays legible. Mirrors hx-toast precedent (commit 300e21ab0); routed
+     through the semantic tier in 3.2.1 token-cascade remediation. */
   .button--danger:hover {
-    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-error-600, #c92a2a));
-    --hx-button-color: var(--hx-color-neutral-0, #ffffff);
+    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-action-danger-bg-hover, #c92a2a));
+    --hx-button-color: var(--hx-color-text-on-error-strong, #ffffff);
+  }
+
+  /* Pressed state binds explicitly to action.danger.bg-active (error-700,
+     #A21312) + text.on-error-strong (neutral-0) = 7.96:1 AA. Base
+     .button:active filter:brightness(0.8) would compound on top of bg-hover
+     (#C92A2A) and produce ~3.3:1 sub-AA on the bound colors. Override the
+     filter to none. HC override on action.danger.bg-active flips to HC
+     error-500 so the on-error-strong (HC = #000) pair is AA in HC too. */
+  .button--danger:active {
+    --hx-button-bg: var(--hx-button-active-bg, var(--hx-color-action-danger-bg-active, #a21312));
+    --hx-button-color: var(--hx-color-text-on-error-strong, #ffffff);
+    filter: none;
   }
 
   .button--ghost {
     --hx-button-bg: transparent;
-    /* primary-500 (#429797) text on white surface = 3.43:1 — fails AA.
-       primary-600 (#0F7078) on white = 6.06:1 — AA pass. */
-    --hx-button-color: var(--hx-color-primary-600, #0f7078);
+    /* primary-500 (#429797) text on white surface = 3.44:1 — fails AA.
+       primary-600 (#0F7078) on white = 5.82:1 — AA pass. */
+    --hx-button-color: var(--hx-color-action-ghost-fg, #0f7078);
     --hx-button-border-color: transparent;
   }
 
   .button--ghost:hover {
-    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-surface-raised, #f5f8f3));
+    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-action-ghost-bg-hover, #ebf8f8));
   }
 
   .button--outline {
     --hx-button-bg: transparent;
     --hx-button-color: var(--hx-color-text-primary, #0d1825);
-    --hx-button-border-color: var(--hx-color-border-strong, #8e9c98);
+    --hx-button-border-color: var(--hx-color-border-strong, #66787b);
   }
 
   .button--outline:hover {
@@ -501,12 +517,24 @@
   }
 
   /* on-primary token resolves to neutral-900 (#0D1825) — tuned for primary-500.
-     primary-600 (#0F7078) drops the pair to 3.07:1 — AA fail. Pin fg at
-     neutral-0 for the darker hover fill. Mirrors hx-toast precedent
-     (commit 300e21ab0). */
+     primary-600 (#0F7078) drops the pair to 3.07:1 — AA fail. text.on-primary-strong
+     resolves to neutral-0 across modes (no dark flip) for the darker hover fill.
+     Mirrors hx-toast precedent (commit 300e21ab0); routed through the semantic
+     tier in 3.2.1 token-cascade remediation. */
   .button--primary:hover {
-    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-primary-600, #0f7078));
-    --hx-button-color: var(--hx-color-neutral-0, #ffffff);
+    --hx-button-bg: var(--hx-button-hover-bg, var(--hx-color-action-primary-bg-hover, #0f7078));
+    --hx-button-color: var(--hx-color-text-on-primary-strong, #ffffff);
+  }
+
+  /* Pressed state binds explicitly to action.primary.bg-active (primary-700,
+     #0F6363) + text.on-primary-strong (neutral-0) = 7.03:1 AA. The base
+     .button:active filter:brightness(0.8) would compound on top of bg-hover
+     (#0F7078) and produce ~3.7:1 sub-AA on the bound colors. Override the
+     filter to none so the action.*.bg-active token is what actually paints. */
+  .button--primary:active {
+    --hx-button-bg: var(--hx-button-active-bg, var(--hx-color-action-primary-bg-active, #0f6363));
+    --hx-button-color: var(--hx-color-text-on-primary-strong, #ffffff);
+    filter: none;
   }
 
   /* ─── Disabled ─── */
@@ -550,9 +578,20 @@
 
   /* ─── Inverted Mode ─── */
 
+  /* Inline-fallback contract for the on-dark-* tokens in this section:
+     the literal rgba(255, 255, 255, 0.X) arms are a LIGHT-MODE-only last
+     resort (cold-start, CSS-not-loaded). At runtime, hx-theme injects
+     the dark.* override (overlay-black-* for the strong border and the
+     surface.on-dark-overlay-* fills) so dark-mode inverted buttons stay
+     visible on the now-light surface.inverse (#EBEEE9). The inline white
+     overlays would render invisible (≈1.1:1) on a light surface, but
+     they never paint when the theme is mounted. If a future change
+     moves these into a context where hx-theme is not guaranteed,
+     replace with mode-aware tokens. */
+
   /* Override text color and filter-based hover/active for all variants */
   :host([inverted]) .button {
-    color: var(--hx-button-inverted-color, var(--hx-color-neutral-0, #ffffff));
+    color: var(--hx-button-inverted-color, var(--hx-color-text-inverse, #ffffff));
     filter: none;
   }
 
@@ -565,37 +604,115 @@
   }
 
   :host([inverted]) .button:focus-visible {
+    /* WCAG 1.4.11: focus indicator needs ≥3:1 against adjacent colors.
+       border-on-dark-strong (overlay-white-70) ≈ 5:1 on neutral-900 — passes.
+       The lower-alpha siblings used to live in border.* but were sub-3:1
+       against any plausible surface and could not honour a border contract;
+       they're now surface.on-dark-overlay-{default,subtle} (translucent
+       fills, not borders) and used elsewhere in this file. See
+       tokens.json color.surface.on-dark-overlay-* for canonical ratios. */
     outline-color: var(
       --hx-button-inverted-focus-ring-color,
-      var(--hx-overlay-white-50, rgba(255, 255, 255, 0.5))
+      var(--hx-color-border-on-dark-strong, rgba(255, 255, 255, 0.7))
     );
   }
 
-  /* Primary inverted — slight transparent white overlay on hover */
-  :host([inverted]) .button--primary:hover {
-    --hx-button-bg: var(--hx-color-primary-400, #6ab1b1);
+  /* Primary inverted — resting bg routes through action.primary.bg-inverted-rest
+     so dark mode can flip the fill to primary-600. surface.inverse becomes light
+     (#EBEEE9) in dark mode; primary-500 on #EBEEE9 = 2.94:1 (sub-3:1 UI floor
+     fail for the inverted-button boundary). primary-600 on #EBEEE9 = 4.97:1
+     (AA pass). Light mode tracks action.primary.bg-inverted-rest's base value
+     (primary-500, 5.20:1 on dark surface.inverse).
+
+     Override path note (codex round-11): this binds --hx-button-bg directly,
+     matching the cascade convention every other .button--{variant} rule uses
+     (light primary at line 89, danger at 120, secondary, tertiary, ghost). The
+     consumer override path for inverted-primary rest is
+     --hx-color-action-primary-bg-inverted-rest, NOT --hx-button-bg — the same
+     pattern as light primary (consumers override --hx-color-action-primary-bg).
+     Pinned by dark-mode-resolution.test.ts:185-197 across both modes. */
+  :host([inverted]) .button--primary {
+    --hx-button-bg: var(--hx-color-action-primary-bg-inverted-rest, #429797);
+  }
+
+  /* Primary inverted — hover/pressed lift to action.primary.bg-inverted-hover
+     (primary-400, light teal). The base :host([inverted]) .button rule binds
+     color to text.inverse, which flips by mode (neutral-0 in light, neutral-900
+     in dark). On a permanent light-teal fill, white text drops to 2.4:1 in
+     light mode (AA fail). Pin color to text.on-primary (neutral-900, no
+     dark-mode flip) for both hover and active so the foreground is dark in
+     both modes — neutral-900 on primary-400 = 7.27:1 (AA pass).
+     Pressed === hover visually in inverted mode is acceptable UX (the
+     transient absence of pointer over the button signals release).
+     The fallback chain wraps --hx-button-active-bg (highest precedence) and
+     --hx-button-hover-bg so consumer overrides on either prop apply under
+     :host([inverted]) — the two share a paint here, so either knob is
+     honored, with active-bg winning when both are set. */
+  :host([inverted]) .button--primary:hover,
+  :host([inverted]) .button--primary:active {
+    --hx-button-bg: var(
+      --hx-button-active-bg,
+      var(--hx-button-hover-bg, var(--hx-color-action-primary-bg-inverted-hover, #6ab1b1))
+    );
+    color: var(
+      --hx-button-inverted-primary-interactive-color,
+      var(--hx-color-text-on-primary, #0d1825)
+    );
+  }
+
+  /* Danger inverted — sister to primary. Hover/pressed lift to
+     action.danger.bg-inverted-hover (error-400, #FC7264). Same foreground
+     contract: text.inverse fails in light mode (white on light red ≈ 2.6:1);
+     pin to text.on-error (neutral-900, no dark-mode flip) for 6.58:1 in both
+     modes. Same active-bg → hover-bg → semantic fallback chain as primary. */
+  :host([inverted]) .button--danger:hover,
+  :host([inverted]) .button--danger:active {
+    --hx-button-bg: var(
+      --hx-button-active-bg,
+      var(--hx-button-hover-bg, var(--hx-color-action-danger-bg-inverted-hover, #fc7264))
+    );
+    color: var(
+      --hx-button-inverted-danger-interactive-color,
+      var(--hx-color-text-on-error, #0d1825)
+    );
   }
 
-  /* Secondary inverted — white border and text */
+  /* Secondary inverted — white border and translucent hover fill */
   :host([inverted]) .button--secondary {
-    --hx-button-border-color: var(--hx-overlay-white-70, rgba(255, 255, 255, 0.7));
+    --hx-button-border-color: var(--hx-color-border-on-dark-strong, rgba(255, 255, 255, 0.7));
   }
 
+  /* Inverted overlay fills read both names so consumer overrides reach paint
+     regardless of which token they target: the deprecated --hx-color-border-on-dark-*
+     names (3.2.0/3.2.1 public API, scheduled for removal in 4.0.0) and the canonical
+     --hx-color-surface-on-dark-overlay-* names (round-8 rename). Deprecated name
+     wins when set; otherwise resolves through the canonical alias chain. */
   :host([inverted]) .button--secondary:hover {
-    --hx-button-bg: var(--hx-overlay-white-15, rgba(255, 255, 255, 0.15));
+    --hx-button-bg: var(
+      --hx-color-border-on-dark-default,
+      var(--hx-color-surface-on-dark-overlay-default, rgba(255, 255, 255, 0.3))
+    );
   }
 
-  /* Tertiary inverted */
+  /* Tertiary inverted — resting at the subtle overlay (10%) lifts to the default
+     overlay (30%) on hover so the runtime hover delta is visually distinct, not
+     collapsed onto a single token. */
   :host([inverted]) .button--tertiary {
-    --hx-button-bg: var(--hx-overlay-white-15, rgba(255, 255, 255, 0.15));
+    --hx-button-bg: var(
+      --hx-color-border-on-dark-subtle,
+      var(--hx-color-surface-on-dark-overlay-subtle, rgba(255, 255, 255, 0.1))
+    );
     --hx-button-border-color: transparent;
   }
 
   :host([inverted]) .button--tertiary:hover {
-    --hx-button-bg: var(--hx-overlay-white-25, rgba(255, 255, 255, 0.25));
+    --hx-button-bg: var(
+      --hx-color-border-on-dark-default,
+      var(--hx-color-surface-on-dark-overlay-default, rgba(255, 255, 255, 0.3))
+    );
   }
 
-  /* Ghost inverted — transparent base, white hover bg */
+  /* Ghost inverted — transparent base, translucent hover bg */
   :host([inverted]) .button--ghost {
     --hx-button-bg: transparent;
     --hx-button-border-color: transparent;
@@ -604,17 +721,23 @@
   :host([inverted]) .button--ghost:hover {
     --hx-button-bg: var(
       --hx-button-inverted-ghost-hover-bg,
-      var(--hx-overlay-white-20, rgba(255, 255, 255, 0.2))
+      var(
+        --hx-color-border-on-dark-default,
+        var(--hx-color-surface-on-dark-overlay-default, rgba(255, 255, 255, 0.3))
+      )
     );
   }
 
   /* Outline inverted — white border */
   :host([inverted]) .button--outline {
-    --hx-button-border-color: var(--hx-overlay-white-70, rgba(255, 255, 255, 0.7));
+    --hx-button-border-color: var(--hx-color-border-on-dark-strong, rgba(255, 255, 255, 0.7));
   }
 
   :host([inverted]) .button--outline:hover {
-    --hx-button-bg: var(--hx-overlay-white-15, rgba(255, 255, 255, 0.15));
+    --hx-button-bg: var(
+      --hx-color-border-on-dark-default,
+      var(--hx-color-surface-on-dark-overlay-default, rgba(255, 255, 255, 0.3))
+    );
   }
 
   /* ─── Prefix / Suffix / Label ─── */
@@ -642,6 +765,16 @@
       border: 2px solid ButtonText;
     }
 
+    .button:hover {
+      /* Hover affordance must survive in HC. Highlight/HighlightText is the
+         OS-level "selected" pair, mirroring the forcedColorsInteractive mixin's
+         hover contract — kept inline since this component owns its bespoke HC
+         block (XOR rule). */
+      background-color: Highlight;
+      color: HighlightText;
+      border-color: Highlight;
+    }
+
     .button:focus-visible {
       outline: 3px solid Highlight;
       outline-offset: 2px;
@@ -870,10 +1003,7 @@
 
   .card--interactive:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-card-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-500, #429797))
-      );
+      var(--hx-card-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
   }
 
@@ -1179,10 +1309,7 @@
 
   .button:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-icon-button-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-500, #429797))
-      );
+      var(--hx-icon-button-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
   }
 
@@ -1252,7 +1379,7 @@
   .button--tertiary {
     --hx-icon-button-bg: transparent;
     --hx-icon-button-color: var(--hx-color-text-strong, #202b39);
-    --hx-icon-button-border-color: var(--hx-color-border-strong, #8e9c98);
+    --hx-icon-button-border-color: var(--hx-color-border-strong, #66787b);
   }
 
   .button--tertiary:hover {
@@ -1425,10 +1552,7 @@
 
   .link:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-link-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-400, #6ab1b1))
-      );
+      var(--hx-link-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
     border-radius: var(--hx-border-radius-sm, 0.25rem);
   }

package/dist/css/helix-data.css

@@ -80,7 +80,8 @@
     min-width: var(--hx-touch-target-min, 2.75rem);
     min-height: var(--hx-touch-target-min, 2.75rem);
     padding: var(--hx-space-1, 0.25rem) var(--hx-space-2, 0.5rem);
-    border: var(--hx-border-width-thin, 1px) solid var(--hx-color-border-strong, #8e9c98);
+    border: var(--hx-border-width-thin, 1px) solid
+      var(--hx-color-border-on-dark-strong, rgba(255, 255, 255, 0.7));
     border-radius: var(--hx-border-radius-sm, 0.25rem);
     /* Copy button sits on the always-dark block snippet surface; uses inverse family for contrast on the terminal background. */
     background-color: var(--hx-color-surface-inverse, #0d1825);
@@ -105,8 +106,14 @@
   }
 
   .code-snippet__copy-button:focus-visible {
-    outline: var(--hx-focus-ring-width, 2px) solid
-      var(--hx-focus-ring-color, var(--hx-color-primary-400, #6ab1b1));
+    /* Always-dark terminal surface — uses primary-400 (#6AB1B1, 7.27:1 on #0d1825)
+       instead of the light-mode --hx-focus-ring-color (primary-600, 3.07:1 — razor
+       above the 3:1 UI floor with no headroom). Deliberate primitive-tier consumption:
+       there is no semantic focus-ring-on-dark alias today — the dark.color.focus-ring
+       override at tokens.json only fires under theme=dark, but this surface is dark in
+       every theme. Tracked for promotion to a semantic alias in a future token-cascade
+       follow-up. */
+    outline: var(--hx-focus-ring-width, 2px) solid var(--hx-color-primary-400, #6ab1b1);
     outline-offset: var(--hx-focus-ring-offset, 2px);
   }
 
@@ -125,7 +132,8 @@
     min-height: var(--hx-touch-target-min, 2.75rem);
     padding: var(--hx-space-2, 0.5rem) var(--hx-space-4, 1rem);
     border: none;
-    border-top: var(--hx-border-width-thin, 1px) solid var(--hx-color-border-strong, #8e9c98);
+    border-top: var(--hx-border-width-thin, 1px) solid
+      var(--hx-color-border-on-dark-strong, rgba(255, 255, 255, 0.7));
     /* Expand button is attached to the always-dark block snippet — inverse family maintains the terminal aesthetic. */
     background-color: var(--hx-color-surface-inverse, #0d1825);
     color: var(--hx-color-text-inverse, #ffffff);
@@ -146,8 +154,14 @@
   }
 
   .code-snippet__expand-button:focus-visible {
-    outline: var(--hx-focus-ring-width, 2px) solid
-      var(--hx-focus-ring-color, var(--hx-color-primary-400, #6ab1b1));
+    /* Always-dark terminal surface — uses primary-400 (#6AB1B1, 7.27:1 on #0d1825)
+       instead of the light-mode --hx-focus-ring-color (primary-600, 3.07:1 — razor
+       above the 3:1 UI floor with no headroom). Deliberate primitive-tier consumption:
+       there is no semantic focus-ring-on-dark alias today — the dark.color.focus-ring
+       override at tokens.json only fires under theme=dark, but this surface is dark in
+       every theme. Tracked for promotion to a semantic alias in a future token-cascade
+       follow-up. */
+    outline: var(--hx-focus-ring-width, 2px) solid var(--hx-color-primary-400, #6ab1b1);
     outline-offset: var(--hx-focus-ring-offset, 2px);
   }
 
@@ -301,10 +315,7 @@
 
   .sort-btn:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-data-table-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-500, #429797))
-      );
+      var(--hx-data-table-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
     border-radius: var(--hx-border-radius-sm, 2px);
   }
@@ -406,10 +417,7 @@
   [part~='td']:focus-visible,
   [part~='th']:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-data-table-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-500, #429797))
-      );
+      var(--hx-data-table-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, -2px);
     border-radius: var(--hx-border-radius-sm, 2px);
   }
@@ -679,8 +687,7 @@ export const helixStructuredListRowStyles = css`
   /* ─── Focus ─── */
 
   ::slotted(:focus-visible) {
-    outline: var(--hx-focus-ring-width, 2px) solid
-      var(--hx-focus-ring-color, var(--hx-color-primary-500, #429797));
+    outline: var(--hx-focus-ring-width, 2px) solid var(--hx-focus-ring-color, #0f7078);
     outline-offset: var(--hx-focus-ring-offset, -2px);
   }
 

package/dist/css/helix-feedback.css

@@ -160,10 +160,7 @@
 
   .alert__close-button:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-alert-close-btn-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-400, #6ab1b1))
-      );
+      var(--hx-alert-close-btn-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
     opacity: 1;
   }
@@ -336,10 +333,7 @@
 
   .banner__action:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-banner-action-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-400, #6ab1b1))
-      );
+      var(--hx-banner-action-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
     border-radius: var(--hx-border-radius-sm, 0.25rem);
   }
@@ -380,10 +374,7 @@
 
   .banner__close-button:focus-visible {
     outline: var(--hx-focus-ring-width, 2px) solid
-      var(
-        --hx-banner-close-btn-focus-ring-color,
-        var(--hx-focus-ring-color, var(--hx-color-primary-400, #6ab1b1))
-      );
+      var(--hx-banner-close-btn-focus-ring-color, var(--hx-focus-ring-color, #0f7078));
     outline-offset: var(--hx-focus-ring-offset, 2px);
     opacity: 1;
   }
@@ -481,8 +472,7 @@
   }
 
   .meter:focus-visible {
-    outline: var(--hx-focus-ring-width, 2px) solid
-      var(--hx-focus-ring-color, var(--hx-color-primary-500, #429797));
+    outline: var(--hx-focus-ring-width, 2px) solid var(--hx-focus-ring-color, #0f7078);
     outline-offset: var(--hx-focus-ring-offset, 2px);
   }
 
@@ -1233,33 +1223,38 @@
    * error-600) because the lighter -500 fills can't pass AA against white
    * text in the precision-cool palette. The neutral-900 on-{role} tokens
    * are tuned for the lighter -500 surfaces and would fail here (e.g.
-   * neutral-900 on primary-600 = 3.07:1), so we hold fg at neutral-0
-   * directly for primary/success/danger.
-   * - neutral-0 on primary-600 (#0F7078) = 5.39:1 — AA pass
-   * - neutral-0 on success-700 (#146831) = 6.88:1 — AA pass
-   *   (success-600 #0E8A4A on white = 4.41:1 — drifts under AA at 14px)
-   * - neutral-0 on error-600   (#C92A2A) = 5.92:1 — AA pass
-   * - neutral-900 on warning-500 (#C2711C) = 4.83:1 — AA pass
+   * neutral-900 on primary-600 = 3.07:1), so the on-{role}-strong tokens
+   * (neutral-0, no dark-mode flip) keep fg legible on the darker fills.
+   * - text.on-primary-strong on info.bg-strong (primary-600, #0F7078) = 5.82:1
+   * - text.on-success-strong on success.bg-strong (success-700, #146831) = 6.88:1
+   *   (success-600 #0E8A4A on white = 4.42:1 — drifts under AA at 14px)
+   * - text.on-error-strong   on danger.bg-strong  (error-600, #C92A2A) = 5.46:1
+   * - text.on-warning        on warning.bg-strong (warning-500, #C2711C) = 4.83:1
    *   (warning stays on the lighter -500 surface so on-warning works)
+   *
+   * 3.2.1 token-cascade: bg variants now route through surface.{role}-strong
+   * semantics; fg variants route through text.on-{role}-strong (or on-warning
+   * for the warning variant). Component-tier tokens are NOT bypassed — the
+   * --hx-toast-bg / --hx-toast-color slots remain the single override point.
    */
   .toast--success {
-    --hx-toast-bg: var(--hx-color-success-700, #146831);
-    --hx-toast-color: var(--hx-color-neutral-0, #ffffff);
+    --hx-toast-bg: var(--hx-color-surface-success-strong, #146831);
+    --hx-toast-color: var(--hx-color-text-on-success-strong, #ffffff);
   }
 
   .toast--warning {
-    --hx-toast-bg: var(--hx-color-warning-500, #c2711c);
+    --hx-toast-bg: var(--hx-color-surface-warning-strong, #c2711c);
     --hx-toast-color: var(--hx-color-text-on-warning, #0d1825);
   }
 
   .toast--danger {
-    --hx-toast-bg: var(--hx-color-error-600, #c92a2a);
-    --hx-toast-color: var(--hx-color-neutral-0, #ffffff);
+    --hx-toast-bg: var(--hx-color-surface-danger-strong, #c92a2a);
+    --hx-toast-color: var(--hx-color-text-on-error-strong, #ffffff);
   }
 
   .toast--info {
-    --hx-toast-bg: var(--hx-color-primary-600, #0f7078);
-    --hx-toast-color: var(--hx-color-neutral-0, #ffffff);
+    --hx-toast-bg: var(--hx-color-surface-info-strong, #0f7078);
+    --hx-toast-color: var(--hx-color-text-on-primary-strong, #ffffff);
   }
 
   /* ─── Severity Label (WCAG 1.4.1) ─── */
@@ -1352,10 +1347,16 @@
   }
 
   /* ─── Forced Colors (Windows High Contrast) ─── */
-  /* Belt-and-suspenders: rich per-class HC overrides PLUS the forcedColorsSurface mixin. */
+  /* Sole owner: bespoke per-class HC overrides on .toast and .toast__close.
+     The shared forcedColorsSurface mixin was dropped in 3.2.1 (XOR rule);
+     this block now carries the surface contract the mixin used to provide
+     (background:Canvas + color:CanvasText + border:1px solid CanvasText)
+     plus the per-class affordances the mixin never touched. */
 
   @media (forced-colors: active) {
     .toast {
+      background: Canvas;
+      color: CanvasText;
       border: 1px solid CanvasText;
     }