@radicool/throughline 0.23.0 → 0.24.0

package/README.md

@@ -73,7 +73,7 @@ Everything above was created during a single working session and synced directly
 
 | | |
 |---|---|
-| **A supported agent** | Required — [Claude Code](https://docs.claude.com/en/docs/claude-code) (native plugin), or **Cursor**, **Codex**, or any **AGENTS.md**-aware agent via `npx @radicool/throughline@0.23.0 init`. |
+| **A supported agent** | Required — [Claude Code](https://docs.claude.com/en/docs/claude-code) (native plugin), or **Cursor**, **Codex**, or any **AGENTS.md**-aware agent via `npx @radicool/throughline@0.24.0 init`. |
 | **Figma** | Required, **desktop app** (the browser version causes connection errors). **Professional plan or higher recommended** — multi-mode variables (Light/Dark, brand themes) need it. |
 | **Figma access token** | Optional — only for the few Figma calls the Desktop Bridge can't make, like reading a published library. Without it, you work through the bridge alone. The setup skill walks you through it; your token stays yours and is never shared in chat. |
 | **GitHub** (or similar) | Optional — only when you're ready to graduate to a real remote repo with PRs and CI. |
@@ -114,9 +114,9 @@ Update anytime with `/plugin marketplace update throughline-marketplace`.
 Run the installer in your project — it stamps in the skills, the reference docs, the scripts, and the Figma MCP config for your tool:
 
 ```
-npx @radicool/throughline@0.23.0 init --target=cursor    # → .cursor/rules + .cursor/mcp.json
-npx @radicool/throughline@0.23.0 init --target=codex      # → prompts/ + AGENTS.md index + codex-mcp.toml
-npx @radicool/throughline@0.23.0 init --target=generic    # → skills/ + AGENTS.md index
+npx @radicool/throughline@0.24.0 init --target=cursor    # → .cursor/rules + .cursor/mcp.json
+npx @radicool/throughline@0.24.0 init --target=codex      # → prompts/ + AGENTS.md index + codex-mcp.toml
+npx @radicool/throughline@0.24.0 init --target=generic    # → skills/ + AGENTS.md index
 ```
 
 It's safe to re-run (it merges `AGENTS.md` and `.cursor/mcp.json` non-destructively) and stages everything the skills read into `.throughline/`. Then open the `figma-environment-setup` skill/rule/prompt for your tool to begin. For Codex, add the printed `codex-mcp.toml` block to your Codex config to enable Figma access.
@@ -212,7 +212,7 @@ Future improvements and planned capabilities. Have a request? **[Open an issue](
 - **Deeper Code Connect coverage** — richer Figma-to-code mappings as more plans support it.
 - **Expanded component starters** — a larger foundational kit out of the box.
 - **Richer status & auditing** — more from `/design-system-status`, including drift detection between Figma and code.
-- **Built-in accessibility checks** — the color half is shipped. Eight semantic text-on-surface pairs are checked against WCAG AA's 4.5:1 when tokens are created in Figma, and derived again from the token source when they sync to code — in every mode, so a system that clears in light and fails in dark fails. A failing pair stops the build rather than warning. Components are checked too: on web frameworks, a Figma build stops when a focus state has no visible ring, and in JSX code the adherence gate is built to fail an icon-only button with no accessible name and a status badge that relies on color alone — proven by unit tests. The one real app it has run on had almost nothing for it to check, so it hasn't caught a bug in the wild yet. Still ahead: focus-ring contrast (WCAG's 3:1 for non-text).
+- **Built-in accessibility checks** — the color half is shipped. Eight semantic text-on-surface pairs are checked against WCAG AA's 4.5:1 when tokens are created in Figma, and derived again from the token source when they sync to code — in every mode, so a system that clears in light and fails in dark fails. A failing pair stops the build rather than warning. Components are checked too: on web frameworks, a Figma build stops when a focus state has no visible ring, and in JSX code the adherence gate is built to fail an icon-only button with no accessible name and a status badge that relies on color alone — proven by unit tests. A Figma build also stops when a focus ring falls below WCAG's 3:1 against a surface the architect names for it, in any mode. The one real app it has run on had almost nothing for it to check, so it hasn't caught a bug in the wild yet.
 - **Token fan-out to more platforms** — the DTCG token source is platform-neutral, and web targets are in daily use. Every target is **validated per build, not assumed**: `tokens:validate-output` checks generated output against its source, native Swift and Kotlin as well as web CSS, because the stock transforms have been measured emitting wrong-but-compiling values. iOS/Swift is a curated adapter whose Style Dictionary configuration ships as tested code, and Android/Kotlin uses the same configuration through the Tier 2 protocol. JavaScript theme output (MUI, a Tailwind v3 config) isn't checked yet.
 - **Native component code generation** — producing a SwiftUI view or a Compose composable the way Storybook components are produced for React. This does not exist yet; it is a separate, larger effort than token fan-out, and the two were previously described as one roadmap item.
 

package/adapters/codex/prompts/component-builder.md

@@ -177,8 +177,12 @@ deterministic naming):
   way the executor does: `'spec'` mode before the first write and `'built'` mode
   in the self-verify loop, with `EXPECT` built from your own matrix. You are the
   architect here, so you name `controlLayer` yourself for a wrapped control (an
-  Input with a label or helper text). A `fail` on the `focus-indicator` check
-  stops the build, as it would for the executor.
+  Input with a label or helper text), and `surfaces` yourself: the colour-variable
+  names of the page surfaces the component sits on. A `fail` on the
+  `focus-indicator` check stops the build, as it would for the executor. A `fail`
+  on `focus-contrast` stops it too, naming its detail. A ring below 3:1 is fixed by
+  a token value, so don't change a variable or swap the ring to another one to make
+  it pass; a surface the file doesn't have is a wrong name in `surfaces`.
 
 Checkpoint after each component: show all variants, confirm before the next.
 
@@ -366,8 +370,8 @@ any component built with the toggle + manual-swap fallback is listed in
 component-builder --subject <Name> --entry <tmp>.json`. Build `<tmp>.json` with
 `at` (an ISO timestamp you supply), `changed` (what was built), the attested checks `structural-read-back`,
 `state-baseline` and `figma-name` from what the `figma-executor` returned (or
-what your inline read-back found), `focus-indicator` when that check ran and
-passed (not when it was skipped),
+what your inline read-back found), `focus-indicator` and `focus-contrast`
+each when that check ran and passed (not when it was skipped),
 `review` when a reviewer ran, `screenshot` when one was captured, and
 `advancedBecause`. The entry shape is
 `.throughline/references/proof-bundle.md` — don't restate it here. Write

package/adapters/cursor/.cursor/rules/component-builder.mdc

@@ -181,8 +181,12 @@ deterministic naming):
   way the executor does: `'spec'` mode before the first write and `'built'` mode
   in the self-verify loop, with `EXPECT` built from your own matrix. You are the
   architect here, so you name `controlLayer` yourself for a wrapped control (an
-  Input with a label or helper text). A `fail` on the `focus-indicator` check
-  stops the build, as it would for the executor.
+  Input with a label or helper text), and `surfaces` yourself: the colour-variable
+  names of the page surfaces the component sits on. A `fail` on the
+  `focus-indicator` check stops the build, as it would for the executor. A `fail`
+  on `focus-contrast` stops it too, naming its detail. A ring below 3:1 is fixed by
+  a token value, so don't change a variable or swap the ring to another one to make
+  it pass; a surface the file doesn't have is a wrong name in `surfaces`.
 
 Checkpoint after each component: show all variants, confirm before the next.
 
@@ -370,8 +374,8 @@ any component built with the toggle + manual-swap fallback is listed in
 component-builder --subject <Name> --entry <tmp>.json`. Build `<tmp>.json` with
 `at` (an ISO timestamp you supply), `changed` (what was built), the attested checks `structural-read-back`,
 `state-baseline` and `figma-name` from what the `figma-executor` returned (or
-what your inline read-back found), `focus-indicator` when that check ran and
-passed (not when it was skipped),
+what your inline read-back found), `focus-indicator` and `focus-contrast`
+each when that check ran and passed (not when it was skipped),
 `review` when a reviewer ran, `screenshot` when one was captured, and
 `advancedBecause`. The entry shape is
 `.throughline/references/proof-bundle.md` — don't restate it here. Write

package/adapters/generic/skills/component-builder/SKILL.md

@@ -177,8 +177,12 @@ deterministic naming):
   way the executor does: `'spec'` mode before the first write and `'built'` mode
   in the self-verify loop, with `EXPECT` built from your own matrix. You are the
   architect here, so you name `controlLayer` yourself for a wrapped control (an
-  Input with a label or helper text). A `fail` on the `focus-indicator` check
-  stops the build, as it would for the executor.
+  Input with a label or helper text), and `surfaces` yourself: the colour-variable
+  names of the page surfaces the component sits on. A `fail` on the
+  `focus-indicator` check stops the build, as it would for the executor. A `fail`
+  on `focus-contrast` stops it too, naming its detail. A ring below 3:1 is fixed by
+  a token value, so don't change a variable or swap the ring to another one to make
+  it pass; a surface the file doesn't have is a wrong name in `surfaces`.
 
 Checkpoint after each component: show all variants, confirm before the next.
 
@@ -366,8 +370,8 @@ any component built with the toggle + manual-swap fallback is listed in
 component-builder --subject <Name> --entry <tmp>.json`. Build `<tmp>.json` with
 `at` (an ISO timestamp you supply), `changed` (what was built), the attested checks `structural-read-back`,
 `state-baseline` and `figma-name` from what the `figma-executor` returned (or
-what your inline read-back found), `focus-indicator` when that check ran and
-passed (not when it was skipped),
+what your inline read-back found), `focus-indicator` and `focus-contrast`
+each when that check ran and passed (not when it was skipped),
 `review` when a reviewer ran, `screenshot` when one was captured, and
 `advancedBecause`. The entry shape is
 `.throughline/references/proof-bundle.md` — don't restate it here. Write

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radicool/throughline",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "description": "Build a complete design system end to end — author in Figma, sync tokens to code, generate Storybook. Usable from Claude Code, Cursor, Codex, or any AGENTS.md agent.",
   "type": "module",
   "bin": {

package/references/figma-checks.md

@@ -1,30 +1,39 @@
 # Figma stop-condition checks (GENERATED)
 
 > **GENERATED FILE — do not edit by hand.** Sources: `scripts/lib/component-states.mjs`
-> (the state table), `scripts/lib/figma-checks.mjs` (the pure checker, unit-tested in
-> Node) + `scripts/lib/figma-checks-read.figma.js` (the Figma reader). Regenerate with
+> (the state table), `scripts/lib/contrast.mjs` (the WCAG contrast maths),
+> `scripts/lib/figma-checks.mjs` (the pure checker, unit-tested in Node) +
+> `scripts/lib/figma-checks-read.figma.js` (the Figma reader). Regenerate with
 > `node scripts/build-figma-checks.mjs`; CI gates freshness with `--check`.
 
 The canonical `figma_execute` snippet for the checks that can stop a component
 build: the COMPONENT_SET assertion against the full variant matrix, the state
-matrix, and the focus ring. The script is the rule; do not re-write these checks
-by hand.
+matrix, the focus ring, and the focus ring's contrast against the surfaces it
+sits on (WCAG 1.4.11, 3:1, in every mode). The script is the rule; do not re-write
+these checks by hand.
 
 ## How to call it
 
 1. Paste the snippet below into `figma_execute`, with the two slots filled above it:
-   - `const EXPECT = { name, matrix, uiFramework, controlLayer }` — `name` is the
+   - `const EXPECT = { name, matrix, uiFramework, controlLayer, surfaces }` — `name` is the
      component's real name; `matrix` is `{ axis: [values] }` for every axis of the
      set; `uiFramework` is `project.uiFramework` from `design-system.json`;
      `controlLayer` is the layer that is the actual control in a wrapped control,
-     copied from the architect's spec when it gives one (omit it otherwise).
+     copied from the architect's spec when it gives one (omit it otherwise);
+     `surfaces` is the list of colour-variable names of the page surfaces the
+     component sits on, copied from the architect's spec. Without it the
+     focus-contrast check is skipped. Surfaces are looked up among the file's
+     local variables only.
    - `const MODE = 'spec'` or `'built'`.
 2. End the script with `return await runFigmaChecks(EXPECT, MODE);` and pass
    `timeout: 30000`.
 3. Read the result, `{ pass, checks: [{ name, result, detail }] }`. `result` is
    `pass`, `fail` or `skip`; `pass` ignores skips. On `fail`, fix what each failing
    check's `detail` names and run it again, within the ~3-pass budget; after that,
-   `BLOCKED` naming the failing checks' `detail`.
+   `BLOCKED` naming the failing checks' `detail`. A `focus-contrast` fail is
+   the exception: return `BLOCKED` at once, naming its detail. A ring below 3:1 is
+   fixed by a token value, which no rebuild changes, and a missing surface is a
+   wrong name in the spec. Never edit a variable to make it pass.
 4. `'spec'` reads no node and runs before the first write. `'built'` reads the
    COMPONENT_SET inside the frame named `WIP: <name>` on the current page and runs
    in the self-verify loop. It throws only if that frame is missing; a frame with
@@ -118,29 +127,159 @@ function missingStates(record) {
   return baseline.filter((state) => !recordedKeys.has(normalizeName(state)));
 }
 
+// The WCAG contrast maths and the semantic colour pair table behind the
+// `color-contrast` rule (`docs/specs/2026-09-12-token-contrast-validation.md`,
+// step 1). Source of truth for the prose contract is
+// `skills/token-builder/SKILL.md:250-265`.
+//
+// MAINTENANCE: a change to the semantic role set must change this table.
+
+const AA_NORMAL_TEXT = 4.5;
+// WCAG 1.4.11 non-text contrast, used by the Figma `focus-contrast` check.
+const AA_NON_TEXT = 3;
+
+// `text/disabled` is excluded: WCAG 1.4.3 exempts inactive user-interface
+// components from the contrast minimum, and a disabled role is deliberately
+// low-contrast — gating it would fail correct systems.
+//
+// `bg/subtle` and `bg/muted` are deliberately not paired in v1 (Open
+// questions) — a system is free to use those roles for non-text surfaces, so
+// pairing them risks the first false failures in the table.
+//
+// This table is text-on-surface only. Focus-ring contrast, the 3:1 non-text case
+// (WCAG 1.4.11), is checked in the Figma checks (`figma-checks.mjs`,
+// `focus-contrast`), where the build knows which ring sits on which surface.
+//
+// One threshold is applied to every pair because a colour role does not say
+// what text size it is used at — `text/primary` is body copy as well as
+// headings, so 4.5:1 is the binding requirement for it anyway.
+const CONTRAST_PAIRS = [
+  {
+    fg: 'color.text.primary',
+    bg: 'color.bg.default',
+    threshold: AA_NORMAL_TEXT,
+    why: 'the default reading pair; if this fails, body copy fails everywhere at once',
+  },
+  {
+    fg: 'color.text.secondary',
+    bg: 'color.bg.default',
+    threshold: AA_NORMAL_TEXT,
+    why: 'secondary text is still text, and still has to clear AA on the same surface primary does',
+  },
+  {
+    fg: 'color.text.link',
+    bg: 'color.bg.default',
+    threshold: AA_NORMAL_TEXT,
+    why: 'a link that fails contrast is a link nobody can find, regardless of colour meaning',
+  },
+  {
+    fg: 'color.text.onEmphasis',
+    bg: 'color.bg.emphasis',
+    threshold: AA_NORMAL_TEXT,
+    why: 'the role exists because it sits on the emphasis fill; that is the whole reason it is not `text/inverse`',
+  },
+  {
+    fg: 'color.text.inverse',
+    bg: 'color.bg.inverse',
+    threshold: AA_NORMAL_TEXT,
+    why: 'the inverse pair flips with the theme, and both sides have to keep clearing together',
+  },
+  {
+    fg: 'color.status.success.text',
+    bg: 'color.status.success.bg',
+    threshold: AA_NORMAL_TEXT,
+    why: 'a status text role exists to sit on that status\'s own background, not any other surface',
+  },
+  {
+    fg: 'color.status.warning.text',
+    bg: 'color.status.warning.bg',
+    threshold: AA_NORMAL_TEXT,
+    why: 'a status text role exists to sit on that status\'s own background, not any other surface',
+  },
+  {
+    fg: 'color.status.danger.text',
+    bg: 'color.status.danger.bg',
+    threshold: AA_NORMAL_TEXT,
+    why: 'a status text role exists to sit on that status\'s own background, not any other surface',
+  },
+];
+
+// WCAG 2.x sRGB relative luminance over 0-255 channels.
+function relativeLuminance({ r, g, b }) {
+  const linearize = (channel) => {
+    const c = channel / 255;
+    return c <= 0.03928 ? c / 12.92 : ((c + 0.055) / 1.055) ** 2.4;
+  };
+  return 0.2126 * linearize(r) + 0.7152 * linearize(g) + 0.0722 * linearize(b);
+}
+
+// Takes two `#rrggbb` strings (no alpha; the caller composites first) and
+// returns the raw ratio, unrounded.
+function contrastRatio(hexA, hexB) {
+  const lumA = relativeLuminance(parseHex(hexA));
+  const lumB = relativeLuminance(parseHex(hexB));
+  const lighter = Math.max(lumA, lumB);
+  const darker = Math.min(lumA, lumB);
+  return (lighter + 0.05) / (darker + 0.05);
+}
+
+// `#rrggbb` or `#rrggbbaa` → `{ r, g, b, a }` with `a` in 0-1. `null` for
+// anything else.
+function parseHex(hex) {
+  if (typeof hex !== 'string') return null;
+  const match = /^#([0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/.exec(hex);
+  if (!match) return null;
+  const digits = match[1];
+  const r = parseInt(digits.slice(0, 2), 16);
+  const g = parseInt(digits.slice(2, 4), 16);
+  const b = parseInt(digits.slice(4, 6), 16);
+  const a = digits.length === 8 ? parseInt(digits.slice(6, 8), 16) / 255 : 1;
+  return { r, g, b, a };
+}
+
+// The `#rrggbb` of `fg` drawn over `bg` with src-over (`out = fg*a + bg*(1-a)`).
+function composite(fgHex, bgHex) {
+  const fg = parseHex(fgHex);
+  if (fg.a === 0) return bgHex;
+  if (fg.a === 1) return fgHex.slice(0, 7);
+  const bg = parseHex(bgHex);
+  const mix = (fgChannel, bgChannel) => Math.round(fgChannel * fg.a + bgChannel * (1 - fg.a));
+  const toHex = (value) => value.toString(16).padStart(2, '0');
+  return `#${toHex(mix(fg.r, bg.r))}${toHex(mix(fg.g, bg.g))}${toHex(mix(fg.b, bg.b))}`;
+}
+
 // The Figma stop conditions as a pure checker: the COMPONENT_SET assertion against
-// the full variant matrix, the state matrix, and the focus ring. ZERO imports,
+// the full variant matrix, the state matrix, the focus ring, and the focus ring's
+// contrast against the surfaces it sits on. ZERO imports,
 // `export const`/`export function` only. This module is inlined, with
-// component-states.mjs above it, into the generated Figma script
+// component-states.mjs and contrast.mjs above it, into the generated Figma script
 // (references/figma-checks.md) by build-figma-checks.mjs, so it must run in both
 // Node and the Figma plugin sandbox.
 //
 // The state table is not imported. `withTable({ resolveArchetype, BASELINE_STATES,
-// STATE_SYNONYMS, normalizeName })` takes it, and the fold, from the caller and
-// returns { checkSpec, checkBuilt }. In the generated script the caller passes the
+// STATE_SYNONYMS, normalizeName, contrastRatio, composite, parseHex, AA_NON_TEXT })`
+// takes it, the fold and the contrast maths from the caller and returns
+// { checkSpec, checkBuilt }. In the generated script the caller passes the
 // inlined component-states.mjs names; in tests it passes the module's own exports.
 //
 // Spec: docs/specs/2026-10-07-figma-checks-as-scripts.md
 // Rules: references/figma-component-standards.md (State handling; audit items 8, 9)
 //
-// EXPECT: { name, matrix: { axis: [values] }, uiFramework, controlLayer? }
+// Spec (focus contrast): docs/specs/2026-10-13-focus-ring-contrast.md
+//
+// EXPECT: { name, matrix: { axis: [values] }, uiFramework, controlLayer?, surfaces? }
+//   surfaces: colour-variable names of the page surfaces the component sits on.
 //
 // SNAPSHOT (what the reader returns for the COMPONENT_SET in `WIP: <name>`):
 //   {
 //     type,                               // the set's node type, 'COMPONENT_SET'
 //     variantGroupProperties: { Axis: { values: [...] }, ... },   // only the keys are read
-//     children: [ VARIANT, ... ]
+//     children: [ VARIANT, ... ],
+//     colors: { [variableName]: { modes: { [modeName]: '#rrggbb' | '#rrggbbaa' | null }, defaultMode } },
+//     missingSurfaces: [name, ...]          // EXPECT.surfaces names with no local colour variable
 //   }
+//   `colors` holds every colour variable read on focus variants and their
+//   controlLayer, plus each EXPECT.surfaces name that was found.
 //   VARIANT (every child):  { type, variantProperties: { Axis: 'Value' } }
 //   A VARIANT whose state value folds to `focus` also carries FOCUS NODE fields
 //   (below), plus `controlLayer` when EXPECT names one.
@@ -156,6 +295,8 @@ function missingStates(record) {
 //   Variable names are resolved by the reader and only for focus variants and their controlLayer.
 //
 // RESULT: { pass, checks: [{ name, result: 'pass' | 'fail' | 'skip', detail }] }
+//   built mode returns four checks: structural-read-back, state-baseline,
+//   focus-indicator, focus-contrast.
 //   `pass` ignores skips. A failed assertion is data; nothing here throws.
 
 // The in-scope `uiFramework` values and the focus recipe each one uses. An absent or
@@ -181,11 +322,17 @@ function frameworkRecipe(uiFramework) {
     : null;
 }
 
-// A focus variable is any variable whose name has a `focus` segment:
-// `border/focus`, `color/border/focus` and `color/focus/ring` count; `focusRing` and
-// a raw colour (null) do not.
+// A focus variable is any variable whose name has `focus` as a whole word: in a
+// `/` segment of its own, or inside one split on `-`, `_`, spaces or a camelCase
+// boundary. `border/focus`, `color/focus/ring`, `color/focusRing` and
+// `interaction/border-primary-focus` count; `color/bg/focused` and a raw colour
+// (null) do not.
 function isFocusVariable(name) {
-  return typeof name === 'string' && name.split('/').some((seg) => seg.trim().toLowerCase() === 'focus');
+  if (typeof name !== 'string') return false;
+  const words = name
+    .split('/')
+    .flatMap((seg) => seg.replace(/([a-z0-9])([A-Z])/g, '$1 $2').split(/[\s_-]+/));
+  return words.some((word) => word.toLowerCase() === 'focus');
 }
 
 // A choice control may carry selection on its own axis instead of as a `selected`
@@ -222,7 +369,34 @@ function lacksRing(target, recipe, isInput) {
       ];
 }
 
-function withTable({ resolveArchetype, BASELINE_STATES, STATE_SYNONYMS, normalizeName }) {
+// The focus-variable names that make up the ring `lacksRing` accepted, for the
+// contrast check. Same recipes, same tests.
+function ringVariables(target, recipe, isInput) {
+  const children = target.children ?? [];
+  const focusStrokes = (node) => (node.strokeVariables ?? []).filter(isFocusVariable);
+  if (recipe === 'mui' && isInput) return focusStrokes(target);
+  if (recipe === 'outline') {
+    return [target, ...children].filter((n) => n.strokeAlign === 'OUTSIDE').flatMap(focusStrokes);
+  }
+  const shadows = (target.effects ?? [])
+    .filter((e) => e.type === 'DROP_SHADOW' && e.visible !== false && e.spread > 0 && isFocusVariable(e.colorVariable))
+    .map((e) => e.colorVariable);
+  const ringChildren = children
+    .filter((c) => c.layoutPositioning === 'ABSOLUTE' && c.strokeAlign === 'OUTSIDE')
+    .flatMap(focusStrokes);
+  return [...shadows, ...ringChildren];
+}
+
+function withTable({
+  resolveArchetype,
+  BASELINE_STATES,
+  STATE_SYNONYMS,
+  normalizeName,
+  contrastRatio,
+  composite,
+  parseHex,
+  AA_NON_TEXT,
+}) {
   const fold = normalizeName;
   const foldState = (value) => {
     const name = fold(value);
@@ -242,6 +416,10 @@ function withTable({ resolveArchetype, BASELINE_STATES, STATE_SYNONYMS, normaliz
       .map(([k, v]) => `${k}=${v}`)
       .join(', ');
 
+  const isFocusVariant = (child) =>
+    child.type === 'COMPONENT' &&
+    Object.entries(child.variantProperties ?? {}).some(([k, v]) => fold(k) === 'state' && fold(v) === 'focus');
+
   function crossProduct(matrix) {
     let combos = [{}];
     for (const [axis, values] of Object.entries(matrix ?? {})) {
@@ -319,9 +497,6 @@ function withTable({ resolveArchetype, BASELINE_STATES, STATE_SYNONYMS, normaliz
     if (recipe === null) {
       return { name, result: 'skip', detail: `uiFramework "${expect.uiFramework}" is out of scope for the focus check` };
     }
-    const isFocusVariant = (child) =>
-      child.type === 'COMPONENT' &&
-      Object.entries(child.variantProperties ?? {}).some(([k, v]) => fold(k) === 'state' && fold(v) === 'focus');
     const variants = (snapshot.children ?? []).filter(isFocusVariant);
     if (variants.length === 0) {
       return { name, result: 'fail', detail: 'no COMPONENT variant has a state of focus, so no ring can be read; the state check stops on this' };
@@ -344,6 +519,100 @@ function withTable({ resolveArchetype, BASELINE_STATES, STATE_SYNONYMS, normaliz
       : { name, result: 'pass', detail: `all ${variants.length} focus variants carry a ${recipe}-recipe focus indicator` };
   }
 
+  // WCAG 1.4.11: each ring colour against each named surface, in every mode either
+  // side has. Runs only on a ring focusIndicator accepted.
+  function focusContrast(snapshot, expect, indicator) {
+    const name = 'focus-contrast';
+    if (indicator.result !== 'pass') {
+      return { name, result: 'skip', detail: 'focus-indicator did not pass, so there is no ring to measure' };
+    }
+    const surfaces = expect.surfaces ?? [];
+    if (surfaces.length === 0) {
+      return {
+        name,
+        result: 'skip',
+        detail: 'no surfaces named; the architect names the colour variables of the surfaces the component sits on',
+      };
+    }
+    const missing = snapshot.missingSurfaces ?? [];
+    if (missing.length) {
+      return { name, result: 'fail', detail: `no local colour variable named: ${missing.join(', ')}` };
+    }
+
+    const recipe = frameworkRecipe(expect.uiFramework);
+    const isInput = resolveArchetype({ name: expect.name }) === 'input';
+    const hasLayer = expect.controlLayer !== undefined && expect.controlLayer !== null;
+    const rings = new Set();
+    for (const variant of (snapshot.children ?? []).filter(isFocusVariant)) {
+      const target = hasLayer ? variant.controlLayer : variant;
+      if (target) for (const ring of ringVariables(target, recipe, isInput)) rings.add(ring);
+    }
+
+    const colors = snapshot.colors ?? {};
+    // A mode's value: the same-named mode after the fold, else the default.
+    const valueIn = (entry, foldedMode) => {
+      const modes = entry?.modes ?? {};
+      const hit = Object.keys(modes).find((m) => fold(m) === foldedMode);
+      if (hit !== undefined) return modes[hit];
+      return entry?.defaultMode !== undefined ? modes[entry.defaultMode] ?? null : null;
+    };
+    const skipped = { unresolved: 0, translucentSurface: 0 };
+    const failures = [];
+    const modesSeen = new Set();
+    let pairs = 0;
+    for (const ring of [...rings].sort()) {
+      for (const surface of [...surfaces].sort()) {
+        const ringEntry = colors[ring];
+        const surfaceEntry = colors[surface];
+        // Modes come from the side(s) with more than one: a single-mode collection
+        // reads the same value in every mode, so its own mode name adds nothing.
+        // When both are single-mode, the ring's one mode is the only comparison.
+        const entries = [ringEntry, surfaceEntry];
+        const multi = entries.filter((e) => Object.keys(e?.modes ?? {}).length > 1);
+        const single = Object.keys(ringEntry?.modes ?? {}).length ? [ringEntry] : [surfaceEntry];
+        const modeNames = new Map();
+        for (const entry of multi.length ? multi : single) {
+          for (const m of Object.keys(entry?.modes ?? {})) if (!modeNames.has(fold(m))) modeNames.set(fold(m), m);
+        }
+        if (modeNames.size === 0) {
+          skipped.unresolved += 1;
+          continue;
+        }
+        for (const [foldedMode, mode] of [...modeNames].sort((a, b) => (a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0))) {
+          const ringHex = valueIn(ringEntry, foldedMode);
+          const surfaceHex = valueIn(surfaceEntry, foldedMode);
+          const surfaceParsed = parseHex(surfaceHex);
+          if (parseHex(ringHex) === null || surfaceParsed === null) {
+            skipped.unresolved += 1;
+            continue;
+          }
+          if (surfaceParsed.a < 1) {
+            skipped.translucentSurface += 1;
+            continue;
+          }
+          const surfaceOpaque = surfaceHex.slice(0, 7);
+          const ratio = contrastRatio(composite(ringHex, surfaceOpaque), surfaceOpaque);
+          pairs += 1;
+          modesSeen.add(foldedMode);
+          if (ratio < AA_NON_TEXT) {
+            const shown = (Math.floor(ratio * 100) / 100).toFixed(2);
+            failures.push(`${ring} on ${surface} in ${mode}: ${shown}:1, needs ${AA_NON_TEXT}:1`);
+          }
+        }
+      }
+    }
+    const skipNote = [
+      skipped.unresolved && `${skipped.unresolved} skipped as unresolved or not a colour`,
+      skipped.translucentSurface && `${skipped.translucentSurface} skipped for a translucent surface`,
+    ].filter(Boolean);
+    if (failures.length) return { name, result: 'fail', detail: failures.join('; ') };
+    if (pairs === 0) {
+      return { name, result: 'skip', detail: `no ring/surface pair could be compared: ${skipNote.join(', ') || 'no ring colour found'}` };
+    }
+    const passed = `${pairs} ring/surface pair(s) clear ${AA_NON_TEXT}:1 across ${modesSeen.size} mode(s)`;
+    return { name, result: 'pass', detail: skipNote.length ? `${passed}; ${skipNote.join(', ')}` : passed };
+  }
+
   // Before anything is written: the matrix the spec asks for against the state table.
   function checkSpec(expect) {
     const entries = Object.entries(expect.matrix ?? {}).flatMap(([axis, values]) => values.map((v) => [axis, v]));
@@ -353,32 +622,77 @@ function withTable({ resolveArchetype, BASELINE_STATES, STATE_SYNONYMS, normaliz
   // After the build: the node as read.
   function checkBuilt(snapshot, expect) {
     const entries = (snapshot.children ?? []).flatMap((c) => Object.entries(c.variantProperties ?? {}));
-    return result([structural(snapshot, expect), stateBaseline(expect, entries), focusIndicator(snapshot, expect)]);
+    const indicator = focusIndicator(snapshot, expect);
+    return result([
+      structural(snapshot, expect),
+      stateBaseline(expect, entries),
+      indicator,
+      focusContrast(snapshot, expect, indicator),
+    ]);
   }
 
   return { checkSpec, checkBuilt };
 }
 
-const { checkSpec, checkBuilt } = withTable({ resolveArchetype, BASELINE_STATES, STATE_SYNONYMS, normalizeName });
+const { checkSpec, checkBuilt } = withTable({ resolveArchetype, BASELINE_STATES, STATE_SYNONYMS, normalizeName, contrastRatio, composite, parseHex, AA_NON_TEXT });
 
 // Figma plugin-API reader for the stop-condition checks. This file is NOT a
 // Node module — build-figma-checks.mjs concatenates it after the inlined
-// component-states.mjs and figma-checks.mjs into references/figma-checks.md, and
+// component-states.mjs, contrast.mjs and figma-checks.mjs into
+// references/figma-checks.md, and
 // the result runs inside figma_execute (dynamic-page mode). Constraints honored
 // here (see references/figma-scripting.md): async getters only, variable names
-// resolved with getVariableByIdAsync and only for focus variants and their
-// controlLayer. Untested in Node, like the doc-card renderer; the pure checker
-// it feeds is unit-tested.
+// and per-mode colour values resolved with getVariableByIdAsync and only for
+// focus variants and their controlLayer, plus the EXPECT.surfaces names, which
+// are looked up among the file's LOCAL colour variables only (a surface from a
+// published library reads as missing). Untested in Node, like the doc-card
+// renderer; the pure checker it feeds is unit-tested.
 //
 // In-scope globals when assembled: normalizeName (inlined
 // component-states.mjs), checkSpec, checkBuilt (bound from withTable) and the
 // caller-filled slots EXPECT and MODE (passed to runFigmaChecks). The snapshot
 // shape is documented at the top of scripts/lib/figma-checks.mjs.
 
+// Colour variables read on focus nodes, by name, for the contrast check.
+const readVariables = new Map();
+
 async function variableName(alias) {
   if (!alias || !alias.id) return null;
   const variable = await figma.variables.getVariableByIdAsync(alias.id);
-  return variable ? variable.name : null;
+  if (!variable) return null;
+  if (variable.resolvedType === 'COLOR') readVariables.set(variable.name, variable);
+  return variable.name;
+}
+
+function colorHex(value) {
+  if (!value || typeof value !== 'object' || !('r' in value)) return null;
+  const byte = (x) => Math.round(x * 255).toString(16).padStart(2, '0');
+  const alpha = value.a === undefined ? 1 : value.a;
+  return `#${byte(value.r)}${byte(value.g)}${byte(value.b)}${alpha < 1 ? byte(alpha) : ''}`;
+}
+
+// The value of `variable` in the mode named `modeName` (after the fold), else
+// its collection's default mode, following aliases up to 10 hops.
+async function resolveColor(variable, modeName, hops) {
+  if (!variable || hops > 10) return null;
+  const collection = await figma.variables.getVariableCollectionByIdAsync(variable.variableCollectionId);
+  if (!collection) return null;
+  const mode = collection.modes.find((m) => normalizeName(m.name) === normalizeName(modeName));
+  const value = variable.valuesByMode[mode ? mode.modeId : collection.defaultModeId];
+  if (value && value.type === 'VARIABLE_ALIAS') {
+    return resolveColor(await figma.variables.getVariableByIdAsync(value.id), modeName, hops + 1);
+  }
+  return colorHex(value);
+}
+
+// { modes: { [modeName]: hex | null }, defaultMode } over the variable's own collection.
+async function variableColors(variable) {
+  const collection = await figma.variables.getVariableCollectionByIdAsync(variable.variableCollectionId);
+  if (!collection) return { modes: {}, defaultMode: undefined };
+  const modes = {};
+  for (const mode of collection.modes) modes[mode.name] = await resolveColor(variable, mode.name, 0);
+  const fallback = collection.modes.find((m) => m.modeId === collection.defaultModeId);
+  return { modes, defaultMode: fallback ? fallback.name : undefined };
 }
 
 // The fields the focus check reads from a variant, a control layer or a direct child.
@@ -439,6 +753,7 @@ function groupProperties(set) {
 }
 
 async function readComponentSet(expect) {
+  readVariables.clear();
   await figma.currentPage.loadAsync();
   const frameName = `WIP: ${expect.name}`;
   const frame = figma.currentPage.findOne((n) => n.name === frameName);
@@ -469,10 +784,24 @@ async function readComponentSet(expect) {
     }
     children.push(read);
   }
+  const colors = {};
+  for (const [name, variable] of readVariables) colors[name] = await variableColors(variable);
+  const missingSurfaces = [];
+  const surfaces = expect.surfaces || [];
+  if (surfaces.length) {
+    const local = await figma.variables.getLocalVariablesAsync('COLOR');
+    for (const name of surfaces) {
+      const variable = local.find((v) => v.name === name);
+      if (variable) colors[name] = await variableColors(variable);
+      else missingSurfaces.push(name);
+    }
+  }
   return {
     type: set.type,
     variantGroupProperties: groupProperties(set),
     children,
+    colors,
+    missingSurfaces,
   };
 }