@motion-proto/live-tokens 0.49.0 → 0.50.0

package/src/editor/docs/content/where-themes-live.md

@@ -34,8 +34,8 @@ deleting anything else never breaks it.
 
 - **Editing** changes the page through CSS variables. The editor keeps your
   edits in the browser as you work and writes them to the `_working.json`
-  buffers when you save a component. A buffer exists only where the live layer
-  differs from the active theme's saved layer, so a fresh project has none.
+  buffers when you save a component. When the Theme panel finds several dirty
+  components, **Save all** writes those buffers together.
 - **Save** captures the buffers into the open theme's file. That file is the
   durable copy of your look; matching buffers are then removed.
 - **Load** clears the buffers and points `themes/_active.json` at the theme you
@@ -49,6 +49,11 @@ The `default.json` files are the shipped baseline. The editor derives them at
 boot and refreshes them when the package updates; it never saves your work
 over them.
 
+Projects upgraded from 0.48 may initially contain working files copied from the
+active theme. On the first dev-server boot, exact copies are removed
+automatically. Any file that differs is kept as unsaved work, so no migration
+command is required.
+
 ## What to commit
 
 All of it. The data tree is designed to live in git: themes diff readably, the

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.** Two curves shape how lightness and saturation fall off across the\n  ramp. Drag the handles to bias it darker, lighter, or more saturated.\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 you changed, in one file. It\ncarries the name the look ships under, whether production is running it, and\n**Adopt**. Two 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 run something the theme does not\n  carry, 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 you\n  changed.\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`. Only **Adopt** changes it.\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 edits are the exception. Each component editor holds its own unsaved\nstate, which this panel cannot write, so save a component in its editor before\ncapturing it. The panel says how many are waiting.\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** lists your saved themes and the seven example looks. Picking one shows\nit on the page as a preview with nothing written to disk, so you can try each\nlook and compare. **Save** in that window opens the previewed theme: the active\npointer changes, the buffers clear, components it does not carry fall through\nto their defaults, and the editor works on it from then on. **Cancel** returns\nyou to where you were.\nTrying a look 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 you changed. It depends on no other file, so\ndeleting anything 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. A buffer exists only where the live layer\n  differs from the active theme's saved layer, so a fresh project has none.\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\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",
+  "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 you changed, in one file. It\ncarries the name the look ships under, whether production is running it, and\n**Adopt**. Two 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 run something the theme does not\n  carry, 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 you\n  changed.\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, components it\ndoes not carry fall through to their defaults, the editor works on it, and\nproduction ships it. **Cancel** returns you to where you were. Previewing alone\nnever 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 you changed. It depends on no other file, so\ndeleting anything 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/FileLoadList.svelte

@@ -167,6 +167,7 @@
       {@const protectedRow = isProtected(file)}
       <div
         class="load-item"
+        data-file-name={file.fileName}
         class:active={file.fileName === activeFileName}
         class:selected={file.fileName === selectedFileName}
         class:protected={protectedRow}

package/src/editor/ui/FontStackEditor.svelte

@@ -11,7 +11,7 @@
     SystemCascadePreset,
   } from '../core/themes/themeTypes';
   import { editorState, setFontStacks } from '../core/store/editorStore';
-  import { applyFontStacks, SYSTEM_CASCADES } from '../core/fonts/fontLoader';
+  import { SYSTEM_CASCADES } from '../core/fonts/fontLoader';
 
   const SYSTEM_PRESETS: SystemCascadePreset[] = ['system-ui-sans', 'system-ui-serif', 'system-ui-mono'];
   // `cursive` and `fantasy` are CSS-spec generics whose rendering varies wildly
@@ -110,7 +110,6 @@
   function updateStack(variable: FontStackVariable, updater: (slots: FontStackSlot[]) => FontStackSlot[]) {
     const next = stacks.map((s) => (s.variable === variable ? { ...s, slots: updater([...s.slots]) } : s));
     setFontStacks(next);
-    applyFontStacks(next, fontSourcesList);
   }
 
   function handleSelectChange(variable: FontStackVariable, index: number, value: string) {

package/src/editor/ui/GradientEditor.svelte

@@ -274,7 +274,11 @@
 </script>
 
 {#if gradient}
-  <div class="gradient-editor" class:has-pad={hasAside}>
+  <div
+    class="gradient-editor"
+    class:has-pad={hasAside}
+    data-token-variable={gradientSource.targetVariable}
+  >
     {#if sectionLabel || hasAside}
       <div class="editor-header editor-section-left">
         <span class="editor-section-label">{sectionLabel ?? ''}</span>

package/src/editor/ui/ProjectFontsSection.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import type { FontFamily, FontSource } from '../core/themes/themeTypes';
   import { editorState, setFontSources, transaction } from '../core/store/editorStore';
-  import { applyFontSources, applyFontStacks } from '../core/fonts/fontLoader';
   import {
     buildSourceFromFontFaceText,
     buildSourceFromUrl,
@@ -69,8 +68,6 @@
 
   function commitSources(next: FontSource[]) {
     setFontSources(next);
-    applyFontSources(next);
-    applyFontStacks(fontStacksList, next);
   }
 
   /** One paste field → sniff whether it's @font-face or a URL/embed and
@@ -220,8 +217,6 @@
       s.fonts.sources = next;
       s.fonts.stacks = updatedStacks;
     });
-    applyFontSources(next);
-    applyFontStacks(updatedStacks, next);
   }
 
   /** Resolve a clickable target for the row. We prefer the human-readable

package/src/editor/ui/ThemePanel.svelte

@@ -22,8 +22,12 @@
     exportTheme,
     importTheme,
   } from '../core/themes/themeService';
+  import {
+    THEME_APPLIED_EVENT,
+    type AppliedThemeDetail,
+  } from '../core/themes/themeDocumentSync';
   import { countComponentsOffLook, lookProductionState } from '../core/themes/lookSummary';
-  import { previewTheme, previewColorsAndType, revertPreview } from '../core/preview/lookPreview';
+  import { commitPreview, previewTheme, previewColorsAndType, revertPreview } from '../core/preview/lookPreview';
   import {
     deleteColorsAndType,
     hydrateColorsAndType,
@@ -41,10 +45,17 @@
   } from '../core/themes/loadRows';
   import {
     listComponents,
+    componentConfigFromState,
+    writeWorkingComponentConfig,
     type ComponentSummary,
   } from '../core/components/componentConfigService';
   import { fontPairingLabel } from '../core/fonts/fontPairing';
-  import { componentDirty, editorState, colorsAndTypeDirty } from '../core/store/editorStore';
+  import {
+    componentDirty,
+    editorState,
+    colorsAndTypeDirty,
+    markComponentSaved,
+  } from '../core/store/editorStore';
   import { openThemeSlug } from '../core/store/editorConfigStore';
   import { editorView } from '../core/store/editorViewStore';
   import {
@@ -53,12 +64,14 @@
     bumpProductionRevision,
     liveMovedSinceBake,
     productionTheme,
+    bumpComponentActiveRevision,
   } from '../core/productionPulse';
   import { flashStatus } from '../core/flashStatus';
   import UIInfoPopover from './UIInfoPopover.svelte';
   import UIPillButton from './UIPillButton.svelte';
   import FileLoadList from './FileLoadList.svelte';
   import FilePill from './FilePill.svelte';
+  import UIDialog from './UIDialog.svelte';
   import SaveAsDialog from '../component-editor/scaffolding/SaveAsDialog.svelte';
 
   interface Props {
@@ -75,6 +88,9 @@
   let rows = $derived(buildLoadRows(files, colorsFiles));
   let showFileList = $state(false);
   let saveAsDialog = $state(false);
+  let saveComponentsDialog = $state(false);
+  let pendingComponentSave: (() => Promise<void>) | null = null;
+  let pendingComponentCount = $state(0);
   let saveStatus: 'idle' | 'saving' | 'saved' | 'error' = $state('idle');
 
   let currentDisplayName = $state('Motion Proto');
@@ -171,6 +187,19 @@
     await refreshProduction();
   });
 
+  // A consumer can load a theme from the host while this iframe stays open.
+  // The cross-document bridge hydrates this document's typed store; keep the
+  // panel's local identity/summary state on that same payload as well.
+  onMount(() => {
+    const handleThemeApplied = (event: Event) => {
+      const { result } = (event as CustomEvent<AppliedThemeDetail>).detail;
+      currentDisplayName = result.theme.name;
+      lookConfigs = result.theme.componentConfigs;
+    };
+    document.addEventListener(THEME_APPLIED_EVENT, handleThemeApplied);
+    return () => document.removeEventListener(THEME_APPLIED_EVENT, handleThemeApplied);
+  });
+
   // Re-read whenever an Adopt fires, here or in a component editor: it saves
   // the open theme and moves the production pointer, so the identity, the
   // component summary and the production state shown here all need to track.
@@ -188,10 +217,10 @@
     refreshComponents();
   });
 
-  // A capture reads the server's live state, so the colors and type on screen
-  // go to their buffer first — that is what makes Save and Adopt mean the look
-  // in front of you. A component's edits live in its own editor's state, which
-  // this panel cannot write, so those are the only ones a capture leaves behind.
+  // A capture reads the server's live state, so colors and type go to their
+  // buffer first. Component editors retain their own save boundary; when any
+  // are dirty, the theme panel offers to flush all of them in one explicit
+  // step before continuing.
   //
   // The gate is `colorsAndTypeDirty`, not history: history counts every entry,
   // components included, so it would flush the colors over component-only work.
@@ -200,20 +229,45 @@
     await persistColorsAndType(get(editorState), currentDisplayName);
   }
 
-  function confirmUnsavedComponents(action: string): boolean {
-    if (dirtyComponentCount === 0) return true;
-    const n = dirtyComponentCount;
-    return window.confirm(
-      `${n === 1 ? '1 component has' : `${n} components have`} unsaved edits. Those stay out `
-        + `until you save them in the component editor. ${action}`,
-    );
+  async function flushComponents(displayName = currentDisplayName): Promise<void> {
+    const dirtyComponents = Object.entries(get(componentDirty))
+      .filter(([, dirty]) => dirty)
+      .map(([component]) => component);
+    if (dirtyComponents.length === 0) return;
+
+    const state = get(editorState);
+    await Promise.all(dirtyComponents.map((component) =>
+      writeWorkingComponentConfig(
+        component,
+        componentConfigFromState(state, component, displayName),
+      ),
+    ));
+    for (const component of dirtyComponents) markComponentSaved(component);
+    bumpComponentActiveRevision();
   }
 
-  async function handleSave() {
-    if (activeIsProtected) return;
-    if (!confirmUnsavedComponents('Save the theme anyway?')) return;
+  function continueWithComponentChoice(action: () => Promise<void>): void {
+    const dirtyCount = Object.values(get(componentDirty)).filter(Boolean).length;
+    if (dirtyCount === 0) {
+      void action();
+      return;
+    }
+    pendingComponentCount = dirtyCount;
+    pendingComponentSave = action;
+    saveComponentsDialog = true;
+  }
+
+  async function confirmSaveAllComponents(): Promise<void> {
+    const action = pendingComponentSave;
+    pendingComponentSave = null;
+    saveComponentsDialog = false;
+    if (action) await action();
+  }
+
+  async function runSave(saveComponents: boolean) {
     saveStatus = 'saving';
     try {
+      if (saveComponents) await flushComponents();
       await flushColors();
       await saveActiveTheme(currentDisplayName);
       await refreshActive();
@@ -223,10 +277,21 @@
     }
   }
 
+  function handleSave() {
+    if (activeIsProtected) return;
+    continueWithComponentChoice(() => runSave(true));
+  }
+
   function openSaveAs() {
-    if (!confirmUnsavedComponents('Save the theme anyway?')) return;
-    showFileList = false;
-    saveAsDialog = true;
+    continueWithComponentChoice(async () => {
+      try {
+        await flushComponents();
+        showFileList = false;
+        saveAsDialog = true;
+      } catch {
+        flashStatus(setSaveStatus, 'error');
+      }
+    });
   }
 
   async function confirmSaveAs(detail: { displayName: string; fileName: string }) {
@@ -266,10 +331,9 @@
     return 'Save this theme and ship it to production';
   });
 
-  async function handleAdopt() {
+  function handleAdopt() {
     if (production.inProduction || adoptStatus === 'adopting') return;
-    if (!confirmUnsavedComponents('Ship the theme anyway?')) return;
-    await runAdopt();
+    continueWithComponentChoice(() => runAdopt(true));
   }
 
   /**
@@ -278,9 +342,10 @@
    * Adopt, and which file holds the look is bookkeeping they should not have
    * to think about, so it forks to a theme of their own first.
    */
-  async function runAdopt() {
+  async function runAdopt(saveComponents = false) {
     adoptStatus = 'adopting';
     try {
+      if (saveComponents) await flushComponents();
       await flushColors();
       if (activeIsProtected) {
         const taken = new Set((await listThemes()).map((m) => m.fileName));
@@ -329,6 +394,13 @@
     previewLayer = null;
   }
 
+  function acceptPreview() {
+    commitPreview();
+    previewRow = null;
+    previewLook = null;
+    previewLayer = null;
+  }
+
   /** Paint whatever is selected, through the engine the mode calls for. A
    *  theme's colors and type are the slice embedded in it, so one look
    *  previews either way. */
@@ -386,26 +458,54 @@
     if (!row) return;
     if (unsavedEdits) {
       const ok = window.confirm(
-        'Loading a theme will reload the editor and discard unsaved changes. Continue?',
+        'Loading a theme will replace the editor’s current state and discard unsaved changes. Continue?',
       );
       if (!ok) return;
     }
-    // The window stays open until the page reloads: closing it would revert the
-    // preview and flash the outgoing look while Apply is in flight.
+    // The exact theme being opened is already painted. Hand that preview to
+    // the store load without restoring the old look across the request.
+    acceptPreview();
+    let result: Awaited<ReturnType<typeof applyTheme>>;
     try {
-      const result = await applyTheme(row.slug);
+      result = await applyTheme(row.slug);
       if (result.skippedComponents.length > 0) {
         window.alert(
           `Loaded "${row.name}". These components are not installed here, so their `
             + `saved settings were skipped:\n\n${result.skippedComponents.join(', ')}`,
         );
       }
-      // applyTheme opens the theme: it clears working deltas and points
-      // `themes/_active.json` at it. Reload to rehydrate through the resolver.
-      window.location.reload();
+      currentDisplayName = result.theme.name;
+      lookConfigs = result.theme.componentConfigs;
+      showFileList = false;
     } catch (err) {
       window.alert(`Failed to load theme: ${(err as Error).message}`);
+      // The selection remains visible after a failed request; put its preview
+      // back so the dialog and page continue to agree.
+      previewRow = row;
+      previewLook = row.kind === 'look' ? await loadTheme(row.slug).catch(() => null) : null;
+      if (previewLook) await repaint();
+      return;
+    }
+
+    // The picker is a one-step choose-and-ship flow. Package/user presets are
+    // already saved documents, so adopting can publish them directly. The
+    // protected baseline cannot be production's editable document; mirror the
+    // normal Adopt behavior and fork it first when it is selected.
+    adoptStatus = 'adopting';
+    try {
+      if (row.slug === 'default') {
+        const taken = new Set((await listThemes()).map((m) => m.fileName));
+        await saveAsTheme(freshName('my-theme', taken), 'My Theme');
+        await refreshActive();
+      }
+      await adoptLook();
+      bumpProductionRevision();
+      flashStatus(setAdoptStatus, 'done');
+    } catch (err) {
+      window.alert(`Theme loaded, but could not be adopted: ${(err as Error).message}`);
+      flashStatus(setAdoptStatus, 'error', { durationMs: 3000 });
     }
+    await Promise.all([refreshFiles(), refreshComponents(), refreshProduction()]);
   }
 
   /**
@@ -554,6 +654,11 @@
     if (showFileList) refreshFiles();
   }
 
+  function openThemePicker() {
+    showFileList = true;
+    refreshFiles();
+  }
+
   function rowBadge(row: LoadRow) {
     return row.kind === 'layer'
       ? { label: 'colors & type', title: 'Holds colors and type only, no shapes' }
@@ -575,7 +680,7 @@
         <strong>Load</strong> opens the list. Picking a theme shows it on the page as a preview, so you can try each look with nothing written to disk. Pick another to compare, or <strong>Cancel</strong> to go back to where you were.
       </p>
       <p>
-        <strong>Save</strong> opens the previewed theme: the editor works on it from then on, and components it does not carry go back to their defaults. Trying a theme never changes what your site ships.
+        <strong>Save</strong> opens and adopts the previewed theme: the editor works on it from then on and production ships it immediately. Components it does not carry go back to their defaults. Previewing and cancelling never change what your site ships.
       </p>
       <p>
         <strong>Colors and type only</strong> in that window takes the palette and the fonts and leaves your shapes and component settings alone.
@@ -584,7 +689,7 @@
         The <strong>active</strong> theme is the one the editor has open. <strong>Adopt</strong> saves it and ships it to production, colors and type plus every component you changed. The line under the name says whether production is running this theme.
       </p>
       <p>
-        Save and Adopt both take the colors and type on screen as they are. Component edits are the exception: save those in the component's own editor first.
+        If components have unsaved edits, Save and Adopt offer to save all of them before continuing. You can cancel to review or save components individually.
       </p>
       <p>
         <strong>Motion Proto</strong> is the protected baseline. To start customizing, <strong>Save As</strong> a new theme first.
@@ -603,13 +708,21 @@
         </span>
       {/if}
     </div>
-    <FilePill
-      name={currentDisplayName}
-      isProtected={activeIsProtected}
-      protectedTitle="Protected default theme"
-      title={currentDisplayName}
-      style="display: flex;"
-    />
+    <button
+      type="button"
+      class="theme-name-trigger"
+      onclick={openThemePicker}
+      title="Open the Theme Picker"
+      aria-label={`Open Theme Picker. Current theme: ${currentDisplayName}`}
+    >
+      <FilePill
+        name={currentDisplayName}
+        isProtected={activeIsProtected}
+        protectedTitle="Protected default theme"
+        title={currentDisplayName}
+        style="display: flex;"
+      />
+    </button>
     <span class="mfm-prod-status" class:applied={production.inProduction}>
       <i class="mfm-status-dot" aria-hidden="true"></i>
       <span>
@@ -668,7 +781,7 @@
         class="mfm-btn mfm-btn-row"
         class:active={showFileList}
         onclick={toggleFileList}
-        title="Preview a theme, then save it to load it"
+        title="Open the Theme Picker"
       >
         <i class="fas fa-folder-open"></i>
         <span>Load…</span>
@@ -741,13 +854,29 @@
   style="display: none;"
 />
 
+<UIDialog
+  bind:show={saveComponentsDialog}
+  title="Unsaved component edits"
+  cancelLabel="Cancel"
+  confirmLabel={pendingComponentCount === 1 ? 'Save component' : 'Save all components'}
+  onconfirm={confirmSaveAllComponents}
+  width="400px"
+>
+  <p class="save-components-message">
+    {pendingComponentCount === 1
+      ? '1 component has unsaved edits.'
+      : `${pendingComponentCount} components have unsaved edits.`}
+    Save {pendingComponentCount === 1 ? 'it' : 'all of them'} and continue?
+  </p>
+</UIDialog>
+
 <FileLoadList
   bind:show={showFileList}
-  title="Load Theme"
+  title="Theme Picker"
   files={rows}
   activeFileName={activeRowId}
   selectedFileName={previewRow?.fileName ?? null}
-  selectedBadge={{ label: 'Preview', title: 'Shown on the page now. Save to keep it.' }}
+  selectedBadge={{ label: 'Preview', title: 'Shown on the page now. Save to use and publish it.' }}
   {rowBadge}
   cancelLabel={previewRow ? 'Cancel' : 'Close'}
   confirmLabel={previewRow ? 'Save' : ''}
@@ -788,6 +917,13 @@
 />
 
 <style>
+  .save-components-message {
+    margin: 0;
+    color: var(--ui-text-secondary);
+    font-size: var(--ui-font-size-sm);
+    line-height: 1.5;
+  }
+
   .look-panel {
     --mfm-active: #5aa85e;
     --mfm-rail-neutral: var(--ui-border);
@@ -850,6 +986,34 @@
     color: var(--ui-text-tertiary);
   }
 
+  .theme-name-trigger {
+    display: block;
+    width: 100%;
+    padding: 0;
+    border: 0;
+    background: transparent;
+    color: inherit;
+    font: inherit;
+    text-align: inherit;
+    cursor: pointer;
+  }
+
+  .theme-name-trigger :global(.file-pill) {
+    width: 100%;
+  }
+
+  .theme-name-trigger:hover :global(.file-pill),
+  .theme-name-trigger:focus-visible :global(.file-pill) {
+    border-color: var(--ui-border-higher);
+    box-shadow: inset 0 0 0 1px var(--ui-border-high);
+  }
+
+  .theme-name-trigger:focus-visible {
+    outline: 2px solid var(--ui-text-accent);
+    outline-offset: 2px;
+    border-radius: var(--ui-radius-md);
+  }
+
   .mfm-badge {
     display: inline-flex;
     align-items: center;

package/src/editor/ui/UIDialog.svelte

@@ -55,7 +55,13 @@
 {#if show}
   <!-- svelte-ignore a11y_click_events_have_key_events, a11y_no_noninteractive_element_interactions, a11y_no_static_element_interactions -->
   <div class="ui-dialog-backdrop" onclick={self(handleClose)}>
-    <div class="ui-dialog" style="width: {width}; max-width: {width};">
+    <div
+      class="ui-dialog"
+      role="dialog"
+      aria-modal="true"
+      aria-label={title || 'Dialog'}
+      style="width: {width}; max-width: {width};"
+    >
       {#if title}
         <div class="ui-dialog-header">
           <h3 class="ui-dialog-title">{title}</h3>

package/src/editor/ui/UIFontFamilySelector.svelte

@@ -1,10 +1,8 @@
 <script lang="ts">
-  import { run } from 'svelte/legacy';
-
-  import { onMount, onDestroy } from 'svelte';
+  import { onMount, onDestroy, untrack } from 'svelte';
   import { resolveAliasChain } from '../core/palettes/tokenRegistry';
   import { editorState } from '../core/store/editorStore';
-  import { CSS_VAR_CHANGE_EVENT } from '../core/cssVarSync';
+  import { CSS_VARS_CHANGE_EVENT, type CssVarsChangeDetail } from '../core/cssVarSync';
   import type { FontFamily, FontSource, FontSourceKind } from '../core/themes/themeTypes';
   import UITokenSelector from './UITokenSelector.svelte';
   import UIOptionList from './UIOptionList.svelte';
@@ -93,8 +91,8 @@
   }
 
   function handleVarChange(e: Event) {
-    const detail = (e as CustomEvent<{ name: string }>).detail;
-    if (detail?.name?.startsWith('--font-')) readResolved();
+    const names = (e as CustomEvent<CssVarsChangeDetail>).detail?.names ?? [];
+    if (names.some((name) => name.startsWith('--font-'))) readResolved();
   }
 
   function initFromCurrent() {
@@ -160,19 +158,21 @@
 
   // Re-derive `chosenKey` / `chosenFamilyId` when `variable` changes (the
   // VariantGroup tabs view reuses the same selector instance across states).
-  let lastSeenVariable: string | null = $state(null);
-  run(() => {
-    if (variable !== lastSeenVariable) {
-      lastSeenVariable = variable;
+  $effect(() => {
+    // A tab can reuse this instance with a different variable. Track only the
+    // prop; initialization writes local selector state and is intentionally
+    // untracked to prevent a self-triggering effect.
+    variable;
+    untrack(() => {
       initFromCurrent();
-    }
+    });
   });
 
   onMount(() => {
-    document.addEventListener(CSS_VAR_CHANGE_EVENT, handleVarChange);
+    document.addEventListener(CSS_VARS_CHANGE_EVENT, handleVarChange);
   });
   onDestroy(() => {
-    document.removeEventListener(CSS_VAR_CHANGE_EVENT, handleVarChange);
+    document.removeEventListener(CSS_VARS_CHANGE_EVENT, handleVarChange);
   });
 
   let activeLabel = $derived(chosenFamilyId