@motion-proto/live-tokens 0.55.0 → 0.56.1

package/src/editor/core/fonts/googleFontsUrl.ts

@@ -0,0 +1,123 @@
+import { parseFontFaceText } from './fontParse';
+
+export interface CssResponse {
+  ok: boolean;
+  status: number;
+  text: () => Promise<string>;
+}
+
+export type CssFetcher = (url: string) => Promise<CssResponse>;
+
+export interface ResolvedGoogleFont {
+  /** As Google spells it in the returned CSS, not as the caller typed it. */
+  name: string;
+  url: string;
+  weights: number[];
+  italics: boolean;
+  probeUrl: string;
+}
+
+/** The shipped `--font-weight-*` scale runs 100 to 900 in hundreds, so probing
+ *  that ladder discovers every weight a theme can ask for. */
+const LADDER = [100, 200, 300, 400, 500, 600, 700, 800, 900];
+
+function familyParam(name: string): string {
+  return name.trim().replace(/\s+/g, '+');
+}
+
+function url(name: string, spec?: string): string {
+  const family = spec ? `${familyParam(name)}:${spec}` : familyParam(name);
+  return `https://fonts.googleapis.com/css2?family=${family}&display=swap`;
+}
+
+/**
+ * Ask for every weight in both styles. Google silently drops the ones a family
+ * does not have and answers 200 anyway, so the returned CSS is a census of the
+ * family rather than a yes/no on the request. A 400 here means the family
+ * itself is not on Google Fonts.
+ */
+export function discoveryUrl(name: string): string {
+  const pairs = [
+    ...LADDER.map((w) => `0,${w}`),
+    ...LADDER.map((w) => `1,${w}`),
+  ];
+  return url(name, `ital,wght@${pairs.join(';')}`);
+}
+
+function isContiguous(weights: number[]): boolean {
+  return weights.length > 1 && weights.every((w, i) => i === 0 || w - weights[i - 1] === 100);
+}
+
+/** The narrowest URL that still delivers everything the family has. A range
+ *  serves one variable file; an enumeration serves one file per weight. */
+export function persistUrlFor(name: string, weights: number[], italics: boolean): string {
+  if (weights.length === 0 || (weights.length === 1 && weights[0] === 400 && !italics)) {
+    return url(name);
+  }
+  if (isContiguous(weights)) {
+    const range = `${weights[0]}..${weights[weights.length - 1]}`;
+    return url(name, italics ? `ital,wght@0,${range};1,${range}` : `wght@${range}`);
+  }
+  const spec = italics
+    ? `ital,wght@${[...weights.map((w) => `0,${w}`), ...weights.map((w) => `1,${w}`)].join(';')}`
+    : `wght@${weights.join(';')}`;
+  return url(name, spec);
+}
+
+function censusFrom(css: string, requested: string): { name: string; weights: number[]; italics: boolean } {
+  const families = parseFontFaceText(css);
+  if (families.length === 0) {
+    throw new Error(`Google Fonts returned no @font-face rules for "${requested}".`);
+  }
+  const family = families[0];
+  return {
+    name: family.name,
+    weights: family.weights ?? [],
+    italics: family.italics === true,
+  };
+}
+
+/**
+ * Verify a family exists on Google Fonts and settle on the URL to persist.
+ * Two requests in the common case: one to take the census, one to confirm the
+ * narrower URL built from it. A range that the family's axis cannot serve
+ * answers 400, so the enumerated form is the fallback rather than the guess.
+ */
+export async function resolveGoogleFont(name: string, fetcher: CssFetcher): Promise<ResolvedGoogleFont> {
+  const probeUrl = discoveryUrl(name);
+  const probe = await fetcher(probeUrl);
+  if (!probe.ok) {
+    throw new Error(
+      `"${name}" is not on Google Fonts (the API answered ${probe.status}). ` +
+        `Check the spelling against fonts.google.com.`,
+    );
+  }
+  const census = censusFrom(await probe.text(), name);
+
+  const candidates = [persistUrlFor(census.name, census.weights, census.italics)];
+  const enumerated = census.weights.length > 0
+    ? url(
+        census.name,
+        census.italics
+          ? `ital,wght@${[...census.weights.map((w) => `0,${w}`), ...census.weights.map((w) => `1,${w}`)].join(';')}`
+          : `wght@${census.weights.join(';')}`,
+      )
+    : null;
+  if (enumerated && !candidates.includes(enumerated)) candidates.push(enumerated);
+  const bare = url(census.name);
+  if (!candidates.includes(bare)) candidates.push(bare);
+
+  for (const candidate of candidates) {
+    const res = await fetcher(candidate);
+    if (!res.ok) continue;
+    const served = censusFrom(await res.text(), census.name);
+    return {
+      name: census.name,
+      url: candidate,
+      weights: served.weights,
+      italics: served.italics,
+      probeUrl,
+    };
+  }
+  throw new Error(`Could not build a working Google Fonts URL for "${census.name}".`);
+}

package/src/editor/core/fonts/weightCoverage.ts

@@ -0,0 +1,92 @@
+import type { FontStackVariable } from '../themes/themeTypes';
+import { inferFontFamilyVariable } from './fontWeightAvailability';
+
+export interface WeightRequirement {
+  variable: string;
+  stack: FontStackVariable;
+  weight: number;
+}
+
+export interface FaceCoverage {
+  stack: FontStackVariable;
+  family: string;
+  required: number[];
+  available: number[];
+  missing: number[];
+  italics: boolean;
+}
+
+const STACK_REF = /var\(\s*(--font-(?:display|sans|serif|mono))\s*\)/;
+const VAR_REF = /var\(\s*(--[a-z0-9-]+)/i;
+
+function declarations(css: string): Map<string, string> {
+  const decls = new Map<string, string>();
+  for (const [, name, value] of css.matchAll(/(--[a-z0-9-]+)\s*:\s*([^;{}]+);/gi)) {
+    decls.set(name, value.trim());
+  }
+  return decls;
+}
+
+/**
+ * Every weight the token contract asks of each font stack, read off the
+ * `-font-family` / `-font-weight` pairing that typography tokens follow.
+ * `overrides` takes a theme's own `cssVariables`, so component tokens count
+ * the same as the shipped text styles.
+ */
+export function requiredWeights(
+  tokensCss: string,
+  overrides: Record<string, string> = {},
+): WeightRequirement[] {
+  const decls = declarations(tokensCss);
+  for (const [name, value] of Object.entries(overrides)) decls.set(name, String(value).trim());
+
+  const scale = new Map<string, number>();
+  for (const [name, value] of decls) {
+    if (name.startsWith('--font-weight-') && /^\d+$/.test(value)) scale.set(name, Number(value));
+  }
+
+  const seen = new Set<string>();
+  const out: WeightRequirement[] = [];
+  for (const [name, value] of decls) {
+    const familyVariable = inferFontFamilyVariable(name);
+    if (!familyVariable) continue;
+    const stack = decls.get(familyVariable)?.match(STACK_REF)?.[1] as FontStackVariable | undefined;
+    if (!stack) continue;
+
+    const weight = /^\d+$/.test(value) ? Number(value) : scale.get(value.match(VAR_REF)?.[1] ?? '');
+    if (weight === undefined) continue;
+
+    const key = `${stack}:${weight}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push({ variable: name, stack, weight });
+  }
+  return out;
+}
+
+export interface CoveredFace {
+  name: string;
+  weights: number[];
+  italics: boolean;
+}
+
+export function weightCoverage(
+  requirements: WeightRequirement[],
+  faces: Partial<Record<FontStackVariable, CoveredFace>>,
+): FaceCoverage[] {
+  const out: FaceCoverage[] = [];
+  for (const [stack, face] of Object.entries(faces) as [FontStackVariable, CoveredFace][]) {
+    const required = [...new Set(requirements.filter((r) => r.stack === stack).map((r) => r.weight))].sort(
+      (a, b) => a - b,
+    );
+    out.push({
+      stack,
+      family: face.name,
+      required,
+      available: face.weights,
+      missing: required.filter((w) => !face.weights.includes(w)),
+      italics: face.italics,
+    });
+  }
+  return out;
+}

package/src/editor/docs/content/themes-workflow.md

@@ -35,6 +35,45 @@ A theme is a document, and the editor works the way any editor does.
 Absence is the answer for anything untouched: a buffer exists only where the
 live look diverges from the active theme, so a newly opened theme has none.
 
+## Fonts
+
+Type is part of the look, so it saves, loads and ships with the theme rather
+than on its own. Four named stacks carry it:
+
+| Stack | Used by |
+|---|---|
+| `--font-display` | headings |
+| `--font-sans` | body text and most UI |
+| `--font-serif` | anywhere you ask for it |
+| `--font-mono` | code |
+
+Each stack is a family followed by its fallbacks, so a page still reads while a
+web font loads, and still reads if it never does. **Project fonts**, in the
+Colors and type editor, is where families come from: type a Google Fonts family
+name and the editor checks it, or paste a fonts URL, an embed tag, or your own
+`@font-face` rules. Removing a family puts the stack back on its fallbacks.
+
+You can also set both faces at once from the command line:
+
+```bash
+npx live-tokens set-fonts fonts.json
+```
+
+with a brief naming the families:
+
+```json
+{ "display": "Fraunces", "body": "Nunito Sans" }
+```
+
+It checks each family against Google Fonts, works out the weights that family
+actually has, and binds it to its stack. Like every other edit, the result lands
+in the buffer, so **Save** keeps it. In Claude Code, asking for a font pairing in
+plain English runs the same command.
+
+A font is only requested by the browser once something on the page uses it, so
+carrying a family you no longer reference costs nothing at load. Adopting is
+what writes the font imports your site ships, into `fonts.css`.
+
 ## Saving
 
 In the Theme panel:

package/src/editor/docs/content.generated.ts

@@ -6,6 +6,6 @@ export const docContent: Record<string, string> = {
   "creating-components": "# Creating components\n\nThe package ships about 25 editable components. When you need one it doesn't\nhave, you can make your own Svelte component editable, so anyone using the\neditor can re-point its colours, type, and spacing without touching code.\n\nThe simplest way is to ask Claude. The package bundles a Claude Code skill that\nknows the conventions, writes the files, and checks the result for you.\n\n## Install the skills\n\n```bash\nnpx @motion-proto/live-tokens setup-claude\n```\n\nThis copies the bundled skills into your project's `.claude/skills/`. Once\nthey're there, Claude Code picks them up automatically.\n\n## Ask for a component\n\nDescribe what you want in plain English. Phrases like these trigger the skill:\n\n- \"Add a Toggle component to live-tokens\"\n- \"Make this Svelte component editable in the live-tokens editor\"\n- \"Create a Stat component with a value and a label\"\n\nClaude asks any clarifying questions it needs (which variants, which states,\nwhich parts), then writes the component, registers it with the editor, and runs\nits verification checklist. When it finishes, open `/live-tokens/components` to see your new\ncomponent in the editor and confirm everything works.\n\n## What you get\n\n- A runtime component whose editable properties default to your theme tokens.\n- An editor entry that appears under **Custom** in the `/live-tokens/components` view.\n- The naming and wiring handled for you, so the component fits the system.\n\nAdvanced authors who want to write a component by hand can read the naming and\nstate-model conventions shipped in the package\n(`src/system/styles/CONVENTIONS.md` and the skill's own `SKILL.md`).\n",
   "editing-tokens": "# Editing tokens\n\nA tour of the editor. The page behind it repaints on every change; saving\nwrites a theme file you can reload later.\n\nThe editor has two views:\n\n- **Tokens**: the design-system primitives (colour, type, spacing, and so on).\n  They apply everywhere your site uses them.\n- **Components**: per-component editors. Re-Assign what tokens a component uses\n  without changing the underlying system.\n\nThis page covers **Tokens**. For components, see\n[Creating components](creating-components.md).\n\n## Palettes\n\nMost colour work happens here. Each palette (Brand, Accent, Neutral, Canvas,\nSuccess, Warning, Info, Danger, and a few more) has:\n\n- **Base colour.** Pick a hex; the palette derives an 11-step ramp (100 to 950)\n  from it.\n- **Curves.** Three curves shape the ramp, in stack order: Hue, Saturation,\n  Lightness. Drag the handles to bias it warmer or cooler, more or less\n  saturated, darker or lighter. Hue drifts the ramp's temperature without\n  moving contrast, because OKLCH hue rotation is close to lightness-preserving.\n  It holds ±45 degrees; a bigger shift belongs on the base colour or the\n  harmony axis.\n- **Overrides.** Lock a single step to a hand-picked hex when the curve doesn't\n  land where you want.\n\nEditing a palette base ripples through every colour that depends on it, in real\ntime. Colours use OKLCH, so the ramp stays perceptually even across hues\nwithout muddy mid-tones.\n\n## Type\n\n- **Fonts.** Add sources from Google Fonts, Adobe (Typekit), a CSS URL, or an\n  inline `@font-face`. The font loads in the page as soon as you add it.\n- **Stacks.** Named font cascades you reference by token, such as a display\n  stack and a body stack.\n- **Sizes and weights.** A t-shirt scale (xs, sm, md, lg, xl, 2xl…) for size and\n  a numeric scale (100 to 900) for weight.\n\n## Spacing, radius, shadow\n\nNumeric scales with a slider per step.\n\n- **Spacing**: the padding, gap, and margin scale.\n- **Radius**: none through full.\n- **Shadow**: colour, offset, blur, spread, and opacity per step, with stacked\n  shadows supported.\n\nChange a step and every element using it repaints.\n\n## Overlays and gradients\n\n- **Overlays** are translucent tints layered over surfaces, like the subtle\n  tint a card gets on hover. Set a colour and opacity per state.\n- **Gradients** are reusable gradient tokens with a stop list and direction, for\n  hero panels and accent backgrounds.\n\n## Columns\n\nThe page-grid overlay. Set column count, gutter, and outer margin, and toggle\nthe visual guide with `Cmd/Ctrl+G`. Pages built on the column system reflow\nlive.\n\n## Saving\n\nThe editor saves to your browser continuously, so work survives a reload\nmid-edit. Writing a file is a separate step: the **Theme** panel at the foot of\nthe sidebar has **Save**, **Save As**, and **Load**, and each theme is one JSON\nfile under `src/live-tokens/data/themes/`.\n\nThe header gives you undo/redo (`Cmd/Ctrl+Z`, `Cmd/Ctrl+Shift+Z`). You can keep\nmany themes side by side; one is open at a time, and only **Adopt** publishes\none. See [Themes](themes-workflow.md) for the full lifecycle.\n",
   "getting-started": "# Getting started\n\nScaffold a live token site in a moments. You need Node 20 or later, a\npackage manager (npm, pnpm, or yarn), and a browser. Open claude code in your repo and start building.\n\n## Scaffold a new app\n\n```bash\nnpm create @motion-proto/live-tokens@latest my-app\ncd my-app\nnpm install\nnpm run dev\n```\n\nOpen the URL Vite prints (usually `http://localhost:5173`). You get a\none-page Svelte + Vite app that depends on the published package, with the\neditor wired up and the full component set ready to import.\n\n`npx @motion-proto/live-tokens create my-app` runs the same scaffold without\nthe initialiser package.\n\n### What the scaffold gives you\n\nEvery editable file lives under `src/` and is committed, so `npm install` and\nversion upgrades never touch your styles. The package code stays in\n`node_modules`.\n\n| Path | What it is |\n|------|------------|\n| `src/pages/Home.svelte` | The starter page. Replace it with your own content. |\n| `src/App.svelte` | Your routes. `<LiveTokensRouter>` adds dev-only routes under a reserved `/live-tokens/*` namespace: `/live-tokens/editor`, `/live-tokens/components`, and `/live-tokens/docs`. |\n| `src/system/styles/tokens.css` | Your base token vocabulary, hand-authored. |\n| `src/styles/site.css` | Themed page typography, yours to edit. |\n\n## Your first edit\n\n1. Run `npm run dev` and open the home page.\n2. Click **Open Token Editor**, or visit `/live-tokens/editor`. The editor opens beside\n   the page.\n3. Open **Palettes**, pick **Brand**, and change the base hex. The page\n   repaints as you type.\n4. In the **Theme** panel at the foot of the sidebar, choose **Save As**. Your\n   theme appears as JSON under `src/live-tokens/data/themes/`.\n5. Reload. The editor reopens on your theme, so the page returns as you left\n   it.\n\n## What you just changed\n\nEvery edit sets a CSS custom property on `:root`. Your components read those\nproperties through `var(--...)`. There is no token build step and no\npreprocessor rewriting your code: the page renders against plain CSS variables\nthe editor swaps live.\n\nTo ship, click **Adopt** in the Theme panel. That saves the open theme and bakes\nit into `src/live-tokens/data/tokens.generated.css`, which your build bundles\nalongside `tokens.css`. Adopt is the only action that changes what your site\nships, so try any look you like first. The editor itself never reaches\nproduction.\n\nAlready have a Svelte 5 + Vite app? The\n[README](https://github.com/motionproto/live-tokens#readme) covers installing\ninto an existing project.\n\n## Where to go next\n\n- **[Editing tokens](editing-tokens.md)**: a tour of the editor.\n- **[Themes](themes-workflow.md)**: save, switch, and ship.\n- **[Creating components](creating-components.md)**: make your own component\n  editable.\n",
-  "themes-workflow": "# Themes\n\nSave your work, switch between looks, and ship one to production.\n\n## The Theme panel\n\nThe **Theme** panel at the foot of the editor sidebar holds the whole look:\ncolors, type, and a setting for every component, in one file. It carries the\nname the look ships under, whether production is running it, and **Adopt**.\nTwo parts sit under it, each a read-out rather than a file to manage.\n\n- **Colors & Type** holds the design tokens. Components read those tokens to\n  define their appearance. It names the two faces the page is showing.\n- **Components** counts how many components have an unsaved edit that has not\n  been saved into the theme, and opens the component editors.\n\nA theme holds its own copy of every part, so one theme can never break another.\n\n## How themes work\n\nA theme is a document, and the editor works the way any editor does.\n\n- **A theme** is a named JSON file in `src/live-tokens/data/themes/`. It carries\n  the whole look: the colors and type plus a setting for every component.\n- **The open theme** is the one the editor is working on, named in\n  `themes/_active.json`. One at a time.\n- **Your unsaved edits** are what the page shows right now. The editor keeps\n  them in your browser as you work and writes them to a buffer, `_working.json`,\n  one slot per part of the look. **Save** captures that buffer into the open\n  theme.\n- **The production theme** is the one your site ships, named in\n  `themes/_production.json`. **Adopt** changes it; saving a preset in the Theme\n  Picker performs that Adopt for you.\n\nAbsence is the answer for anything untouched: a buffer exists only where the\nlive look diverges from the active theme, so a newly opened theme has none.\n\n## Saving\n\nIn the Theme panel:\n\n- **Save** captures the look on screen into the open theme. Your colors and type\n  go in as part of it, so there is nothing to save first.\n- **Save As** names a new theme. Use it for your first save and for forking.\n\nComponent editors keep their own unsaved state. If one or more components are\nwaiting when you use **Save**, **Save As**, or **Adopt**, the Theme panel offers\nto save all of them before continuing. You can accept once instead of visiting\neach component, or cancel to review them individually. A component editor's\n**Save As** creates a reusable component preset.\n\nNames are tidied to lowercase with hyphens, so \"My Brand!\" becomes `my-brand`,\nand a leading underscore is dropped: those names are reserved for the buffer.\n**Motion Proto** is the built-in theme and is read-only. You can always return\nto it, and the editor never overwrites it, so start your own with **Save As**.\n\n## Switching\n\n**Load**—or clicking the active theme's name—opens the Theme Picker. Picking a\ntheme shows it on the page as a preview with nothing written to disk, so you can\ntry each look and compare. **Save** in that window opens and adopts the previewed\ntheme in one step: the active pointer changes, the buffers clear, the editor\nworks on it, and production ships it. **Cancel** returns you to where you were.\nPreviewing alone never changes what your site ships.\n\n**Colors and type only. Keep my shapes.** narrows the load to the palette and\nthe fonts: your component settings stay as they are and the theme you have open\nstays open. Saved colors and type files are listed there too, marked *colors &\ntype*, and picking one is always that narrower load.\n\n## Shipping\n\n**Adopt**, in the Theme panel, is the \"ship it\" step, and it ships the whole\nlook. It saves the open theme, then bakes that theme into\n`src/live-tokens/data/tokens.generated.css`, which your build bundles alongside\n`tokens.css`: the colors and type plus every component the theme carries. Fonts\nregenerate to match. The line under the theme name says whether production is\nrunning this theme.\n\nProduction is one saved theme, so nothing else publishes. Trying a look, moving\na token, saving a theme: all of it leaves the generated CSS alone until you\nAdopt. A component editor's Adopt runs the same whole-look step, because a\ncomponent never ships alone. Adopting while Motion Proto is open saves your look\nas a theme of your own first, since the built-in one is read-only.\n\nProduction builds (`npm run build`) ship only that plain CSS and your\ncomponents. No editor, no JSON loading, no runtime indirection.\n\n## Keeping your work safe\n\nEverything under `src/live-tokens/data/` is plain JSON, so commit it. Themes show\nup as readable diffs you can review per branch, and the buffer shows up as the\nwork you have not saved into a theme yet. Nothing is backed up anywhere else:\ngit is your safety net. To experiment freely, **Save As** a new name first, then\nedit.\n\n## Where to go next\n\n- **[Where themes live](where-themes-live.md)**: the files behind all of this,\n  and what writes each one.\n- **[Creating components](creating-components.md)**: make your own components\n  editable in the same editor.\n",
+  "themes-workflow": "# Themes\n\nSave your work, switch between looks, and ship one to production.\n\n## The Theme panel\n\nThe **Theme** panel at the foot of the editor sidebar holds the whole look:\ncolors, type, and a setting for every component, in one file. It carries the\nname the look ships under, whether production is running it, and **Adopt**.\nTwo parts sit under it, each a read-out rather than a file to manage.\n\n- **Colors & Type** holds the design tokens. Components read those tokens to\n  define their appearance. It names the two faces the page is showing.\n- **Components** counts how many components have an unsaved edit that has not\n  been saved into the theme, and opens the component editors.\n\nA theme holds its own copy of every part, so one theme can never break another.\n\n## How themes work\n\nA theme is a document, and the editor works the way any editor does.\n\n- **A theme** is a named JSON file in `src/live-tokens/data/themes/`. It carries\n  the whole look: the colors and type plus a setting for every component.\n- **The open theme** is the one the editor is working on, named in\n  `themes/_active.json`. One at a time.\n- **Your unsaved edits** are what the page shows right now. The editor keeps\n  them in your browser as you work and writes them to a buffer, `_working.json`,\n  one slot per part of the look. **Save** captures that buffer into the open\n  theme.\n- **The production theme** is the one your site ships, named in\n  `themes/_production.json`. **Adopt** changes it; saving a preset in the Theme\n  Picker performs that Adopt for you.\n\nAbsence is the answer for anything untouched: a buffer exists only where the\nlive look diverges from the active theme, so a newly opened theme has none.\n\n## Fonts\n\nType is part of the look, so it saves, loads and ships with the theme rather\nthan on its own. Four named stacks carry it:\n\n| Stack | Used by |\n|---|---|\n| `--font-display` | headings |\n| `--font-sans` | body text and most UI |\n| `--font-serif` | anywhere you ask for it |\n| `--font-mono` | code |\n\nEach stack is a family followed by its fallbacks, so a page still reads while a\nweb font loads, and still reads if it never does. **Project fonts**, in the\nColors and type editor, is where families come from: type a Google Fonts family\nname and the editor checks it, or paste a fonts URL, an embed tag, or your own\n`@font-face` rules. Removing a family puts the stack back on its fallbacks.\n\nYou can also set both faces at once from the command line:\n\n```bash\nnpx live-tokens set-fonts fonts.json\n```\n\nwith a brief naming the families:\n\n```json\n{ \"display\": \"Fraunces\", \"body\": \"Nunito Sans\" }\n```\n\nIt checks each family against Google Fonts, works out the weights that family\nactually has, and binds it to its stack. Like every other edit, the result lands\nin the buffer, so **Save** keeps it. In Claude Code, asking for a font pairing in\nplain English runs the same command.\n\nA font is only requested by the browser once something on the page uses it, so\ncarrying a family you no longer reference costs nothing at load. Adopting is\nwhat writes the font imports your site ships, into `fonts.css`.\n\n## Saving\n\nIn the Theme panel:\n\n- **Save** captures the look on screen into the open theme. Your colors and type\n  go in as part of it, so there is nothing to save first.\n- **Save As** names a new theme. Use it for your first save and for forking.\n\nComponent editors keep their own unsaved state. If one or more components are\nwaiting when you use **Save**, **Save As**, or **Adopt**, the Theme panel offers\nto save all of them before continuing. You can accept once instead of visiting\neach component, or cancel to review them individually. A component editor's\n**Save As** creates a reusable component preset.\n\nNames are tidied to lowercase with hyphens, so \"My Brand!\" becomes `my-brand`,\nand a leading underscore is dropped: those names are reserved for the buffer.\n**Motion Proto** is the built-in theme and is read-only. You can always return\nto it, and the editor never overwrites it, so start your own with **Save As**.\n\n## Switching\n\n**Load**—or clicking the active theme's name—opens the Theme Picker. Picking a\ntheme shows it on the page as a preview with nothing written to disk, so you can\ntry each look and compare. **Save** in that window opens and adopts the previewed\ntheme in one step: the active pointer changes, the buffers clear, the editor\nworks on it, and production ships it. **Cancel** returns you to where you were.\nPreviewing alone never changes what your site ships.\n\n**Colors and type only. Keep my shapes.** narrows the load to the palette and\nthe fonts: your component settings stay as they are and the theme you have open\nstays open. Saved colors and type files are listed there too, marked *colors &\ntype*, and picking one is always that narrower load.\n\n## Shipping\n\n**Adopt**, in the Theme panel, is the \"ship it\" step, and it ships the whole\nlook. It saves the open theme, then bakes that theme into\n`src/live-tokens/data/tokens.generated.css`, which your build bundles alongside\n`tokens.css`: the colors and type plus every component the theme carries. Fonts\nregenerate to match. The line under the theme name says whether production is\nrunning this theme.\n\nProduction is one saved theme, so nothing else publishes. Trying a look, moving\na token, saving a theme: all of it leaves the generated CSS alone until you\nAdopt. A component editor's Adopt runs the same whole-look step, because a\ncomponent never ships alone. Adopting while Motion Proto is open saves your look\nas a theme of your own first, since the built-in one is read-only.\n\nProduction builds (`npm run build`) ship only that plain CSS and your\ncomponents. No editor, no JSON loading, no runtime indirection.\n\n## Keeping your work safe\n\nEverything under `src/live-tokens/data/` is plain JSON, so commit it. Themes show\nup as readable diffs you can review per branch, and the buffer shows up as the\nwork you have not saved into a theme yet. Nothing is backed up anywhere else:\ngit is your safety net. To experiment freely, **Save As** a new name first, then\nedit.\n\n## Where to go next\n\n- **[Where themes live](where-themes-live.md)**: the files behind all of this,\n  and what writes each one.\n- **[Creating components](creating-components.md)**: make your own components\n  editable in the same editor.\n",
   "where-themes-live": "# Where themes live\n\nEverything the editor writes is plain JSON and CSS inside your project. There\nis no database and no hidden state: the files are the storage, and git is the\nhistory.\n\n## The data tree\n\n```\nsrc/live-tokens/data/\n  themes/\n    _active.json         names the theme the editor has open\n    _production.json     names the theme your site ships\n    default.json         Motion Proto, the built-in look, rewritten at boot\n    my-brand.json        a saved theme: the whole look in one file\n  colors-and-type/\n    _working.json        unsaved colors and type edits\n  component-configs/\n    button/\n      default.json       Button's shipped settings, derived at boot\n      _working.json      unsaved Button edits\n      my-button.json     a preset you saved from the Button editor\n  tokens.generated.css   the baked CSS your production build ships\nsrc/system/styles/\n  tokens.css             your token vocabulary, hand-authored, never written\n  fonts.css              font imports, rewritten when you Adopt\n```\n\nA saved theme carries the whole look by value: the colors and type plus a\nsetting for every component. It depends on no other file, so deleting\nanything else never breaks it.\n\n## What writes when\n\n- **Editing** changes the page through CSS variables. The editor keeps your\n  edits in the browser as you work and writes them to the `_working.json`\n  buffers when you save a component. When the Theme panel finds several dirty\n  components, **Save all** writes those buffers together.\n- **Save** captures the buffers into the open theme's file. That file is the\n  durable copy of your look; matching buffers are then removed.\n- **Load** clears the buffers and points `themes/_active.json` at the theme you\n  picked. Live reads fall through to that file. Nothing else changes, so trying\n  looks is free and ordinary switching changes only the pointer.\n- **Adopt** points `themes/_production.json` at the open theme, bakes it into\n  `tokens.generated.css`, and rewrites `fonts.css` to match. It is the only\n  action that changes what your site ships.\n\nThe `default.json` files are the shipped baseline. The editor derives them at\nboot and refreshes them when the package updates; it never saves your work\nover them.\n\nProjects upgraded from 0.48 may initially contain working files copied from the\nactive theme. On the first dev-server boot, exact copies are removed\nautomatically. Any file that differs is kept as unsaved work, so no migration\ncommand is required.\n\n## What to commit\n\nAll of it. The data tree is designed to live in git: themes diff readably, the\ntwo pointers say what is open and what ships, and a `_working.json` in a diff\nis exactly the work you have not yet saved into a theme. Nothing is backed up\nanywhere else.\n\n## Where to go next\n\n- **[Themes](themes-workflow.md)**: the workflow built on these files: saving,\n  loading, and shipping.\n",
 };

package/src/editor/ui/ColorEditPanel.svelte

@@ -8,6 +8,9 @@
   
   interface Props {
     title?: string | null;
+    /** Ties the panel to the swatch it was opened from, when it renders docked
+     *  beneath that swatch's row. */
+    highlighted?: boolean;
     showRemoveOverride?: boolean;
     /** Hide the confirm/cancel actions for live-apply consumers (Colors view
      *  readout) where edits commit through the store as they happen. */
@@ -37,6 +40,7 @@
 
   let {
     title = null,
+    highlighted = false,
     showRemoveOverride = false,
     hideActions = false,
     hidePreview = false,
@@ -133,7 +137,7 @@
   }
 </script>
 
-<div class="hsl-panel">
+<div class="hsl-panel" class:highlighted>
   <div class="hsl-panel-header">
     {#if !hidePreview}
       <div class="hsl-preview" style="background: {previewHex}"></div>
@@ -250,6 +254,17 @@
     border-radius: var(--ui-radius-md);
   }
 
+  /* Docked to a swatch: the border thickens to the weight of that swatch's
+     selection ring, so the pair reads as one object. */
+  .hsl-panel.highlighted {
+    border-width: 2px;
+    border-color: var(--ui-border-higher);
+  }
+
+  .hsl-panel.highlighted .hsl-panel-title {
+    color: var(--ui-text-primary);
+  }
+
   .hsl-panel-header {
     display: flex;
     align-items: center;

package/src/editor/ui/PaletteEditor.svelte

@@ -207,8 +207,19 @@
     openSession();
   }
 
-  function handlePaletteClick(ps: { label: string; lightness: number; index: number }) {
+  function handlePaletteClick(ps: { label: string; index: number; anchored: boolean }) {
     const k = paletteStepKey(ps.label);
+    // The anchored step is not a copy of the base color, it IS the base color:
+    // the anchor pins the curves through it. So editing it edits the base, and
+    // the header swatch and the whole ramp follow. An override here would fork
+    // the two apart and quietly break the guarantee the anchor makes.
+    if (ps.anchored) {
+      if (isEditingBase) { confirmEdit(); return; }
+      startBaseEdit();
+      // After openSession, so cancel and undo both put it back.
+      if (k in overrides) removeOverride(k);
+      return;
+    }
     if (editingKey === k) {
       confirmEdit();
       return;
@@ -505,6 +516,10 @@
   let overridesHex = $derived(Object.fromEntries(Object.entries(overrides).map(([k, v]) => [k, toHex(v)])));
 
   let isEditingBase = $derived(isBaseEdit(editing));
+  // Naming the step the base sits on is what says the header swatch and that
+  // ramp swatch are one value, not two that happen to match.
+  let anchoredStep = $derived(paletteComputed.find(ps => ps.anchored) ?? null);
+  let basePanelTitle = $derived(anchoredStep ? `Base Color \u203A ${anchoredStep.label}` : 'Base Color');
   let editingColor = $derived(isEditingBase ? baseColor : editingDraft);
   let editingStepInfo = $derived((() => {
     if (!editingKey || isEditingBase) return null;
@@ -520,11 +535,28 @@
     return null;
   })());
   let panelOpen = $derived(editingKey !== null && (isEditingBase || (editingDraft !== null && editingStepInfo !== null)));
-  let editPanelTitle = $derived(isEditingBase
-    ? 'Base Color'
-    : editingStepInfo
-      ? `${editingStepInfo.scale} \u203A ${editingStepInfo.step}`
-      : null);
+  // The panel docks under the row that owns the step being edited, so these
+  // place it: a column for the palette caret, a row slot for the derived scales.
+  let editingPaletteIndex = $derived.by(() => {
+    if (!panelOpen || isEditingBase) return null;
+    const i = paletteComputed.findIndex(ps => ps.key === editingKey);
+    return i === -1 ? null : i;
+  });
+  let editingDerivedRow = $derived.by(() => {
+    if (!panelOpen || isEditingBase || editingPaletteIndex !== null) return null;
+    const scale = scales.find(s => s.title === editingStepInfo?.scale);
+    if (!scale) return null;
+    return scale.isText ? 'text' : 'solid';
+  });
+  let editPanelTitle = $derived(editingStepInfo ? `${editingStepInfo.scale} \u203A ${editingStepInfo.step}` : null);
+  // The reveal's outro needs something to render: closing the panel resets
+  // `editing` to idle, and every value below it goes null in the same tick, so a
+  // live read would slide an empty box shut. Held until the next edit replaces it.
+  let dock: { title: string | null; color: Oklch; paletteIndex: number | null } | null = $state(null);
+  $effect(() => {
+    if (!panelOpen || isEditingBase || !editingColor) return;
+    dock = { title: editPanelTitle, color: editingColor, paletteIndex: editingPaletteIndex };
+  });
   $effect(() => {
     // Touch each input so the effect tracks them (resnapScales reads indirectly).
     void baseColor;
@@ -537,6 +569,24 @@
   });
 </script>
 
+{#snippet stepEditPanel()}
+  {#if dock}
+    <ColorEditPanel
+      title={dock.title}
+      highlighted
+      showRemoveOverride
+      hue={dock.color.h}
+      chroma={dock.color.c}
+      lightness={dock.color.l * 100}
+      onHueChromaChange={(h, c, l) => handleColorChange({ l: l / 100, c, h })}
+      onConfirm={confirmEdit}
+      onCancel={cancelEdit}
+      onRemoveOverride={() => editingKey && removeOverride(editingKey)}
+      onSliderStart={() => beginSliderGesture(`edit ${label} ${editingKey ?? 'color'}`)}
+    />
+  {/if}
+{/snippet}
+
 <div class="palette-editor" bind:this={rootEl} style="--editor-base: {toHex(baseColor)}">
   <PaletteBase
     {label}
@@ -544,6 +594,7 @@
     {baseColor}
     {isEditingBase}
     pinnedOpen={paletteEditorOpen}
+    selected={isEditingBase}
     {copiedKey}
     onStartEdit={startBaseEdit}
     onCopyBaseHex={copyHex}
@@ -573,7 +624,7 @@
     <div class="swatch-grid" style="--swatch-cols: {paletteStepLightness.length + 2}">
       <div class="base-panel" style="grid-column: 2 / {paletteStepLightness.length + 2}">
         <ColorEditPanel
-          title={isEditingBase ? editPanelTitle : 'Base Color'}
+          title={basePanelTitle}
           showRemoveOverride={false}
           hideActions={!isEditingBase}
           hidePreview
@@ -617,21 +668,21 @@
         </div>
         {#each paletteComputed as ps}
           <div class="step-column">
-            <button class="step-label copyable-label" class:copied={copiedLabelKey === ps.key} type="button" onclick={(e) => copyVarName(ps.key, `--color-${cssNamespace}-${ps.label}`, e)}>
+            <button class="step-label copyable-label" class:copied={copiedLabelKey === ps.key} class:selected={editingKey === ps.key || (isEditingBase && ps.anchored)} type="button" onclick={(e) => copyVarName(ps.key, `--color-${cssNamespace}-${ps.label}`, e)}>
               {copiedLabelKey === ps.key ? 'copied!' : ps.label}
             </button>
             <!-- svelte-ignore a11y_no_noninteractive_tabindex -->
             <div
               class="swatch gray-swatch"
-              class:active={editingKey === ps.key}
+              class:active={editingKey === ps.key || (isEditingBase && ps.anchored)}
               class:overridden={ps.key in overrides}
               class:anchored={ps.anchored}
               title={ps.anchored ? 'Base color' : undefined}
               style="background: {ps.effective}"
-              onclick={() => handlePaletteClick({ label: ps.label, lightness: ps.lightness, index: ps.index })}
+              onclick={() => handlePaletteClick(ps)}
               role="button"
               tabindex="0"
-              onkeydown={(e) => e.key === 'Enter' && handlePaletteClick({ label: ps.label, lightness: ps.lightness, index: ps.index })}
+              onkeydown={(e) => e.key === 'Enter' && handlePaletteClick(ps)}
             >
               {#if ps.key in overrides}
                 <span class="override-lock" title="Palette override: this step is set by hand, not derived from the curve">
@@ -653,6 +704,17 @@
           </button>
           <div class="swatch gray-swatch bookend" style="background: #000000"></div>
         </div>
+
+        <UIReveal open={editingPaletteIndex !== null} style="grid-column: 2 / {paletteStepLightness.length + 2}">
+          <!-- The reveal has to own the grid slot, so the dock rebuilds the
+               ramp's tracks inside it: the caret is then placed on the step's
+               own column and points at it at any width, no arithmetic. -->
+          <div class="dock" style="--dock-cols: {paletteStepLightness.length}">
+            <div class="edit-caret" style="grid-column: {(dock?.paletteIndex ?? 0) + 1}"></div>
+            <div class="docked-panel">{@render stepEditPanel()}</div>
+          </div>
+        </UIReveal>
+
       <UIReveal open={paletteEditorOpen} style="grid-column: 2 / {paletteStepLightness.length + 2}">
         <div class="curve-grid-span">
           {#if anchorUnlockPrompt && anchorToBase}
@@ -787,29 +849,19 @@
           {@render overridesPanel(scale, true, derivedHexForBase)}
         {/each}
       </div>
+      <UIReveal open={editingDerivedRow === 'text'}>
+        <div class="docked-panel">{@render stepEditPanel()}</div>
+      </UIReveal>
       <div class="scales-row">
         {#each scales.filter(s => !s.isText) as scale}
           {@render overridesPanel(scale, true, derivedHexForBase)}
         {/each}
       </div>
+      <UIReveal open={editingDerivedRow === 'solid'}>
+        <div class="docked-panel">{@render stepEditPanel()}</div>
+      </UIReveal>
     </div>
   </UIReveal>
-
-  <!-- Color Edit Panel (non-base edits) -->
-  {#if !isEditingBase && panelOpen && editingColor}
-    <ColorEditPanel
-      title={editPanelTitle}
-      showRemoveOverride={!!editingKey}
-      hue={editingColor.h}
-      chroma={editingColor.c}
-      lightness={editingColor.l * 100}
-      onHueChromaChange={(h, c, l) => handleColorChange({ l: l / 100, c, h })}
-      onConfirm={confirmEdit}
-      onCancel={cancelEdit}
-      onRemoveOverride={() => editingKey && removeOverride(editingKey)}
-      onSliderStart={() => beginSliderGesture(`edit ${label} ${editingKey ?? 'color'}`)}
-    />
-  {/if}
 </div>
 
 <style>
@@ -937,6 +989,12 @@
     color: var(--ui-text-accent, var(--ui-text-primary));
   }
 
+  /* The name the docked panel's title repeats back. */
+  .step-label.copyable-label.selected {
+    color: var(--ui-text-primary);
+    font-weight: var(--ui-font-weight-semibold);
+  }
+
   /* Swatches */
 
   .swatch {
@@ -1013,6 +1071,34 @@
     gap: var(--ui-space-8);
   }
 
+  /* Same tracks and gutter as the ramp above, so a column here lands under the
+     swatch of the same index. */
+  .dock {
+    display: grid;
+    grid-template-columns: repeat(var(--dock-cols), minmax(0, 1fr));
+    gap: var(--ui-space-4) var(--swatch-gap, var(--ui-space-4));
+  }
+
+  /* Docked under the row it edits, pointed at the swatch it edits. */
+  .docked-panel {
+    grid-column: 1 / -1;
+    min-width: 0;
+  }
+
+  .edit-caret {
+    display: flex;
+    justify-content: center;
+    align-items: flex-end;
+    height: var(--ui-space-6);
+  }
+
+  .edit-caret::after {
+    content: '';
+    border-left: var(--ui-space-6) solid transparent;
+    border-right: var(--ui-space-6) solid transparent;
+    border-bottom: var(--ui-space-6) solid var(--ui-border-higher);
+  }
+
   .anchor-unlock-notice {
     display: flex;
     align-items: center;
@@ -1057,10 +1143,17 @@
     border-color: var(--ui-border-high);
   }
 
-  .swatch.gray-swatch.active {
-    border-color: var(--ui-border-higher);
-    outline: 2px solid var(--ui-border-high);
-    outline-offset: 1px;
+  /* A ring drawn inside the swatch, weight only: the editor stays greyscale, so
+     selection has to out-weigh the anchored step's emphasized border rather
+     than out-colour it. Insets, because a 3px outline would eat the column gap
+     and a 3px border would resize the swatch mid-grid. The dark keylines either
+     side of the white band keep it legible at both ends of the ramp. */
+  .swatch.gray-swatch.active,
+  .swatch.gray-swatch.anchored.active {
+    border-color: var(--ui-surface-lowest);
+    box-shadow:
+      inset 0 0 0 3px var(--ui-text-primary),
+      inset 0 0 0 4px var(--ui-surface-lowest);
   }
 
   /* The step the base color is placed at: taller, with an emphasized border. It