@elytracms/studio 0.0.86 → 0.0.87

package/dist/previews/enumerate.js

@@ -1,5 +1,5 @@
 import { ComponentRegistry, isCanvasEligible } from '@elytracms/core/component-registry';
-import { basePrimitives, getImplementation } from '@elytracms/core/runtime-renderer';
+import { basePrimitives, getImplementation, registerImplementations } from '@elytracms/core/runtime-renderer';
 import { resolveWorkspaceConfig } from '@elytracms/core/studio-core';
 import { DEFAULT_VARIANT } from '../components/builder/blocks-model.js';
 /**
@@ -10,6 +10,13 @@ import { DEFAULT_VARIANT } from '../components/builder/blocks-model.js';
  * id). A config that fails shape-resolution contributes no project components
  * — the primitives still enumerate, and the CLI surfaces config problems
  * through the studio/doctor, not here.
+ *
+ * EC-555: the kept entries' implementations (`unknown` in the config) go through
+ * core's one registration step, like the studio registry's and the Next host's —
+ * a non-component is withheld (its preview renders the missing-component
+ * fallback, never `createElement`) and returned as an `invalid-implementation`
+ * issue. The first-wins dedupe runs BEFORE the check, so a withheld entry still
+ * claims its id.
  */
 export function previewComponentsFromConfig(config) {
     const base = basePrimitives();
@@ -21,6 +28,7 @@ export function previewComponentsFromConfig(config) {
             implementations[manifest.id] = implementation;
     }
     const seen = new Set(manifests.map((m) => m.id));
+    const kept = [];
     const resolved = resolveWorkspaceConfig(config);
     for (const project of resolved.projects) {
         for (const entry of project.components ?? []) {
@@ -28,15 +36,28 @@ export function previewComponentsFromConfig(config) {
                 continue;
             seen.add(entry.manifest.id);
             manifests.push(entry.manifest);
-            implementations[entry.manifest.id] = entry.implementation;
+            kept.push(entry);
         }
     }
-    return { manifests, implementations };
+    // Ids are unique by construction here (deduped against the primitives too),
+    // so the merge order below decides nothing.
+    const project = registerImplementations(kept);
+    return {
+        manifests,
+        implementations: { ...implementations, ...project.implementations },
+        issues: project.issues,
+    };
 }
-/** The {@link StudioRegistry}-shaped registry the harness renders against. */
+/**
+ * The {@link StudioRegistry}-shaped registry the harness renders against. Its
+ * `registry.issues` carries the implementation issues too — the same list the
+ * studio registry records them into (EC-555).
+ */
 export function previewRegistryFromConfig(config) {
-    const { manifests, implementations } = previewComponentsFromConfig(config);
-    return { registry: new ComponentRegistry(manifests), implementations };
+    const { manifests, implementations, issues } = previewComponentsFromConfig(config);
+    const registry = new ComponentRegistry(manifests);
+    registry.issues.push(...issues);
+    return { registry, implementations };
 }
 /**
  * Enumerate every generated-preview entry for a config: canvas-eligible

package/dist/previews/enumerate.js.map

@@ -1 +1 @@
-{"version":3,"file":"enumerate.js","sourceRoot":"","sources":["../../src/previews/enumerate.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ComponentType } from 'react'\nimport { ComponentRegistry, isCanvasEligible } from '@elytracms/core/component-registry'\nimport type { ComponentFixture, ComponentManifest } from '@elytracms/core/component-registry'\nimport { basePrimitives, getImplementation } from '@elytracms/core/runtime-renderer'\nimport type { ComponentImplementations } from '@elytracms/core/runtime-renderer'\nimport { resolveWorkspaceConfig } from '@elytracms/core/studio-core'\nimport { DEFAULT_VARIANT } from '../components/builder/blocks-model'\nimport type { StudioRegistry } from '../lib/registry'\n\n/**\n * EC-440 — the fixture-preview enumeration behind `elytra previews`. ONE\n * source of truth for \"which previews exist\" shared by the CLI's node-side\n * driver (hashing, staleness `--check`) and the browser render harness\n * ({@link import('./harness').mountPreviewHarness}) — both derive the entry\n * set from the consumer's `elytra.config.ts` default export through here, so\n * generation, staleness checking, and rendering can never disagree.\n *\n * DATA-FREE by construction: this module reads the consumer CONFIG (registry\n * manifests + implementations — code), never a persistence adapter, auth, or\n * content data. The entry set mirrors the blocks panel exactly (EC-439): every\n * canvas-eligible manifest, one entry per declared fixture, and a single\n * implicit {@link DEFAULT_VARIANT} entry for fixture-less manifests. Base\n * primitives are included — they are insertable tiles too. Layout-helper\n * presets are NOT manifests and keep their placeholder treatment.\n */\n\n/** One renderable preview: a component fixture plus its staleness-hash inputs. */\nexport interface PreviewEntrySpec {\n  componentId: string\n  /** The fixture name, or {@link DEFAULT_VARIANT} for a fixture-less manifest. */\n  fixture: string\n  /**\n   * The render-relevant inputs the CLI hashes (with the engine version) for\n   * staleness: the manifest's prop + slot shape (defaults live in the prop\n   * field-defs, so seeded renders are covered) and the declared fixture's own\n   * props/slotChildren (`fixture: null` for the implicit Default variant).\n   * Deliberately NOT hashed: the component implementation and the theme —\n   * drift there is caught by regeneration runs, not by the hash (the ratified\n   * EC-440 staleness split).\n   */\n  hashInput: {\n    manifest: { props: ComponentManifest['props']; slots: ComponentManifest['slots'] }\n    fixture: {\n      props: NonNullable<ComponentFixture['props']> | null\n      slotChildren: NonNullable<ComponentFixture['slotChildren']> | null\n    } | null\n  }\n}\n\n/**\n * The component set a config carries, as the harness registry input: the base\n * primitives plus every resolved project's `components` entries, deduped by\n * component id (first declaration wins — the generated-preview seam is keyed\n * by component id alone, so one image serves every project that registers the\n * id). A config that fails shape-resolution contributes no project components\n * — the primitives still enumerate, and the CLI surfaces config problems\n * through the studio/doctor, not here.\n */\nexport function previewComponentsFromConfig(config: unknown): {\n  manifests: ComponentManifest[]\n  implementations: ComponentImplementations\n} {\n  const base = basePrimitives()\n  const manifests: ComponentManifest[] = [...base.manifests]\n  const implementations: Record<string, ComponentType<Record<string, unknown>>> = {}\n  for (const manifest of base.manifests) {\n    const implementation = getImplementation(base.implementations, manifest.id)\n    if (implementation) implementations[manifest.id] = implementation\n  }\n  const seen = new Set(manifests.map((m) => m.id))\n\n  const resolved = resolveWorkspaceConfig(config)\n  for (const project of resolved.projects) {\n    for (const entry of project.components ?? []) {\n      if (seen.has(entry.manifest.id)) continue\n      seen.add(entry.manifest.id)\n      manifests.push(entry.manifest)\n      implementations[entry.manifest.id] = entry.implementation as ComponentType<Record<string, unknown>>\n    }\n  }\n  return { manifests, implementations }\n}\n\n/** The {@link StudioRegistry}-shaped registry the harness renders against. */\nexport function previewRegistryFromConfig(config: unknown): StudioRegistry {\n  const { manifests, implementations } = previewComponentsFromConfig(config)\n  return { registry: new ComponentRegistry(manifests), implementations }\n}\n\n/**\n * Enumerate every generated-preview entry for a config: canvas-eligible\n * manifests only (server-only components never render on the client canvas),\n * one entry per declared fixture in declaration order, else one implicit\n * {@link DEFAULT_VARIANT} entry. Components are sorted by id so the output —\n * and everything the CLI derives from it (manifest JSON, file writes) — is\n * deterministic regardless of registration order.\n */\nexport function previewEntriesForConfig(config: unknown): PreviewEntrySpec[] {\n  const { manifests } = previewComponentsFromConfig(config)\n  const entries: PreviewEntrySpec[] = []\n  for (const manifest of [...manifests].sort((a, b) => a.id.localeCompare(b.id))) {\n    if (!isCanvasEligible(manifest)) continue\n    const manifestShape = { props: manifest.props, slots: manifest.slots }\n    if (manifest.fixtures && manifest.fixtures.length > 0) {\n      for (const fixture of manifest.fixtures) {\n        entries.push({\n          componentId: manifest.id,\n          fixture: fixture.name,\n          hashInput: {\n            manifest: manifestShape,\n            fixture: { props: fixture.props ?? null, slotChildren: fixture.slotChildren ?? null },\n          },\n        })\n      }\n    } else {\n      entries.push({\n        componentId: manifest.id,\n        fixture: DEFAULT_VARIANT,\n        hashInput: { manifest: manifestShape, fixture: null },\n      })\n    }\n  }\n  return entries\n}\n"]}
+{"version":3,"file":"enumerate.js","sourceRoot":"","sources":["../../src/previews/enumerate.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ComponentType } from 'react'\nimport { ComponentRegistry, isCanvasEligible } from '@elytracms/core/component-registry'\nimport type {\n  ComponentFixture,\n  ComponentIssue,\n  ComponentManifest,\n} from '@elytracms/core/component-registry'\nimport { basePrimitives, getImplementation, registerImplementations } from '@elytracms/core/runtime-renderer'\nimport type { ComponentImplementations } from '@elytracms/core/runtime-renderer'\nimport { resolveWorkspaceConfig } from '@elytracms/core/studio-core'\nimport type { HostComponentEntry } from '@elytracms/core/studio-core'\nimport { DEFAULT_VARIANT } from '../components/builder/blocks-model'\nimport type { StudioRegistry } from '../lib/registry'\n\n/**\n * EC-440 — the fixture-preview enumeration behind `elytra previews`. ONE\n * source of truth for \"which previews exist\" shared by the CLI's node-side\n * driver (hashing, staleness `--check`) and the browser render harness\n * ({@link import('./harness').mountPreviewHarness}) — both derive the entry\n * set from the consumer's `elytra.config.ts` default export through here, so\n * generation, staleness checking, and rendering can never disagree.\n *\n * DATA-FREE by construction: this module reads the consumer CONFIG (registry\n * manifests + implementations — code), never a persistence adapter, auth, or\n * content data. The entry set mirrors the blocks panel exactly (EC-439): every\n * canvas-eligible manifest, one entry per declared fixture, and a single\n * implicit {@link DEFAULT_VARIANT} entry for fixture-less manifests. Base\n * primitives are included — they are insertable tiles too. Layout-helper\n * presets are NOT manifests and keep their placeholder treatment.\n */\n\n/** One renderable preview: a component fixture plus its staleness-hash inputs. */\nexport interface PreviewEntrySpec {\n  componentId: string\n  /** The fixture name, or {@link DEFAULT_VARIANT} for a fixture-less manifest. */\n  fixture: string\n  /**\n   * The DECLARED render inputs the CLI hashes per entry for staleness: the\n   * manifest's prop + slot shape (defaults live in the prop field-defs, so\n   * seeded renders are covered) and the declared fixture's own\n   * props/slotChildren (`fixture: null` for the implicit Default variant). A\n   * change here re-renders one entry.\n   *\n   * NOT in here: the component implementation and the theme — a config arrives\n   * evaluated, so neither has a per-entry identity. The CLI covers them as\n   * manifest-level render dependencies instead (EC-600: content hashes of the\n   * project source files the config imports plus the theme `@import` chain),\n   * and a change there re-renders every entry. Before EC-600 this comment said\n   * regeneration caught such drift; it did not — regeneration only rendered what\n   * this hash called stale.\n   */\n  hashInput: {\n    manifest: { props: ComponentManifest['props']; slots: ComponentManifest['slots'] }\n    fixture: {\n      props: NonNullable<ComponentFixture['props']> | null\n      slotChildren: NonNullable<ComponentFixture['slotChildren']> | null\n    } | null\n  }\n}\n\n/**\n * The component set a config carries, as the harness registry input: the base\n * primitives plus every resolved project's `components` entries, deduped by\n * component id (first declaration wins — the generated-preview seam is keyed\n * by component id alone, so one image serves every project that registers the\n * id). A config that fails shape-resolution contributes no project components\n * — the primitives still enumerate, and the CLI surfaces config problems\n * through the studio/doctor, not here.\n *\n * EC-555: the kept entries' implementations (`unknown` in the config) go through\n * core's one registration step, like the studio registry's and the Next host's —\n * a non-component is withheld (its preview renders the missing-component\n * fallback, never `createElement`) and returned as an `invalid-implementation`\n * issue. The first-wins dedupe runs BEFORE the check, so a withheld entry still\n * claims its id.\n */\nexport function previewComponentsFromConfig(config: unknown): {\n  manifests: ComponentManifest[]\n  implementations: ComponentImplementations\n  issues: ComponentIssue[]\n} {\n  const base = basePrimitives()\n  const manifests: ComponentManifest[] = [...base.manifests]\n  const implementations: Record<string, ComponentType<Record<string, unknown>>> = {}\n  for (const manifest of base.manifests) {\n    const implementation = getImplementation(base.implementations, manifest.id)\n    if (implementation) implementations[manifest.id] = implementation\n  }\n  const seen = new Set(manifests.map((m) => m.id))\n\n  const kept: HostComponentEntry[] = []\n  const resolved = resolveWorkspaceConfig(config)\n  for (const project of resolved.projects) {\n    for (const entry of project.components ?? []) {\n      if (seen.has(entry.manifest.id)) continue\n      seen.add(entry.manifest.id)\n      manifests.push(entry.manifest)\n      kept.push(entry)\n    }\n  }\n  // Ids are unique by construction here (deduped against the primitives too),\n  // so the merge order below decides nothing.\n  const project = registerImplementations(kept)\n  return {\n    manifests,\n    implementations: { ...implementations, ...project.implementations },\n    issues: project.issues,\n  }\n}\n\n/**\n * The {@link StudioRegistry}-shaped registry the harness renders against. Its\n * `registry.issues` carries the implementation issues too — the same list the\n * studio registry records them into (EC-555).\n */\nexport function previewRegistryFromConfig(config: unknown): StudioRegistry {\n  const { manifests, implementations, issues } = previewComponentsFromConfig(config)\n  const registry = new ComponentRegistry(manifests)\n  registry.issues.push(...issues)\n  return { registry, implementations }\n}\n\n/**\n * Enumerate every generated-preview entry for a config: canvas-eligible\n * manifests only (server-only components never render on the client canvas),\n * one entry per declared fixture in declaration order, else one implicit\n * {@link DEFAULT_VARIANT} entry. Components are sorted by id so the output —\n * and everything the CLI derives from it (manifest JSON, file writes) — is\n * deterministic regardless of registration order.\n */\nexport function previewEntriesForConfig(config: unknown): PreviewEntrySpec[] {\n  const { manifests } = previewComponentsFromConfig(config)\n  const entries: PreviewEntrySpec[] = []\n  for (const manifest of [...manifests].sort((a, b) => a.id.localeCompare(b.id))) {\n    if (!isCanvasEligible(manifest)) continue\n    const manifestShape = { props: manifest.props, slots: manifest.slots }\n    if (manifest.fixtures && manifest.fixtures.length > 0) {\n      for (const fixture of manifest.fixtures) {\n        entries.push({\n          componentId: manifest.id,\n          fixture: fixture.name,\n          hashInput: {\n            manifest: manifestShape,\n            fixture: { props: fixture.props ?? null, slotChildren: fixture.slotChildren ?? null },\n          },\n        })\n      }\n    } else {\n      entries.push({\n        componentId: manifest.id,\n        fixture: DEFAULT_VARIANT,\n        hashInput: { manifest: manifestShape, fixture: null },\n      })\n    }\n  }\n  return entries\n}\n"]}

package/dist/previews/manifest-format.d.ts

@@ -42,6 +42,15 @@ export interface GeneratedPreviewsManifest {
     /** The `@elytracms/studio` version the images were rendered with. */
     engine: string;
     entries: GeneratedPreviewsManifestEntry[];
+    /**
+     * EC-600 (format v3): the render dependencies the images were rendered against —
+     * project source files imported by the config plus the theme `@import` chain, each
+     * with its content hash. Written and compared by the CLI; the studio ignores it.
+     */
+    renderDeps?: Array<{
+        path: string;
+        hash: string;
+    }>;
 }
 /**
  * Adapt a previews manifest (a plain JSON import) into the EC-439

package/dist/previews/manifest-format.js.map

@@ -1 +1 @@
-{"version":3,"file":"manifest-format.js","sourceRoot":"","sources":["../../src/previews/manifest-format.ts"],"names":[],"mappings":"AAkDA,0EAA0E;AAC1E,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,KAAK,GAAG,KAAgC,CAAA;IAC9C,OAAO,CACL,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ;QACrC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QACjC,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,CAC9B,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,6BAA6B,CAAC,QAAiB;IAC7D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAA;IACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtD,MAAM,OAAO,GAAI,QAAkC,CAAC,OAAO,CAAA;QAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,IAAI,eAAe,CAAC,KAAK,CAAC;oBAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/F,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAA;AACrF,CAAC;AAED,SAAS,SAAS,CAAC,WAAmB,EAAE,OAAe;IACrD,wEAAwE;IACxE,OAAO,GAAG,WAAW,SAAS,OAAO,EAAE,CAAA;AACzC,CAAC","sourcesContent":["import type { GeneratedPreviewLookup } from '../components/builder/blocks-model'\n\n/**\n * The previews-manifest format (EC-440) — the JSON contract between the\n * `elytra previews` CLI (the writer) and a consumer's `studio.config.tsx`\n * (the reader, via {@link generatedPreviewsFromManifest}).\n *\n * The CLI renders every canvas-eligible component's fixtures headlessly\n * against the consumer theme, writes the images to the studio app's\n * `public/elytra-previews/` (served at `/elytra-previews/...`), and writes\n * this manifest next to `studio.config.tsx` (`studio/elytra-previews.json`)\n * so it is importable as a plain JSON module. Everything in it is\n * deterministic — no timestamps — so an unchanged re-run rewrites nothing.\n */\n\n/**\n * The manifest FORMAT VERSION is declared once, in the CLI (`@elytracms/cli`\n * `src/previews.js` `PREVIEWS_MANIFEST_VERSION`) — the CLI is both its writer and\n * its only reader (`elytra previews --check` reports a mismatch as itself and\n * regenerates). EC-514 removed the mirror this module used to carry: nothing in the\n * studio ever read it, and a hand-kept copy is a drift site with no reader to catch\n * the drift. The reader below is version-agnostic by design — it only ever looks at\n * `componentId`/`fixture`/`url`, so a manifest of any version resolves tiles.\n */\n\n/** One generated preview artifact: a component fixture and its rendered image. */\nexport interface GeneratedPreviewsManifestEntry {\n  componentId: string\n  /** The fixture name, or `'Default'` for a fixture-less component's implicit variant. */\n  fixture: string\n  /** Root-relative image URL (the file lives in the studio app's `public/`). */\n  url: string\n  /**\n   * Input hash (sha-256 hex over the stable-serialized inputs: manifest prop +\n   * slot shape, fixture props/slotChildren — NOT the engine version, EC-502).\n   * `elytra previews` skips entries whose hash is unchanged; `elytra previews\n   * --check` flags entries whose hash drifted as stale. Deliberately NOT part of\n   * the lookup — the studio only reads `componentId`/`fixture`/`url`.\n   */\n  hash: string\n}\n\n/** The manifest document `elytra previews` writes (`studio/elytra-previews.json`). */\nexport interface GeneratedPreviewsManifest {\n  version: number\n  /** The `@elytracms/studio` version the images were rendered with. */\n  engine: string\n  entries: GeneratedPreviewsManifestEntry[]\n}\n\n/** Tolerant entry guard — a malformed entry is skipped, never a crash. */\nfunction isManifestEntry(value: unknown): value is GeneratedPreviewsManifestEntry {\n  if (typeof value !== 'object' || value === null) return false\n  const entry = value as Record<string, unknown>\n  return (\n    typeof entry.componentId === 'string' &&\n    typeof entry.fixture === 'string' &&\n    typeof entry.url === 'string'\n  )\n}\n\n/**\n * Adapt a previews manifest (a plain JSON import) into the EC-439\n * {@link GeneratedPreviewLookup} seam. The whole consumer wiring is ~2 lines:\n *\n * ```tsx\n * // studio.config.tsx\n * import previewsManifest from './elytra-previews.json'\n * export default defineStudio({\n *   previews: { generated: generatedPreviewsFromManifest(previewsManifest) },\n * })\n * ```\n *\n * Tolerant by design (the input is a generated file a human may hand-edit or\n * delete): a malformed document or entry yields lookup misses — the blocks\n * panel then falls back to the icon+name placeholder — never a crash. A\n * fixture-less component's single implicit variant is looked up (and written\n * by the CLI) under the fixture name `'Default'`.\n */\nexport function generatedPreviewsFromManifest(manifest: unknown): GeneratedPreviewLookup {\n  const byKey = new Map<string, string>()\n  if (typeof manifest === 'object' && manifest !== null) {\n    const entries = (manifest as { entries?: unknown }).entries\n    if (Array.isArray(entries)) {\n      for (const entry of entries) {\n        if (isManifestEntry(entry)) byKey.set(lookupKey(entry.componentId, entry.fixture), entry.url)\n      }\n    }\n  }\n  return (componentId, fixtureName) => byKey.get(lookupKey(componentId, fixtureName))\n}\n\nfunction lookupKey(componentId: string, fixture: string): string {\n  // NUL (\\u0000) can appear in neither a component id nor a fixture name.\n  return `${componentId}\\u0000${fixture}`\n}\n"]}
+{"version":3,"file":"manifest-format.js","sourceRoot":"","sources":["../../src/previews/manifest-format.ts"],"names":[],"mappings":"AAwDA,0EAA0E;AAC1E,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAA;IAC7D,MAAM,KAAK,GAAG,KAAgC,CAAA;IAC9C,OAAO,CACL,OAAO,KAAK,CAAC,WAAW,KAAK,QAAQ;QACrC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ;QACjC,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ,CAC9B,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,6BAA6B,CAAC,QAAiB;IAC7D,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAA;IACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;QACtD,MAAM,OAAO,GAAI,QAAkC,CAAC,OAAO,CAAA;QAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,IAAI,eAAe,CAAC,KAAK,CAAC;oBAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/F,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAA;AACrF,CAAC;AAED,SAAS,SAAS,CAAC,WAAmB,EAAE,OAAe;IACrD,wEAAwE;IACxE,OAAO,GAAG,WAAW,SAAS,OAAO,EAAE,CAAA;AACzC,CAAC","sourcesContent":["import type { GeneratedPreviewLookup } from '../components/builder/blocks-model'\n\n/**\n * The previews-manifest format (EC-440) — the JSON contract between the\n * `elytra previews` CLI (the writer) and a consumer's `studio.config.tsx`\n * (the reader, via {@link generatedPreviewsFromManifest}).\n *\n * The CLI renders every canvas-eligible component's fixtures headlessly\n * against the consumer theme, writes the images to the studio app's\n * `public/elytra-previews/` (served at `/elytra-previews/...`), and writes\n * this manifest next to `studio.config.tsx` (`studio/elytra-previews.json`)\n * so it is importable as a plain JSON module. Everything in it is\n * deterministic — no timestamps — so an unchanged re-run rewrites nothing.\n */\n\n/**\n * The manifest FORMAT VERSION is declared once, in the CLI (`@elytracms/cli`\n * `src/previews.js` `PREVIEWS_MANIFEST_VERSION`) — the CLI is both its writer and\n * its only reader (`elytra previews --check` reports a mismatch as itself and\n * regenerates). EC-514 removed the mirror this module used to carry: nothing in the\n * studio ever read it, and a hand-kept copy is a drift site with no reader to catch\n * the drift. The reader below is version-agnostic by design — it only ever looks at\n * `componentId`/`fixture`/`url`, so a manifest of any version resolves tiles.\n */\n\n/** One generated preview artifact: a component fixture and its rendered image. */\nexport interface GeneratedPreviewsManifestEntry {\n  componentId: string\n  /** The fixture name, or `'Default'` for a fixture-less component's implicit variant. */\n  fixture: string\n  /** Root-relative image URL (the file lives in the studio app's `public/`). */\n  url: string\n  /**\n   * Input hash (sha-256 hex over the stable-serialized inputs: manifest prop +\n   * slot shape, fixture props/slotChildren — NOT the engine version, EC-502).\n   * `elytra previews` skips entries whose hash is unchanged; `elytra previews\n   * --check` flags entries whose hash drifted as stale. Deliberately NOT part of\n   * the lookup — the studio only reads `componentId`/`fixture`/`url`.\n   */\n  hash: string\n}\n\n/** The manifest document `elytra previews` writes (`studio/elytra-previews.json`). */\nexport interface GeneratedPreviewsManifest {\n  version: number\n  /** The `@elytracms/studio` version the images were rendered with. */\n  engine: string\n  entries: GeneratedPreviewsManifestEntry[]\n  /**\n   * EC-600 (format v3): the render dependencies the images were rendered against —\n   * project source files imported by the config plus the theme `@import` chain, each\n   * with its content hash. Written and compared by the CLI; the studio ignores it.\n   */\n  renderDeps?: Array<{ path: string; hash: string }>\n}\n\n/** Tolerant entry guard — a malformed entry is skipped, never a crash. */\nfunction isManifestEntry(value: unknown): value is GeneratedPreviewsManifestEntry {\n  if (typeof value !== 'object' || value === null) return false\n  const entry = value as Record<string, unknown>\n  return (\n    typeof entry.componentId === 'string' &&\n    typeof entry.fixture === 'string' &&\n    typeof entry.url === 'string'\n  )\n}\n\n/**\n * Adapt a previews manifest (a plain JSON import) into the EC-439\n * {@link GeneratedPreviewLookup} seam. The whole consumer wiring is ~2 lines:\n *\n * ```tsx\n * // studio.config.tsx\n * import previewsManifest from './elytra-previews.json'\n * export default defineStudio({\n *   previews: { generated: generatedPreviewsFromManifest(previewsManifest) },\n * })\n * ```\n *\n * Tolerant by design (the input is a generated file a human may hand-edit or\n * delete): a malformed document or entry yields lookup misses — the blocks\n * panel then falls back to the icon+name placeholder — never a crash. A\n * fixture-less component's single implicit variant is looked up (and written\n * by the CLI) under the fixture name `'Default'`.\n */\nexport function generatedPreviewsFromManifest(manifest: unknown): GeneratedPreviewLookup {\n  const byKey = new Map<string, string>()\n  if (typeof manifest === 'object' && manifest !== null) {\n    const entries = (manifest as { entries?: unknown }).entries\n    if (Array.isArray(entries)) {\n      for (const entry of entries) {\n        if (isManifestEntry(entry)) byKey.set(lookupKey(entry.componentId, entry.fixture), entry.url)\n      }\n    }\n  }\n  return (componentId, fixtureName) => byKey.get(lookupKey(componentId, fixtureName))\n}\n\nfunction lookupKey(componentId: string, fixture: string): string {\n  // NUL (\\u0000) can appear in neither a component id nor a fixture name.\n  return `${componentId}\\u0000${fixture}`\n}\n"]}

package/dist/router/match.d.ts

@@ -53,8 +53,6 @@ export declare const studioPath: {
     readonly settings: () => string;
     readonly assets: () => string;
     readonly asset: (assetId: string) => string;
-    readonly routes: () => string;
-    readonly extensions: () => string;
     readonly builder: () => string;
     readonly components: () => string;
     readonly component: (componentId: string) => string;

package/dist/router/match.js

@@ -61,8 +61,6 @@ export const studioPath = {
     // see asset-detail.tsx) drives it (AD-19).
     assets: () => 'assets',
     asset: (assetId) => `assets/${assetId}`,
-    routes: () => 'routes',
-    extensions: () => 'extensions',
     builder: () => 'builder',
     components: () => 'components',
     component: (componentId) => `components/${componentId}`,

package/dist/router/match.js.map

@@ -1 +1 @@
-{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/router/match.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAMH,yFAAyF;AACzF,SAAS,QAAQ,CAAC,KAAa;IAC7B,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,OAAO,CAAC,CAAA;AACpB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACzC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;IACrD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;AACpD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE;IACf,QAAQ,EAAE,GAAG,EAAE,CAAC,UAAU;IAC1B,4EAA4E;IAC5E,0EAA0E;IAC1E,2CAA2C;IAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ;IACtB,KAAK,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,UAAU,OAAO,EAAE;IAC/C,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ;IACtB,UAAU,EAAE,GAAG,EAAE,CAAC,YAAY;IAC9B,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;IACxB,UAAU,EAAE,GAAG,EAAE,CAAC,YAAY;IAC9B,SAAS,EAAE,CAAC,WAAmB,EAAE,EAAE,CAAC,cAAc,WAAW,EAAE;IAC/D,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK;IAChB,aAAa,EAAE,CAAC,YAAoB,EAAE,EAAE,CAAC,OAAO,YAAY,EAAE;IAC9D,WAAW,EAAE,CAAC,YAAoB,EAAE,UAAkB,EAAE,EAAE,CACxD,OAAO,YAAY,IAAI,UAAU,EAAE;IACrC,4EAA4E;IAC5E,kEAAkE;IAClE,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO;IACpB,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,SAAS,MAAM,EAAE;IAC3C,8EAA8E;IAC9E,4CAA4C;IAC5C,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;IAC5B,QAAQ,EAAE,CAAC,UAAkB,EAAE,EAAE,CAAC,aAAa,UAAU,EAAE;CACnD,CAAA","sourcesContent":["/**\n * Studio route table (EC-223 Stage 6 — catch-all routing). The studio mounts as\n * a SINGLE splat route per project (`/$projectId/$`); this pure matcher turns the\n * splat's trailing pathname into a typed match that the screen resolver renders.\n * Keeping the URL→screen map inside the engine (instead of in per-consumer route\n * files) is what lets the package own its navigation with a near-empty consumer\n * route tree — the goal of Stage 6.\n *\n * Deterministic and dependency-free: every screen state is reproducible from a\n * pathname string (see `match.test.ts`), satisfying the fixtures-reproducibility\n * convention without needing a router instance.\n *\n * EC-239 (app-view modularization): the route table is no longer a hardcoded\n * per-section switch — the studio's surfaces are a config-extendable VIEW registry\n * derived from the section rail, so the matcher is registry-AGNOSTIC. It splits the\n * splat into a view id (the first segment) + that view's trailing segments; the\n * screen resolver looks the id up in the registry and the view's own `parsePath`\n * interprets the segments (CMS: collection/document; components: id; flat: none).\n * Keeping the matcher free of the surface list is what lets a consuming repo add a\n * routable custom view purely from config.\n *\n *   /$projectId                      → { section: 'index' }              (redirect to first view)\n *   /$projectId/<id>                 → { section: 'view', viewId: '<id>', segments: [] }\n *   /$projectId/<id>/a/b             → { section: 'view', viewId: '<id>', segments: ['a','b'] }\n *\n * The view decides whether its segments resolve; an unknown id or an over-deep\n * path becomes a not-found at the resolver, not here.\n */\n\nexport type StudioRouteMatch =\n  | { section: 'index' }\n  | { section: 'view'; viewId: string; segments: string[] }\n\n/** Split a splat pathname into clean segments (drops empty/leading/trailing slashes). */\nfunction segments(splat: string): string[] {\n  return splat\n    .split('/')\n    .map((segment) => segment.trim())\n    .filter(Boolean)\n}\n\n/**\n * Match the trailing pathname of the project splat (`_splat`) into a view id +\n * its segments. `splat` is everything after `/$projectId/` — e.g. `'cms/page/abc'`\n * for `/p1/cms/page/abc` → `{ viewId: 'cms', segments: ['page', 'abc'] }`. An\n * empty splat is the bare project index (which redirects to the first view).\n */\nexport function matchStudioRoute(splat: string): StudioRouteMatch {\n  const [viewId, ...rest] = segments(splat)\n  if (viewId === undefined) return { section: 'index' }\n  return { section: 'view', viewId, segments: rest }\n}\n\n/**\n * The inverse of {@link matchStudioRoute}: build the `_splat` subpath for a\n * screen. Navigation addresses the single project splat as\n * `to={STUDIO_PROJECT_ROUTE} params={{ projectId, _splat: studioPath.X(...) }}`,\n * so the URL-construction lives in exactly one place — the same module that\n * parses it back. `matchStudioRoute(studioPath.cmsDocument(c, d))` round-trips\n * (pinned in `match.test.ts`), which is what keeps the two directions in sync.\n */\nexport const studioPath = {\n  index: () => '',\n  settings: () => 'settings',\n  // The assets rail (EC-319) — a list + a per-asset detail, mirroring the CMS\n  // arity so the SAME portable list surface (plus a bespoke detail surface,\n  // see asset-detail.tsx) drives it (AD-19).\n  assets: () => 'assets',\n  asset: (assetId: string) => `assets/${assetId}`,\n  routes: () => 'routes',\n  extensions: () => 'extensions',\n  builder: () => 'builder',\n  components: () => 'components',\n  component: (componentId: string) => `components/${componentId}`,\n  cms: () => 'cms',\n  cmsCollection: (collectionId: string) => `cms/${collectionId}`,\n  cmsDocument: (collectionId: string, documentId: string) =>\n    `cms/${collectionId}/${documentId}`,\n  // The users rail (EC-240) — a list + a per-member detail, mirroring the CMS\n  // arity so the SAME portable list/edit surfaces drive it (AD-19).\n  users: () => 'users',\n  user: (userId: string) => `users/${userId}`,\n  // The redirects rail (EC-303) — editorial redirects as data, same list+detail\n  // arity over the portable surfaces (AD-19).\n  redirects: () => 'redirects',\n  redirect: (redirectId: string) => `redirects/${redirectId}`,\n} as const\n"]}
+{"version":3,"file":"match.js","sourceRoot":"","sources":["../../src/router/match.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAMH,yFAAyF;AACzF,SAAS,QAAQ,CAAC,KAAa;IAC7B,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;SAChC,MAAM,CAAC,OAAO,CAAC,CAAA;AACpB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,MAAM,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACzC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAA;IACrD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;AACpD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE;IACf,QAAQ,EAAE,GAAG,EAAE,CAAC,UAAU;IAC1B,4EAA4E;IAC5E,0EAA0E;IAC1E,2CAA2C;IAC3C,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ;IACtB,KAAK,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,UAAU,OAAO,EAAE;IAC/C,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS;IACxB,UAAU,EAAE,GAAG,EAAE,CAAC,YAAY;IAC9B,SAAS,EAAE,CAAC,WAAmB,EAAE,EAAE,CAAC,cAAc,WAAW,EAAE;IAC/D,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK;IAChB,aAAa,EAAE,CAAC,YAAoB,EAAE,EAAE,CAAC,OAAO,YAAY,EAAE;IAC9D,WAAW,EAAE,CAAC,YAAoB,EAAE,UAAkB,EAAE,EAAE,CACxD,OAAO,YAAY,IAAI,UAAU,EAAE;IACrC,4EAA4E;IAC5E,kEAAkE;IAClE,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO;IACpB,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,SAAS,MAAM,EAAE;IAC3C,8EAA8E;IAC9E,4CAA4C;IAC5C,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW;IAC5B,QAAQ,EAAE,CAAC,UAAkB,EAAE,EAAE,CAAC,aAAa,UAAU,EAAE;CACnD,CAAA","sourcesContent":["/**\n * Studio route table (EC-223 Stage 6 — catch-all routing). The studio mounts as\n * a SINGLE splat route per project (`/$projectId/$`); this pure matcher turns the\n * splat's trailing pathname into a typed match that the screen resolver renders.\n * Keeping the URL→screen map inside the engine (instead of in per-consumer route\n * files) is what lets the package own its navigation with a near-empty consumer\n * route tree — the goal of Stage 6.\n *\n * Deterministic and dependency-free: every screen state is reproducible from a\n * pathname string (see `match.test.ts`), satisfying the fixtures-reproducibility\n * convention without needing a router instance.\n *\n * EC-239 (app-view modularization): the route table is no longer a hardcoded\n * per-section switch — the studio's surfaces are a config-extendable VIEW registry\n * derived from the section rail, so the matcher is registry-AGNOSTIC. It splits the\n * splat into a view id (the first segment) + that view's trailing segments; the\n * screen resolver looks the id up in the registry and the view's own `parsePath`\n * interprets the segments (CMS: collection/document; components: id; flat: none).\n * Keeping the matcher free of the surface list is what lets a consuming repo add a\n * routable custom view purely from config.\n *\n *   /$projectId                      → { section: 'index' }              (redirect to first view)\n *   /$projectId/<id>                 → { section: 'view', viewId: '<id>', segments: [] }\n *   /$projectId/<id>/a/b             → { section: 'view', viewId: '<id>', segments: ['a','b'] }\n *\n * The view decides whether its segments resolve; an unknown id or an over-deep\n * path becomes a not-found at the resolver, not here.\n */\n\nexport type StudioRouteMatch =\n  | { section: 'index' }\n  | { section: 'view'; viewId: string; segments: string[] }\n\n/** Split a splat pathname into clean segments (drops empty/leading/trailing slashes). */\nfunction segments(splat: string): string[] {\n  return splat\n    .split('/')\n    .map((segment) => segment.trim())\n    .filter(Boolean)\n}\n\n/**\n * Match the trailing pathname of the project splat (`_splat`) into a view id +\n * its segments. `splat` is everything after `/$projectId/` — e.g. `'cms/page/abc'`\n * for `/p1/cms/page/abc` → `{ viewId: 'cms', segments: ['page', 'abc'] }`. An\n * empty splat is the bare project index (which redirects to the first view).\n */\nexport function matchStudioRoute(splat: string): StudioRouteMatch {\n  const [viewId, ...rest] = segments(splat)\n  if (viewId === undefined) return { section: 'index' }\n  return { section: 'view', viewId, segments: rest }\n}\n\n/**\n * The inverse of {@link matchStudioRoute}: build the `_splat` subpath for a\n * screen. Navigation addresses the single project splat as\n * `to={STUDIO_PROJECT_ROUTE} params={{ projectId, _splat: studioPath.X(...) }}`,\n * so the URL-construction lives in exactly one place — the same module that\n * parses it back. `matchStudioRoute(studioPath.cmsDocument(c, d))` round-trips\n * (pinned in `match.test.ts`), which is what keeps the two directions in sync.\n */\nexport const studioPath = {\n  index: () => '',\n  settings: () => 'settings',\n  // The assets rail (EC-319) — a list + a per-asset detail, mirroring the CMS\n  // arity so the SAME portable list surface (plus a bespoke detail surface,\n  // see asset-detail.tsx) drives it (AD-19).\n  assets: () => 'assets',\n  asset: (assetId: string) => `assets/${assetId}`,\n  builder: () => 'builder',\n  components: () => 'components',\n  component: (componentId: string) => `components/${componentId}`,\n  cms: () => 'cms',\n  cmsCollection: (collectionId: string) => `cms/${collectionId}`,\n  cmsDocument: (collectionId: string, documentId: string) =>\n    `cms/${collectionId}/${documentId}`,\n  // The users rail (EC-240) — a list + a per-member detail, mirroring the CMS\n  // arity so the SAME portable list/edit surfaces drive it (AD-19).\n  users: () => 'users',\n  user: (userId: string) => `users/${userId}`,\n  // The redirects rail (EC-303) — editorial redirects as data, same list+detail\n  // arity over the portable surfaces (AD-19).\n  redirects: () => 'redirects',\n  redirect: (redirectId: string) => `redirects/${redirectId}`,\n} as const\n"]}

package/dist/ui/badge.d.ts

@@ -1,7 +1,7 @@
 import { type VariantProps } from 'class-variance-authority';
 import type { HTMLAttributes } from 'react';
 export declare const badgeVariants: (props?: ({
-    variant?: "error" | "default" | "warning" | "info" | "success" | "primary" | "outline" | null | undefined;
+    variant?: "error" | "default" | "warning" | "success" | "primary" | "outline" | "info" | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
 export interface BadgeProps extends HTMLAttributes<HTMLSpanElement>, VariantProps<typeof badgeVariants> {
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@elytracms/studio",
   "author": "finaldream <hi@finaldream.de>",
-  "version": "0.0.86",
+  "version": "0.0.87",
   "engines": {
     "node": ">=22.18.0"
   },
@@ -153,7 +153,7 @@
     "lucide-react": "^1.23.0",
     "tailwind-merge": "^3.6.0",
     "zod": "^4.4.3",
-    "@elytracms/core": "^0.0.86"
+    "@elytracms/core": "^0.0.87"
   },
   "peerDependencies": {
     "@tanstack/react-router": "^1.170.0",

package/src/styles/studio.css

@@ -17,10 +17,11 @@
 @import '@fontsource-variable/hanken-grotesk';
 @import '@fontsource-variable/jetbrains-mono';
 /*
- * Design-token CSS variables (`:root` + `.dark`) are GENERATED from the canonical
- * @elytracms/design-tokens package. Edit tokens there and run `pnpm gen:tokens`.
- * Cool-slate neutrals + a confident cobalt accent; monospace carries every technical
- * token (component ids, path tokens, issue codes) to reinforce the code-first identity.
+ * The colour roles are declared once, hand-written, in tokens.css (EC-607); the
+ * `@theme inline` block below maps each to its Tailwind colour and is the one
+ * declaration of the fonts and the radius scale. Cool-slate neutrals + a confident
+ * cobalt accent; monospace carries every technical token (component ids, path tokens,
+ * issue codes) to reinforce the code-first identity.
  */
 @import './tokens.css';
 

package/src/styles/tokens.css

@@ -1,63 +1,80 @@
-/* GENERATED from @elytracms/design-tokens — do not edit by hand. Run `pnpm gen:tokens`. */
+/*
+ * Studio colour tokens: the one declaration (EC-607). Hand-written, so edit here.
+ *
+ * Each role is declared ONCE as `light-dark(<light>, <dark>)`, so a role cannot
+ * exist without both values. The `dark` class on <html> (lib/theme.ts) only flips
+ * `color-scheme`, which picks the value; it also gives native controls and
+ * scrollbars the matching scheme. A role that tracks another is a plain `var()`.
+ *
+ * Components never use raw colours: studio.css maps each role to a Tailwind colour
+ * (`bg-primary`, `text-muted-foreground`, …) and the in-canvas chrome uses no var()
+ * at all (canvas-chrome-css.ts). A new role is one line here plus its `@theme inline`
+ * line in studio.css; lib/theme-tokens-contract.test.ts fails if a mapped role is missing.
+ *
+ * Needs light-dark(): Chrome 123, Safari 17.5, Firefox 120.
+ */
 :root {
-  --background: oklch(0.985 0.002 250);
-  --foreground: oklch(0.21 0.02 264);
-  --card: oklch(1 0 0);
+  color-scheme: light;
+  --radius: 0.5rem;
+
+  /* App canvas background */
+  --background: light-dark(oklch(0.985 0.002 250), oklch(0.176 0.012 264));
+  /* Primary text */
+  --foreground: light-dark(oklch(0.21 0.02 264), oklch(0.95 0.005 250));
+  /* Card surface */
+  --card: light-dark(oklch(1 0 0), oklch(0.205 0.013 264));
+  /* Text on cards */
   --card-foreground: var(--foreground);
-  --panel: oklch(0.974 0.003 255);
+  /* Inspector / rail surface */
+  --panel: light-dark(oklch(0.974 0.003 255), oklch(0.196 0.013 264));
+  /* Text on panels */
   --panel-foreground: var(--foreground);
-  --popover: oklch(1 0 0);
+  /* Floating surface */
+  --popover: light-dark(oklch(1 0 0), oklch(0.214 0.013 264));
+  /* Text on popovers */
   --popover-foreground: var(--foreground);
-  --muted: oklch(0.955 0.004 255);
-  --muted-foreground: oklch(0.5 0.018 260);
-  --border: oklch(0.908 0.005 260);
-  --input: oklch(0.908 0.005 260);
-  --ring: oklch(0.55 0.17 256);
-  --primary: oklch(0.55 0.17 256);
-  --primary-foreground: oklch(0.99 0.005 250);
-  --secondary: oklch(0.955 0.004 255);
-  --secondary-foreground: oklch(0.3 0.02 264);
-  --accent: oklch(0.95 0.022 256);
-  --accent-foreground: oklch(0.36 0.07 256);
-  --success: oklch(0.58 0.13 150);
-  --success-foreground: oklch(0.99 0.01 150);
-  --warning: oklch(0.68 0.14 70);
-  --warning-foreground: oklch(0.24 0.04 70);
-  --destructive: oklch(0.57 0.2 27);
-  --destructive-foreground: oklch(0.99 0.01 27);
-  --info: oklch(0.56 0.12 248);
-  --info-foreground: oklch(0.99 0.01 248);
-  --grid-line: oklch(0.8 0.01 260 / 0.5);
-  --radius: 0.5rem;
+  /* Subtle fill */
+  --muted: light-dark(oklch(0.955 0.004 255), oklch(0.256 0.013 264));
+  /* Secondary text */
+  --muted-foreground: light-dark(oklch(0.5 0.018 260), oklch(0.66 0.02 258));
+  /* Hairline borders */
+  --border: light-dark(oklch(0.908 0.005 260), oklch(0.278 0.013 264));
+  /* Form control borders */
+  --input: light-dark(oklch(0.908 0.005 260), oklch(0.3 0.013 264));
+  /* Focus ring */
+  --ring: light-dark(oklch(0.55 0.17 256), oklch(0.66 0.16 256));
+  /* Primary action (cobalt) */
+  --primary: light-dark(oklch(0.55 0.17 256), oklch(0.66 0.16 256));
+  /* Text on primary */
+  --primary-foreground: light-dark(oklch(0.99 0.005 250), oklch(0.16 0.02 264));
+  /* Secondary action */
+  --secondary: light-dark(oklch(0.955 0.004 255), oklch(0.256 0.013 264));
+  /* Text on secondary */
+  --secondary-foreground: light-dark(oklch(0.3 0.02 264), oklch(0.92 0.005 250));
+  /* Selected / emphasis fill */
+  --accent: light-dark(oklch(0.95 0.022 256), oklch(0.288 0.03 256));
+  /* Text on accent */
+  --accent-foreground: light-dark(oklch(0.36 0.07 256), oklch(0.88 0.03 256));
+  /* Success / valid */
+  --success: light-dark(oklch(0.58 0.13 150), oklch(0.7 0.14 150));
+  /* Text on success */
+  --success-foreground: light-dark(oklch(0.99 0.01 150), oklch(0.16 0.03 150));
+  /* Warning */
+  --warning: light-dark(oklch(0.68 0.14 70), oklch(0.79 0.14 75));
+  /* Text on warning */
+  --warning-foreground: light-dark(oklch(0.24 0.04 70), oklch(0.2 0.04 75));
+  /* Error / destructive */
+  --destructive: light-dark(oklch(0.57 0.2 27), oklch(0.67 0.18 25));
+  /* Text on destructive */
+  --destructive-foreground: light-dark(oklch(0.99 0.01 27), oklch(0.16 0.03 25));
+  /* Informational / bound */
+  --info: light-dark(oklch(0.56 0.12 248), oklch(0.7 0.13 245));
+  /* Text on info */
+  --info-foreground: light-dark(oklch(0.99 0.01 248), oklch(0.16 0.03 245));
+  /* Canvas grid lines */
+  --grid-line: light-dark(oklch(0.8 0.01 260 / 0.5), oklch(0.5 0.012 264 / 0.32));
 }
 
 .dark {
-  --background: oklch(0.176 0.012 264);
-  --foreground: oklch(0.95 0.005 250);
-  --card: oklch(0.205 0.013 264);
-  --card-foreground: var(--foreground);
-  --panel: oklch(0.196 0.013 264);
-  --panel-foreground: var(--foreground);
-  --popover: oklch(0.214 0.013 264);
-  --popover-foreground: var(--foreground);
-  --muted: oklch(0.256 0.013 264);
-  --muted-foreground: oklch(0.66 0.02 258);
-  --border: oklch(0.278 0.013 264);
-  --input: oklch(0.3 0.013 264);
-  --ring: oklch(0.66 0.16 256);
-  --primary: oklch(0.66 0.16 256);
-  --primary-foreground: oklch(0.16 0.02 264);
-  --secondary: oklch(0.256 0.013 264);
-  --secondary-foreground: oklch(0.92 0.005 250);
-  --accent: oklch(0.288 0.03 256);
-  --accent-foreground: oklch(0.88 0.03 256);
-  --success: oklch(0.7 0.14 150);
-  --success-foreground: oklch(0.16 0.03 150);
-  --warning: oklch(0.79 0.14 75);
-  --warning-foreground: oklch(0.2 0.04 75);
-  --destructive: oklch(0.67 0.18 25);
-  --destructive-foreground: oklch(0.16 0.03 25);
-  --info: oklch(0.7 0.13 245);
-  --info-foreground: oklch(0.16 0.03 245);
-  --grid-line: oklch(0.5 0.012 264 / 0.32);
+  color-scheme: dark;
 }