@pixerate/editor 0.258.0 → 0.260.0

package/dist/brushes/index.cjs

@@ -8,12 +8,10 @@
 
 
 
-var _chunkMQGQTKVWcjs = require('../chunk-MQGQTKVW.cjs');
+var _chunkPYTJBVW5cjs = require('../chunk-PYTJBVW5.cjs');
 require('../chunk-AVTPZO4Z.cjs');
 
 
-var _chunkLRTR4ASZcjs = require('../chunk-LRTR4ASZ.cjs');
-require('../chunk-A2IS7EHE.cjs');
 
 
 
@@ -59,10 +57,15 @@ require('../chunk-A2IS7EHE.cjs');
 
 
 
-var _chunkRSIKDWOPcjs = require('../chunk-RSIKDWOP.cjs');
+
+var _chunkTZOX7KWVcjs = require('../chunk-TZOX7KWV.cjs');
 
 
 var _chunkJSDND7DFcjs = require('../chunk-JSDND7DF.cjs');
+
+
+var _chunkLRTR4ASZcjs = require('../chunk-LRTR4ASZ.cjs');
+require('../chunk-A2IS7EHE.cjs');
 require('../chunk-U67EN7GG.cjs');
 require('../chunk-WOFXZ3XU.cjs');
 
@@ -109,20 +112,20 @@ var ARIA = {
   "light.pressure": "Light follows pressure"
 };
 var aria = (path, label) => _nullishCoalesce(ARIA[path], () => ( `Brush ${label.toLowerCase()}`));
-function brushEditorSections(brush, profile = _chunkRSIKDWOPcjs.PAINT_PROFILE) {
-  const resolved = _chunkRSIKDWOPcjs.resolveBrush.call(void 0, brush);
-  const engine = _chunkRSIKDWOPcjs.resolveEngine.call(void 0, brush);
-  const fieldOf = (facet) => _chunkRSIKDWOPcjs.BRUSH_FIELDS.find((f) => f.facet === facet && f.engines.includes(engine));
-  const facetOf = (enginePath) => _optionalChain([(_nullishCoalesce(_chunkRSIKDWOPcjs.BRUSH_FIELDS.find((f) => f.engine === enginePath && f.engines.includes(engine)), () => ( _chunkRSIKDWOPcjs.BRUSH_FIELDS.find((f) => f.engine === enginePath)))), 'optionalAccess', _ => _.facet]);
+function brushEditorSections(brush, profile = _chunkTZOX7KWVcjs.PAINT_PROFILE) {
+  const resolved = _chunkTZOX7KWVcjs.resolveBrush.call(void 0, brush);
+  const engine = _chunkTZOX7KWVcjs.resolveEngine.call(void 0, brush);
+  const fieldOf = (facet) => _chunkTZOX7KWVcjs.BRUSH_FIELDS.find((f) => f.facet === facet && f.engines.includes(engine));
+  const facetOf = (enginePath) => _optionalChain([(_nullishCoalesce(_chunkTZOX7KWVcjs.BRUSH_FIELDS.find((f) => f.engine === enginePath && f.engines.includes(engine)), () => ( _chunkTZOX7KWVcjs.BRUSH_FIELDS.find((f) => f.engine === enginePath)))), 'optionalAccess', _ => _.facet]);
   const value = (path) => {
-    const own = _chunkRSIKDWOPcjs.getPath.call(void 0, brush, path);
+    const own = _chunkTZOX7KWVcjs.getPath.call(void 0, brush, path);
     if (own !== void 0) return own;
     const field = fieldOf(path);
     if (!field) return void 0;
-    const v = _chunkRSIKDWOPcjs.getPath.call(void 0, resolved, field.engine);
+    const v = _chunkTZOX7KWVcjs.getPath.call(void 0, resolved, field.engine);
     return field.map ? field.map.toFacet(v) : v;
   };
-  const warned = new Map(_chunkRSIKDWOPcjs.checkBrush.call(void 0, brush, profile).issues.filter((i) => i.severity === "warning").map((i) => [i.facet, i.reason]));
+  const warned = new Map(_chunkTZOX7KWVcjs.checkBrush.call(void 0, brush, profile).issues.filter((i) => i.severity === "warning").map((i) => [i.facet, i.reason]));
   const noteFor = (path) => _optionalChain([[...warned], 'access', _2 => _2.find, 'call', _3 => _3(([facet]) => path === facet || path.startsWith(`${facet}.`)), 'optionalAccess', _4 => _4[1]]);
   const withNote = (c) => {
     const note = noteFor(c.path);
@@ -146,18 +149,18 @@ function brushEditorSections(brush, profile = _chunkRSIKDWOPcjs.PAINT_PROFILE) {
   const marks = _nullishCoalesce(_optionalChain([brush, 'access', _7 => _7.marks, 'optionalAccess', _8 => _8.kind]), () => ( "continuous"));
   add("medium", "Medium", [
     profile.kinds.length > 1 && choice("kind", "Kind", options(profile.kinds, { mark: "Lays a material", tool: "Works on paint" })),
-    !isTool && choice("medium", "Medium", [{ value: "", label: "Any" }, ...options(_chunkRSIKDWOPcjs.BRUSH_MEDIA, MEDIUM_LABELS)], ""),
+    !isTool && choice("medium", "Medium", [{ value: "", label: "Any" }, ...options(_chunkTZOX7KWVcjs.BRUSH_MEDIA, MEDIUM_LABELS)], ""),
     !isTool && withNote({ kind: "text", path: "variety", label: "Variety", ariaLabel: "Brush variety", value: _nullishCoalesce(brush.variety, () => ( "")), placeholder: "pencil, oil, highlighter\u2026" }),
     isTool && profile.tools.length > 0 && choice("tool", "Tool", options(profile.tools, TOOL_LABELS))
   ]);
-  const engineControls = _chunkMQGQTKVWcjs.brushEngineControls.call(void 0, resolved);
-  const tipSliders = _chunkMQGQTKVWcjs.BRUSH_SLIDERS.filter((c) => c.path.startsWith("tip.") && c.path !== "tip.smoothing");
+  const engineControls = _chunkPYTJBVW5cjs.brushEngineControls.call(void 0, resolved);
+  const tipSliders = _chunkPYTJBVW5cjs.BRUSH_SLIDERS.filter((c) => c.path.startsWith("tip.") && c.path !== "tip.smoothing");
   add("shape", "Shape", [
     choice("tip.shape", "Tip", options(profile.tipShapes.filter((s) => !isTool || s !== "stamp"), SHAPE_LABELS)),
     ...tipSliders.map((c) => slider(c)),
     engine === "dab" && choice("tip.blend", "Blend", _chunk2VX55NFMcjs.BLEND_MODES.map((m) => ({ value: m.id, label: m.label })), "normal"),
     ...shape === "bristle" && engineControls ? engineControls.sliders.filter((c) => c.path.startsWith("bristle.")).map((c) => slider(c)) : [],
-    shape === "stamp" && withNote({ kind: "stamps", path: "tip.stamps", label: "Stamps", ariaLabel: "Brush stamps", value: [..._nullishCoalesce(value("tip.stamps"), () => ( []))], max: marks === "particles" ? _chunkRSIKDWOPcjs.MAX_DOT_TEXTURES : _chunkRSIKDWOPcjs.MAX_STICKER_STAMPS, options: STAMP_OPTIONS })
+    shape === "stamp" && withNote({ kind: "stamps", path: "tip.stamps", label: "Stamps", ariaLabel: "Brush stamps", value: [..._nullishCoalesce(value("tip.stamps"), () => ( []))], max: marks === "particles" ? _chunkTZOX7KWVcjs.MAX_DOT_TEXTURES : _chunkTZOX7KWVcjs.MAX_STICKER_STAMPS, options: STAMP_OPTIONS })
   ]);
   if (!isTool && profile.marks.length > 1) {
     const particles = marks === "particles" && engineControls ? engineControls.sliders.filter((c) => c.path.startsWith("particle.") && c.path !== "particle.waveSpeed") : [];
@@ -165,21 +168,21 @@ function brushEditorSections(brush, profile = _chunkRSIKDWOPcjs.PAINT_PROFILE) {
     const render = value("marks.render");
     add("marks", "Marks", [
       choice("marks.kind", "Laid as", options(profile.marks, MARKS_LABELS), "continuous"),
-      marks === "particles" && choice("marks.physics", "Particles", options(_chunkRSIKDWOPcjs.PARTICLE_KINDS, PHYSICS_LABELS)),
-      marks === "particles" && choice("marks.render", "Drawn as", options(_chunkRSIKDWOPcjs.PARTICLE_RENDERS, RENDER_LABELS)),
-      marks === "particles" && render === "ribbon" && choice("marks.ribbonPairs", "Ribbon joins", options(_chunkRSIKDWOPcjs.RIBBON_PAIRS, { adjacent: "Neighbours", "first-last": "Outermost" })),
-      marks === "particles" && shape === "stamp" && choice("marks.stampOrder", "Texture order", options(_chunkRSIKDWOPcjs.DOT_TEXTURE_ORDERS, { sequence: "In turn", random: "Random" })),
-      marks === "particles" && shape === "stamp" && choice("marks.stampRotation", "Texture turn", options(_chunkRSIKDWOPcjs.DOT_ROTATIONS, { follow: "Follow motion", random: "Random", fixed: "Tip angle" })),
+      marks === "particles" && choice("marks.physics", "Particles", options(_chunkTZOX7KWVcjs.PARTICLE_KINDS, PHYSICS_LABELS)),
+      marks === "particles" && choice("marks.render", "Drawn as", options(_chunkTZOX7KWVcjs.PARTICLE_RENDERS, RENDER_LABELS)),
+      marks === "particles" && render === "ribbon" && choice("marks.ribbonPairs", "Ribbon joins", options(_chunkTZOX7KWVcjs.RIBBON_PAIRS, { adjacent: "Neighbours", "first-last": "Outermost" })),
+      marks === "particles" && shape === "stamp" && choice("marks.stampOrder", "Texture order", options(_chunkTZOX7KWVcjs.DOT_TEXTURE_ORDERS, { sequence: "In turn", random: "Random" })),
+      marks === "particles" && shape === "stamp" && choice("marks.stampRotation", "Texture turn", options(_chunkTZOX7KWVcjs.DOT_ROTATIONS, { follow: "Follow motion", random: "Random", fixed: "Tip angle" })),
       ...particles.map((c) => slider(c)),
       ...objects.map((c) => slider(c))
     ]);
   }
-  const feel = _chunkMQGQTKVWcjs.BRUSH_SLIDERS.filter((c) => ["tip.smoothing", "pressureSmoothing", "dynamics.minSize", "dynamics.tiltSize", "dynamics.velocitySize"].includes(c.path)).filter((c) => !(c.path === "dynamics.tiltSize" && profile.tilt === "none") && !(c.path === "dynamics.velocitySize" && profile.velocity === "none"));
+  const feel = _chunkPYTJBVW5cjs.BRUSH_SLIDERS.filter((c) => ["tip.smoothing", "pressureSmoothing", "dynamics.minSize", "dynamics.tiltSize", "dynamics.velocitySize"].includes(c.path)).filter((c) => !(c.path === "dynamics.tiltSize" && profile.tilt === "none") && !(c.path === "dynamics.velocitySize" && profile.velocity === "none"));
   add("feel", "Feel", [
     ...feel.map((c) => slider(c)),
     toggle("dynamics.pressureSize", "Pressure \u2192 size"),
     toggle("dynamics.pressureOpacity", "Pressure \u2192 opacity"),
-    choice("dynamics.rotation", "Rotation", options(_chunkRSIKDWOPcjs.BRUSH_ROTATIONS, ROTATION_LABELS))
+    choice("dynamics.rotation", "Rotation", options(_chunkTZOX7KWVcjs.BRUSH_ROTATIONS, ROTATION_LABELS))
   ]);
   const surfaces = profile.surfaces;
   const engineSliders = (_nullishCoalesce(_optionalChain([engineControls, 'optionalAccess', _9 => _9.sliders]), () => ( []))).filter((c) => !/^(bristle|particle|sticker)\./.test(c.path) && c.path !== "light.amount" && c.path !== "impasto.rim" && c.path !== "impasto.clarity");
@@ -187,8 +190,8 @@ function brushEditorSections(brush, profile = _chunkRSIKDWOPcjs.PAINT_PROFILE) {
   add("behaviour", _nullishCoalesce(_optionalChain([engineControls, 'optionalAccess', _12 => _12.title]), () => ( "Behaviour")), [
     !isTool && surfaces.length > 1 && choice("behaviour.surface", "Surface", options(surfaces, SURFACE_LABELS), "dry"),
     profile.grain !== "none" && slider({ path: "grain", label: "Grain", min: 0, max: 1, step: 0.01 }, "behaviour.grain"),
-    engine === "wet" && !isTool && choice("behaviour.wet.medium", "Medium", options(_chunkRSIKDWOPcjs.WET_MEDIA, WET_MEDIUM_LABELS), "watercolor"),
-    engine === "impasto" && choice("behaviour.thick.applicator", "Tool", options(_chunkRSIKDWOPcjs.IMPASTO_TOOLS, APPLICATOR_LABELS), "brush"),
+    engine === "wet" && !isTool && choice("behaviour.wet.medium", "Medium", options(_chunkTZOX7KWVcjs.WET_MEDIA, WET_MEDIUM_LABELS), "watercolor"),
+    engine === "impasto" && choice("behaviour.thick.applicator", "Tool", options(_chunkTZOX7KWVcjs.IMPASTO_TOOLS, APPLICATOR_LABELS), "brush"),
     ...engineSliders.map((c) => exchangeOk(facetOf(c.path)) ? slider(c) : null),
     _optionalChain([engineControls, 'optionalAccess', _13 => _13.mixingPath]) && fieldOf("behaviour.mixing") && choice("behaviour.mixing", "Mixing", options(["pigment", "rgb"], { pigment: "Pigment", rgb: "RGB" })),
     _optionalChain([engineControls, 'optionalAccess', _14 => _14.dirty]) && profile.exchange !== "none" && fieldOf("behaviour.exchange.dirty") && toggle("behaviour.exchange.dirty", "Dirty brush"),
@@ -216,7 +219,7 @@ function brushEditorSections(brush, profile = _chunkRSIKDWOPcjs.PAINT_PROFILE) {
         label: "Palette",
         ariaLabel: "Brush palette",
         value: (_nullishCoalesce(_optionalChain([brush, 'access', _21 => _21.colour, 'optionalAccess', _22 => _22.palette]), () => ( []))).flatMap((c) => _chunkMLLTWAXHcjs.isDualColor.call(void 0, c) ? [{ light: _chunkLRTR4ASZcjs.brushColourHex.call(void 0, c, "light"), dark: _chunkLRTR4ASZcjs.brushColourHex.call(void 0, c, "dark") }] : hex(c) ? [hex(c)] : []),
-        max: _chunkRSIKDWOPcjs.MAX_BRUSH_PALETTE
+        max: _chunkTZOX7KWVcjs.MAX_BRUSH_PALETTE
       }),
       toggle("colour.own", "Always its own colour")
     ]);
@@ -245,13 +248,13 @@ function setBrushEditorValue(brush, path, value) {
     if (value !== "bristle") delete next.tip.bristle;
   } else if (value === void 0 || value === "") {
     const keys = path.split(".");
-    const parent = _chunkRSIKDWOPcjs.getPath.call(void 0, next, keys.slice(0, -1).join("."));
+    const parent = _chunkTZOX7KWVcjs.getPath.call(void 0, next, keys.slice(0, -1).join("."));
     if (keys.length === 1) delete next[keys[0]];
     else if (parent) delete parent[keys[keys.length - 1]];
-  } else _chunkRSIKDWOPcjs.setPath.call(void 0, next, path, value);
+  } else _chunkTZOX7KWVcjs.setPath.call(void 0, next, path, value);
   const problems = [];
   try {
-    return { brush: _chunkRSIKDWOPcjs.normalizeBrushSpec.call(void 0, JSON.parse(JSON.stringify(next)), problems), problems };
+    return { brush: _chunkTZOX7KWVcjs.normalizeBrushSpec.call(void 0, JSON.parse(JSON.stringify(next)), problems), problems };
   } catch (e) {
     return { brush, problems: [e.message] };
   }
@@ -267,7 +270,7 @@ function brushLibraryGroups(entries, filter = {}) {
       const text = words([b.id, b.name, _nullishCoalesce(b.variety, () => ( "")), _nullishCoalesce(b.medium, () => ( "")), _nullishCoalesce(b.tool, () => ( "")), ..._nullishCoalesce(b.tags, () => ( []))].join(" "));
       if (!wanted.every((w) => text.some((t) => t.startsWith(w)))) continue;
     }
-    if (filter.profile && !_chunkRSIKDWOPcjs.checkBrush.call(void 0, b, filter.profile).ok) continue;
+    if (filter.profile && !_chunkTZOX7KWVcjs.checkBrush.call(void 0, b, filter.profile).ok) continue;
     const id = b.kind === "tool" ? "tools" : _nullishCoalesce(b.medium, () => ( "other"));
     let g = groups.get(id);
     if (!g) groups.set(id, g = { id, title: id === "tools" ? "Tools" : id === "other" ? "Other" : MEDIUM_LABELS[id], varieties: [] });
@@ -280,6 +283,118 @@ function brushLibraryGroups(entries, filter = {}) {
   return [...groups.values()].sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
 }
 
+// src/brushes/contract.ts
+var BRUSH_CONTRACT_FORMAT_VERSION = 1;
+var SUPPORT = { type: "string", enum: ["full", "ignored", "none"], description: "full: rendered; ignored: accepted, painted without it (a warning); none: refused (an error)." };
+var BRUSH_PROFILE_JSON_SCHEMA = {
+  type: "object",
+  description: "What a host can render (`BrushHostProfile`).",
+  properties: {
+    id: { type: "string", description: "paint, image, canvas, vector\u2026" },
+    name: { type: "string", description: "Display name, used in messages." },
+    kinds: { type: "array", items: { type: "string", enum: [..._chunkTZOX7KWVcjs.BRUSH_KINDS] }, description: "Brush kinds it has." },
+    tools: { type: "array", items: { type: "string", enum: [..._chunkTZOX7KWVcjs.BRUSH_TOOLS] }, description: "Tools it has (kind tool)." },
+    tipShapes: { type: "array", items: { type: "string", enum: [..._chunkTZOX7KWVcjs.BRUSH_TIP_SHAPES] }, description: "Tip shapes it renders." },
+    marks: { type: "array", items: { type: "string", enum: [..._chunkTZOX7KWVcjs.BRUSH_MARKS_KINDS] }, description: "Marks kinds it renders." },
+    surfaces: { type: "array", items: { type: "string", enum: [..._chunkTZOX7KWVcjs.BRUSH_SURFACES] }, description: "Surfaces it renders." },
+    exchange: { ...SUPPORT, description: "Picking paint up and mixing it in." },
+    reservoir: { ...SUPPORT, description: "The Mixer Brush reservoir." },
+    grain: { ...SUPPORT, description: "Paper grain response." },
+    light: { ...SUPPORT, description: "Light paint." },
+    motion: { ...SUPPORT, description: "Motion after painting." },
+    colours: { type: "array", items: { type: "string", enum: ["solid", "dual", "gradient", "effect"] }, description: "Colour kinds a default colour may be." },
+    velocity: { ...SUPPORT, description: "Velocity dynamics." },
+    tilt: { ...SUPPORT, description: "Tilt dynamics." }
+  },
+  required: ["id", "name", "kinds", "tools", "tipShapes", "marks", "surfaces", "exchange", "reservoir", "grain", "light", "motion", "colours", "velocity", "tilt"],
+  additionalProperties: false
+};
+var BRUSH_LIBRARY_FILE_JSON_SCHEMA = {
+  type: "object",
+  description: "A brush library file, as export_brushes writes it. Readers also accept version 1 files (flat engine brushes, migrated) and a bare array of brushes.",
+  properties: {
+    format: { type: "string", const: "pixerate-brushes", description: 'Always "pixerate-brushes".' },
+    version: { type: "integer", const: 2, description: "Always 2." },
+    brushes: { type: "array", items: { $ref: "brush.schema.json" }, description: "The brushes, each a facet brush (brush.schema.json)." }
+  },
+  required: ["format", "version", "brushes"],
+  additionalProperties: false
+};
+function migrationInputs() {
+  const pick = (id) => _chunkTZOX7KWVcjs.brushToJSON.call(void 0, _chunkTZOX7KWVcjs.BUILTIN_BRUSHES.find((b) => b.id === id));
+  return [
+    { id: "plain", name: "Plain" },
+    pick("pencil-6b"),
+    { ...pick("soft-pastel"), id: "my-pastel", name: "My pastel", category: "custom", grain: 0.2, tip: { ...pick("soft-pastel").tip, size: 50 } },
+    pick("mixer-brush"),
+    pick("watercolor-wash"),
+    pick("impasto-brush"),
+    pick("hair-strands"),
+    pick("bristle-round"),
+    pick("sticker-stars"),
+    pick("rainbow-marker"),
+    pick("blender"),
+    pick("add-water"),
+    pick("spray-can"),
+    // Fields an engine never reads are dropped on migration.
+    { ...pick("ink-pen"), id: "ink-with-mixer", name: "Ink with mixer settings", mixer: { wet: 0.9, load: 0.1, mix: 0.9, loadEachStroke: false, cleanEachStroke: false, mixing: "pigment" } }
+  ];
+}
+function editorSectionFixtures() {
+  const ids = ["highlighter", "chalk", "watercolor-wash", "hair-strands", "mixer-brush", "blender", "spray-can"];
+  return ids.flatMap(
+    (id) => Object.keys(_chunkTZOX7KWVcjs.BRUSH_HOST_PROFILES).map((host) => {
+      const brush = _chunkTZOX7KWVcjs.BRUSH_PRESETS.find((b) => b.id === id);
+      return { brush: id, host, sections: brushEditorSections(brush, _chunkTZOX7KWVcjs.BRUSH_HOST_PROFILES[host]) };
+    })
+  );
+}
+function toolDefinitions() {
+  const library = _chunkTZOX7KWVcjs.createBrushLibrary.call(void 0, );
+  const toolsFor = (host) => _chunkPYTJBVW5cjs.createBrushLibraryTools.call(void 0, library, { profile: _chunkTZOX7KWVcjs.BRUSH_HOST_PROFILES[host], renderPreview: () => ({ data: "", mimeType: "image/png" }) });
+  return {
+    tools: toolsFor("paint").map((t) => ({ name: t.name, title: t.title, description: t.description, inputSchema: t.inputSchema, annotations: t.annotations })),
+    hosts: Object.fromEntries(Object.keys(_chunkTZOX7KWVcjs.BRUSH_HOST_PROFILES).map((host) => [host, toolsFor(host).map((t) => t.name)]))
+  };
+}
+function brushContracts() {
+  const presets = _chunkTZOX7KWVcjs.BRUSH_PRESETS.map((b) => JSON.parse(JSON.stringify(b)));
+  const resolved = _chunkTZOX7KWVcjs.BRUSH_PRESETS.map((b) => ({ id: b.id, engine: _chunkTZOX7KWVcjs.resolveEngine.call(void 0, b), category: _chunkTZOX7KWVcjs.resolveCategory.call(void 0, b), brush: _chunkTZOX7KWVcjs.brushToJSON.call(void 0, _chunkTZOX7KWVcjs.resolveBrush.call(void 0, b)) }));
+  const profiles = Object.values(_chunkTZOX7KWVcjs.BRUSH_HOST_PROFILES);
+  const checks = _chunkTZOX7KWVcjs.BRUSH_PRESETS.map((b) => ({
+    id: b.id,
+    hosts: Object.fromEntries(profiles.map((p) => {
+      const c = _chunkTZOX7KWVcjs.checkBrush.call(void 0, b, p);
+      return [p.id, { ok: c.ok, issues: c.issues.map(({ facet, severity }) => ({ facet, severity })) }];
+    }))
+  }));
+  const migrations = migrationInputs().map((input) => ({ input, output: _chunkTZOX7KWVcjs.migrateBrushV1.call(void 0, input), resolved: _chunkTZOX7KWVcjs.brushToJSON.call(void 0, _chunkTZOX7KWVcjs.resolveBrush.call(void 0, _chunkTZOX7KWVcjs.migrateBrushV1.call(void 0, input))), engine: _chunkTZOX7KWVcjs.normalizePaintBrush.call(void 0, input).engine }));
+  const files = {
+    "brush.schema.json": { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "brush.schema.json", ..._chunkTZOX7KWVcjs.BRUSH_JSON_SCHEMA },
+    "profile.schema.json": { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "profile.schema.json", ...BRUSH_PROFILE_JSON_SCHEMA },
+    "library-file.schema.json": { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "library-file.schema.json", ...BRUSH_LIBRARY_FILE_JSON_SCHEMA },
+    "presets.json": presets,
+    "resolved.json": resolved,
+    "profiles.json": profiles,
+    "checks.json": checks,
+    "migrations.json": migrations,
+    "tools.json": toolDefinitions(),
+    "editor-sections.json": editorSectionFixtures()
+  };
+  files["manifest.json"] = {
+    domain: "brushes",
+    formatVersion: BRUSH_CONTRACT_FORMAT_VERSION,
+    limits: { maxPalette: _chunkTZOX7KWVcjs.MAX_BRUSH_PALETTE },
+    counts: { presets: presets.length, profiles: profiles.length, migrations: migrations.length, editorSections: files["editor-sections.json"].length },
+    files: Object.keys(files).sort()
+  };
+  return files;
+}
+
+
+
+
+
 
 
 
@@ -322,4 +437,4 @@ function brushLibraryGroups(entries, filter = {}) {
 
 
 
-exports.BRUSH_FACET_SCHEMAS = _chunkRSIKDWOPcjs.BRUSH_FACET_SCHEMAS; exports.BRUSH_HOST_PROFILES = _chunkRSIKDWOPcjs.BRUSH_HOST_PROFILES; exports.BRUSH_JSON_SCHEMA = _chunkRSIKDWOPcjs.BRUSH_JSON_SCHEMA; exports.BRUSH_KINDS = _chunkRSIKDWOPcjs.BRUSH_KINDS; exports.BRUSH_MARKS_KINDS = _chunkRSIKDWOPcjs.BRUSH_MARKS_KINDS; exports.BRUSH_MEDIA = _chunkRSIKDWOPcjs.BRUSH_MEDIA; exports.BRUSH_PATCH_PROPERTIES = _chunkMQGQTKVWcjs.BRUSH_PATCH_PROPERTIES; exports.BRUSH_PRESETS = _chunkRSIKDWOPcjs.BRUSH_PRESETS; exports.BRUSH_SURFACES = _chunkRSIKDWOPcjs.BRUSH_SURFACES; exports.BRUSH_TIP_SHAPES = _chunkRSIKDWOPcjs.BRUSH_TIP_SHAPES; exports.BRUSH_TOOLS = _chunkRSIKDWOPcjs.BRUSH_TOOLS; exports.BRUSH_UNSET_PROPERTY = _chunkMQGQTKVWcjs.BRUSH_UNSET_PROPERTY; exports.BRUSH_WORD = _chunkRSIKDWOPcjs.BRUSH_WORD; exports.BrushLibraryError = _chunkRSIKDWOPcjs.BrushLibraryError; exports.CANVAS_PROFILE = _chunkRSIKDWOPcjs.CANVAS_PROFILE; exports.IMAGE_PROFILE = _chunkRSIKDWOPcjs.IMAGE_PROFILE; exports.MAX_BRUSH_PALETTE = _chunkRSIKDWOPcjs.MAX_BRUSH_PALETTE; exports.PAINT_PROFILE = _chunkRSIKDWOPcjs.PAINT_PROFILE; exports.UNSETTABLE_BRUSH_FACETS = _chunkMQGQTKVWcjs.UNSETTABLE_BRUSH_FACETS; exports.VECTOR_PROFILE = _chunkRSIKDWOPcjs.VECTOR_PROFILE; exports.WET_BRUSH_TOOLS = _chunkRSIKDWOPcjs.WET_BRUSH_TOOLS; exports.brushColourHex = _chunkLRTR4ASZcjs.brushColourHex; exports.brushColourKind = _chunkRSIKDWOPcjs.brushColourKind; exports.brushEditorSections = brushEditorSections; exports.brushLibraryGroups = brushLibraryGroups; exports.changedBrushPaths = _chunkMQGQTKVWcjs.changedBrushPaths; exports.checkBrush = _chunkRSIKDWOPcjs.checkBrush; exports.createBrushLibrary = _chunkRSIKDWOPcjs.createBrushLibrary; exports.createBrushLibraryToolProvider = _chunkMQGQTKVWcjs.createBrushLibraryToolProvider; exports.createBrushLibraryTools = _chunkMQGQTKVWcjs.createBrushLibraryTools; exports.degrade = _chunkRSIKDWOPcjs.degrade; exports.listPresets = _chunkRSIKDWOPcjs.listPresets; exports.mergeBrushPatch = _chunkMQGQTKVWcjs.mergeBrushPatch; exports.migrateBrushV1 = _chunkRSIKDWOPcjs.migrateBrushV1; exports.normalizeBrushSpec = _chunkRSIKDWOPcjs.normalizeBrushSpec; exports.parseBrushLibrary = _chunkRSIKDWOPcjs.parseBrushLibrary2; exports.resolveBrush = _chunkRSIKDWOPcjs.resolveBrush; exports.resolveCategory = _chunkRSIKDWOPcjs.resolveCategory; exports.resolveEngine = _chunkRSIKDWOPcjs.resolveEngine; exports.resolveWetMedium = _chunkRSIKDWOPcjs.resolveWetMedium; exports.setBrushEditorValue = setBrushEditorValue; exports.snapshotBrushLibrary = _chunkRSIKDWOPcjs.snapshotBrushLibrary;
+exports.BRUSH_CONTRACT_FORMAT_VERSION = BRUSH_CONTRACT_FORMAT_VERSION; exports.BRUSH_FACET_SCHEMAS = _chunkTZOX7KWVcjs.BRUSH_FACET_SCHEMAS; exports.BRUSH_HOST_PROFILES = _chunkTZOX7KWVcjs.BRUSH_HOST_PROFILES; exports.BRUSH_JSON_SCHEMA = _chunkTZOX7KWVcjs.BRUSH_JSON_SCHEMA; exports.BRUSH_KINDS = _chunkTZOX7KWVcjs.BRUSH_KINDS; exports.BRUSH_LIBRARY_FILE_JSON_SCHEMA = BRUSH_LIBRARY_FILE_JSON_SCHEMA; exports.BRUSH_MARKS_KINDS = _chunkTZOX7KWVcjs.BRUSH_MARKS_KINDS; exports.BRUSH_MEDIA = _chunkTZOX7KWVcjs.BRUSH_MEDIA; exports.BRUSH_PATCH_PROPERTIES = _chunkPYTJBVW5cjs.BRUSH_PATCH_PROPERTIES; exports.BRUSH_PRESETS = _chunkTZOX7KWVcjs.BRUSH_PRESETS; exports.BRUSH_PROFILE_JSON_SCHEMA = BRUSH_PROFILE_JSON_SCHEMA; exports.BRUSH_SURFACES = _chunkTZOX7KWVcjs.BRUSH_SURFACES; exports.BRUSH_TIP_SHAPES = _chunkTZOX7KWVcjs.BRUSH_TIP_SHAPES; exports.BRUSH_TOOLS = _chunkTZOX7KWVcjs.BRUSH_TOOLS; exports.BRUSH_UNSET_PROPERTY = _chunkPYTJBVW5cjs.BRUSH_UNSET_PROPERTY; exports.BRUSH_WORD = _chunkTZOX7KWVcjs.BRUSH_WORD; exports.BrushLibraryError = _chunkTZOX7KWVcjs.BrushLibraryError; exports.CANVAS_PROFILE = _chunkTZOX7KWVcjs.CANVAS_PROFILE; exports.IMAGE_PROFILE = _chunkTZOX7KWVcjs.IMAGE_PROFILE; exports.MAX_BRUSH_PALETTE = _chunkTZOX7KWVcjs.MAX_BRUSH_PALETTE; exports.PAINT_PROFILE = _chunkTZOX7KWVcjs.PAINT_PROFILE; exports.UNSETTABLE_BRUSH_FACETS = _chunkPYTJBVW5cjs.UNSETTABLE_BRUSH_FACETS; exports.VECTOR_PROFILE = _chunkTZOX7KWVcjs.VECTOR_PROFILE; exports.WET_BRUSH_TOOLS = _chunkTZOX7KWVcjs.WET_BRUSH_TOOLS; exports.brushColourHex = _chunkLRTR4ASZcjs.brushColourHex; exports.brushColourKind = _chunkTZOX7KWVcjs.brushColourKind; exports.brushContracts = brushContracts; exports.brushEditorSections = brushEditorSections; exports.brushLibraryGroups = brushLibraryGroups; exports.changedBrushPaths = _chunkPYTJBVW5cjs.changedBrushPaths; exports.checkBrush = _chunkTZOX7KWVcjs.checkBrush; exports.createBrushLibrary = _chunkTZOX7KWVcjs.createBrushLibrary; exports.createBrushLibraryToolProvider = _chunkPYTJBVW5cjs.createBrushLibraryToolProvider; exports.createBrushLibraryTools = _chunkPYTJBVW5cjs.createBrushLibraryTools; exports.degrade = _chunkTZOX7KWVcjs.degrade; exports.listPresets = _chunkTZOX7KWVcjs.listPresets; exports.mergeBrushPatch = _chunkPYTJBVW5cjs.mergeBrushPatch; exports.migrateBrushV1 = _chunkTZOX7KWVcjs.migrateBrushV1; exports.normalizeBrushSpec = _chunkTZOX7KWVcjs.normalizeBrushSpec; exports.parseBrushLibrary = _chunkTZOX7KWVcjs.parseBrushLibrary2; exports.resolveBrush = _chunkTZOX7KWVcjs.resolveBrush; exports.resolveCategory = _chunkTZOX7KWVcjs.resolveCategory; exports.resolveEngine = _chunkTZOX7KWVcjs.resolveEngine; exports.resolveWetMedium = _chunkTZOX7KWVcjs.resolveWetMedium; exports.setBrushEditorValue = setBrushEditorValue; exports.snapshotBrushLibrary = _chunkTZOX7KWVcjs.snapshotBrushLibrary;

package/dist/brushes/index.d.cts

@@ -15,6 +15,7 @@ export { resolveBrush, resolveCategory, resolveEngine, resolveWetMedium, type Re
 export { migrateBrushV1 } from './migrate.cjs';
 export { BRUSH_PRESETS } from './presets.cjs';
 export { brushColourHex } from './colour.cjs';
+export { BRUSH_CONTRACT_FORMAT_VERSION, BRUSH_LIBRARY_FILE_JSON_SCHEMA, BRUSH_PROFILE_JSON_SCHEMA, brushContracts } from './contract.cjs';
 export { BRUSH_HOST_PROFILES, brushColourKind, CANVAS_PROFILE, checkBrush, degrade, IMAGE_PROFILE, listPresets, PAINT_PROFILE, VECTOR_PROFILE, type BrushCheck, type BrushColourKind, type BrushHostProfile, type BrushIssue, type BrushSupport, type DegradedBrush } from './profiles.cjs';
 export { BrushLibraryError, createBrushLibrary, parseBrushLibrary, snapshotBrushLibrary, type BrushFilter, type BrushLibrary, type BrushLibraryEntry, type BrushLibraryErrorCode, type BrushLibraryFile, type BrushLibrarySnapshot, type BrushLibraryOptions, type ImportBrushesResult, type SaveBrushResult, } from './library.cjs';
 export { BRUSH_PATCH_PROPERTIES, BRUSH_UNSET_PROPERTY, changedBrushPaths, mergeBrushPatch, UNSETTABLE_BRUSH_FACETS, type BrushPatch, type UnsettableBrushFacet } from './patch.cjs';

package/dist/brushes/index.d.ts

@@ -15,6 +15,7 @@ export { resolveBrush, resolveCategory, resolveEngine, resolveWetMedium, type Re
 export { migrateBrushV1 } from './migrate.js';
 export { BRUSH_PRESETS } from './presets.js';
 export { brushColourHex } from './colour.js';
+export { BRUSH_CONTRACT_FORMAT_VERSION, BRUSH_LIBRARY_FILE_JSON_SCHEMA, BRUSH_PROFILE_JSON_SCHEMA, brushContracts } from './contract.js';
 export { BRUSH_HOST_PROFILES, brushColourKind, CANVAS_PROFILE, checkBrush, degrade, IMAGE_PROFILE, listPresets, PAINT_PROFILE, VECTOR_PROFILE, type BrushCheck, type BrushColourKind, type BrushHostProfile, type BrushIssue, type BrushSupport, type DegradedBrush } from './profiles.js';
 export { BrushLibraryError, createBrushLibrary, parseBrushLibrary, snapshotBrushLibrary, type BrushFilter, type BrushLibrary, type BrushLibraryEntry, type BrushLibraryErrorCode, type BrushLibraryFile, type BrushLibrarySnapshot, type BrushLibraryOptions, type ImportBrushesResult, type SaveBrushResult, } from './library.js';
 export { BRUSH_PATCH_PROPERTIES, BRUSH_UNSET_PROPERTY, changedBrushPaths, mergeBrushPatch, UNSETTABLE_BRUSH_FACETS, type BrushPatch, type UnsettableBrushFacet } from './patch.js';

package/dist/brushes/index.js

@@ -8,12 +8,8 @@ import {
   createBrushLibraryToolProvider,
   createBrushLibraryTools,
   mergeBrushPatch
-} from "../chunk-ICTPLVSR.js";
+} from "../chunk-X2EXYY4J.js";
 import "../chunk-J5UQHWVL.js";
-import {
-  brushColourHex
-} from "../chunk-FJBQTZS4.js";
-import "../chunk-3CI7FRMK.js";
 import {
   BRUSH_FACET_SCHEMAS,
   BRUSH_FIELDS,
@@ -28,6 +24,7 @@ import {
   BRUSH_TIP_SHAPES,
   BRUSH_TOOLS,
   BRUSH_WORD,
+  BUILTIN_BRUSHES,
   BrushLibraryError,
   CANVAS_PROFILE,
   DOT_ROTATIONS,
@@ -45,6 +42,7 @@ import {
   WET_BRUSH_TOOLS,
   WET_MEDIA,
   brushColourKind,
+  brushToJSON,
   checkBrush,
   createBrushLibrary,
   degrade,
@@ -52,6 +50,7 @@ import {
   listPresets,
   migrateBrushV1,
   normalizeBrushSpec,
+  normalizePaintBrush,
   parseBrushLibrary2 as parseBrushLibrary,
   resolveBrush,
   resolveCategory,
@@ -59,10 +58,14 @@ import {
   resolveWetMedium,
   setPath,
   snapshotBrushLibrary
-} from "../chunk-SMTUQWGY.js";
+} from "../chunk-5IW65VQ6.js";
 import {
   STAMP_KINDS
 } from "../chunk-APX63ILU.js";
+import {
+  brushColourHex
+} from "../chunk-FJBQTZS4.js";
+import "../chunk-3CI7FRMK.js";
 import "../chunk-SZTI6EER.js";
 import "../chunk-V2ZCJRDM.js";
 import {
@@ -279,15 +282,126 @@ function brushLibraryGroups(entries, filter = {}) {
   const order = ["dry", "ink", "paint", "spray", "other", "tools"];
   return [...groups.values()].sort((a, b) => order.indexOf(a.id) - order.indexOf(b.id));
 }
+
+// src/brushes/contract.ts
+var BRUSH_CONTRACT_FORMAT_VERSION = 1;
+var SUPPORT = { type: "string", enum: ["full", "ignored", "none"], description: "full: rendered; ignored: accepted, painted without it (a warning); none: refused (an error)." };
+var BRUSH_PROFILE_JSON_SCHEMA = {
+  type: "object",
+  description: "What a host can render (`BrushHostProfile`).",
+  properties: {
+    id: { type: "string", description: "paint, image, canvas, vector\u2026" },
+    name: { type: "string", description: "Display name, used in messages." },
+    kinds: { type: "array", items: { type: "string", enum: [...BRUSH_KINDS] }, description: "Brush kinds it has." },
+    tools: { type: "array", items: { type: "string", enum: [...BRUSH_TOOLS] }, description: "Tools it has (kind tool)." },
+    tipShapes: { type: "array", items: { type: "string", enum: [...BRUSH_TIP_SHAPES] }, description: "Tip shapes it renders." },
+    marks: { type: "array", items: { type: "string", enum: [...BRUSH_MARKS_KINDS] }, description: "Marks kinds it renders." },
+    surfaces: { type: "array", items: { type: "string", enum: [...BRUSH_SURFACES] }, description: "Surfaces it renders." },
+    exchange: { ...SUPPORT, description: "Picking paint up and mixing it in." },
+    reservoir: { ...SUPPORT, description: "The Mixer Brush reservoir." },
+    grain: { ...SUPPORT, description: "Paper grain response." },
+    light: { ...SUPPORT, description: "Light paint." },
+    motion: { ...SUPPORT, description: "Motion after painting." },
+    colours: { type: "array", items: { type: "string", enum: ["solid", "dual", "gradient", "effect"] }, description: "Colour kinds a default colour may be." },
+    velocity: { ...SUPPORT, description: "Velocity dynamics." },
+    tilt: { ...SUPPORT, description: "Tilt dynamics." }
+  },
+  required: ["id", "name", "kinds", "tools", "tipShapes", "marks", "surfaces", "exchange", "reservoir", "grain", "light", "motion", "colours", "velocity", "tilt"],
+  additionalProperties: false
+};
+var BRUSH_LIBRARY_FILE_JSON_SCHEMA = {
+  type: "object",
+  description: "A brush library file, as export_brushes writes it. Readers also accept version 1 files (flat engine brushes, migrated) and a bare array of brushes.",
+  properties: {
+    format: { type: "string", const: "pixerate-brushes", description: 'Always "pixerate-brushes".' },
+    version: { type: "integer", const: 2, description: "Always 2." },
+    brushes: { type: "array", items: { $ref: "brush.schema.json" }, description: "The brushes, each a facet brush (brush.schema.json)." }
+  },
+  required: ["format", "version", "brushes"],
+  additionalProperties: false
+};
+function migrationInputs() {
+  const pick = (id) => brushToJSON(BUILTIN_BRUSHES.find((b) => b.id === id));
+  return [
+    { id: "plain", name: "Plain" },
+    pick("pencil-6b"),
+    { ...pick("soft-pastel"), id: "my-pastel", name: "My pastel", category: "custom", grain: 0.2, tip: { ...pick("soft-pastel").tip, size: 50 } },
+    pick("mixer-brush"),
+    pick("watercolor-wash"),
+    pick("impasto-brush"),
+    pick("hair-strands"),
+    pick("bristle-round"),
+    pick("sticker-stars"),
+    pick("rainbow-marker"),
+    pick("blender"),
+    pick("add-water"),
+    pick("spray-can"),
+    // Fields an engine never reads are dropped on migration.
+    { ...pick("ink-pen"), id: "ink-with-mixer", name: "Ink with mixer settings", mixer: { wet: 0.9, load: 0.1, mix: 0.9, loadEachStroke: false, cleanEachStroke: false, mixing: "pigment" } }
+  ];
+}
+function editorSectionFixtures() {
+  const ids = ["highlighter", "chalk", "watercolor-wash", "hair-strands", "mixer-brush", "blender", "spray-can"];
+  return ids.flatMap(
+    (id) => Object.keys(BRUSH_HOST_PROFILES).map((host) => {
+      const brush = BRUSH_PRESETS.find((b) => b.id === id);
+      return { brush: id, host, sections: brushEditorSections(brush, BRUSH_HOST_PROFILES[host]) };
+    })
+  );
+}
+function toolDefinitions() {
+  const library = createBrushLibrary();
+  const toolsFor = (host) => createBrushLibraryTools(library, { profile: BRUSH_HOST_PROFILES[host], renderPreview: () => ({ data: "", mimeType: "image/png" }) });
+  return {
+    tools: toolsFor("paint").map((t) => ({ name: t.name, title: t.title, description: t.description, inputSchema: t.inputSchema, annotations: t.annotations })),
+    hosts: Object.fromEntries(Object.keys(BRUSH_HOST_PROFILES).map((host) => [host, toolsFor(host).map((t) => t.name)]))
+  };
+}
+function brushContracts() {
+  const presets = BRUSH_PRESETS.map((b) => JSON.parse(JSON.stringify(b)));
+  const resolved = BRUSH_PRESETS.map((b) => ({ id: b.id, engine: resolveEngine(b), category: resolveCategory(b), brush: brushToJSON(resolveBrush(b)) }));
+  const profiles = Object.values(BRUSH_HOST_PROFILES);
+  const checks = BRUSH_PRESETS.map((b) => ({
+    id: b.id,
+    hosts: Object.fromEntries(profiles.map((p) => {
+      const c = checkBrush(b, p);
+      return [p.id, { ok: c.ok, issues: c.issues.map(({ facet, severity }) => ({ facet, severity })) }];
+    }))
+  }));
+  const migrations = migrationInputs().map((input) => ({ input, output: migrateBrushV1(input), resolved: brushToJSON(resolveBrush(migrateBrushV1(input))), engine: normalizePaintBrush(input).engine }));
+  const files = {
+    "brush.schema.json": { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "brush.schema.json", ...BRUSH_JSON_SCHEMA },
+    "profile.schema.json": { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "profile.schema.json", ...BRUSH_PROFILE_JSON_SCHEMA },
+    "library-file.schema.json": { $schema: "https://json-schema.org/draft/2020-12/schema", $id: "library-file.schema.json", ...BRUSH_LIBRARY_FILE_JSON_SCHEMA },
+    "presets.json": presets,
+    "resolved.json": resolved,
+    "profiles.json": profiles,
+    "checks.json": checks,
+    "migrations.json": migrations,
+    "tools.json": toolDefinitions(),
+    "editor-sections.json": editorSectionFixtures()
+  };
+  files["manifest.json"] = {
+    domain: "brushes",
+    formatVersion: BRUSH_CONTRACT_FORMAT_VERSION,
+    limits: { maxPalette: MAX_BRUSH_PALETTE },
+    counts: { presets: presets.length, profiles: profiles.length, migrations: migrations.length, editorSections: files["editor-sections.json"].length },
+    files: Object.keys(files).sort()
+  };
+  return files;
+}
 export {
+  BRUSH_CONTRACT_FORMAT_VERSION,
   BRUSH_FACET_SCHEMAS,
   BRUSH_HOST_PROFILES,
   BRUSH_JSON_SCHEMA,
   BRUSH_KINDS,
+  BRUSH_LIBRARY_FILE_JSON_SCHEMA,
   BRUSH_MARKS_KINDS,
   BRUSH_MEDIA,
   BRUSH_PATCH_PROPERTIES,
   BRUSH_PRESETS,
+  BRUSH_PROFILE_JSON_SCHEMA,
   BRUSH_SURFACES,
   BRUSH_TIP_SHAPES,
   BRUSH_TOOLS,
@@ -303,6 +417,7 @@ export {
   WET_BRUSH_TOOLS,
   brushColourHex,
   brushColourKind,
+  brushContracts,
   brushEditorSections,
   brushLibraryGroups,
   changedBrushPaths,

package/dist/{brushstrokeRender-JI4W6F2G.js → brushstrokeRender-25Q5BEY6.js}

@@ -1,9 +1,6 @@
 import {
   pathDataToPolyline
-} from "./chunk-AORZ5M5C.js";
-import {
-  parseCssColor
-} from "./chunk-3CI7FRMK.js";
+} from "./chunk-EHALWBBD.js";
 import {
   BRUSH_PRESETS,
   BUILTIN_BRUSHES,
@@ -14,13 +11,16 @@ import {
   normalizeBrushSpec,
   resolveBrush,
   resolveCategory
-} from "./chunk-SMTUQWGY.js";
+} from "./chunk-5IW65VQ6.js";
 import "./chunk-APX63ILU.js";
 import {
   formatNumber,
   getShapeSvg,
   resolveCanvasGradient
 } from "./chunk-PWBZH3FK.js";
+import {
+  parseCssColor
+} from "./chunk-3CI7FRMK.js";
 import "./chunk-SZTI6EER.js";
 import "./chunk-V2ZCJRDM.js";
 import {
@@ -37,6 +37,12 @@ import "./chunk-OTTT5N3K.js";
 import "./chunk-IRSTHLQQ.js";
 import "./chunk-HVVR5PZW.js";
 import "./chunk-QGHEDC7B.js";
+import {
+  isDualColor
+} from "./chunk-VR6OGHU5.js";
+import "./chunk-JC2SHA4A.js";
+import "./chunk-MHLU6GRJ.js";
+import "./chunk-6ONMQ6WF.js";
 
 // src/canvas/brushstrokeRender.ts
 var PRESETS = listPresets(CANVAS_PROFILE).map((spec) => BUILTIN_BRUSHES.find((b) => b.id === spec.id));
@@ -53,12 +59,16 @@ function readCanvasBrushSpec(spec) {
   return brush;
 }
 function listCanvasBrushes(user = []) {
-  const out = PRESETS.map((b) => ({ id: b.id, name: b.name, category: b.category, size: b.tip.size, builtin: true }));
+  const colourOf = (spec) => {
+    const d = spec.colour?.default;
+    return typeof d === "string" || isDualColor(d) ? { defaultColor: d } : {};
+  };
+  const out = PRESETS.map((b) => ({ id: b.id, name: b.name, category: b.category, size: b.tip.size, builtin: true, ...colourOf(BRUSH_PRESETS.find((p) => p.id === b.id)) }));
   for (const raw of user) {
     try {
       const brush = readCanvasBrushSpec(raw);
       if (out.some((b) => b.id === brush.id)) continue;
-      out.push({ id: brush.id, name: brush.name, category: resolveCategory(brush), size: resolveBrush(brush).tip.size, builtin: false, spec: brush });
+      out.push({ id: brush.id, name: brush.name, category: resolveCategory(brush), size: resolveBrush(brush).tip.size, builtin: false, spec: brush, ...colourOf(brush) });
     } catch {
     }
   }