rafters 0.0.78 → 0.0.80

package/dist/index.js

@@ -311,6 +311,32 @@ function toDTCG(tokens, options = {}) {
 
 // ../design-tokens/src/exporters/tailwind.ts
 var SHADOW_PART_SUFFIX = /-(offset-x|offset-y|blur|spread|color)$/;
+var MOTION_NAMESPACE_PROPERTY = {
+  duration: "transition-duration",
+  ease: "transition-timing-function",
+  delay: "transition-delay",
+  // Extents are consumed inside transforms, so the utility publishes the chosen
+  // extent under a fixed name the consuming rule reads. The name comes from toy
+  // 9 (worktree-toy-motion-registry).
+  //
+  // THIS IS THE UTILITY-SIDE CONTRACT, and it is one of TWO (#2017). A CLASS
+  // picks an extent by naming a member (`extent-pop`) and the rule downstream
+  // reads `--rafters-consumed-extent` without knowing which member won.
+  // KEYFRAME BODIES DO NOT USE THIS ALIAS: they are generator-owned emission and
+  // reference the LEAF directly (`var(--rafters-extent-pop)`, see
+  // DEFAULT_KEYFRAME_DEFINITIONS). A shape is not a function of whatever extent
+  // the consuming class last selected. Do not merge the two contracts.
+  extent: "--rafters-consumed-extent",
+  period: "animation-duration"
+};
+var MOTION_NAMESPACE_NAMES = Object.keys(MOTION_NAMESPACE_PROPERTY);
+var REDUCED_MOTION_ZEROED = /* @__PURE__ */ new Set(["duration", "delay"]);
+var MOTION_NAMESPACE_TOKEN = new RegExp(`^rafters-(${MOTION_NAMESPACE_NAMES.join("|")})-(.+)$`);
+function motionNamespaceParts(name) {
+  const match = MOTION_NAMESPACE_TOKEN.exec(name);
+  if (!match?.[1] || !match[2]) return null;
+  return { namespace: match[1], member: match[2] };
+}
 function isShadowDecomposedPart(name) {
   return SHADOW_PART_SUFFIX.test(name);
 }
@@ -507,7 +533,7 @@ function generateThemeBlock(groups) {
       const value = tokenValueToCSS(token);
       if (value === null) continue;
       const key = token.name.replace(/^radius-/, "");
-      const themeValue = value.replaceAll("var(--rafters-radius-base)", "var(--radius-base)").replaceAll("var(--rafters-radius-tl)", "var(--radius-tl)").replaceAll("var(--rafters-radius-tr)", "var(--radius-tr)").replaceAll("var(--rafters-radius-bl)", "var(--radius-bl)").replaceAll("var(--rafters-radius-br)", "var(--radius-br)");
+      const themeValue = value.replaceAll("var(--rafters-spacing-base)", "var(--spacing-base)").replaceAll("var(--rafters-radius-base)", "var(--radius-base)").replaceAll("var(--rafters-radius-tl)", "var(--radius-tl)").replaceAll("var(--rafters-radius-tr)", "var(--radius-tr)").replaceAll("var(--rafters-radius-bl)", "var(--radius-bl)").replaceAll("var(--rafters-radius-br)", "var(--radius-br)");
       lines.push(`  --radius-${key}: ${themeValue};`);
     }
     lines.push("");
@@ -533,32 +559,26 @@ function generateThemeBlock(groups) {
     }
     lines.push("");
   }
+  const motionNamespaceLines = generateMotionNamespaceVars(groups.motion);
+  if (motionNamespaceLines) {
+    lines.push(motionNamespaceLines);
+    lines.push("");
+  }
   if (groups.motion.length > 0) {
     for (const token of groups.motion) {
       if (token.name.startsWith("motion-duration-") && token.name !== "motion-duration-base")
         continue;
       if (token.name.startsWith("motion-easing-")) continue;
+      if (motionNamespaceParts(token.name)) continue;
       const value = tokenValueToCSS(token);
       if (value === null) continue;
       lines.push(`  --${token.name}: ${value};`);
     }
     lines.push("");
   }
-  if (groups.motion.length > 0) {
-    for (const token of groups.motion) {
-      if (token.name.startsWith("motion-duration-") && token.name !== "motion-duration-base") {
-        const key = token.name.replace("motion-duration-", "");
-        const value = tokenValueToCSS(token);
-        if (value === null) continue;
-        lines.push(`  --duration-${key}: ${value};`);
-      }
-      if (token.name.startsWith("motion-easing-")) {
-        const key = token.name.replace("motion-easing-", "");
-        const value = tokenValueToCSS(token);
-        if (value === null) continue;
-        lines.push(`  --ease-${key}: ${value};`);
-      }
-    }
+  const bridgeLines = generateMotionBridgeVars(groups.motion);
+  if (bridgeLines) {
+    lines.push(bridgeLines);
     lines.push("");
   }
   if (groups.breakpoint.length > 0) {
@@ -574,7 +594,8 @@ function generateThemeBlock(groups) {
     for (const token of groups.focus) {
       const value = tokenValueToCSS(token);
       if (value === null) continue;
-      lines.push(`  --${token.name}: ${value};`);
+      const themeValue = value.replaceAll("var(--rafters-spacing-base)", "var(--spacing-base)").replaceAll("var(--rafters-focus-ring-width)", "var(--focus-ring-width)");
+      lines.push(`  --${token.name}: ${themeValue};`);
     }
     lines.push("");
   }
@@ -594,18 +615,18 @@ function generateThemeBlock(groups) {
   return lines.join("\n");
 }
 var ARTICLE_ELEMENT_STYLES = [
-  // Paragraphs
-  ["p", "leading-relaxed mb-4"],
+  // Paragraphs -- composition for metrics, structural for spacing
+  ["p", "text-body-medium ts-body-medium leading-relaxed mb-4"],
   ["p:last-child", "mb-0"],
-  // Headings
-  ["h1", "text-4xl font-bold tracking-tight mb-4 mt-0 text-accent-foreground"],
-  ["h2", "text-3xl font-semibold tracking-tight mb-3 mt-8 text-accent-foreground"],
+  // Headings -- compositions carry size/weight/tracking/leading/family
+  ["h1", "text-display-medium ts-display-medium mb-4 mt-0 text-accent-foreground"],
+  ["h2", "text-title-large ts-title-large mb-3 mt-8 text-accent-foreground"],
   ["h2:first-child", "mt-0"],
-  ["h3", "text-2xl font-semibold mb-2 mt-6 text-accent-foreground"],
-  ["h4", "text-xl font-semibold mb-2 mt-4 text-accent-foreground"],
-  ["h5", "text-lg font-semibold mb-2 mt-4 text-accent-foreground"],
-  ["h6", "text-base font-semibold mb-2 mt-4 text-accent-foreground"],
-  // Lists
+  ["h3", "text-title-medium ts-title-medium mb-2 mt-6 text-accent-foreground"],
+  ["h4", "text-title-small ts-title-small mb-2 mt-4 text-accent-foreground"],
+  ["h5", "text-title-small ts-title-small mb-2 mt-4 text-accent-foreground"],
+  ["h6", "text-title-small ts-title-small mb-2 mt-4 text-accent-foreground"],
+  // Lists -- structural only (type metrics cascade from parent)
   ["ul", "list-disc pl-6 mb-4"],
   ["ol", "list-decimal pl-6 mb-4"],
   ["li", "mb-1"],
@@ -615,11 +636,11 @@ var ARTICLE_ELEMENT_STYLES = [
   ["a:hover", "text-primary/80"],
   // Blockquotes
   ["blockquote", "border-l-4 border-muted pl-4 italic my-4"],
-  // Code
-  ["code", "bg-muted px-1.5 py-0.5 rounded text-sm font-mono"],
-  ["pre", "bg-muted p-4 rounded-lg overflow-x-auto my-4 text-sm font-mono"],
+  // Code -- composition for metrics + family, structural for bg/padding/radius
+  ["code", "text-code-small ts-code-small bg-muted px-1.5 py-0.5 rounded"],
+  ["pre", "text-code-large ts-code-large bg-muted p-4 rounded-lg overflow-x-auto my-4"],
   ["pre code", "bg-transparent p-0 rounded-none text-[inherit]"],
-  ["kbd", "bg-muted border border-border rounded px-1.5 py-0.5 text-sm font-mono"],
+  ["kbd", "text-code-small ts-code-small bg-muted border border-border rounded px-1.5 py-0.5"],
   // Horizontal rules
   ["hr", "border-border my-8"],
   // Media
@@ -627,12 +648,12 @@ var ARTICLE_ELEMENT_STYLES = [
   ["video", "rounded-lg my-4 max-w-full h-auto"],
   // Tables
   ["table", "w-full my-4 border-collapse"],
-  ["caption", "mt-2 text-sm text-muted-foreground text-left"],
+  ["caption", "text-label-small ts-label-small mt-2 text-muted-foreground text-left"],
   ["th", "border border-border px-3 py-2 text-left font-semibold"],
   ["td", "border border-border px-3 py-2"],
   // Figures
   ["figure", "my-4"],
-  ["figcaption", "mt-2 text-sm text-muted-foreground"],
+  ["figcaption", "text-label-small ts-label-small mt-2 text-muted-foreground"],
   // Definition lists
   ["dl", "my-4"],
   ["dt", "font-semibold mt-2"],
@@ -643,7 +664,7 @@ var ARTICLE_ELEMENT_STYLES = [
   // Inline formatting
   ["strong,\n  article b", "font-semibold"],
   ["mark", "bg-accent text-accent-foreground px-1 rounded"],
-  ["small", "text-sm"],
+  ["small", "text-label-small ts-label-small"],
   ["sub", "text-xs align-sub"],
   ["sup", "text-xs align-super"],
   ["abbr[title]", "underline decoration-dotted underline-offset-4 cursor-help"],
@@ -703,12 +724,21 @@ function generateDepthUtilities(depthTokens) {
   }
   return lines.join("\n");
 }
-function generateTypographyCompositeUtilities(compositeTokens) {
-  if (compositeTokens.length === 0) {
-    return "";
-  }
-  const lines = [];
-  const mappings = compositeTokens.map((t) => {
+var NAMED_TRACKING = {
+  tighter: "-0.05em",
+  tight: "-0.025em",
+  normal: "0em",
+  wide: "0.025em",
+  wider: "0.05em",
+  widest: "0.1em"
+};
+function trackingRef(key) {
+  const named = NAMED_TRACKING[key];
+  if (named !== void 0) return named;
+  return `var(--letter-spacing-${key})`;
+}
+function parseComposites(compositeTokens) {
+  return compositeTokens.map((t) => {
     try {
       const parsed = JSON.parse(t.value);
       return { name: t.name, ...parsed };
@@ -716,40 +746,50 @@ function generateTypographyCompositeUtilities(compositeTokens) {
       return null;
     }
   }).filter((m3) => m3 !== null);
-  for (const mapping of mappings) {
-    lines.push(`@utility text-${mapping.name} {`);
-    lines.push(`  font-family: var(--font-${mapping.fontFamily});`);
-    lines.push(`  font-size: var(--font-size-${mapping.fontSize});`);
-    lines.push(`  font-weight: var(--font-weight-${mapping.fontWeight});`);
-    lines.push(`  line-height: var(--line-height-${mapping.lineHeight});`);
-    const namedTrackingValues = {
-      tighter: "-0.05em",
-      tight: "-0.025em",
-      normal: "0em",
-      wide: "0.025em",
-      wider: "0.05em",
-      widest: "0.1em"
-    };
-    if (mapping.letterSpacing in namedTrackingValues) {
-      lines.push(`  letter-spacing: ${namedTrackingValues[mapping.letterSpacing]};`);
-    } else {
-      lines.push(`  letter-spacing: var(--letter-spacing-${mapping.letterSpacing});`);
-    }
-    if (mapping.responsive) {
-      for (const [breakpoint, overrides] of Object.entries(mapping.responsive)) {
+}
+function generateTypographyCompositeThemeInline(compositeTokens) {
+  const mappings = parseComposites(compositeTokens);
+  if (mappings.length === 0) return "";
+  const lines = [];
+  lines.push("@theme inline {");
+  for (const m3 of mappings) {
+    lines.push(`  --text-${m3.name}: var(--font-size-${m3.fontSize});`);
+    lines.push(`  --text-${m3.name}--line-height: var(--font-size-${m3.lineHeight}--line-height);`);
+    lines.push(`  --text-${m3.name}--letter-spacing: ${trackingRef(m3.letterSpacing)};`);
+    lines.push(`  --text-${m3.name}--font-weight: var(--font-weight-${m3.fontWeight});`);
+    lines.push(`  --rafters-ts-${m3.name}: var(--font-${m3.fontFamily});`);
+    if (m3.responsive) {
+      for (const [bp, overrides] of Object.entries(m3.responsive)) {
         if (overrides.fontSize) {
-          const bpWidth = breakpoint === "sm" ? "480px" : breakpoint === "md" ? "640px" : "1024px";
-          lines.push(`  @container (min-width: ${bpWidth}) {`);
-          lines.push(`    font-size: var(--font-size-${overrides.fontSize});`);
-          lines.push(`    line-height: var(--line-height-${overrides.fontSize});`);
-          lines.push("  }");
+          lines.push(`  --rafters-ts-${m3.name}-${bp}: var(--font-size-${overrides.fontSize});`);
+          lines.push(
+            `  --rafters-ts-${m3.name}-${bp}-leading: var(--font-size-${overrides.fontSize}--line-height);`
+          );
         }
       }
     }
-    lines.push("}");
+    lines.push("");
   }
+  lines.push("}");
   return lines.join("\n");
 }
+function generateTypographyCompositeUtility(compositeTokens) {
+  if (compositeTokens.length === 0) return "";
+  return [
+    "@utility ts-* {",
+    "  font-family: --value(--rafters-ts-*);",
+    "  text-transform: --value(--rafters-ts-*-transform);",
+    "  @container (min-width: 640px) {",
+    "    font-size: --value(--rafters-ts-*-md);",
+    "    line-height: --value(--rafters-ts-*-md-leading);",
+    "  }",
+    "  @container (min-width: 1024px) {",
+    "    font-size: --value(--rafters-ts-*-lg);",
+    "    line-height: --value(--rafters-ts-*-lg-leading);",
+    "  }",
+    "}"
+  ].join("\n");
+}
 function generateMotionUtilities(motionTokens) {
   const semanticTokens = motionTokens.filter((t) => t.name.startsWith("motion-semantic-"));
   if (semanticTokens.length === 0) {
@@ -781,6 +821,82 @@ function generateMotionUtilities(motionTokens) {
   }
   return lines.join("\n");
 }
+function generateMotionCellUtilities(motionTokens) {
+  const cellTokens = motionTokens.filter((t) => t.name.startsWith("motion-cell-"));
+  if (cellTokens.length === 0) return "";
+  const lines = [
+    "/* Motion cells -- one utility per animated (component, part, transition) */"
+  ];
+  for (const token of cellTokens) {
+    if (typeof token.value !== "string") continue;
+    let spec = null;
+    try {
+      spec = JSON.parse(token.value);
+    } catch {
+      spec = null;
+    }
+    lines.push(`@utility ${token.name.replace("motion-cell-", "animate-")} {`);
+    if (spec === null) {
+      lines.push(`  animation: ${token.value};`);
+    } else {
+      lines.push(`  animation-name: ${spec.keyframe};`);
+      lines.push(`  animation-duration: var(--rafters-duration-${spec.durationTier});`);
+      lines.push(`  animation-timing-function: var(--rafters-ease-${spec.curve});`);
+    }
+    lines.push("  @media (prefers-reduced-motion: reduce) {");
+    lines.push("    animation-duration: 0s;");
+    lines.push("  }");
+    lines.push("}");
+  }
+  return lines.join("\n");
+}
+function generateMotionNamespaceVars(motionTokens) {
+  const lines = [];
+  for (const token of motionTokens) {
+    if (!motionNamespaceParts(token.name)) continue;
+    const value = tokenValueToCSS(token);
+    if (value === null) continue;
+    lines.push(`  --${token.name}: ${value};`);
+  }
+  if (lines.length === 0) return "";
+  return [
+    "  /* The five motion namespaces -- system leaves, the values live here */",
+    ...lines
+  ].join("\n");
+}
+function generateMotionBridgeVars(motionTokens) {
+  const lines = [];
+  for (const token of motionTokens) {
+    if (token.name.startsWith("motion-duration-") && token.name !== "motion-duration-base") {
+      const key = token.name.replace("motion-duration-", "");
+      lines.push(`  --duration-${key}: var(--rafters-duration-${key});`);
+    }
+    if (token.name.startsWith("motion-easing-")) {
+      const key = token.name.replace("motion-easing-", "");
+      lines.push(`  --ease-${key}: var(--rafters-ease-${key});`);
+    }
+  }
+  return lines.join("\n");
+}
+function generateMotionNamespaceUtilities(motionTokens) {
+  const lines = ["/* The five motion namespaces -- one utility per member */"];
+  let emitted = 0;
+  for (const token of motionTokens) {
+    const parts = motionNamespaceParts(token.name);
+    if (!parts) continue;
+    const property = MOTION_NAMESPACE_PROPERTY[parts.namespace];
+    emitted++;
+    lines.push(`@utility ${parts.namespace}-${parts.member} {`);
+    lines.push(`  ${property}: var(--${token.name});`);
+    if (REDUCED_MOTION_ZEROED.has(parts.namespace)) {
+      lines.push("  @media (prefers-reduced-motion: reduce) {");
+      lines.push(`    ${property}: 0ms;`);
+      lines.push("  }");
+    }
+    lines.push("}");
+  }
+  return emitted === 0 ? "" : lines.join("\n");
+}
 function overridePropertyToUtility(property, value) {
   switch (property) {
     case "fontFamily":
@@ -846,21 +962,38 @@ function tokensToTailwind(tokens, options = {}, typographyOverrides = []) {
   if (keyframes) {
     sections.push(keyframes);
   }
-  const typographyUtilities = generateTypographyCompositeUtilities(groups["typography-composite"]);
-  if (typographyUtilities) {
+  const typographyThemeInline = generateTypographyCompositeThemeInline(
+    groups["typography-composite"]
+  );
+  if (typographyThemeInline) {
     sections.push("");
-    sections.push(typographyUtilities);
+    sections.push(typographyThemeInline);
+  }
+  const typographyTsUtility = generateTypographyCompositeUtility(groups["typography-composite"]);
+  if (typographyTsUtility) {
+    sections.push("");
+    sections.push(typographyTsUtility);
   }
   const depthUtilities = generateDepthUtilities(groups.depth);
   if (depthUtilities) {
     sections.push("");
     sections.push(depthUtilities);
   }
+  const namespaceUtilities = generateMotionNamespaceUtilities(groups.motion);
+  if (namespaceUtilities) {
+    sections.push("");
+    sections.push(namespaceUtilities);
+  }
   const motionUtilities = generateMotionUtilities(groups.motion);
   if (motionUtilities) {
     sections.push("");
     sections.push(motionUtilities);
   }
+  const cellUtilities = generateMotionCellUtilities(groups.motion);
+  if (cellUtilities) {
+    sections.push("");
+    sections.push(cellUtilities);
+  }
   const overrideCSS = generateTypographyOverrideCSS(typographyOverrides);
   if (overrideCSS) {
     sections.push("");
@@ -882,7 +1015,7 @@ async function registryToCompiled(registry2, options = {}) {
 ${sourceDirectives}
 ${themeBody}`;
   const { execFileSync } = await import("child_process");
-  const { mkdtempSync, writeFileSync: writeFileSync2, readFileSync: readFileSync3, rmSync } = await import("fs");
+  const { mkdtempSync, writeFileSync: writeFileSync2, readFileSync: readFileSync4, rmSync } = await import("fs");
   const { join: join15, dirname: dirname4 } = await import("path");
   const { createRequire: createRequire2 } = await import("module");
   const require2 = createRequire2(import.meta.url);
@@ -904,7 +1037,7 @@ ${themeBody}`;
       args.push("--minify");
     }
     execFileSync("node", args, { stdio: "pipe", timeout: 3e4, cwd: pkgDir });
-    return readFileSync3(tempOutput, "utf-8");
+    return readFileSync4(tempOutput, "utf-8");
   } catch (error47) {
     const message = error47 instanceof Error ? error47.message : String(error47);
     throw new Error(`Failed to compile CSS: ${message}`);
@@ -1050,6 +1183,10 @@ function deriveCandidates(themeCSS) {
       candidates.add(name);
     } else if (name.startsWith("animate-")) {
       candidates.add(name);
+    } else if (name.startsWith("text-") && !name.includes("--")) {
+      candidates.add(`text-${name.slice(5)}`);
+    } else if (name.startsWith("rafters-ts-") && !name.endsWith("-transform")) {
+      candidates.add(`ts-${name.slice(11)}`);
     }
   }
   const base = [...candidates];
@@ -1105,8 +1242,8 @@ ${themeBody}`;
     const args = [binPath, "-i", tempInput, "-o", tempOutput];
     if (minify) args.push("--minify");
     execFileSync("node", args, { stdio: "pipe", timeout: 6e4, cwd: pkgDir });
-    const { readFileSync: readFileSync3 } = await import("fs");
-    const raw = readFileSync3(tempOutput, "utf-8");
+    const { readFileSync: readFileSync4 } = await import("fs");
+    const raw = readFileSync4(tempOutput, "utf-8");
     return postProcessDocSheet(raw);
   } catch (error47) {
     const message = error47 instanceof Error ? error47.message : String(error47);
@@ -1124,7 +1261,30 @@ function postProcessDocSheet(css) {
     themeContent = themeContent.replace(/:root,:host/g, ":host");
     parts.push(`:host{container-type:inline-size}${themeContent}`);
   }
-  const layerRe = /@layer (base|components|utilities)\{/g;
+  const propertyRe = /@property\s+--[\w-]+\s*\{[^}]*\}/g;
+  let propMatch;
+  while ((propMatch = propertyRe.exec(css)) !== null) {
+    parts.push(propMatch[0]);
+  }
+  const keyframesRe = /@keyframes\s+[\w-]+\s*\{/g;
+  let kfMatch;
+  while ((kfMatch = keyframesRe.exec(css)) !== null) {
+    const start = kfMatch.index;
+    let depth = 0;
+    let end = start;
+    for (let i = start; i < css.length; i++) {
+      if (css[i] === "{") depth++;
+      if (css[i] === "}") {
+        depth--;
+        if (depth === 0) {
+          end = i + 1;
+          break;
+        }
+      }
+    }
+    parts.push(css.slice(start, end));
+  }
+  const layerRe = /@layer (base|components|utilities|properties)\{/g;
   let match;
   while ((match = layerRe.exec(css)) !== null) {
     const start = match.index;
@@ -1140,7 +1300,14 @@ function postProcessDocSheet(css) {
         }
       }
     }
-    parts.push(css.slice(start, end));
+    let block = css.slice(start, end);
+    if (match[1] === "properties") {
+      block = block.replace(
+        /\*\s*,\s*:?:?before\s*,\s*:?:?after\s*,\s*:?:?backdrop/g,
+        ":host,*,::before,::after"
+      );
+    }
+    parts.push(block);
   }
   return parts.join("");
 }
@@ -1306,10 +1473,12 @@ var DEFAULT_SYSTEM_CONFIG = {
   // 1.2 ratio
   fontFamily: "'Noto Sans Variable', sans-serif",
   monoFontFamily: "ui-monospace, SFMono-Regular, 'SF Mono', Menlo, Consolas, 'Liberation Mono', monospace",
-  // Rafters aesthetic overrides (happen to match pure math at baseSpacingUnit=4)
+  // Rafters aesthetic overrides.
+  // baseRadius and focusRingWidth have NO pin here -- they derive from
+  // baseSpacingUnit (×1.5 and ÷2), and at base 4 the derivation already
+  // produces 6 and 2. A pin would hide the derivation, which is the #2031
+  // defect one layer down.
   baseFontSizeOverride: 16,
-  baseRadiusOverride: 6,
-  focusRingWidthOverride: 2,
   baseTransitionDurationOverride: 150
 };
 var COLOR_SCALE_POSITIONS = [
@@ -1325,42 +1494,6 @@ var COLOR_SCALE_POSITIONS = [
   "900",
   "950"
 ];
-var SPACING_SCALE = [
-  "0",
-  "0.5",
-  "1",
-  "1.5",
-  "2",
-  "2.5",
-  "3",
-  "3.5",
-  "4",
-  "5",
-  "6",
-  "7",
-  "8",
-  "9",
-  "10",
-  "11",
-  "12",
-  "14",
-  "16",
-  "20",
-  "24",
-  "28",
-  "32",
-  "36",
-  "40",
-  "44",
-  "48",
-  "52",
-  "56",
-  "60",
-  "64",
-  "72",
-  "80",
-  "96"
-];
 var TYPOGRAPHY_SCALE = [
   "xs",
   "sm",
@@ -4468,7 +4601,7 @@ function range(color1, color2, options = {}) {
     let [r, options2] = [color1, color2];
     return range(...r.rangeArgs.colors, { ...r.rangeArgs.options, ...options2 });
   }
-  let { space, outputSpace, progression: progression2, premultiplied } = options;
+  let { space, outputSpace, progression, premultiplied } = options;
   color1 = getColor(color1);
   color2 = getColor(color2);
   color1 = clone(color1);
@@ -4502,7 +4635,7 @@ function range(color1, color2, options = {}) {
     color2.coords = color2.coords.map((c4) => c4 * color2.alpha);
   }
   return Object.assign((p2) => {
-    p2 = progression2 ? progression2(p2) : p2;
+    p2 = progression ? progression(p2) : p2;
     let coords = color1.coords.map((start, i) => {
       let end = color2.coords[i];
       return interpolate(start, end, p2);
@@ -21891,6 +22024,8 @@ var BindingSchema = external_exports.object({
   plugin: external_exports.string(),
   input: external_exports.unknown()
 });
+var OVERRIDE_KINDS = ["baseline", "preset", "designer"];
+var OverrideKindSchema = external_exports.enum(OVERRIDE_KINDS);
 var TokenSchema = external_exports.object({
   // Core token data
   name: external_exports.string(),
@@ -21929,7 +22064,13 @@ var TokenSchema = external_exports.object({
     // Why was this overridden
     reason: external_exports.string(),
     // Additional context (e.g. "Q1 marketing campaign", "accessibility audit")
-    context: external_exports.string().optional()
+    context: external_exports.string().optional(),
+    // Who attributed the value. The reason string is for humans; kind is what
+    // machines branch on (preset application skips kind === 'designer').
+    // Optional and never defaulted: absent means the provenance is unknown,
+    // which is the honest state of every override written before this field
+    // existed.
+    kind: OverrideKindSchema.optional()
   }).nullable(),
   // Computed value from generation rule (before any override)
   // Stored so agents can see what the system WOULD produce vs what human chose
@@ -22614,7 +22755,7 @@ var DEFAULT_DURATION_DEFINITIONS = {
   },
   moderate: {
     range: [200, 300],
-    default: 200,
+    default: 250,
     band: "communicative (~200-300ms)",
     meaning: "Dropdowns, tab switches, small reveals. The communicative window: fast enough to feel responsive, slow enough for the eye to track a trajectory and build a spatial model.",
     contexts: ["dropdowns", "tab-switches", "small-reveals"],
@@ -22622,7 +22763,7 @@ var DEFAULT_DURATION_DEFINITIONS = {
   },
   normal: {
     range: [300, 400],
-    default: 300,
+    default: 350,
     band: "communicative, larger movement",
     meaning: "The workhorse -- modal entrances, toggles, standard state transitions. The communicative window for larger movement.",
     contexts: ["modals", "toggles", "state-changes"],
@@ -22630,7 +22771,7 @@ var DEFAULT_DURATION_DEFINITIONS = {
   },
   slow: {
     range: [400, 500],
-    default: 400,
+    default: 500,
     band: "at the sluggish boundary",
     meaning: "Sheets, page transitions, large spatial movement where the user needs orientation. At the sluggish boundary -- the ceiling for anything but full-screen spatial transitions.",
     contexts: ["sheets", "page-transitions", "large-spatial-movement"],
@@ -22727,12 +22868,12 @@ var DEFAULT_KEYFRAME_DEFINITIONS = {
     contexts: ["sidebar-close", "panel-exit"]
   },
   "scale-in": {
-    css: (ctx) => `from { transform: scale(${ctx.scaleStart}); opacity: 0; } to { transform: scale(1); opacity: 1; }`,
+    css: () => "from { transform: scale(var(--rafters-extent-pop)); opacity: 0; } to { transform: scale(1); opacity: 1; }",
     meaning: "Scale up while fading in",
     contexts: ["modal", "popover", "dialog"]
   },
   "scale-out": {
-    css: (ctx) => `from { transform: scale(1); opacity: 1; } to { transform: scale(${ctx.scaleStart}); opacity: 0; }`,
+    css: () => "from { transform: scale(1); opacity: 1; } to { transform: scale(var(--rafters-extent-pop)); opacity: 0; }",
     meaning: "Scale down while fading out",
     contexts: ["modal-exit", "popover-close"]
   },
@@ -22889,6 +23030,56 @@ var DEFAULT_ANIMATION_DEFINITIONS = {
     contexts: ["input"]
   }
 };
+var DEFAULT_MOTION_CELL_ANIMATIONS = {
+  "dialog-content-open": {
+    keyframe: "scale-in",
+    tier: "normal",
+    curve: "enter",
+    cell: { component: "dialog", part: "content", transition: "closed -> open" },
+    meaning: "A dialog arriving: fade + zoom from the pop extent, on the arrival curve.",
+    contexts: ["dialog", "modal", "alert-dialog"]
+  },
+  "dialog-content-close": {
+    keyframe: "scale-out",
+    tier: "moderate",
+    curve: "exit",
+    cell: { component: "dialog", part: "content", transition: "open -> closed" },
+    meaning: "A dialog leaving: fade + zoom back to the pop extent, on the departure curve.",
+    contexts: ["dialog", "modal", "alert-dialog"]
+  },
+  "popover-content-open": {
+    keyframe: "scale-in",
+    tier: "moderate",
+    curve: "enter",
+    cell: { component: "popover", part: "content", transition: "closed -> open" },
+    meaning: "A popover arriving: smaller and nearer than a dialog, so one tier quicker.",
+    contexts: ["popover", "anchored-popup"]
+  },
+  "popover-content-close": {
+    keyframe: "scale-out",
+    tier: "fast",
+    curve: "exit",
+    cell: { component: "popover", part: "content", transition: "open -> closed" },
+    meaning: "A popover leaving: the user already chose to dismiss it.",
+    contexts: ["popover", "anchored-popup"]
+  },
+  "dropdown-menu-content-open": {
+    keyframe: "scale-in",
+    tier: "moderate",
+    curve: "enter",
+    cell: { component: "dropdown-menu", part: "content", transition: "closed -> open" },
+    meaning: "A menu arriving: same anchored-popup moment as popover, declared separately.",
+    contexts: ["dropdown-menu", "menu", "anchored-popup"]
+  },
+  "dropdown-menu-content-close": {
+    keyframe: "scale-out",
+    tier: "fast",
+    curve: "exit",
+    cell: { component: "dropdown-menu", part: "content", transition: "open -> closed" },
+    meaning: "A menu leaving, after a choice or a dismissal.",
+    contexts: ["dropdown-menu", "menu", "anchored-popup"]
+  }
+};
 var DEFAULT_MOTION_COMPOSITE_PRESETS = {
   "motion-fade-in": {
     durationTier: "fast",
@@ -22924,7 +23115,8 @@ var DEFAULT_MOTION_COMPOSITE_PRESETS = {
 var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   hover: {
     properties: ["color", "background-color", "border-color"],
-    durationTier: "fast",
+    travel: "none",
+    band: "fast",
     curve: "standard",
     reducedMotion: null,
     category: "interaction",
@@ -22934,7 +23126,8 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   focus: {
     properties: ["box-shadow", "outline-color"],
-    durationTier: "micro",
+    travel: "none",
+    band: "micro",
     curve: "linear",
     reducedMotion: null,
     category: "interaction",
@@ -22944,7 +23137,8 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   press: {
     properties: ["transform", "color", "background-color"],
-    durationTier: "micro",
+    travel: "none",
+    band: "micro",
     curve: "spring-snappy",
     reducedMotion: { properties: ["color", "background-color"] },
     category: "interaction",
@@ -22954,18 +23148,25 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   toggle: {
     properties: ["color", "background-color", "transform"],
-    durationTier: "moderate",
-    curve: "spring-snappy",
+    travel: "none",
+    band: "moderate",
+    // `standard`, not `spring-snappy`. The 30-site study found 29 of 30 sites
+    // carry zero overshoot curves, and the one that does is the friendly
+    // exemplar -- spring-snappy belongs to friendly and effectively nowhere
+    // else. Efficient is the shipped default intent and is characterised as
+    // zero-overshoot, so a spring here contradicts the intent it ships under.
+    // Matches the recorded ruling: an efficient toggle is crisp; friendly is
+    // the intent that springs a switch.
+    curve: "standard",
     reducedMotion: { properties: ["color", "background-color"] },
     category: "interaction",
-    sizeReasoning: "A thumb travelling a track is a small, tracked movement -- moderate tier, snappy spring. Reduced motion drops the transform to a colour cross-fade.",
+    sizeReasoning: "A thumb travelling a track is a small, tracked movement -- moderate tier at the standard curve. Reduced motion drops the transform to a colour cross-fade.",
     meaning: "Toggle/switch state change. Shows the new state.",
     contexts: ["switch", "toggle", "checkbox"]
   },
   "dropdown-in": {
     properties: ["opacity", "transform"],
-    durationTier: "moderate",
-    curve: "enter",
+    travel: "short",
     reducedMotion: { properties: ["opacity"], ms: 100 },
     category: "enter",
     sizeReasoning: "A dropdown is small and travels a short distance -- moderate tier, one step below the modal, with the arrival curve.",
@@ -22974,8 +23175,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   "dropdown-out": {
     properties: ["opacity", "transform"],
-    durationTier: "fast",
-    curve: "exit",
+    travel: "short",
     reducedMotion: { properties: ["opacity"], ms: 100 },
     category: "exit",
     sizeReasoning: "The exit of a small element -- fast tier (shorter than its moderate entrance) with the departure curve. The user already chose to dismiss it.",
@@ -22984,8 +23184,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   "modal-in": {
     properties: ["opacity", "transform"],
-    durationTier: "normal",
-    curve: "enter",
+    travel: "medium",
     reducedMotion: { properties: ["opacity"], ms: 150 },
     category: "enter",
     sizeReasoning: "A modal is larger and travels farther than a dropdown -- normal tier, one step up, with the arrival curve. Size and distance produce the longer duration.",
@@ -22994,8 +23193,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   "modal-out": {
     properties: ["opacity", "transform"],
-    durationTier: "moderate",
-    curve: "exit",
+    travel: "medium",
     reducedMotion: { properties: ["opacity"], ms: 150 },
     category: "exit",
     sizeReasoning: "The modal exit -- moderate tier (shorter than its normal entrance) with the departure curve.",
@@ -23004,8 +23202,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   "sheet-in": {
     properties: ["transform"],
-    durationTier: "normal",
-    curve: "spring-smooth",
+    travel: "large",
     reducedMotion: { properties: ["opacity"], ms: 250 },
     category: "enter",
     sizeReasoning: "A sheet is a large spatial movement -- normal tier with the physical settle of a smooth spring, because the user must track it into place. Reduced motion becomes a cross-fade.",
@@ -23014,8 +23211,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   "sheet-out": {
     properties: ["transform"],
-    durationTier: "normal",
-    curve: "exit",
+    travel: "large",
     reducedMotion: { properties: ["opacity"], ms: 250 },
     category: "exit",
     sizeReasoning: "The sheet exit -- normal tier (shorter than its slow entrance) with the departure curve.",
@@ -23024,8 +23220,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   expand: {
     properties: ["grid-template-rows", "opacity"],
-    durationTier: "normal",
-    curve: "enter",
+    travel: "medium",
     reducedMotion: { properties: ["opacity"] },
     category: "enter",
     sizeReasoning: "Content unfolding to its natural height -- normal tier with the arrival curve. Transitions grid-template-rows (0fr->1fr), the transitionable stand-in for height:auto. Reduced motion snaps the rows and fades opacity.",
@@ -23034,8 +23229,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   collapse: {
     properties: ["grid-template-rows", "opacity"],
-    durationTier: "moderate",
-    curve: "exit",
+    travel: "medium",
     reducedMotion: { properties: ["opacity"] },
     category: "exit",
     sizeReasoning: "Content folding away -- moderate tier (shorter than its normal expansion) with the departure curve. Reduced motion snaps the rows.",
@@ -23044,8 +23238,7 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
   },
   page: {
     properties: ["opacity", "transform"],
-    durationTier: "normal",
-    curve: "spring-smooth",
+    travel: "large",
     reducedMotion: { properties: ["opacity"], ms: 200 },
     category: "enter",
     sizeReasoning: "A whole-view transition -- normal tier with the physical settle of a smooth spring, because the user reorients across a large distance.",
@@ -23053,11 +23246,95 @@ var DEFAULT_MOTION_SEMANTIC_MAPPINGS = {
     contexts: ["page-transition", "route-change", "view-switch"]
   }
 };
-var DEFAULT_DELAY_DEFINITIONS = {
-  none: { step: "none" },
-  short: { step: -1 },
-  medium: { step: 0 },
-  long: { step: 1 }
+var DEFAULT_DELAY_NAMESPACE = {
+  "hover-intent": {
+    value: "200ms",
+    provenance: "observed",
+    note: "Observed in navigation-menu, which hardcoded it before #1995 routed both it and tooltip through the runtime accessor. Observed in working code, not tuned.",
+    meaning: "How long a pointer must rest before the system believes the hover was meant. Long enough to survive a pass-through, short enough that a deliberate hover does not feel ignored.",
+    contexts: ["tooltip", "hover-card", "navigation-menu"]
+  },
+  linger: {
+    value: "300ms",
+    provenance: "proposed",
+    note: "PROPOSED. The grace window before a hovered surface closes, so a diagonal cursor path to a submenu does not dismiss it.",
+    meaning: "How long a surface stays after the pointer leaves, so a near-miss is forgiven.",
+    contexts: ["hover-card", "navigation-menu", "submenu"]
+  },
+  "choreo-step": {
+    value: "50ms",
+    provenance: "proposed",
+    note: "PROPOSED. The offset between two parts of ONE surface moving together (panel then its content).",
+    meaning: "The beat between choreographed parts of a single surface.",
+    contexts: ["modal-content", "panel-content", "sequenced-parts"]
+  },
+  "stagger-step": {
+    value: "0ms",
+    provenance: "proposed",
+    note: "PROPOSED, and zero is a value: efficient does not stagger lists. A non-zero stagger is a character choice a designer makes, not a default.",
+    meaning: "The per-item offset when a list animates in.",
+    contexts: ["staggered-lists", "sequential-elements"]
+  },
+  skip: {
+    value: "300ms",
+    provenance: "proposed",
+    note: "PROPOSED. The warm-reopen window: reopen inside it and the entrance delay is skipped, because the user is already oriented.",
+    meaning: "How long a just-closed surface stays warm enough to reopen without ceremony.",
+    contexts: ["tooltip-reopen", "menu-reopen"]
+  }
+};
+var DEFAULT_EXTENT_NAMESPACE = {
+  pop: {
+    value: "0.95",
+    provenance: "proposed",
+    note: "PROPOSED. The scale a surface enters from. Close to 1 so the entrance reads as arrival rather than as a zoom.",
+    meaning: "How far a surface scales up as it arrives.",
+    contexts: ["modal", "popover", "dialog"]
+  },
+  press: {
+    value: "0.97",
+    provenance: "proposed",
+    note: "PROPOSED. Depression under a press. Smaller than `pop` because the finger is the evidence -- the motion only confirms it.",
+    meaning: "How far a control depresses when pressed.",
+    contexts: ["button", "toggle", "press-feedback"]
+  },
+  draw: {
+    value: "1",
+    provenance: "proposed",
+    note: "PROPOSED. The completed fraction of a drawn indicator. 1 is full travel; a value below it is a deliberately incomplete stroke.",
+    meaning: "How far an indicator draws along its track.",
+    contexts: ["tabs-indicator", "underline", "progress-stroke"]
+  }
+};
+var DEFAULT_PERIOD_NAMESPACE = {
+  spin: {
+    value: "1s",
+    provenance: "baseline",
+    note: "The shipped loop period of the spin animation.",
+    meaning: "One full rotation of a working indicator.",
+    contexts: ["loading", "spinner", "refresh"]
+  },
+  pulse: {
+    value: "2s",
+    provenance: "baseline",
+    note: "The shipped loop period of the pulse animation.",
+    meaning: "One breath of a skeleton or placeholder.",
+    contexts: ["skeleton", "loading-placeholder"]
+  },
+  blink: {
+    value: "1.25s",
+    provenance: "baseline",
+    note: "The shipped loop period of the caret-blink animation.",
+    meaning: "One blink of a text caret.",
+    contexts: ["input-caret", "text-cursor"]
+  },
+  shimmer: {
+    value: "2s",
+    provenance: "proposed",
+    note: "PROPOSED. No shimmer animation ships yet; the period is here because the namespace is a vocabulary, not a list of what happens to exist.",
+    meaning: "One sweep of a shimmer across a loading surface.",
+    contexts: ["skeleton", "loading-placeholder"]
+  }
 };
 var DEFAULT_FOCUS_CONFIGS = {
   default: {
@@ -23136,41 +23413,13 @@ var DEFAULT_RADIUS_DEFINITIONS = {
     contexts: ["avatars", "pill-buttons", "circular-elements"]
   }
 };
-var DEFAULT_SPACING_MULTIPLIERS = {
-  "0": 0,
-  "0.5": 0.5,
-  "1": 1,
-  "1.5": 1.5,
-  "2": 2,
-  "2.5": 2.5,
-  "3": 3,
-  "3.5": 3.5,
-  "4": 4,
-  "5": 5,
-  "6": 6,
-  "7": 7,
-  "8": 8,
-  "9": 9,
-  "10": 10,
-  "11": 11,
-  "12": 12,
-  "14": 14,
-  "16": 16,
-  "20": 20,
-  "24": 24,
-  "28": 28,
-  "32": 32,
-  "36": 36,
-  "40": 40,
-  "44": 44,
-  "48": 48,
-  "52": 52,
-  "56": 56,
-  "60": 60,
-  "64": 64,
-  "72": 72,
-  "80": 80,
-  "96": 96
+var DEFAULT_SPACING_BOUNDS = {
+  floor: 1,
+  ceiling: 96
+};
+var DEFAULT_SHADOW_BOUNDS = {
+  floor: 1,
+  ceiling: 96
 };
 var DEFAULT_TYPOGRAPHY_SCALE = {
   xs: { step: -2, lineHeight: 1.5, letterSpacing: "0.025em" },
@@ -25272,25 +25521,23 @@ function generateDepthTokens(_config, depthDefs) {
 }
 
 // ../design-tokens/src/generators/focus.ts
-function pxToRem(px) {
-  const rem = Math.round(px / 16 * 1e3) / 1e3;
-  return `${rem}rem`;
-}
 function generateFocusTokens(config2, focusConfigs) {
   const tokens = [];
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
-  const { focusRingWidth } = config2;
-  const focusRingWidthRem = pxToRem(focusRingWidth);
+  const { focusRingWidth, baseSpacingUnit } = config2;
+  const focusDivisor = focusRingWidth > 0 ? Math.round(baseSpacingUnit / focusRingWidth * 1e3) / 1e3 : 2;
+  const focusWidthValue = `calc(var(--rafters-spacing-base) / ${focusDivisor})`;
   tokens.push({
     name: "focus-ring-width",
-    value: focusRingWidthRem,
+    value: focusWidthValue,
     category: "focus",
     namespace: "focus",
-    semanticMeaning: "Default focus ring width - WCAG 2.2 requires minimum 2px",
+    semanticMeaning: "Default focus ring width - derives from spacing base",
     usageContext: ["focus-indicators", "keyboard-navigation"],
     accessibilityLevel: "AA",
-    focusRingWidth: focusRingWidthRem,
-    description: `Focus ring width ${focusRingWidthRem}. WCAG 2.2 requires minimum 2px for visibility.`,
+    focusRingWidth: focusWidthValue,
+    dependsOn: ["spacing-base"],
+    description: `Focus ring width = spacing-base / ${focusDivisor} (${focusRingWidth}px at base ${baseSpacingUnit}). WCAG 2.2 requires minimum 2px.`,
     generatedAt: timestamp,
     containerQueryAware: false,
     userOverride: null,
@@ -25314,14 +25561,22 @@ function generateFocusTokens(config2, focusConfigs) {
     highContrastMode: "Highlight",
     userOverride: null
   });
+  const focusVar = "var(--rafters-focus-ring-width)";
+  const focusCalc = (px) => {
+    const mult = px / focusRingWidth;
+    if (mult === 0) return "0";
+    if (mult === 1) return focusVar;
+    if (mult === -1) return `calc(${focusVar} * -1)`;
+    return `calc(${focusVar} * ${mult})`;
+  };
   for (const [name, focusConfig] of Object.entries(focusConfigs)) {
-    const widthRem = pxToRem(focusConfig.width);
-    const offsetRem = pxToRem(focusConfig.offset);
+    const widthVal = focusCalc(focusConfig.width);
+    const offsetVal = focusCalc(focusConfig.offset);
     tokens.push({
       name: name === "default" ? "focus-ring" : `focus-ring-${name}`,
       value: JSON.stringify({
-        width: widthRem,
-        offset: offsetRem,
+        width: widthVal,
+        offset: offsetVal,
         style: focusConfig.style,
         color: "var(--ring)"
       }),
@@ -25329,13 +25584,13 @@ function generateFocusTokens(config2, focusConfigs) {
       namespace: "focus",
       semanticMeaning: focusConfig.meaning,
       usageContext: focusConfig.contexts,
-      focusRingWidth: widthRem,
+      focusRingWidth: widthVal,
       focusRingColor: "var(--ring)",
-      focusRingOffset: offsetRem,
+      focusRingOffset: offsetVal,
       focusRingStyle: focusConfig.style,
       dependsOn: ["ring", "focus-ring-width"],
       accessibilityLevel: focusConfig.width >= 2 ? "AA" : void 0,
-      description: `${focusConfig.meaning}. Width: ${widthRem}, Offset: ${offsetRem}.`,
+      description: `${focusConfig.meaning}. Width: ${widthVal}, Offset: ${offsetVal}.`,
       generatedAt: timestamp,
       containerQueryAware: false,
       highContrastMode: "Highlight",
@@ -25348,7 +25603,7 @@ function generateFocusTokens(config2, focusConfigs) {
         ]
       }
     });
-    const outlineValue = `${widthRem} ${focusConfig.style} var(--ring)`;
+    const outlineValue = `${widthVal} ${focusConfig.style} var(--ring)`;
     tokens.push({
       name: name === "default" ? "focus-outline" : `focus-outline-${name}`,
       value: outlineValue,
@@ -25356,20 +25611,21 @@ function generateFocusTokens(config2, focusConfigs) {
       namespace: "focus",
       semanticMeaning: `CSS outline shorthand for ${name} focus ring`,
       usageContext: ["css-outline-property"],
-      dependsOn: ["ring"],
-      description: `CSS outline value: ${outlineValue}. Use with outline-offset: ${offsetRem}.`,
+      dependsOn: ["ring", "focus-ring-width"],
+      description: `CSS outline value: ${outlineValue}. Use with outline-offset: ${offsetVal}.`,
       generatedAt: timestamp,
       containerQueryAware: false,
       userOverride: null
     });
     tokens.push({
       name: name === "default" ? "focus-offset" : `focus-offset-${name}`,
-      value: offsetRem,
+      value: offsetVal,
       category: "focus",
       namespace: "focus",
       semanticMeaning: `Focus ring offset for ${name} style`,
-      focusRingOffset: offsetRem,
-      description: `Focus offset ${offsetRem} for ${name} focus style.`,
+      focusRingOffset: offsetVal,
+      dependsOn: ["focus-ring-width"],
+      description: `Focus offset ${offsetVal} for ${name} focus style.`,
       generatedAt: timestamp,
       containerQueryAware: false,
       userOverride: null
@@ -25378,7 +25634,7 @@ function generateFocusTokens(config2, focusConfigs) {
   tokens.push({
     name: "focus-within-ring",
     value: JSON.stringify({
-      width: focusRingWidthRem,
+      width: focusVar,
       offset: "0",
       style: "solid",
       color: "var(--ring)"
@@ -25387,11 +25643,11 @@ function generateFocusTokens(config2, focusConfigs) {
     namespace: "focus",
     semanticMeaning: "Focus ring for containers with focused descendants",
     usageContext: ["form-groups", "card-actions", "list-containers"],
-    focusRingWidth: focusRingWidthRem,
+    focusRingWidth: focusVar,
     focusRingColor: "var(--ring)",
     focusRingOffset: "0",
     focusRingStyle: "solid",
-    dependsOn: ["ring"],
+    dependsOn: ["ring", "focus-ring-width"],
     description: "Focus indicator for containers using :focus-within pseudo-class.",
     generatedAt: timestamp,
     containerQueryAware: false,
@@ -25401,13 +25657,13 @@ function generateFocusTokens(config2, focusConfigs) {
       never: ["Use as replacement for child focus indicators", "Apply to non-container elements"]
     }
   });
-  const highContrastWidth = focusRingWidth * 1.5;
-  const highContrastOffset = focusRingWidth;
+  const hcWidthVal = `calc(${focusVar} * 1.5)`;
+  const hcOffsetVal = focusVar;
   tokens.push({
     name: "focus-high-contrast",
     value: JSON.stringify({
-      width: pxToRem(highContrastWidth),
-      offset: pxToRem(highContrastOffset),
+      width: hcWidthVal,
+      offset: hcOffsetVal,
       style: "solid",
       color: "Highlight"
     }),
@@ -25415,10 +25671,11 @@ function generateFocusTokens(config2, focusConfigs) {
     namespace: "focus",
     semanticMeaning: "Focus ring for Windows High Contrast Mode",
     usageContext: ["high-contrast-mode", "forced-colors"],
-    focusRingWidth: pxToRem(highContrastWidth),
-    focusRingOffset: pxToRem(highContrastOffset),
+    focusRingWidth: hcWidthVal,
+    focusRingOffset: hcOffsetVal,
     focusRingStyle: "solid",
     highContrastMode: "Highlight",
+    dependsOn: ["focus-ring-width"],
     description: "High contrast focus ring using system Highlight color.",
     generatedAt: timestamp,
     containerQueryAware: false,
@@ -25598,21 +25855,6 @@ function evaluateExpression(expression, options = {}) {
 }
 
 // ../math-utils/src/progressions.ts
-var progression = (r, base, step) => base * ratioValue(r) ** step;
-function generateSequence(r, base, count, options = {}) {
-  const { startStep = 0, includeZero = false } = options;
-  const ratio = ratioValue(r);
-  const result = [];
-  for (let i = 0; i < count; i++) {
-    if (i === 0 && includeZero) {
-      result.push(0);
-    } else {
-      const step = startStep + (includeZero ? i - 1 : i);
-      result.push(base * ratio ** step);
-    }
-  }
-  return result;
-}
 function generateModularScale(r, base, steps2 = 5) {
   const ratio = ratioValue(r);
   const smaller = [];
@@ -25674,23 +25916,123 @@ function tryParseUnit(cssValue, registry2 = DEFAULT_UNITS) {
   }
 }
 
+// ../design-tokens/src/generators/motion-derivation.ts
+var BAND_ORDER = ["instant", "micro", "fast", "moderate", "normal", "slow"];
+var TRAVEL_BAND = {
+  none: "fast",
+  short: "moderate",
+  medium: "normal",
+  large: "slow"
+};
+var LARGE_TRAVEL_DISAGREEMENT = {
+  derived: "slow",
+  shipped: "normal",
+  reason: "b864de01 places the sheet pair at normal deliberately -- the one pair without a shortened exit. Unresolved: either the model needs a term that justifies normal, or these move to slow."
+};
+function applyLargeTravelException(band, travel) {
+  return travel === "large" ? LARGE_TRAVEL_DISAGREEMENT.shipped : band;
+}
+function shortenForExit(band) {
+  const i = BAND_ORDER.indexOf(band);
+  return BAND_ORDER[Math.max(0, i - 1)];
+}
+var INTENT_POSITION = {
+  efficient: null,
+  elegant: 1,
+  friendly: null,
+  technical: null,
+  editorial: null
+};
+var LANDMARK_BANDS = /* @__PURE__ */ new Set(["instant", "micro", "fast"]);
+function deriveDuration(band, intent, durationDefs) {
+  const def = durationDefs[band];
+  if (def === void 0) {
+    throw new Error(
+      `motion derivation: unknown band "${band}". Known bands: ${BAND_ORDER.join(", ")}.`
+    );
+  }
+  if (LANDMARK_BANDS.has(band)) return def.default;
+  const position = INTENT_POSITION[intent];
+  if (position === null) return def.default;
+  const [min, max2] = def.range;
+  return Math.round(min + (max2 - min) * position);
+}
+function deriveBand(category, travel, declaredBand) {
+  if (category === "interaction") {
+    if (declaredBand === void 0) {
+      throw new Error(
+        "motion derivation: an interaction mapping must declare its band -- it has no travel to derive from."
+      );
+    }
+    return declaredBand;
+  }
+  const base = applyLargeTravelException(TRAVEL_BAND[travel], travel);
+  if (category === "exit" && travel !== "large") return shortenForExit(base);
+  return base;
+}
+function deriveCurve(category, travel, _intent, declaredCurve) {
+  if (category === "exit") return "exit";
+  if (category === "enter") return travel === "large" ? "spring-smooth" : "enter";
+  return declaredCurve ?? "standard";
+}
+
 // ../design-tokens/src/generators/motion.ts
-function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, semanticMappings, keyframeDefs, animationDefs, compositePresets) {
+function requireDef(defs, key, kind, owner) {
+  const def = defs[key];
+  if (def === void 0) {
+    throw new Error(
+      `motion generator: ${owner} references unknown ${kind} "${key}". Known ${kind}s: ${Object.keys(defs).sort().join(", ")}.`
+    );
+  }
+  return def;
+}
+function motionNamespaceTokenName(namespace, member) {
+  return `rafters-${namespace}-${member}`;
+}
+function namespaceLeaf(input) {
+  const { namespaceName, member, value, provenance, note, meaning, contexts, timestamp } = input;
+  return {
+    name: motionNamespaceTokenName(namespaceName, member),
+    value,
+    category: "motion",
+    namespace: "motion",
+    semanticMeaning: meaning,
+    usageContext: contexts,
+    dependsOn: [],
+    description: `${namespaceName}-${member}: ${value} [provenance: ${provenance}] ${note} ${meaning}`,
+    generatedAt: timestamp,
+    containerQueryAware: false,
+    // Mirrors the exporter's REDUCED_MOTION_ZEROED set: only duration and delay
+    // are zeroed under prefers-reduced-motion. ease/extent are shaped BY a
+    // duration, not zeroed themselves; period is exempt by law (loops slow,
+    // never stop).
+    reducedMotionAware: namespaceName === "duration" || namespaceName === "delay",
+    userOverride: null,
+    usagePatterns: {
+      do: [`Use the generated utility \`${namespaceName}-${member}\``],
+      never: [
+        "Hardcode this value in a component",
+        "Add a second name for the same idea -- one fast, everywhere, always"
+      ]
+    }
+  };
+}
+function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, extentDefs, periodDefs, semanticMappings, keyframeDefs, animationDefs, compositePresets, cellAnimations) {
   const tokens = [];
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
   const { baseTransitionDuration, progressionRatio } = config2;
+  const intent = config2.intent ?? "efficient";
   const ratio = resolveRatio(progressionRatio);
   const ratioVal = ratioValue(ratio);
-  const computeStep = (base, step) => progression(ratio, base, step);
   tokens.push({
     name: "motion-duration-base",
     value: `${baseTransitionDuration}ms`,
     category: "motion",
     namespace: "motion",
-    semanticMeaning: "Legacy base transition duration. The perceptual duration scale (motion-duration-*) no longer derives from this; retained only as a reference value and delay-progression base.",
-    usageContext: ["calculation-reference", "delay-base"],
+    semanticMeaning: "Legacy base transition duration. Nothing derives from this any more: the perceptual duration scale never did, and the ratio-stepped delay tokens that did were removed in #1991. Retained as a reference value only.",
+    usageContext: ["calculation-reference"],
     progressionSystem: progressionRatio,
-    description: `Base duration (${baseTransitionDuration}ms). Delay tokens use ${progressionRatio} progression (ratio ${ratioVal}); duration tiers are perceptual RANGES a designer sets within and do not derive from this base.`,
+    description: `Base duration (${baseTransitionDuration}ms). A reference value with no dependents: duration tiers are perceptual RANGES a designer sets within, and the delay namespace holds relationships rather than ratio steps.`,
     generatedAt: timestamp,
     containerQueryAware: false,
     reducedMotionAware: true,
@@ -25706,7 +26048,7 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
     const def = durationDefs[scale2];
     if (!def) continue;
     const scaleIndex = MOTION_DURATION_SCALE.indexOf(scale2);
-    const durationMs = def.default;
+    const durationMs = deriveDuration(scale2, intent, durationDefs);
     const [rangeMin, rangeMax] = def.range;
     const bandNote = def.band ? ` Band: ${def.band}.` : "";
     const rangeNote = rangeMin === rangeMax ? " Fixed." : ` Range: ${rangeMin}-${rangeMax}ms.`;
@@ -25759,40 +26101,64 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
       }
     });
   }
-  for (const [name, def] of Object.entries(delayDefs)) {
-    let delayMs;
-    let mathRelationship;
-    if (def.step === "none") {
-      delayMs = 0;
-      mathRelationship = "0";
-    } else {
-      delayMs = Math.round(computeStep(baseTransitionDuration, def.step));
-      mathRelationship = def.step === 0 ? `${baseTransitionDuration}ms (base)` : `${baseTransitionDuration} \xD7 ${ratioVal}^${def.step}`;
+  for (const scale2 of MOTION_DURATION_SCALE) {
+    const def = durationDefs[scale2];
+    if (!def) continue;
+    const durationMs = deriveDuration(scale2, intent, durationDefs);
+    tokens.push(
+      namespaceLeaf({
+        namespaceName: "duration",
+        member: scale2,
+        value: `${durationMs}ms`,
+        provenance: "baseline",
+        note: def.band ? `Efficient baseline. ${durationMs}ms within the ${def.band} band (${def.range[0]}-${def.range[1]}ms).` : `Efficient baseline. Fixed at ${durationMs}ms.`,
+        meaning: def.meaning,
+        contexts: def.contexts,
+        timestamp
+      })
+    );
+  }
+  for (const curve of EASING_CURVES) {
+    const def = easingDefs[curve];
+    if (!def) continue;
+    tokens.push(
+      namespaceLeaf({
+        namespaceName: "ease",
+        member: curve,
+        value: def.css,
+        provenance: "baseline",
+        note: "Efficient baseline curve.",
+        meaning: def.meaning,
+        contexts: def.contexts,
+        timestamp
+      })
+    );
+  }
+  for (const [namespaceName, members] of [
+    ["delay", delayDefs],
+    ["extent", extentDefs],
+    ["period", periodDefs]
+  ]) {
+    for (const [member, def] of Object.entries(members)) {
+      tokens.push(
+        namespaceLeaf({
+          namespaceName,
+          member,
+          value: def.value,
+          provenance: def.provenance,
+          note: def.note,
+          meaning: def.meaning,
+          contexts: def.contexts,
+          timestamp
+        })
+      );
     }
-    tokens.push({
-      name: `motion-delay-${name}`,
-      value: delayMs === 0 ? "0ms" : `${delayMs}ms`,
-      category: "motion",
-      namespace: "motion",
-      semanticMeaning: `${name.charAt(0).toUpperCase() + name.slice(1)} animation delay`,
-      usageContext: name === "none" ? ["immediate-response"] : name === "short" ? ["staggered-lists", "sequential-elements"] : name === "medium" ? ["modal-content", "after-transition"] : ["emphasis", "dramatic-reveals"],
-      delayMs,
-      mathRelationship,
-      dependsOn: def.step === "none" ? [] : ["motion-duration-base"],
-      description: `Delay ${name}: ${delayMs}ms. Based on duration progression.`,
-      generatedAt: timestamp,
-      containerQueryAware: false,
-      reducedMotionAware: true,
-      userOverride: null
-    });
   }
   const ratioValue2 = ratioVal;
-  const scaleStart = Math.round(1 / ratioValue2 ** 0.25 * 100) / 100;
   const pingScale = Math.round(ratioValue2 ** 3 * 10) / 10;
   const pulseOpacity = Math.round(1 / ratioValue2 ** 4 * 100) / 100;
   const bouncePercent = Math.round(100 / ratioValue2 ** 6);
   const keyframeContext = {
-    scaleStart,
     pingScale,
     pulseOpacity,
     bouncePercent
@@ -25822,15 +26188,18 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
       durationRef = anim.duration.loopPeriod;
       durationDependency = [];
     } else {
-      const durationDef = durationDefs[anim.duration.tier];
-      if (!durationDef) continue;
+      const durationDef = requireDef(
+        durationDefs,
+        anim.duration.tier,
+        "duration tier",
+        `animation "${name}"`
+      );
       durationValue = `${durationDef.default}ms`;
-      durationRef = `var(--motion-duration-${anim.duration.tier})`;
-      durationDependency = [`motion-duration-${anim.duration.tier}`];
+      durationRef = `var(--rafters-duration-${anim.duration.tier})`;
+      durationDependency = [`rafters-duration-${anim.duration.tier}`];
     }
-    const easingDef = easingDefs[anim.curve];
-    if (!easingDef) continue;
-    const easingRef = `var(--motion-easing-${anim.curve})`;
+    const easingDef = requireDef(easingDefs, anim.curve, "easing curve", `animation "${name}"`);
+    const easingRef = `var(--rafters-ease-${anim.curve})`;
     const iterations = anim.iterations || "";
     const animValue = iterations ? `${anim.keyframe} ${durationRef} ${easingRef} ${iterations}` : `${anim.keyframe} ${durationRef} ${easingRef}`;
     tokens.push({
@@ -25848,7 +26217,7 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
       dependsOn: [
         `motion-keyframe-${anim.keyframe}`,
         ...durationDependency,
-        `motion-easing-${anim.curve}`
+        `rafters-ease-${anim.curve}`
       ],
       description: `Animation ${name}: ${anim.meaning}`,
       generatedAt: timestamp,
@@ -25857,10 +26226,57 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
       userOverride: null
     });
   }
+  for (const [name, cell] of Object.entries(cellAnimations)) {
+    requireDef(keyframeDefs, cell.keyframe, "keyframe", `motion cell "${name}"`);
+    requireDef(durationDefs, cell.tier, "duration tier", `motion cell "${name}"`);
+    requireDef(easingDefs, cell.curve, "easing curve", `motion cell "${name}"`);
+    const { component, part, transition } = cell.cell;
+    tokens.push({
+      name: `motion-cell-${name}`,
+      value: JSON.stringify({
+        keyframe: cell.keyframe,
+        durationTier: cell.tier,
+        curve: cell.curve
+      }),
+      category: "motion",
+      namespace: "motion",
+      semanticMeaning: cell.meaning,
+      usageContext: cell.contexts,
+      animationName: name,
+      keyframeName: cell.keyframe,
+      generateUtilityClass: true,
+      dependsOn: [
+        `motion-keyframe-${cell.keyframe}`,
+        `rafters-duration-${cell.tier}`,
+        `rafters-ease-${cell.curve}`
+      ],
+      description: `Motion cell ${component} / ${part} / ${transition}: ${cell.keyframe} over ${cell.tier} with ${cell.curve}. ${cell.meaning}`,
+      generatedAt: timestamp,
+      containerQueryAware: false,
+      reducedMotionAware: true,
+      userOverride: null,
+      usagePatterns: {
+        do: [`Apply class animate-${name} on the ${component} ${part} for "${transition}"`],
+        never: [
+          "Reuse this cell on a different component -- assignments come from motion.jsonl, one cell at a time",
+          "Add motion-reduce:animate-none alongside it -- animation:none resets the shorthand and discards the zeroed duration"
+        ]
+      }
+    });
+  }
   for (const [name, comp] of Object.entries(compositePresets)) {
-    const durationDef = durationDefs[comp.durationTier];
-    const easingDef = easingDefs[comp.curve];
-    if (!durationDef || !easingDef) continue;
+    const durationDef = requireDef(
+      durationDefs,
+      comp.durationTier,
+      "duration tier",
+      `composite preset "${name}"`
+    );
+    const easingDef = requireDef(
+      easingDefs,
+      comp.curve,
+      "easing curve",
+      `composite preset "${name}"`
+    );
     const durationMs = durationDef.default;
     tokens.push({
       name,
@@ -25881,12 +26297,16 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
     });
   }
   for (const [name, mapping] of Object.entries(semanticMappings)) {
+    const durationTier = deriveBand(mapping.category, mapping.travel, mapping.band);
+    const curve = deriveCurve(mapping.category, mapping.travel, intent, mapping.curve);
+    requireDef(durationDefs, durationTier, "duration tier", `semantic motion "${name}"`);
+    requireDef(easingDefs, curve, "easing curve", `semantic motion "${name}"`);
     tokens.push({
       name: `motion-semantic-${name}`,
       value: JSON.stringify({
         properties: mapping.properties,
-        durationTier: mapping.durationTier,
-        curve: mapping.curve,
+        durationTier,
+        curve,
         reducedMotion: mapping.reducedMotion
       }),
       category: "motion",
@@ -25895,8 +26315,8 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
       usageContext: mapping.contexts,
       motionIntent: mapping.category === "enter" ? "enter" : mapping.category === "exit" ? "exit" : "transition",
       generateUtilityClass: true,
-      dependsOn: [`motion-duration-${mapping.durationTier}`, `motion-easing-${mapping.curve}`],
-      description: `Semantic motion motion-${name}: ${mapping.properties.join(", ")} over ${mapping.durationTier} with ${mapping.curve}. ${mapping.sizeReasoning}`,
+      dependsOn: [`motion-duration-${durationTier}`, `motion-easing-${curve}`],
+      description: `Semantic motion motion-${name}: ${mapping.properties.join(", ")} over ${durationTier} with ${curve}. ${mapping.sizeReasoning}`,
       generatedAt: timestamp,
       containerQueryAware: false,
       reducedMotionAware: true,
@@ -25913,12 +26333,13 @@ function generateMotionTokens(config2, durationDefs, easingDefs, delayDefs, sema
       ratio: progressionRatio,
       ratioValue: ratioVal,
       baseDuration: baseTransitionDuration,
-      note: "Duration tiers are perceptually derived literals (docs/MOTION.md); delay tokens use the workspace progression ratio from the base duration."
+      note: "Duration tiers are perceptually derived literals (docs/MOTION.md) and the five motion namespaces are authored leaves. The ratio reaches exactly one place: the loop keyframes ping, pulse and bounce, whose shapes are computed from it.",
+      ratioDrivenKeyframes: ["ping", "pulse", "bounce"]
     }),
     category: "motion",
     namespace: "motion",
     semanticMeaning: "Metadata about the motion system",
-    description: `Duration tiers are perceptual literals; delays use ${progressionRatio} progression from ${baseTransitionDuration}ms base.`,
+    description: `Duration tiers are perceptual literals; the five motion namespaces (duration, ease, delay, extent, period) are authored leaves. The ${progressionRatio} progression drives the loop keyframes ping, pulse and bounce, and nothing else -- the ${baseTransitionDuration}ms base is recorded for reference and drives no value.`,
     generatedAt: timestamp,
     containerQueryAware: false,
     userOverride: null
@@ -25942,16 +26363,17 @@ function generateRadiusTokens(config2, radiusDefs) {
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
   const { baseRadius, progressionRatio } = config2;
   const ratioVal = ratioValue(resolveRatio(progressionRatio));
-  const baseRadiusRem = baseRadius / 16;
+  const radiusMultiplier = Math.round(baseRadius / config2.baseSpacingUnit * 1e3) / 1e3;
   tokens.push({
     name: "radius-base",
-    value: `${baseRadiusRem}rem`,
+    value: `calc(var(--rafters-spacing-base) * ${radiusMultiplier})`,
     category: "radius",
     namespace: "radius",
-    semanticMeaning: "Base border radius - all other radii derive from this value",
+    semanticMeaning: "Base border radius - derives from spacing base",
     usageContext: ["calculation-reference"],
     progressionSystem: progressionRatio,
-    description: `Base radius (${baseRadiusRem}rem / ${baseRadius}px). Scale uses ${progressionRatio} progression (ratio ${ratioVal}).`,
+    dependsOn: ["spacing-base"],
+    description: `Base radius = spacing-base * ${radiusMultiplier} (${baseRadius}px at base ${config2.baseSpacingUnit}). Scale uses ${progressionRatio} progression (ratio ${ratioVal}).`,
     generatedAt: timestamp,
     containerQueryAware: false,
     userOverride: null,
@@ -25989,15 +26411,15 @@ function generateRadiusTokens(config2, radiusDefs) {
       mathRelationship = "infinite (9999px)";
     } else if (def.step === 0) {
       value = "var(--rafters-radius-base)";
-      mathRelationship = `${baseRadiusRem}rem (base)`;
+      mathRelationship = `spacing-base * ${radiusMultiplier} (base)`;
     } else {
       const multiplier = Math.round(ratioVal ** def.step * 1e3) / 1e3;
       value = `calc(var(--rafters-radius-base) * ${multiplier})`;
       mathRelationship = `base \xD7 ${ratioVal}^${def.step} (\xD7${multiplier})`;
     }
-    const scaleName = scale2 === "DEFAULT" ? "radius" : `radius-${scale2}`;
+    const scaleName2 = scale2 === "DEFAULT" ? "radius" : `radius-${scale2}`;
     tokens.push({
-      name: scaleName,
+      name: scaleName2,
       value,
       category: "radius",
       namespace: "radius",
@@ -26186,40 +26608,69 @@ function generateSemanticTokens(_config) {
   };
 }
 
+// ../design-tokens/src/generators/progression.ts
+var NON_ADVANCING = 1;
+function progressionFrom(floor, ratioVal, ceiling) {
+  if (!(ratioVal > NON_ADVANCING) || !(floor > 0) || !(ceiling >= floor)) return [floor];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (let n2 = 0; ; n2++) {
+    const value = Math.round(floor * ratioVal ** n2);
+    if (value > ceiling) break;
+    if (!seen.has(value)) {
+      seen.add(value);
+      out.push(value);
+    }
+  }
+  return out;
+}
+function nearestRung(target, scale2) {
+  let best = scale2[0] ?? target;
+  for (const v of scale2) {
+    if (Math.abs(v - target) < Math.abs(best - target)) best = v;
+  }
+  return best;
+}
+
 // ../design-tokens/src/generators/shadow.ts
-function pxToRem2(px) {
+function pxToRem(px) {
   const rem = Math.round(px / 16 * 1e3) / 1e3;
   return `${rem}rem`;
 }
 var SHADOW_PARTS = ["offset-x", "offset-y", "blur", "spread", "color"];
-function scalePx(multiplier, baseSpacing) {
-  return Math.round(multiplier * baseSpacing * 100) / 100;
+function shadowScale(ratioVal, bounds) {
+  return progressionFrom(bounds.floor, ratioVal, bounds.ceiling);
 }
-function resolveShadowParts(def, baseSpacing) {
+function scalePx(multiplier, baseSpacing, scale2) {
+  if (multiplier === 0) return 0;
+  return nearestRung(multiplier * baseSpacing, scale2);
+}
+function resolveShadowParts(def, baseSpacing, scale2) {
   return {
     // Shadows are vertical-only by design (material elevation model)
     "offset-x": "0rem",
-    "offset-y": pxToRem2(scalePx(def.yOffset, baseSpacing)),
-    blur: pxToRem2(scalePx(def.blur, baseSpacing)),
-    spread: pxToRem2(scalePx(def.spread, baseSpacing)),
+    "offset-y": pxToRem(scalePx(def.yOffset, baseSpacing, scale2)),
+    blur: pxToRem(scalePx(def.blur, baseSpacing, scale2)),
+    spread: pxToRem(scalePx(def.spread, baseSpacing, scale2)),
     color: `rgb(0 0 0 / ${def.opacity})`
   };
 }
-function generateInnerShadowValue(inner, baseSpacing) {
-  const y = pxToRem2(scalePx(inner.yOffset, baseSpacing));
-  const blur = pxToRem2(scalePx(inner.blur, baseSpacing));
-  const spread = pxToRem2(scalePx(inner.spread, baseSpacing));
+function generateInnerShadowValue(inner, baseSpacing, scale2) {
+  const y = pxToRem(scalePx(inner.yOffset, baseSpacing, scale2));
+  const blur = pxToRem(scalePx(inner.blur, baseSpacing, scale2));
+  const spread = pxToRem(scalePx(inner.spread, baseSpacing, scale2));
   return `0 ${y} ${blur} ${spread} rgb(0 0 0 / ${inner.opacity})`;
 }
 function buildCompositeFromVars(prefix, innerValue) {
   const primary = SHADOW_PARTS.map((part) => `var(--rafters-${prefix}-${part})`).join(" ");
   return innerValue ? `${primary}, ${innerValue}` : primary;
 }
-function generateShadowTokens(config2, shadowDefs) {
+function generateShadowTokens(config2, shadowDefs, bounds) {
   const tokens = [];
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
   const { baseSpacingUnit, progressionRatio } = config2;
   const ratioVal = ratioValue(resolveRatio(progressionRatio));
+  const geometry = shadowScale(ratioVal, bounds);
   const baseSpacingRem = baseSpacingUnit / 16;
   tokens.push({
     name: "shadow-base-unit",
@@ -26239,10 +26690,10 @@ function generateShadowTokens(config2, shadowDefs) {
     const def = shadowDefs[scale2];
     if (!def) continue;
     const scaleIndex = SHADOW_SCALE.indexOf(scale2);
-    const scaleName = scale2 === "DEFAULT" ? "shadow" : `shadow-${scale2}`;
+    const scaleName2 = scale2 === "DEFAULT" ? "shadow" : `shadow-${scale2}`;
     if (def.opacity === 0) {
       tokens.push({
-        name: scaleName,
+        name: scaleName2,
         value: "none",
         category: "shadow",
         namespace: "shadow",
@@ -26262,10 +26713,10 @@ function generateShadowTokens(config2, shadowDefs) {
       });
       continue;
     }
-    const parts = resolveShadowParts(def, baseSpacingUnit);
+    const parts = resolveShadowParts(def, baseSpacingUnit, geometry);
     const partDeps = [];
     for (const part of SHADOW_PARTS) {
-      const partName = `${scaleName}-${part}`;
+      const partName = `${scaleName2}-${part}`;
       partDeps.push(partName);
       tokens.push({
         name: partName,
@@ -26282,10 +26733,10 @@ function generateShadowTokens(config2, shadowDefs) {
         userOverride: null
       });
     }
-    const innerValue = def.innerShadow && def.innerShadow.opacity > 0 ? generateInnerShadowValue(def.innerShadow, baseSpacingUnit) : null;
-    const compositeValue = buildCompositeFromVars(scaleName, innerValue);
+    const innerValue = def.innerShadow && def.innerShadow.opacity > 0 ? generateInnerShadowValue(def.innerShadow, baseSpacingUnit, geometry) : null;
+    const compositeValue = buildCompositeFromVars(scaleName2, innerValue);
     tokens.push({
-      name: scaleName,
+      name: scaleName2,
       value: compositeValue,
       category: "shadow",
       namespace: "shadow",
@@ -26294,7 +26745,7 @@ function generateShadowTokens(config2, shadowDefs) {
       scalePosition: scaleIndex,
       progressionSystem: progressionRatio,
       dependsOn: partDeps,
-      description: `Shadow ${scale2}: ${def.meaning}. Composed from var() refs to ${scaleName}-* tokens.`,
+      description: `Shadow ${scale2}: ${def.meaning}. Composed from var() refs to ${scaleName2}-* tokens.`,
       generatedAt: timestamp,
       containerQueryAware: false,
       userOverride: null,
@@ -26367,13 +26818,19 @@ function generateShadowTokens(config2, shadowDefs) {
 }
 
 // ../design-tokens/src/generators/spacing.ts
-function generateSpacingTokens(config2, spacingMultipliers) {
+function spacingMultipliers(ratioVal, bounds) {
+  return progressionFrom(bounds.floor, ratioVal, bounds.ceiling);
+}
+function scaleName(multiplier) {
+  return String(multiplier);
+}
+function generateSpacingTokens(config2, bounds) {
   const tokens = [];
   const timestamp = (/* @__PURE__ */ new Date()).toISOString();
   const { baseSpacingUnit, progressionRatio } = config2;
   const ratio = resolveRatio(progressionRatio);
   const ratioVal = ratioValue(ratio);
-  const progression2 = generateSequence(ratio, baseSpacingUnit, 10, { includeZero: true });
+  const multipliers = spacingMultipliers(ratioVal, bounds);
   const baseRem = baseSpacingUnit / 16;
   tokens.push({
     name: "spacing-base",
@@ -26398,11 +26855,10 @@ function generateSpacingTokens(config2, spacingMultipliers) {
       ]
     }
   });
-  for (const scale2 of SPACING_SCALE) {
-    const multiplier = spacingMultipliers[scale2];
-    if (multiplier === void 0) continue;
+  for (const multiplier of [0, ...multipliers]) {
+    const scale2 = scaleName(multiplier);
     const value = baseSpacingUnit * multiplier;
-    const scaleIndex = SPACING_SCALE.indexOf(scale2);
+    const scaleIndex = multipliers.indexOf(multiplier) + 1;
     let meaning;
     let usageContext;
     if (multiplier === 0) {
@@ -26449,16 +26905,19 @@ function generateSpacingTokens(config2, spacingMultipliers) {
   }
   tokens.push({
     name: "spacing-progression",
+    // The scale that actually shipped. Before #2031 this carried a `sample`
+    // computed straight off the ratio while the tokens came from a table --
+    // metadata describing a scale that did not exist.
     value: JSON.stringify({
       ratio: progressionRatio,
       ratioValue: ratioVal,
       baseUnit: baseSpacingUnit,
-      sample: progression2.map((v) => Math.round(v * 100) / 100)
+      multipliers
     }),
     category: "spacing",
     namespace: "spacing",
     semanticMeaning: "Metadata about the spacing progression system",
-    description: `Spacing uses ${progressionRatio} progression (ratio ${ratioVal}) from base ${baseRem}rem. Sample values: ${progression2.slice(0, 5).map((v) => Math.round(v)).join(", ")}...`,
+    description: `Spacing is ${baseSpacingUnit}px x ${progressionRatio} (${ratioVal})^n from position 0, rounded to whole pixels: ${multipliers.length} rungs, ${baseSpacingUnit}px to ${Math.round(baseSpacingUnit * (multipliers[multipliers.length - 1] ?? 1))}px.`,
     generatedAt: timestamp,
     containerQueryAware: false,
     userOverride: null,
@@ -26795,7 +27254,7 @@ function createGeneratorDefs(colorPaletteBases) {
     },
     {
       name: "spacing",
-      generate: (config2) => generateSpacingTokens(config2, DEFAULT_SPACING_MULTIPLIERS)
+      generate: (config2) => generateSpacingTokens(config2, DEFAULT_SPACING_BOUNDS)
     },
     {
       name: "typography",
@@ -26816,7 +27275,7 @@ function createGeneratorDefs(colorPaletteBases) {
     },
     {
       name: "shadow",
-      generate: (config2) => generateShadowTokens(config2, DEFAULT_SHADOW_DEFINITIONS)
+      generate: (config2) => generateShadowTokens(config2, DEFAULT_SHADOW_DEFINITIONS, DEFAULT_SHADOW_BOUNDS)
     },
     {
       name: "depth",
@@ -26828,11 +27287,14 @@ function createGeneratorDefs(colorPaletteBases) {
         config2,
         DEFAULT_DURATION_DEFINITIONS,
         DEFAULT_EASING_DEFINITIONS,
-        DEFAULT_DELAY_DEFINITIONS,
+        DEFAULT_DELAY_NAMESPACE,
+        DEFAULT_EXTENT_NAMESPACE,
+        DEFAULT_PERIOD_NAMESPACE,
         DEFAULT_MOTION_SEMANTIC_MAPPINGS,
         DEFAULT_KEYFRAME_DEFINITIONS,
         DEFAULT_ANIMATION_DEFINITIONS,
-        DEFAULT_MOTION_COMPOSITE_PRESETS
+        DEFAULT_MOTION_COMPOSITE_PRESETS,
+        DEFAULT_MOTION_CELL_ANIMATIONS
       )
     },
     {
@@ -26871,7 +27333,10 @@ function generateBaseSystem(config2 = {}) {
 var UserOverrideSchema = external_exports.object({
   previousValue: external_exports.unknown(),
   reason: external_exports.string(),
-  context: external_exports.string().optional()
+  context: external_exports.string().optional(),
+  // Provenance. Optional by design: absent means unknown, which is what every
+  // override written before this field existed actually is.
+  kind: OverrideKindSchema.optional()
 });
 var BindingSchema2 = external_exports.object({
   plugin: external_exports.string(),
@@ -26916,7 +27381,8 @@ var TokenGraph = class {
       userOverride: {
         previousValue: existing?.value,
         reason: options.reason,
-        ...options.context ? { context: options.context } : {}
+        ...options.context ? { context: options.context } : {},
+        ...options.kind ? { kind: options.kind } : {}
       },
       ...existing?.binding ? { binding: existing.binding } : {}
     };
@@ -27482,7 +27948,7 @@ async function regenerateOutputs(registry2, input, hooks2 = {}) {
     written.push("rafters.standalone.css");
   }
   if (exports.documentation) {
-    const doc = await registryToDocumentation(registry2);
+    const doc = await registryToDocumentation(registry2, { contentSources });
     await writeFile(join2(outputDir2, "rafters.documentation.css"), doc);
     written.push("rafters.documentation.css");
   }
@@ -27512,11 +27978,7 @@ var TokenRegistry = class {
       parsed.push(result.data);
     }
     for (const t of parsed) {
-      const override = t.userOverride ? {
-        previousValue: t.userOverride.previousValue,
-        reason: t.userOverride.reason,
-        ...t.userOverride.context ? { context: t.userOverride.context } : {}
-      } : void 0;
+      const override = toNodeOverride(t.userOverride);
       if (t.binding && !override) continue;
       this.graph.seed(t.name, t.value, {
         ...override ? { userOverride: override } : {},
@@ -27540,11 +28002,7 @@ var TokenRegistry = class {
     }
     const t = result.data;
     this.metadata.set(t.name, t);
-    const override = t.userOverride ? {
-      previousValue: t.userOverride.previousValue,
-      reason: t.userOverride.reason,
-      ...t.userOverride.context ? { context: t.userOverride.context } : {}
-    } : void 0;
+    const override = toNodeOverride(t.userOverride);
     if (t.binding && !override) {
       this.graph.bind(t.name, t.binding.plugin, t.binding.input);
     } else {
@@ -27620,6 +28078,15 @@ var TokenParseError = class extends Error {
     this.name = "TokenParseError";
   }
 };
+function toNodeOverride(field) {
+  if (!field) return void 0;
+  return {
+    previousValue: field.previousValue,
+    reason: field.reason,
+    ...field.context ? { context: field.context } : {},
+    ...field.kind ? { kind: field.kind } : {}
+  };
+}
 function toUserOverrideField(override, baseValue) {
   const previousValue = override.previousValue ?? baseValue;
   const result = {
@@ -27627,6 +28094,7 @@ function toUserOverrideField(override, baseValue) {
     reason: override.reason
   };
   if (override.context) result.context = override.context;
+  if (override.kind) result.kind = override.kind;
   return result;
 }
 
@@ -28467,15 +28935,37 @@ function log(event) {
         console.log(`  ${event.suggestion}`);
       }
       break;
-    case "add:complete":
-      context.spinner?.succeed(
-        `Added ${event.installed} component${event.installed !== 1 ? "s" : ""}`
-      );
-      if (event.skipped > 0) {
-        console.log(`  Skipped: ${event.skipped} (use --overwrite to replace)`);
+    case "add:complete": {
+      const written = event.written;
+      const skippedCount = event.skipped;
+      const untrackedCount = event.untracked;
+      const failedCount = event.failed;
+      const headline = `Wrote ${written} item${written !== 1 ? "s" : ""}`;
+      if (failedCount > 0) {
+        context.spinner?.fail(`${headline}, ${failedCount} failed -- see below`);
+      } else {
+        context.spinner?.succeed(headline);
+      }
+      if (skippedCount > 0) {
+        const names = event.skippedComponents ?? [];
+        console.log(
+          `  Skipped: ${skippedCount} (already present; use --update to re-fetch)${names.length > 0 ? ` -- ${names.join(", ")}` : ""}`
+        );
+      }
+      if (untrackedCount > 0) {
+        const names = event.untrackedComponents ?? [];
+        console.log(`  Untracked on disk, now tracked: ${untrackedCount} -- ${names.join(", ")}`);
+      }
+      if (failedCount > 0) {
+        const names = event.failedComponents ?? [];
+        console.log(`  Failed: ${failedCount} -- ${names.join(", ")}`);
       }
       console.log("");
       break;
+    }
+    case "add:untracked":
+      console.log(`  ${event.message}`);
+      break;
     case "add:hint":
       console.log(`
   ${event.message}`);
@@ -28825,6 +29315,51 @@ function resolveReadSet(field, cwd, fallback) {
   return out;
 }
 
+// src/utils/reconcile.ts
+import { readdirSync as readdirSync2 } from "fs";
+var DISCOVERABLE_KINDS = ["components", "primitives", "composites"];
+var KIND_PATHS = {
+  components: { field: "componentsPath", fallback: "components/ui" },
+  primitives: { field: "primitivesPath", fallback: "lib/primitives" },
+  composites: { field: "compositesPath", fallback: "composites" }
+};
+function hasEntryFor(entries, name) {
+  return entries.some((entry) => entry === name || entry.startsWith(`${name}.`));
+}
+function buildUpdateCandidates(tracked, index, entries) {
+  const trackedSet = new Set(tracked);
+  const untracked = /* @__PURE__ */ new Set();
+  if (index) {
+    for (const kind of DISCOVERABLE_KINDS) {
+      for (const name of index[kind]) {
+        if (trackedSet.has(name)) continue;
+        if (hasEntryFor(entries[kind], name)) untracked.add(name);
+      }
+    }
+  }
+  return { tracked: [...trackedSet].sort(), untracked: [...untracked].sort() };
+}
+function readInstallRoots(cwd, config2) {
+  const entries = { components: [], primitives: [], composites: [] };
+  for (const kind of DISCOVERABLE_KINDS) {
+    const { field, fallback } = KIND_PATHS[kind];
+    const configured = config2?.[field];
+    const pathField = isPathField(configured) ? configured : fallback;
+    const names = /* @__PURE__ */ new Set();
+    for (const dir of resolveReadSet(pathField, cwd, fallback)) {
+      try {
+        for (const entry of readdirSync2(dir)) names.add(entry);
+      } catch {
+      }
+    }
+    entries[kind] = [...names];
+  }
+  return entries;
+}
+function isPathField(value) {
+  return typeof value === "string" || Array.isArray(value);
+}
+
 // src/commands/add.ts
 var REGISTRY_PLUGINS = [scalePlugin, contrastPlugin, statePlugin, invertPlugin];
 async function regenerateAfterInstall(cwd, config2) {
@@ -28885,10 +29420,26 @@ function getInstalledNames(config2) {
   const names = /* @__PURE__ */ new Set([
     ...config2.installed.components,
     ...config2.installed.primitives,
-    ...config2.installed.composites ?? []
+    ...config2.installed.composites ?? [],
+    ...config2.installed.rules ?? [],
+    ...config2.installed.substrate ?? []
   ]);
   return [...names].sort();
 }
+async function discoverUntrackedNames(cwd, config2, client, tracked) {
+  let index = null;
+  try {
+    index = await client.fetchIndex();
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    log({
+      event: "add:warning",
+      message: `Could not read the registry index to reconcile on-disk components (${message}). Updating tracked components only.`
+    });
+  }
+  const { untracked } = buildUpdateCandidates(tracked, index, readInstallRoots(cwd, config2));
+  return untracked;
+}
 function getComponentTarget(config2) {
   return resolveComponentTarget(config2);
 }
@@ -29134,6 +29685,7 @@ async function add(componentArgs, options) {
   if (options.update) {
     options.overwrite = true;
   }
+  let untrackedNames = [];
   if (options.updateAll) {
     options.overwrite = true;
     if (!config2) {
@@ -29141,13 +29693,22 @@ async function add(componentArgs, options) {
       process.exitCode = 1;
       return;
     }
-    const installedNames = getInstalledNames(config2);
-    if (installedNames.length === 0) {
+    const trackedNames = getInstalledNames(config2);
+    untrackedNames = await discoverUntrackedNames(cwd, config2, client, trackedNames);
+    const candidates = [.../* @__PURE__ */ new Set([...trackedNames, ...untrackedNames])].sort();
+    if (candidates.length === 0) {
       error46("No installed components found. Use 'rafters add <component>' to install first.");
       process.exitCode = 1;
       return;
     }
-    components = installedNames;
+    if (untrackedNames.length > 0) {
+      log({
+        event: "add:untracked",
+        components: untrackedNames,
+        message: `Found ${untrackedNames.length} component(s) on disk the config never tracked: ${untrackedNames.join(", ")}. Refreshing and tracking them.`
+      });
+    }
+    components = candidates;
   }
   if (folder === "composites" && components.length === 0) {
     components = ["composites"];
@@ -29198,8 +29759,9 @@ async function add(componentArgs, options) {
       allItems.filter((item) => item.type === "substrate").map((item) => item.files[0]?.path.split("/")[0]).filter((segment) => Boolean(segment))
     )
   ];
-  const installed = [];
+  const written = [];
   const skipped = [];
+  const failed = [];
   const installedItems = [];
   const filteredItems = [];
   const target = getComponentTarget(config2);
@@ -29223,7 +29785,7 @@ async function add(componentArgs, options) {
     try {
       const result = await installItem(cwd, item, options, config2, substrateKinds);
       if (result.installed) {
-        installed.push(item.name);
+        written.push(item.name);
         installedItems.push(item);
         if (item.type === "ui") {
           const selection = selectFilesForFramework(item.files, target);
@@ -29243,6 +29805,7 @@ async function add(componentArgs, options) {
         installedItems.push(item);
       }
     } catch (err) {
+      failed.push(item.name);
       if (err instanceof Error) {
         log({
           event: "add:warning",
@@ -29300,11 +29863,19 @@ async function add(componentArgs, options) {
   }
   log({
     event: "add:complete",
-    installed: installed.length,
+    written: written.length,
     skipped: skipped.length,
-    components: installed
-  });
-  if (skipped.length > 0 && installed.length === 0) {
+    untracked: untrackedNames.length,
+    failed: failed.length,
+    components: written,
+    skippedComponents: skipped,
+    untrackedComponents: untrackedNames,
+    failedComponents: failed
+  });
+  if (failed.length > 0) {
+    process.exitCode = 1;
+  }
+  if (!options.updateAll && skipped.length > 0 && written.length === 0) {
     log({
       event: "add:hint",
       message: "Some components were skipped. Use --update to re-fetch, or --update-all to refresh everything.",
@@ -30187,6 +30758,24 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";
 
+// src/version.ts
+import { readFileSync as readFileSync2 } from "fs";
+var UNKNOWN_VERSION = "0.0.0-unknown";
+function readVersion() {
+  try {
+    const parsed = JSON.parse(
+      readFileSync2(new URL("../package.json", import.meta.url), "utf-8")
+    );
+    if (parsed !== null && typeof parsed === "object" && "version" in parsed) {
+      const { version: version2 } = parsed;
+      if (typeof version2 === "string" && version2.length > 0) return version2;
+    }
+  } catch {
+  }
+  return UNKNOWN_VERSION;
+}
+var VERSION = readVersion();
+
 // src/mcp/tools.ts
 import { readFile as readFile6 } from "fs/promises";
 import { join as join12 } from "path";
@@ -30402,7 +30991,7 @@ async function discoverFromDirs(...directories) {
 }
 
 // src/utils/workspaces.ts
-import { existsSync as existsSync6, readdirSync as readdirSync2, readFileSync as readFileSync2, statSync as statSync2 } from "fs";
+import { existsSync as existsSync6, readdirSync as readdirSync3, readFileSync as readFileSync3, statSync as statSync2 } from "fs";
 import { basename, dirname as dirname3, join as join11, resolve as resolve4 } from "path";
 
 // src/utils/discover.ts
@@ -30430,14 +31019,14 @@ function findMonorepoRoot(startDir, boundary) {
   for (; ; ) {
     const pnpmWorkspace = join11(current, "pnpm-workspace.yaml");
     if (existsSync6(pnpmWorkspace)) {
-      const patterns = parsePnpmWorkspaceYaml(readFileSync2(pnpmWorkspace, "utf-8"));
+      const patterns = parsePnpmWorkspaceYaml(readFileSync3(pnpmWorkspace, "utf-8"));
       if (patterns.length > 0) {
         return { root: current, patterns };
       }
     }
     const pkgJson = join11(current, "package.json");
     if (existsSync6(pkgJson)) {
-      const patterns = parsePackageJsonWorkspaces(readFileSync2(pkgJson, "utf-8"));
+      const patterns = parsePackageJsonWorkspaces(readFileSync3(pkgJson, "utf-8"));
       if (patterns.length > 0) {
         return { root: current, patterns };
       }
@@ -30493,7 +31082,7 @@ function expandPattern(monorepoRoot, pattern) {
     const parentRel = trimmed.slice(0, -2);
     const parent = join11(monorepoRoot, parentRel);
     if (!existsSync6(parent)) return [];
-    return readdirSync2(parent).map((entry) => join11(parent, entry)).filter((path) => {
+    return readdirSync3(parent).map((entry) => join11(parent, entry)).filter((path) => {
       try {
         return statSync2(path).isDirectory();
       } catch {
@@ -30882,7 +31471,7 @@ async function startMcpServer(workspaces, defaultWorkspace) {
   const server = new Server(
     {
       name: "rafters",
-      version: "0.0.1"
+      version: VERSION
     },
     {
       capabilities: {
@@ -31678,7 +32267,7 @@ async function studio() {
 
 // src/index.ts
 var program = new Command();
-program.name("rafters").description("Design system CLI - scaffold tokens and serve MCP").version("0.0.1");
+program.name("rafters").description("Design system CLI - scaffold tokens and serve MCP").version(VERSION);
 program.command("init").description("Initialize .rafters/ with default tokens and config").option("-r, --rebuild", "Regenerate output files from existing tokens").option("--reset", "Re-run generators fresh, replacing persisted tokens").option(
   "--framework <name>",
   "Override framework detection (next|vite|remix|react-router|astro|wc|vanilla)"