@r0kshan/cairn 1.0.0-RC13 → 1.0.0-RC15

package/bin/cairn.mjs

@@ -1,4 +1,24 @@
 #!/usr/bin/env node
+/*!
+ * cairn — Apache-2.0 — https://github.com/R0kshan/cairn
+ * Copyright 2026 Røkshan.
+ *
+ * This artifact contains third-party code and artwork:
+ *
+ * elkjs 0.12.0 — (c) 2017 Kiel University and others.
+ *   Dual-licensed EPL-2.0 OR GPL-3.0-or-later; cairn elects EPL-2.0.
+ *   Full text: licenses/elkjs-EPL-2.0.md — https://www.eclipse.org/legal/epl-2.0
+ *
+ * Simple Icons 16.29.0 artwork — CC0-1.0 project-wide.
+ *   Six of the vendored icons carry their own terms instead — MIT,
+ *   BSD-3-Clause, CC-BY-4.0 or Apache-2.0 — and are attributed individually.
+ *   Full texts: licenses/
+ *
+ * Per-icon attribution and the full licence texts ship with this artifact:
+ *   the package root (npm), the app directory (Scoop), or
+ *   share/doc/cairn (Homebrew, install.sh). Also at
+ *   https://github.com/R0kshan/cairn/blob/main/THIRD-PARTY-NOTICES.md
+ */
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -251,13 +271,13 @@ var require_elk_bundled = __commonJS({
               this.id = id + 1;
               msg.id = id;
               var self2 = this;
-              return new Promise(function(resolve, reject) {
+              return new Promise(function(resolve2, reject) {
                 self2.resolvers[id] = function(err, res) {
                   if (err) {
                     self2.convertGwtStyleError(err);
                     reject(err);
                   } else {
-                    resolve(res);
+                    resolve2(res);
                   }
                 };
                 self2.worker.postMessage(msg);
@@ -92320,11 +92340,12 @@ var init_lexer = __esm({
 });
 
 // src/models/ast.ts
-var ATTACH_SIDES, defaultDiagramStyle, explanations;
+var ATTACH_SIDES, ATTACH_ROLES, defaultDiagramStyle, explanations;
 var init_ast = __esm({
   "src/models/ast.ts"() {
     "use strict";
     ATTACH_SIDES = ["left", "right", "top", "bottom"];
+    ATTACH_ROLES = ["producer", "consumer"];
     defaultDiagramStyle = () => ({
       crossingHops: true,
       compact: false,
@@ -92343,7 +92364,11 @@ var init_ast = __esm({
     });
     explanations = {
       E0101: "Syntax error: the file does not follow the DSL grammar.",
+      E0105: '`logo:` takes either a built-in name (`logo: react`) or a quoted path to a file in the workspace (`logo: "./logos/acme.svg"`). A URL is refused on purpose: a diagram that fetches its logos stops being self-contained, leaks the reader\'s IP to whoever hosts them, and rots silently when the address dies \u2014 so cairn inlines a file instead of linking one.',
       E0106: "`order:` takes a whole number \u2265 0. On a top-level element it sets the reading order the disposition defines \u2014 left to right for `wide`/`slide`, top to bottom for `tall`/`page` \u2014 by banding the element inside its own layout partition, so it never crosses into another partition. Inside a container the axis flips: a child's layer belongs to the flows and elk honors no constraint that would change it, so there `order:` sorts the siblings that share a layer. Values need not be contiguous.",
+      E0107: 'Unknown built-in logo. The built-in set is deliberately small \u2014 it covers common stack technologies, not every brand. Anything outside it is still reachable as a workspace file: `logo: "./logos/name.svg"`.',
+      E0108: "This element kind does not carry a logo. A logo marks what a piece of software is built with, so the kinds that accept one are the kinds that run code; actors are people and containers are groupings, so neither takes one.",
+      W0580: "A `logo:` file could not be inlined \u2014 it is missing, too large, or not one of the supported types. Only a warning: the diagram is still valid and renders without the mark, because a decoration that failed to load is no reason to fail a build.",
       E0201: "Unknown element kind for the active view. Each view defines its own kinds (e.g. logical: actor-group, actor, system, layer, block, external).",
       E0202: "Duplicate identifier. IDs are flat and unique per file (decision D1): every element needs a distinct ID so flows can reference it unambiguously.",
       E0203: "The logical view forbids unlabelled arrows: every flow must name the data, command or event it carries. A logical diagram tells what circulates, not just who talks to whom.",
@@ -92360,42 +92385,53 @@ var init_ast = __esm({
       E0215: "A deployed application (app-instance) must sit on a server or in a zone. It shows WHERE an application runs, without its internal detail (C4 deployment convention).",
       E0216: "Network zones belong to a site (or nest inside a larger zone): DMZ and LAN only mean something relative to a perimeter.",
       W0540: 'C4 container-diagram practice: inter-process relationships should be labelled with their technology/protocol ("the how, not just the what"). Human/actor interactions are exempt. Add `(API_REST, JSON)` after the label, or ignore if the diagram is intentionally functional-only.',
-      E0223: "Unknown attachment side. A flow endpoint may name the side it attaches to \u2014 `APP.right -> DB.left` \u2014 using the diagram as it is read: `left`, `right`, `top`, `bottom`. The side is a hint, not a guarantee: a side the layout cannot reach is dropped with a W0570 warning rather than forced.",
+      E0223: "Unknown endpoint suffix. A flow endpoint may name the side it attaches to \u2014 `APP.right -> DB.left` \u2014 using the diagram as it is read: `left`, `right`, `top`, `bottom`. It may instead name its role towards a queue at the other end: `producer` or `consumer`. A declared side is a hint, not a guarantee: one the layout cannot reach is dropped with a W0570 warning rather than forced.",
+      E0224: "An endpoint role says what this element does with the *queue* at the other end of the flow (`CAPTURE.producer -> EVENTS`), so the other end has to be one. Point the flow at a queue, or drop the role \u2014 between two ordinary elements the arrow already says everything a role would.",
+      E0225: "A flow's queue endpoint carries both a declared side and a role at the other end, and they are two answers to one question: `producer` already means the queue's left cap and `consumer` its right. Keep the role and drop the side, or keep the side and drop the role.",
       E0240: "The infrastructure view requires every flow to carry its protocol (and port if relevant): the flow matrix is the primary output of this view. Add `(HTTPS/443)` after the label.",
       E0221: 'Unknown business-object reference: a flow carries `[AN_ID]` that no `business-object` declaration defines. Declare it once (`business-object ID "Name" "description"`) so the registry and the chips stay consistent.',
-      E0222: "Business objects are a logical-view concept (what data circulates between functional blocks). They are not part of the application, infrastructure, or security views \u2014 model the exchange with the flow label and technical tail instead. Remove the `business-object` declaration and its `[refs]`, or switch the diagram to `logical`.",
+      E0222: "Business objects are a logical-view concept (what data circulates between functional blocks). They are not part of the application or infrastructure views \u2014 model the exchange with the flow label and technical tail instead. Remove the `business-object` declaration and its `[refs]`, or switch the diagram to `logical`.",
       W0530: "Completeness check: a declared business object is never carried by any flow \u2014 either connect it to the flows that transport it, or remove it from this view.",
-      E0217: "A sensitive asset must sit inside a trust zone: its protection level is defined by the zone that contains it.",
-      E0218: "A security node (firewall, WAF, bastion, reverse proxy) lives inside a trust zone \u2014 typically the exposed zone whose traffic it filters.",
-      E0250: 'The security view requires each trust zone to declare a sensitivity level in parentheses after the label: `trust-zone DMZ "DMZ" (public)`. Levels, least \u2192 most trusted: public, internal, restricted, secret. The level drives the zone color and the trust-boundary crossing checks.',
       W0570: "A declared attachment side (`APP.right -> DB.left`) did not survive layout: the flow ended up on another side of the element. Pins are honored where the layout can reach them and dropped where it cannot, rather than forced into an unreadable route. Move the element instead (`order:`), pin the other endpoint, or drop the pin.",
-      W0571: "An endpoint reads `ID.side`, but `ID.side` is itself a declared element, and a declared id always wins \u2014 so the flow attaches to that element and no side is pinned. Rename the element if you meant the side.",
-      W0560: "Security check: this flow enters a more-trusted zone from a less-trusted one without passing through a security-node (firewall/WAF/bastion). Route it through a filtering point, or confirm the direct path is deliberate. This is the diagram equivalent of a missing firewall rule review.",
-      W0561: "Security check: an inter-zone flow does not state its encryption/protocol. Cross-zone traffic should declare how it is protected: add `(TLS1.3)` or the relevant protocol after the label."
+      W0571: "An endpoint reads `ID.side`, but `ID.side` is itself a declared element, and a declared id always wins \u2014 so the flow attaches to that element and no side is pinned. Rename the element if you meant the side."
     };
   }
 });
 
 // src/themes.ts
+function isDarkTheme(name) {
+  return name === "classic-dark" || THEME_SPECS[name]?.dark === true;
+}
+function registerTheme(name, spec) {
+  if (RESERVED_THEME_NAMES.includes(name)) {
+    throw new Error(`\`${name}\` is a reserved theme name \u2014 rename the theme file`);
+  }
+  THEME_SPECS[name] = spec;
+  themes[name] = buildTheme(spec);
+  if (!themeNames.includes(name)) themeNames.push(name);
+}
 function themeFor(name, view) {
-  if (name === "classic")
-    return {
-      palette: lightPalette,
-      kinds: view.defaults,
-      levels: view.levelDefaults ?? {}
-    };
-  if (name === "classic-dark")
-    return {
-      palette: darkPalette,
-      kinds: view.defaultsDark,
-      levels: view.levelDefaultsDark ?? {}
-    };
-  const theme = themes[name] ?? themes.light;
+  if (name === "classic") return { palette: lightPalette, kinds: view.defaults };
+  if (name === "classic-dark") return { palette: darkPalette, kinds: view.defaultsDark };
+  return applyTheme(themes[name] ?? themes.light, view);
+}
+function themeFromSpec(spec, view) {
+  return applyTheme(buildTheme(spec), view);
+}
+function paletteFor(name) {
+  if (name === "classic") return lightPalette;
+  if (name === "classic-dark") return darkPalette;
+  return themes[name]?.palette ?? lightPalette;
+}
+function paletteFromSpec(spec) {
+  return buildTheme(spec).palette;
+}
+function applyTheme(theme, view) {
   const kinds = {};
-  for (const kind of view.kinds) kinds[kind] = theme.roles[roleForKind(kind, view.name)] ?? {};
-  return { palette: theme.palette, kinds, levels: theme.levels };
+  for (const kind of view.kinds) kinds[kind] = theme.roles[roleForKind(kind)] ?? {};
+  return { palette: theme.palette, kinds };
 }
-var lightPalette, darkPalette, palettes, flowPalette, containerStyle, leafStyle, KIND_ROLE_MAP, roleForKind, buildTheme, themes, themeNames;
+var lightPalette, darkPalette, flowPalette, containerStyle, leafStyle, KIND_ROLE_MAP, roleForKind, buildTheme, THEME_SPECS, themes, themeNames, RESERVED_THEME_NAMES;
 var init_themes = __esm({
   "src/themes.ts"() {
     "use strict";
@@ -92447,10 +92483,6 @@ var init_themes = __esm({
       chipStroke: "#b08d2a",
       chipText: "#e0c068"
     };
-    palettes = {
-      light: lightPalette,
-      dark: darkPalette
-    };
     flowPalette = {
       light: [
         "#1f77b4",
@@ -92497,16 +92529,15 @@ var init_themes = __esm({
       datastore: "datastore",
       queue: "datastore",
       gateway: "authGateway",
+      firewall: "firewall",
       auth: "auth",
       idp: "identityProvider",
       site: "site",
       "network-zone": "networkZone",
       server: "server",
-      "app-instance": "appInstance",
-      "security-node": "securityNode",
-      asset: "leaf"
+      "app-instance": "appInstance"
     };
-    roleForKind = (kind, viewName) => viewName === "security" && kind === "external" ? "untrusted" : KIND_ROLE_MAP[kind] ?? "leaf";
+    roleForKind = (kind) => KIND_ROLE_MAP[kind] ?? "leaf";
     buildTheme = (spec) => {
       const paletteSpec = spec.pal, accentColors = spec.accentColors;
       const palette = {
@@ -92542,28 +92573,25 @@ var init_themes = __esm({
           application: containerStyle(accentColors.appF, accentColors.app),
           layer: containerStyle(accentColors.goldF, accentColors.gold, false, 1),
           external: containerStyle(accentColors.violetF, accentColors.violet, true),
-          untrusted: containerStyle(accentColors.redF, accentColors.red, true, 1.3),
           leaf: leafStyle(accentColors.leafF, accentColors.leafS),
           datastore: leafStyle(accentColors.purpleF, accentColors.purple),
           site: containerStyle(accentColors.siteF, accentColors.siteS, false, 1.4),
           networkZone: containerStyle(accentColors.greenF, accentColors.green, true),
           server: containerStyle(accentColors.serverF, accentColors.serverS, false, 1.5),
           appInstance: leafStyle(accentColors.aiF, accentColors.aiS, 1.2),
-          securityNode: leafStyle(accentColors.nodeF, accentColors.node, 1.6),
+          // Accent keys predate the roles that read them: `auth`/`authF` is the
+          // gateway's orange, `authn`/`authnF` the auth middleware's blue. The two
+          // used to share the `node` orange, which is what made a gateway and an
+          // auth middleware indistinguishable in a dense infrastructure view.
           authGateway: leafStyle(accentColors.authF, accentColors.auth, 1.4),
-          auth: leafStyle(accentColors.nodeF, accentColors.node, 1.5),
+          firewall: leafStyle(accentColors.fwF, accentColors.fw, 1.6),
+          auth: leafStyle(accentColors.authnF, accentColors.authn, 1.5),
           identityProvider: leafStyle(accentColors.idpF, accentColors.idp)
-        },
-        levels: {
-          public: containerStyle(spec.lv.public[0], spec.lv.public[1], false, 1.4),
-          internal: containerStyle(spec.lv.internal[0], spec.lv.internal[1], false, 1.4),
-          restricted: containerStyle(spec.lv.restricted[0], spec.lv.restricted[1], false, 1.4),
-          secret: containerStyle(spec.lv.secret[0], spec.lv.secret[1], false, 1.4)
         }
       };
     };
-    themes = {
-      light: buildTheme({
+    THEME_SPECS = {
+      light: {
         pal: {
           bg: "#ffffff",
           text: "#17202c",
@@ -92611,16 +92639,15 @@ var init_themes = __esm({
           auth: "#b85a30",
           authF: "#f5e6dd",
           idp: "#3a8f8f",
-          idpF: "#e0f0f0"
-        },
-        lv: {
-          public: ["#fdeceb", "#d0463f"],
-          internal: ["#fef2e2", "#cf9436"],
-          restricted: ["#e9f2fb", "#2f7cc4"],
-          secret: ["#efe9f7", "#7a55a8"]
+          idpF: "#e0f0f0",
+          fw: "#c0392b",
+          fwF: "#fdecea",
+          authn: "#2f6fb5",
+          authnF: "#e8f1fb"
         }
-      }),
-      dark: buildTheme({
+      },
+      dark: {
+        dark: true,
         pal: {
           bg: "#1e2530",
           text: "#e6edf3",
@@ -92668,16 +92695,14 @@ var init_themes = __esm({
           auth: "#c96a4a",
           authF: "#332218",
           idp: "#4fafaf",
-          idpF: "#1a2e2e"
-        },
-        lv: {
-          public: ["#3a2422", "#c25a54"],
-          internal: ["#332a1c", "#c08a44"],
-          restricted: ["#1f2a37", "#4a86b8"],
-          secret: ["#291f33", "#8a6cb0"]
+          idpF: "#1a2e2e",
+          fw: "#e5675a",
+          fwF: "#33211f",
+          authn: "#6fa8e0",
+          authnF: "#1d2735"
         }
-      }),
-      slate: buildTheme({
+      },
+      slate: {
         pal: {
           bg: "#f7f9fb",
           text: "#26303c",
@@ -92725,16 +92750,14 @@ var init_themes = __esm({
           auth: "#a85a30",
           authF: "#f0e4dd",
           idp: "#3a8f8f",
-          idpF: "#e4f0f0"
-        },
-        lv: {
-          public: ["#f7ece9", "#c05a4a"],
-          internal: ["#f3efe6", "#a8823f"],
-          restricted: ["#e8eff6", "#3b6ea5"],
-          secret: ["#efecf5", "#7d6ba8"]
+          idpF: "#e4f0f0",
+          fw: "#bd4b3c",
+          fwF: "#f9e9e6",
+          authn: "#3a6ea5",
+          authnF: "#e9f0f8"
         }
-      }),
-      sand: buildTheme({
+      },
+      sand: {
         pal: {
           bg: "#faf6ee",
           text: "#3a2f22",
@@ -92782,16 +92805,14 @@ var init_themes = __esm({
           auth: "#a85a30",
           authF: "#f0e5dd",
           idp: "#3a7a6f",
-          idpF: "#e5f0ed"
-        },
-        lv: {
-          public: ["#f7e2da", "#c0562a"],
-          internal: ["#f6ecd2", "#b0842e"],
-          restricted: ["#e6f0f1", "#3f7a8c"],
-          secret: ["#f0e8ef", "#8a5f7a"]
+          idpF: "#e5f0ed",
+          fw: "#b8492f",
+          fwF: "#f8e8e0",
+          authn: "#3a6b9a",
+          authnF: "#e9eff7"
         }
-      }),
-      contrast: buildTheme({
+      },
+      contrast: {
         pal: {
           bg: "#ffffff",
           text: "#000000",
@@ -92839,16 +92860,15 @@ var init_themes = __esm({
           auth: "#993a1a",
           authF: "#f6e3dd",
           idp: "#005a5a",
-          idpF: "#daf0f0"
-        },
-        lv: {
-          public: ["#f9dcd6", "#c0341a"],
-          internal: ["#f6e6c8", "#9a6a00"],
-          restricted: ["#e0edf7", "#005a9c"],
-          secret: ["#eee0f7", "#6a2fa0"]
+          idpF: "#daf0f0",
+          fw: "#a3140a",
+          fwF: "#fbe3df",
+          authn: "#00408f",
+          authnF: "#dfe8fb"
         }
-      }),
-      nord: buildTheme({
+      },
+      nord: {
+        dark: true,
         pal: {
           bg: "#2e3440",
           text: "#eceff4",
@@ -92896,16 +92916,14 @@ var init_themes = __esm({
           auth: "#c96a4a",
           authF: "#332218",
           idp: "#6fafaf",
-          idpF: "#203432"
-        },
-        lv: {
-          public: ["#3a2a2d", "#bf616a"],
-          internal: ["#3a3524", "#d0a85f"],
-          restricted: ["#2f3a44", "#81a1c1"],
-          secret: ["#312a3a", "#a38bbd"]
+          idpF: "#203432",
+          fw: "#bf616a",
+          fwF: "#3b2f34",
+          authn: "#81a1c1",
+          authnF: "#333c4a"
         }
-      }),
-      solarized: buildTheme({
+      },
+      solarized: {
         pal: {
           bg: "#fdf6e3",
           text: "#586e75",
@@ -92953,17 +92971,25 @@ var init_themes = __esm({
           auth: "#b85a30",
           authF: "#f5e6dd",
           idp: "#2aa198",
-          idpF: "#dff0ec"
-        },
-        lv: {
-          public: ["#f7ddd6", "#dc322f"],
-          internal: ["#f2e6c8", "#b58900"],
-          restricted: ["#e3edf3", "#268bd2"],
-          secret: ["#e8e6f2", "#6c71c4"]
+          idpF: "#dff0ec",
+          fw: "#dc322f",
+          fwF: "#f7e3dd",
+          authn: "#268bd2",
+          authnF: "#e3edf5"
         }
-      })
+      }
     };
+    themes = Object.fromEntries(
+      Object.entries(THEME_SPECS).map(([name, spec]) => [name, buildTheme(spec)])
+    );
     themeNames = [...Object.keys(themes), "classic", "classic-dark"];
+    RESERVED_THEME_NAMES = [
+      "classic",
+      "classic-dark",
+      "__proto__",
+      "constructor",
+      "prototype"
+    ];
   }
 });
 
@@ -93087,7 +93113,7 @@ function parseFlow(p, sourceToken) {
   model.flows.push(flow);
 }
 function parseElement(p, sourceToken, parent) {
-  const { matchToken, advance, reportError, lookAhead, syncToNextLine, model } = p;
+  const { matchToken, advance, reportError, syncToNextLine, model } = p;
   if (!matchToken("id")) {
     reportError(
       `invalid declaration: \`${sourceToken.text}\` alone on this line`,
@@ -93107,84 +93133,66 @@ function parseElement(p, sourceToken, parent) {
     parent: parent ?? void 0
   };
   if (matchToken("str")) element.label = advance().text;
-  if (matchToken("lparen")) {
-    advance();
-    if (matchToken("id")) {
-      const token = advance();
-      element.attr = {
-        value: token.text,
-        span: token.span
-      };
-    } else
-      reportError(
-        "attribute value expected after `(`",
-        lookAhead().span,
-        'e.g. `trust-zone DMZ "DMZ" (public)`'
-      );
-    if (matchToken("rparen")) advance();
-    else
-      reportError(
-        "`)` expected to close the attribute",
-        lookAhead().span,
-        'e.g. `trust-zone DMZ "DMZ" (public)`'
-      );
-  }
   if (matchToken("lbrace")) {
     advance();
     p.parseElementBody(element);
   }
   (parent ? parent.children : model.elements).push(element);
 }
-function splitEndpoint(token, flow, role) {
+function splitEndpoint(token, flow, end) {
   const dot = token.text.lastIndexOf(".");
   if (dot <= 0 || dot === token.text.length - 1) return null;
   const base = token.text.slice(0, dot);
-  const side = token.text.slice(dot + 1);
+  const suffix = token.text.slice(dot + 1);
   return {
     flow,
-    role,
+    end,
     raw: token.text,
     rawSpan: token.span,
     base,
     baseSpan: { line: token.span.line, col: token.span.col, len: base.length },
-    side,
-    sideSpan: { line: token.span.line, col: token.span.col + dot + 1, len: side.length }
+    suffix,
+    suffixSpan: { line: token.span.line, col: token.span.col + dot + 1, len: suffix.length }
   };
 }
-function resolveAttachSides(splits, model, diagnostics) {
+function resolveEndpointSuffixes(splits, model, diagnostics) {
   for (const split of splits) {
+    const isSide = ATTACH_SIDES.includes(split.suffix);
+    const isRole = ATTACH_ROLES.includes(split.suffix);
     if (model.index.has(split.raw)) {
-      if (ATTACH_SIDES.includes(split.side))
+      if (isSide || isRole)
         diagnostics.push({
           code: "W0571",
           severity: "warning",
-          message: `\`${split.raw}\` is a declared element, so \`.${split.side}\` is not read as an attachment side`,
+          message: `\`${split.raw}\` is a declared element, so \`.${split.suffix}\` is not read as ${isSide ? "an attachment side" : "a role"}`,
           span: split.rawSpan,
           note: "a declared id always wins over the `ID.side` reading",
-          help: `rename the element if you meant to attach the flow to the ${split.side} side of \`${split.base}\``
+          help: isSide ? `rename the element if you meant to attach the flow to the ${split.suffix} side of \`${split.base}\`` : `rename the element if you meant \`${split.base}\` to be the ${split.suffix} of the queue at the other end`
         });
       continue;
     }
     if (!model.index.has(split.base)) continue;
-    const known = ATTACH_SIDES.includes(split.side);
-    if (!known)
+    if (!isSide && !isRole)
       diagnostics.push({
         code: "E0223",
         severity: "error",
-        message: `unknown attachment side \`${split.side}\``,
-        span: split.sideSpan,
-        note: "sides are named as the diagram is read",
-        help: "use `left`, `right`, `top` or `bottom`, e.g. `APP.right -> DB.left`"
+        message: `unknown endpoint suffix \`${split.suffix}\``,
+        span: split.suffixSpan,
+        note: "an endpoint names either the side it attaches to, as the diagram is read, or its role towards a queue",
+        help: "use `left`, `right`, `top` or `bottom` \u2014 `APP.right -> DB.left` \u2014 or `producer` / `consumer`, e.g. `CAPTURE.producer -> EVENTS`"
       });
-    const side = known ? { value: split.side, span: split.sideSpan } : void 0;
-    if (split.role === "from") {
+    const side = isSide ? { value: split.suffix, span: split.suffixSpan } : void 0;
+    const role = isRole ? { value: split.suffix, span: split.suffixSpan } : void 0;
+    if (split.end === "from") {
       split.flow.from = split.base;
       split.flow.fromSpan = split.baseSpan;
       split.flow.fromSide = side;
+      split.flow.fromRole = role;
     } else {
       split.flow.to = split.base;
       split.flow.toSpan = split.baseSpan;
       split.flow.toSide = side;
+      split.flow.toRole = role;
     }
   }
 }
@@ -93213,6 +93221,34 @@ function tryOrderEntry(p, parent) {
   parent.order = { value, span: valueToken.span };
   return true;
 }
+function tryLogoEntry(p, parent) {
+  const { matchToken, advance, reportCoded, save, restore, syncToNextLine } = p;
+  if (!parent || !matchToken("id", "logo")) return false;
+  const mark = save();
+  const keyToken = advance();
+  if (!matchToken("colon")) {
+    restore(mark);
+    return false;
+  }
+  advance();
+  const valueToken = matchToken("id") || matchToken("str") ? advance() : null;
+  if (!valueToken || valueToken.text.length === 0) {
+    reportCoded(
+      "E0105",
+      "`logo` expects a built-in name or a quoted file path",
+      (valueToken ?? keyToken).span,
+      'e.g. `logo: react`, or `logo: "./logos/acme.svg"` for your own'
+    );
+    syncToNextLine();
+    return true;
+  }
+  parent.logo = {
+    value: valueToken.text,
+    source: valueToken.kind === "str" ? "file" : "builtin",
+    span: valueToken.span
+  };
+  return true;
+}
 function tryLegendBlock(p) {
   const { matchToken, advance, reportError, lookAhead, skipNewlines, syncToNextLine, model } = p;
   if (!matchToken("id", "legend")) return false;
@@ -93420,6 +93456,7 @@ function parse(src) {
     }
     if (tryStyleBlock(parent)) return;
     if (tryOrderEntry(parser, parent)) return;
+    if (tryLogoEntry(parser, parent)) return;
     if (!parent && tryLegendBlock(parser)) return;
     if (!parent && tryBusinessObject(parser)) return;
     parseFlowOrElement(parser, parent);
@@ -93432,7 +93469,7 @@ function parse(src) {
   for (const [id, element] of indexElementsById(model.elements)) {
     if (!model.index.has(id)) model.index.set(id, element);
   }
-  resolveAttachSides(endpointSplits, model, diagnostics);
+  resolveEndpointSuffixes(endpointSplits, model, diagnostics);
   return { model, diags: diagnostics };
 }
 function applyStyleEntry(entry) {
@@ -93664,12 +93701,14 @@ var init_parser = __esm({
 });
 
 // src/views.ts
-var logicalView, applicationView, infrastructureView, SEC_LEVELS, securityView, views;
+var LINE_STYLES2, logicalView, applicationView, infrastructureView, views;
 var init_views = __esm({
   "src/views.ts"() {
     "use strict";
+    LINE_STYLES2 = ["solid", "dashed", "dotted"];
     logicalView = {
       name: "logical",
+      laneKinds: ["external"],
       kinds: ["actor-group", "actor", "system", "layer", "block", "external"],
       containerKinds: ["actor-group", "system", "layer", "external"],
       // Logical flows carry no technical detail (flowTech* are null below), so the
@@ -93698,6 +93737,16 @@ var init_views = __esm({
       },
       legendFlowLabel: "Functional flow (label = exchanged data)",
       legendFlowLabelFr: "Flux fonctionnel (libell\xE9 = donn\xE9es \xE9chang\xE9es)",
+      legendLineStyles: {
+        solid: "Direct exchange",
+        dashed: "Asynchronous or event-driven exchange",
+        dotted: "Dependency \u2014 no data exchanged"
+      },
+      legendLineStylesFr: {
+        solid: "\xC9change direct",
+        dashed: "\xC9change asynchrone ou \xE9v\xE9nementiel",
+        dotted: "D\xE9pendance \u2014 aucune donn\xE9e \xE9chang\xE9e"
+      },
       flowTechRequired: null,
       flowTechRecommended: null,
       businessObjects: true,
@@ -93792,17 +93841,33 @@ var init_views = __esm({
     };
     applicationView = {
       name: "application",
+      laneKinds: ["external"],
+      hubKinds: ["queue"],
       kinds: [
         "actor-group",
         "actor",
         "system",
         "application",
         "module",
+        "gateway",
+        "auth",
+        "idp",
         "queue",
         "datastore",
         "external"
       ],
       containerKinds: ["actor-group", "system", "application", "external"],
+      // A logo says what a thing is built with, so it belongs to the kinds that run
+      // code. `actor` and `actor-group` are people; `system` is a grouping whose
+      // children carry their own stacks. `gateway`, `auth` and `idp` are left out
+      // on purpose: they are drawn with a corner glyph, and the glyph renderer has
+      // no logo slot — a logo on them would reserve width and draw nothing.
+      logoKinds: ["application", "module", "queue", "datastore", "external"],
+      // The same three kinds as the infrastructure view, drawn the same way: an API
+      // gateway, an auth middleware and an identity provider are containers in
+      // their own right at the application level, and the glyph is what tells them
+      // apart from a plain `application` at a glance.
+      glyphKinds: ["gateway", "auth", "idp"],
       // C4-style `(API_REST, JSON)`: the protocol half is worth tabulating, the port is not.
       // `zoneOf` walks ancestors nearest-first, so an endpoint inside an application
       // still reads `Name (App)`; the system only annotates what sits directly in it.
@@ -93814,6 +93879,9 @@ var init_views = __esm({
         "actor-group": 0,
         system: 1,
         application: 1,
+        gateway: 1,
+        auth: 1,
+        idp: 1,
         queue: 1,
         datastore: 1,
         external: 2
@@ -93824,6 +93892,9 @@ var init_views = __esm({
         system: "System",
         application: "Application",
         module: "Application module",
+        gateway: "Gateway / reverse proxy",
+        auth: "Auth middleware",
+        idp: "Identity provider (IdP)",
         queue: "Message queue / broker",
         datastore: "Datastore / registry",
         external: "External system"
@@ -93834,6 +93905,9 @@ var init_views = __esm({
         system: "Syst\xE8me",
         application: "Application",
         module: "Module applicatif",
+        gateway: "Passerelle / proxy",
+        auth: "Middleware d'authentification",
+        idp: "Fournisseur d'identit\xE9 (IdP)",
         queue: "File de messages / broker",
         datastore: "Entrep\xF4t / r\xE9f\xE9rentiel",
         external: "Syst\xE8me externe"
@@ -93845,6 +93919,16 @@ var init_views = __esm({
       },
       legendFlowLabel: "Application flow \u2014 (protocol, format) under the label",
       legendFlowLabelFr: "Flux applicatif \u2014 (protocole, format) sous le libell\xE9",
+      legendLineStyles: {
+        solid: "Synchronous call (request / response)",
+        dashed: "Asynchronous exchange (message, event)",
+        dotted: "Dependency \u2014 no direct call"
+      },
+      legendLineStylesFr: {
+        solid: "Appel synchrone (requ\xEAte / r\xE9ponse)",
+        dashed: "\xC9change asynchrone (message, \xE9v\xE9nement)",
+        dotted: "D\xE9pendance \u2014 sans appel direct"
+      },
       flowLabelRequired: null,
       flowTechRequired: null,
       flowTechRecommended: {
@@ -93871,7 +93955,7 @@ var init_views = __esm({
       minCounts: [],
       isolatedWarn: {
         code: "W0510",
-        kinds: ["module", "queue", "datastore"],
+        kinds: ["module", "gateway", "auth", "idp", "queue", "datastore"],
         message: "isolated element: no incoming or outgoing flow"
       },
       defaults: {
@@ -93893,6 +93977,20 @@ var init_views = __esm({
           fill: "#ffffff",
           stroke: { color: "#5b7a99", style: "solid", width: 1.3 }
         },
+        // Same colours as the infrastructure view's `gateway`, `auth` and `idp`: one
+        // thing drawn one way, whichever view it appears in.
+        gateway: {
+          fill: "#f5e6dd",
+          stroke: { color: "#bf5530", style: "solid", width: 1.6 }
+        },
+        auth: {
+          fill: "#e8f1fb",
+          stroke: { color: "#2f6fb5", style: "solid", width: 1.5 }
+        },
+        idp: {
+          fill: "#e0f0f0",
+          stroke: { color: "#3a8f8f", style: "solid", width: 1.3 }
+        },
         queue: {
           fill: "#f3eef8",
           stroke: { color: "#8a6fae", style: "solid", width: 1.3 }
@@ -93924,6 +94022,18 @@ var init_views = __esm({
           fill: "#252a31",
           stroke: { color: "#5f7f9e", style: "solid", width: 1.3 }
         },
+        gateway: {
+          fill: "#332218",
+          stroke: { color: "#c96a4a", style: "solid", width: 1.6 }
+        },
+        auth: {
+          fill: "#1d2735",
+          stroke: { color: "#6fa8e0", style: "solid", width: 1.5 }
+        },
+        idp: {
+          fill: "#1a2e2e",
+          stroke: { color: "#4fafaf", style: "solid", width: 1.3 }
+        },
         queue: {
           fill: "#2a2433",
           stroke: { color: "#7a5f9e", style: "solid", width: 1.3 }
@@ -93941,19 +94051,27 @@ var init_views = __esm({
     };
     infrastructureView = {
       name: "infrastructure",
+      laneKinds: ["external"],
+      hubKinds: ["queue"],
       kinds: [
         "actor",
+        "device",
         "site",
         "network-zone",
         "server",
         "app-instance",
         "queue",
         "gateway",
+        "firewall",
         "auth",
         "idp",
         "external"
       ],
       containerKinds: ["site", "network-zone", "server"],
+      glyphKinds: ["gateway", "firewall", "auth", "idp", "device"],
+      // A `device` is a flow origin, so it belongs on the entry side with the
+      // actors rather than in a declaration-order band with the zones.
+      ingressKinds: ["actor", "actor-group", "device"],
       // The reference shape: the matrice des flux techniques as an EA dossier expects it.
       matrix: {
         zoneKinds: ["network-zone", "site"],
@@ -93964,24 +94082,28 @@ var init_views = __esm({
       actorLegend: true,
       legendNames: {
         actor: "User / consumer",
+        device: "Device / workstation",
         site: "Site / data center",
         "network-zone": "Network zone",
         server: "Server / VM",
         "app-instance": "Deployed application",
         queue: "Message queue / broker",
         gateway: "Gateway / reverse proxy",
+        firewall: "Firewall",
         auth: "Auth middleware",
         idp: "Identity provider (IdP)",
         external: "External system"
       },
       legendNamesFr: {
         actor: "Utilisateur / consommateur",
+        device: "Poste de travail",
         site: "Site / centre de donn\xE9es",
         "network-zone": "Zone r\xE9seau",
         server: "Serveur / VM",
         "app-instance": "Application d\xE9ploy\xE9e",
         queue: "File de messages / broker",
         gateway: "Passerelle / proxy",
+        firewall: "Pare-feu",
         auth: "Middleware d'authentification",
         idp: "Fournisseur d'identit\xE9 (IdP)",
         external: "Syst\xE8me externe"
@@ -93993,6 +94115,16 @@ var init_views = __esm({
       },
       legendFlowLabel: "Technical flow (protocol, port)",
       legendFlowLabelFr: "Flux technique (protocole, port)",
+      legendLineStyles: {
+        solid: "Permanent link \u2014 nominal traffic",
+        dashed: "Asynchronous or intermittent link",
+        dotted: "Dependency \u2014 outside nominal traffic"
+      },
+      legendLineStylesFr: {
+        solid: "Lien permanent \u2014 trafic nominal",
+        dashed: "Lien asynchrone ou intermittent",
+        dotted: "D\xE9pendance \u2014 hors trafic nominal"
+      },
       flowLabelRequired: null,
       flowTechRecommended: null,
       flowTechRequired: {
@@ -94026,7 +94158,7 @@ var init_views = __esm({
       minCounts: [],
       isolatedWarn: {
         code: "W0510",
-        kinds: ["app-instance", "queue", "gateway", "auth", "idp"],
+        kinds: ["app-instance", "queue", "gateway", "firewall", "auth", "idp", "device"],
         message: "isolated element: no incoming or outgoing flow"
       },
       defaults: {
@@ -94043,6 +94175,12 @@ var init_views = __esm({
           fill: "#ffffff",
           stroke: { color: "#55606b", style: "solid", width: 1.5 }
         },
+        // The server's grey: a workstation is hardware like a server is, and the
+        // monitor glyph is what tells the two apart.
+        device: {
+          fill: "#eef0f2",
+          stroke: { color: "#55606b", style: "solid", width: 1.3 }
+        },
         "app-instance": {
           fill: "#fff7e6",
           stroke: { color: "#b08d2a", style: "solid", width: 1.2 }
@@ -94055,9 +94193,13 @@ var init_views = __esm({
           fill: "#f5e6dd",
           stroke: { color: "#bf5530", style: "solid", width: 1.6 }
         },
+        firewall: {
+          fill: "#fdecea",
+          stroke: { color: "#c0392b", style: "solid", width: 1.6 }
+        },
         auth: {
-          fill: "#fef3e2",
-          stroke: { color: "#d68a2a", style: "solid", width: 1.5 }
+          fill: "#e8f1fb",
+          stroke: { color: "#2f6fb5", style: "solid", width: 1.5 }
         },
         idp: {
           fill: "#e0f0f0",
@@ -94082,6 +94224,10 @@ var init_views = __esm({
           fill: "#252a31",
           stroke: { color: "#6b7885", style: "solid", width: 1.5 }
         },
+        device: {
+          fill: "#242a30",
+          stroke: { color: "#6b7885", style: "solid", width: 1.3 }
+        },
         "app-instance": {
           fill: "#2e2717",
           stroke: { color: "#b08d2a", style: "solid", width: 1.2 }
@@ -94094,9 +94240,13 @@ var init_views = __esm({
           fill: "#332218",
           stroke: { color: "#c96a4a", style: "solid", width: 1.6 }
         },
+        firewall: {
+          fill: "#33211f",
+          stroke: { color: "#e5675a", style: "solid", width: 1.6 }
+        },
         auth: {
-          fill: "#332614",
-          stroke: { color: "#b88a30", style: "solid", width: 1.5 }
+          fill: "#1d2735",
+          stroke: { color: "#6fa8e0", style: "solid", width: 1.5 }
         },
         idp: {
           fill: "#1a2e2e",
@@ -94108,186 +94258,186 @@ var init_views = __esm({
         }
       }
     };
-    SEC_LEVELS = ["public", "internal", "restricted", "secret"];
-    securityView = {
-      name: "security",
-      kinds: ["trust-zone", "security-node", "asset", "actor-group", "actor", "external"],
-      containerKinds: ["trust-zone", "actor-group"],
-      // Security flows state their encryption (W0561) but no port; the trust zone
-      // an endpoint sits in is the point of the view, so it annotates every row.
-      matrix: {
-        zoneKinds: ["trust-zone"],
-        columns: ["num", "source", "dest", "proto", "nature"]
+    views = {
+      logical: logicalView,
+      application: applicationView,
+      infrastructure: infrastructureView
+    };
+  }
+});
+
+// src/logos.ts
+var LOGOS, LOGO_NAMES;
+var init_logos = __esm({
+  "src/logos.ts"() {
+    "use strict";
+    LOGOS = {
+      angular: {
+        title: "Angular",
+        d: "M16.712 17.711H7.288l-1.204 2.916L12 24l5.916-3.373-1.204-2.916ZM14.692 0l7.832 16.855.814-12.856L14.692 0ZM9.308 0 .662 3.999l.814 12.856L9.308 0Zm-.405 13.93h6.198L12 6.396 8.903 13.93Z",
+        license: "CC-BY-4.0",
+        licenseUrl: "https://creativecommons.org/licenses/by/4.0/legalcode",
+        source: "https://angular.dev/press-kit"
       },
-      legendNames: {
-        "trust-zone": "Trust zone (sensitivity)",
-        "security-node": "Filtering / security node",
-        asset: "Sensitive asset",
-        "actor-group": "Actor group",
-        actor: "Actor",
-        external: "Untrusted external"
+      apache: {
+        title: "Apache",
+        d: "M17.805 2.197v.066h.156v.44h.072v-.44h.156v-.066zm.9 0l-.175.353-.172-.353h-.087v.506h.067V2.3l.172.35h.045l.172-.35v.404h.066v-.506zm-4.257 1c-.204.31-.424.66-.66 1.06l-.04.062a44.457 44.457 0 00-1.265 2.29c-.187.36-.38.742-.577 1.146l2.267-.25c.66-.302.955-.578 1.242-.976a15.5 15.5 0 00.23-.342c.23-.363.46-.763.663-1.16.197-.386.37-.767.505-1.11.083-.22.15-.422.198-.6.042-.158.074-.307.1-.45-.884.15-1.965.295-2.668.33zM11.894 7.78l-.077.16c-.078.16-.157.32-.236.488-.086.18-.172.364-.26.552l-.132.287a75.265 75.265 0 00-1.427 3.3c-.163.397-.327.807-.493 1.23-.15.38-.297.765-.45 1.164l-.02.06c-.15.396-.3.802-.453 1.22l-.01.027.72-.08a.213.213 0 01-.042-.006c.863-.106 2.01-.75 2.75-1.547.342-.367.652-.8.94-1.306.213-.377.413-.795.604-1.258.168-.405.328-.843.48-1.318-.196.105-.423.18-.673.235a2.184 2.184 0 01-.273.046c.806-.31 1.314-.905 1.683-1.64a2.816 2.816 0 01-.968.428c-.06.012-.116.022-.174.03l-.043.006h.002c.278-.118.514-.248.718-.403a2.571 2.571 0 00.637-.698l.063-.104.077-.154a8.107 8.107 0 00.367-.85l.03-.088a3.04 3.04 0 00.123-.463.733.733 0 01-.094.065c-.243.145-.66.277-.996.34l.663-.074-.664.073h-.017l-.1.017c.006-.003.01-.006.017-.008l-2.265.25-.013.022zM8.27 16.45c-.117.323-.236.654-.355.992l-.005.015c-.016.046-.032.094-.05.142-.08.227-.15.432-.31.9.264.12.475.435.675.793a1.44 1.44 0 00-.466-.99c1.293.06 2.41-.27 2.99-1.217.05-.084.096-.173.14-.268-.26.333-.59.474-1.2.44 0 0-.004 0-.005.002l.004-.002c.9-.404 1.354-.79 1.754-1.433.094-.153.186-.32.28-.503-.788.81-1.702 1.04-2.664.865l-.72.078a6.43 6.43 0 00-.067.183zM15.42.112c-.376.222-1 .85-1.748 1.763l.686 1.294c.48-.687.97-1.307 1.462-1.836l.058-.062c-.02.02-.04.04-.057.062-.16.176-.644.74-1.375 1.863.703-.035 1.784-.18 2.666-.33.262-1.47-.258-2.142-.258-2.142s-.66-1.07-1.436-.61zm-3.084 6.402a40.253 40.253 0 011.306-2.26l.04-.064c.224-.352.45-.693.677-1.02l-.685-1.293-.157.192c-.197.245-.403.51-.613.79a39.853 39.853 0 00-2.016 2.97l-.022.038.893 1.763c.19-.378.38-.752.575-1.118zm-3.73 8.32c.158-.406.319-.81.483-1.225.156-.394.32-.79.484-1.19a91.133 91.133 0 011.6-3.604l.205-.424c.12-.243.237-.485.36-.724a.125.125 0 01.02-.04l-.895-1.763-.044.07c-.207.34-.414.687-.617 1.042a38.056 38.056 0 00-1.092 2.04l-.094.193a24.573 24.573 0 00-1.258 3.087 18.492 18.492 0 00-.52 1.997l.896 1.77c.117-.317.24-.638.364-.963zm-1.376-.476a13.38 13.38 0 00-.234 1.692c0 .02-.004.04-.005.06-.28-.45-1.03-.888-1.026-.884.537.778.944 1.55 1.005 2.31-.29.058-.684-.027-1.14-.195.475.436.83.556.97.588-.434.03-.89.328-1.346.67.668-.27 1.21-.38 1.596-.29-.61 1.74-1.23 3.655-1.843 5.69a.538.538 0 00.364-.354c.11-.368.84-2.786 1.978-5.965l.097-.27.028-.078c.12-.332.246-.672.374-1.02l.09-.237v-.004L7.24 14.3c-.003.02-.01.04-.012.06z",
+        license: "Apache-2.0",
+        licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
+        source: "https://www.apache.org/foundation/press/kit"
       },
-      legendNamesFr: {
-        "trust-zone": "Zone de confiance (sensibilit\xE9)",
-        "security-node": "N\u0153ud de filtrage / s\xE9curit\xE9",
-        asset: "Actif sensible",
-        "actor-group": "Groupe d'acteurs",
-        actor: "Acteur",
-        external: "Externe non ma\xEEtris\xE9"
+      apachekafka: {
+        title: "Apache Kafka",
+        d: "M9.71 2.136a1.43 1.43 0 0 0-2.047 0h-.007a1.48 1.48 0 0 0-.421 1.042c0 .41.161.777.422 1.039l.007.007c.257.264.616.426 1.019.426.404 0 .766-.162 1.027-.426l.003-.007c.261-.262.421-.629.421-1.039 0-.408-.159-.777-.421-1.042H9.71zM8.683 22.295c.404 0 .766-.167 1.027-.429l.003-.008c.261-.261.421-.631.421-1.036 0-.41-.159-.778-.421-1.044H9.71a1.42 1.42 0 0 0-1.027-.432 1.4 1.4 0 0 0-1.02.432h-.007c-.26.266-.422.634-.422 1.044 0 .406.161.775.422 1.036l.007.008c.258.262.617.429 1.02.429zm7.89-4.462c.359-.096.683-.33.882-.684l.027-.052a1.47 1.47 0 0 0 .114-1.067 1.454 1.454 0 0 0-.675-.896l-.021-.014a1.425 1.425 0 0 0-1.078-.132c-.36.091-.684.335-.881.686-.2.349-.241.75-.146 1.119.099.363.33.691.675.896h.002c.346.203.737.239 1.101.144zm-6.405-7.342a2.083 2.083 0 0 0-1.485-.627c-.58 0-1.103.242-1.482.627-.378.385-.612.916-.612 1.507s.233 1.124.612 1.514a2.08 2.08 0 0 0 2.967 0c.379-.39.612-.923.612-1.514s-.233-1.122-.612-1.507zm-.835-2.51c.843.141 1.6.552 2.178 1.144h.004c.092.093.182.196.265.299l1.446-.851a3.176 3.176 0 0 1-.047-1.808 3.149 3.149 0 0 1 1.456-1.926l.025-.016a3.062 3.062 0 0 1 2.345-.306c.77.21 1.465.721 1.898 1.482v.002c.431.757.518 1.626.313 2.408a3.145 3.145 0 0 1-1.456 1.928l-.198.118h-.02a3.095 3.095 0 0 1-2.154.201 3.127 3.127 0 0 1-1.514-.944l-1.444.848a4.162 4.162 0 0 1 0 2.879l1.444.846c.413-.47.939-.789 1.514-.944a3.041 3.041 0 0 1 2.371.319l.048.023v.002a3.17 3.17 0 0 1 1.408 1.906 3.215 3.215 0 0 1-.313 2.405l-.026.053-.003-.005a3.147 3.147 0 0 1-1.867 1.436 3.096 3.096 0 0 1-2.371-.318v-.006a3.156 3.156 0 0 1-1.456-1.927 3.175 3.175 0 0 1 .047-1.805l-1.446-.848a3.905 3.905 0 0 1-.265.294l-.004.005a3.938 3.938 0 0 1-2.178 1.138v1.699a3.09 3.09 0 0 1 1.56.862l.002.004c.565.572.914 1.368.914 2.243 0 .873-.35 1.664-.914 2.239l-.002.009a3.1 3.1 0 0 1-2.21.931 3.1 3.1 0 0 1-2.206-.93h-.002v-.009a3.186 3.186 0 0 1-.916-2.239c0-.875.35-1.672.916-2.243v-.004h.002a3.1 3.1 0 0 1 1.558-.862v-1.699a3.926 3.926 0 0 1-2.176-1.138l-.006-.005a4.098 4.098 0 0 1-1.173-2.874c0-1.122.452-2.136 1.173-2.872h.006a3.947 3.947 0 0 1 2.176-1.144V6.289a3.137 3.137 0 0 1-1.558-.864h-.002v-.004a3.192 3.192 0 0 1-.916-2.243c0-.871.35-1.669.916-2.243l.002-.002A3.084 3.084 0 0 1 8.683 0c.861 0 1.641.355 2.21.932v.002h.002c.565.574.914 1.372.914 2.243 0 .876-.35 1.667-.914 2.243l-.002.005a3.142 3.142 0 0 1-1.56.864v1.692zm8.121-1.129l-.012-.019a1.452 1.452 0 0 0-.87-.668 1.43 1.43 0 0 0-1.103.146h.002c-.347.2-.58.529-.677.896-.095.365-.054.768.146 1.119l.007.009c.2.347.519.579.874.673.357.103.755.059 1.098-.144l.019-.009a1.47 1.47 0 0 0 .657-.885 1.493 1.493 0 0 0-.141-1.118",
+        license: "Apache-2.0",
+        licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
+        source: "https://apache.org/logos"
       },
-      bandTitles: {
-        flows: "FLOWS",
-        objects: "BUSINESS OBJECTS",
-        legend: "LEGEND"
+      apachespark: {
+        title: "Apache Spark",
+        d: "M10.812 0c-.425.013-.845.215-1.196.605a3.593 3.593 0 00-.493.722c-.355.667-.425 1.415-.556 2.143a551.9 551.9 0 00-.726 4.087c-.027.16-.096.227-.244.273C5.83 8.386 4.06 8.94 2.3 9.514c-.387.125-.773.289-1.114.506-1.042.665-1.196 1.753-.415 2.71.346.422.79.715 1.284.936 1.1.49 2.202.976 3.3 1.47.019.01.036.013.053.019h-.004l1.306.535c0 .023.002.045 0 .073-.2 2.03-.39 4.063-.58 6.095-.04.419-.012.831.134 1.23.317.87 1.065 1.148 1.881.701.372-.204.666-.497.937-.818 1.372-1.623 2.746-3.244 4.113-4.872.111-.133.205-.15.363-.098.349.117.697.231 1.045.347h.001c.02.012.045.02.073.03l.142.042c1.248.416 2.68.775 3.929 1.19.4.132.622.164 1.045.098.311-.048.592-.062.828-.236.602-.33.995-.957.988-1.682-.005-.427-.154-.813-.35-1.186-.82-1.556-1.637-3.113-2.461-4.666-.078-.148-.076-.243.037-.375 1.381-1.615 2.756-3.236 4.133-4.855.272-.32.513-.658.653-1.058.308-.878-.09-1.57-1-1.741a2.783 2.783 0 00-1.235.069c-1.974.521-3.947 1.041-5.918 1.57-.175.047-.26.015-.355-.144a353.08 353.08 0 00-2.421-4.018 4.61 4.61 0 00-.652-.849c-.371-.37-.802-.549-1.227-.536zm.172 3.703a.592.592 0 01.189.211c.87 1.446 1.742 2.89 2.609 4.338.07.118.135.16.277.121 1.525-.41 3.052-.813 4.579-1.217.367-.098.735-.193 1.103-.289a.399.399 0 01-.1.2c-1.259 1.48-2.516 2.962-3.779 4.438-.11.13-.12.22-.04.37.937 1.803 1.768 3.309 2.498 4.76l-3.696-1.019c-.538-.18-1.077-.358-1.615-.539-.163-.055-.25-.03-.36.1-1.248 1.488-2.504 2.97-3.759 4.454a.398.398 0 01-.18.132c.035-.378.068-.757.104-1.136.149-1.572.297-3.144.451-4.716-.03-.318.117-.405-.322-.545-1.493-.593-3.346-1.321-4.816-1.905a.595.595 0 01.24-.134c1.797-.57 3.595-1.14 5.394-1.705.127-.04.199-.092.211-.233.013-.148.05-.294.076-.441.241-1.363.483-2.726.726-4.088.068-.386.14-.771.21-1.157z",
+        license: "Apache-2.0",
+        licenseUrl: "https://www.apache.org/licenses/LICENSE-2.0.txt",
+        source: "https://apache.org/logos"
       },
-      legendFlowLabel: "Security flow \u2014 cross-zone flows should be filtered and encrypted",
-      legendFlowLabelFr: "Flux de s\xE9curit\xE9 \u2014 les flux inter-zones doivent \xEAtre filtr\xE9s et chiffr\xE9s",
-      partitions: {},
-      partitionByOrder: true,
-      flowLabelRequired: {
-        code: "E0203",
-        message: "flow without a label",
-        help: 'add a label describing the exchange: `A -> B : "\u2026" (TLS1.3)`'
+      django: {
+        title: "Django",
+        d: "M11.146 0h3.924v18.166c-2.013.382-3.491.535-5.096.535-4.791 0-7.288-2.166-7.288-6.32 0-4.002 2.65-6.6 6.753-6.6.637 0 1.121.05 1.707.203zm0 9.143a3.894 3.894 0 00-1.325-.204c-1.988 0-3.134 1.223-3.134 3.365 0 2.09 1.096 3.236 3.109 3.236.433 0 .79-.025 1.35-.102V9.142zM21.314 6.06v9.098c0 3.134-.229 4.638-.917 5.937-.637 1.249-1.478 2.039-3.211 2.905l-3.644-1.733c1.733-.815 2.574-1.53 3.109-2.625.561-1.121.739-2.421.739-5.835V6.059h3.924zM17.39.021h3.924v4.026H17.39z"
       },
-      flowTechRequired: null,
-      flowTechRecommended: null,
-      attrSpec: {
-        kind: "trust-zone",
-        values: SEC_LEVELS,
-        code: "E0250",
-        message: "trust zone without a valid sensitivity level",
-        help: 'set a level in parentheses: `trust-zone DMZ "DMZ" (public)` \u2014 one of public, internal, restricted, secret'
+      docker: {
+        title: "Docker",
+        d: "M13.983 11.078h2.119a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.119a.185.185 0 00-.185.185v1.888c0 .102.083.185.185.185m-2.954-5.43h2.118a.186.186 0 00.186-.186V3.574a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m0 2.716h2.118a.187.187 0 00.186-.186V6.29a.186.186 0 00-.186-.185h-2.118a.185.185 0 00-.185.185v1.887c0 .102.082.185.185.186m-2.93 0h2.12a.186.186 0 00.184-.186V6.29a.185.185 0 00-.185-.185H8.1a.185.185 0 00-.185.185v1.887c0 .102.083.185.185.186m-2.964 0h2.119a.186.186 0 00.185-.186V6.29a.185.185 0 00-.185-.185H5.136a.186.186 0 00-.186.185v1.887c0 .102.084.185.186.186m5.893 2.715h2.118a.186.186 0 00.186-.185V9.006a.186.186 0 00-.186-.186h-2.118a.185.185 0 00-.185.185v1.888c0 .102.082.185.185.185m-2.93 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.083.185.185.185m-2.964 0h2.119a.185.185 0 00.185-.185V9.006a.185.185 0 00-.184-.186h-2.12a.186.186 0 00-.186.186v1.887c0 .102.084.185.186.185m-2.92 0h2.12a.185.185 0 00.184-.185V9.006a.185.185 0 00-.184-.186h-2.12a.185.185 0 00-.184.185v1.888c0 .102.082.185.185.185M23.763 9.89c-.065-.051-.672-.51-1.954-.51-.338.001-.676.03-1.01.087-.248-1.7-1.653-2.53-1.716-2.566l-.344-.199-.226.327c-.284.438-.49.922-.612 1.43-.23.97-.09 1.882.403 2.661-.595.332-1.55.413-1.744.42H.751a.751.751 0 00-.75.748 11.376 11.376 0 00.692 4.062c.545 1.428 1.355 2.48 2.41 3.124 1.18.723 3.1 1.137 5.275 1.137.983.003 1.963-.086 2.93-.266a12.248 12.248 0 003.823-1.389c.98-.567 1.86-1.288 2.61-2.136 1.252-1.418 1.998-2.997 2.553-4.4h.221c1.372 0 2.215-.549 2.68-1.009.309-.293.55-.65.707-1.046l.098-.288Z"
       },
-      trustOrder: { public: 0, internal: 1, restricted: 2, secret: 3 },
-      boundaryLint: {
-        code: "W0560",
-        nodeKind: "security-node",
-        message: "unfiltered trust-boundary crossing",
-        help: "route this flow through a `security-node` (firewall/WAF/bastion), or confirm the direct path is intended"
+      dotnet: {
+        title: ".NET",
+        d: "M24 8.77h-2.468v7.565h-1.425V8.77h-2.462V7.53H24zm-6.852 7.565h-4.821V7.53h4.63v1.24h-3.205v2.494h2.953v1.234h-2.953v2.604h3.396zm-6.708 0H8.882L4.78 9.863a2.896 2.896 0 0 1-.258-.51h-.036c.032.189.048.592.048 1.21v5.772H3.157V7.53h1.659l3.965 6.32c.167.261.275.442.323.54h.024c-.04-.233-.06-.629-.06-1.185V7.529h1.372zm-8.703-.693a.868.829 0 0 1-.869.829.868.829 0 0 1-.868-.83.868.829 0 0 1 .868-.828.868.829 0 0 1 .869.829Z"
       },
-      crossZoneTechRecommended: {
-        code: "W0561",
-        message: "cross-zone flow without stated encryption/protocol",
-        help: 'add the protocol/encryption on inter-zone flows: `A -> B : "\u2026" (TLS1.3)`'
+      elasticsearch: {
+        title: "Elasticsearch",
+        d: "M13.394 0C8.683 0 4.609 2.716 2.644 6.667h15.641a4.77 4.77 0 0 0 3.073-1.11c.446-.375.864-.785 1.247-1.243l.001-.002A11.974 11.974 0 0 0 13.394 0zM1.804 8.889a12.009 12.009 0 0 0 0 6.222h14.7a3.111 3.111 0 1 0 0-6.222zm.84 8.444C4.61 21.283 8.684 24 13.395 24c3.701 0 7.011-1.677 9.212-4.312l-.001-.002a9.958 9.958 0 0 0-1.247-1.243 4.77 4.77 0 0 0-3.073-1.11z"
       },
-      nesting: [
-        {
-          code: "E0217",
-          child: "asset",
-          parents: ["trust-zone"],
-          message: "sensitive asset outside any trust zone",
-          help: "move this `asset` inside a `trust-zone`"
-        },
-        {
-          code: "E0218",
-          child: "security-node",
-          parents: ["trust-zone"],
-          message: "security node outside any trust zone",
-          help: "place this `security-node` inside a `trust-zone` (typically the exposed one it protects)"
-        },
-        {
-          code: "E0211",
-          child: "actor",
-          parents: ["actor-group"],
-          message: "actor outside any group",
-          help: "move this `actor` inside an `actor-group`"
-        }
-      ],
-      minCounts: [],
-      isolatedWarn: {
-        code: "W0510",
-        kinds: ["asset"],
-        message: "isolated element: no incoming or outgoing flow"
+      express: {
+        title: "Express",
+        d: "M12.262 16.666h1.146l6.975-9.325H19.22zm9.778 1.441v.004l-4.334-5.706-.557.74 4.873 6.682H.945V4.173h9.505l5.026 6.7.574-.772-4.374-5.928h.003l-.719-.945H0v17.544h24zM10.917 8.705a3.8 3.8 0 0 0-1.292-1.183q-.796-.45-1.916-.45c-.746 0-1.37.14-1.906.424a3.76 3.76 0 0 0-1.31 1.12 4.9 4.9 0 0 0-.75 1.581 7.17 7.17 0 0 0 0 3.696c.148.567.402 1.101.75 1.573a3.5 3.5 0 0 0 1.31 1.066q.803.39 1.906.389 1.77 0 2.739-.868.966-.867 1.328-2.457h-1.139q-.271 1.084-.977 1.734-.704.651-1.952.65-.812 0-1.392-.342a3.1 3.1 0 0 1-.957-.869 3.5 3.5 0 0 1-.551-1.182 5 5 0 0 1-.17-1.133 9 9 0 0 0-.015-.286 4.5 4.5 0 0 1 .015-.829c.047-.418.147-.83.296-1.223A3.7 3.7 0 0 1 5.54 9.05a2.9 2.9 0 0 1 .922-.742q.541-.28 1.246-.28c.47 0 .869.093 1.23.28q.541.281.922.742.379.461.587 1.057t.225 1.246H5.625l.004.957h6.182a7.3 7.3 0 0 0-.18-1.924 4.9 4.9 0 0 0-.715-1.68z"
       },
-      defaults: {
-        "trust-zone": {
-          fill: "#f5f5f4",
-          stroke: { color: "#8a8a85", style: "solid", width: 1.3 }
-        },
-        "security-node": {
-          fill: "#fff7e6",
-          stroke: { color: "#c46b2a", style: "solid", width: 1.6 }
-        },
-        asset: {
-          fill: "#ffffff",
-          stroke: { color: "#55606b", style: "solid", width: 1.3 }
-        },
-        "actor-group": {
-          fill: "#eef4fb",
-          stroke: { color: "#7a9cc4", style: "dashed", width: 1.2 }
-        },
-        external: {
-          fill: "#fdecea",
-          stroke: { color: "#d9534f", style: "dashed", width: 1.3 }
-        },
-        actor: {}
+      fastapi: {
+        title: "FastAPI",
+        d: "M12 .0387C5.3729.0384.0003 5.3931 0 11.9988c-.001 6.6066 5.372 11.9628 12 11.9625 6.628.0003 12.001-5.3559 12-11.9625-.0003-6.6057-5.3729-11.9604-12-11.96m-.829 5.4153h7.55l-7.5805 5.3284h5.1828L5.279 18.5436q2.9466-6.5444 5.892-13.0896"
       },
-      defaultsDark: {
-        "trust-zone": {
-          fill: "#26261f",
-          stroke: { color: "#8a8a72", style: "solid", width: 1.3 }
-        },
-        "security-node": {
-          fill: "#2e2717",
-          stroke: { color: "#c46b2a", style: "solid", width: 1.6 }
-        },
-        asset: {
-          fill: "#252a31",
-          stroke: { color: "#6b7885", style: "solid", width: 1.3 }
-        },
-        "actor-group": {
-          fill: "#232a33",
-          stroke: { color: "#5c7fa8", style: "dashed", width: 1.2 }
-        },
-        external: {
-          fill: "#3a2422",
-          stroke: { color: "#c25a54", style: "dashed", width: 1.3 }
-        },
-        actor: {}
+      github: {
+        title: "GitHub",
+        d: "M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
       },
-      levelDefaults: {
-        public: {
-          fill: "#fdecea",
-          stroke: { color: "#d9534f", style: "solid", width: 1.4 }
-        },
-        internal: {
-          fill: "#fff4e5",
-          stroke: { color: "#e0a458", style: "solid", width: 1.4 }
-        },
-        restricted: {
-          fill: "#e8f1f8",
-          stroke: { color: "#5b8db8", style: "solid", width: 1.4 }
-        },
-        secret: {
-          fill: "#ece8f5",
-          stroke: { color: "#7a5fae", style: "solid", width: 1.4 }
-        }
+      gitlab: {
+        title: "GitLab",
+        d: "m23.6004 9.5927-.0337-.0862L20.3.9814a.851.851 0 0 0-.3362-.405.8748.8748 0 0 0-.9997.0539.8748.8748 0 0 0-.29.4399l-2.2055 6.748H7.5375l-2.2057-6.748a.8573.8573 0 0 0-.29-.4412.8748.8748 0 0 0-.9997-.0537.8585.8585 0 0 0-.3362.4049L.4332 9.5015l-.0325.0862a6.0657 6.0657 0 0 0 2.0119 7.0105l.0113.0087.03.0213 4.976 3.7264 2.462 1.8633 1.4995 1.1321a1.0085 1.0085 0 0 0 1.2197 0l1.4995-1.1321 2.4619-1.8633 5.006-3.7489.0125-.01a6.0682 6.0682 0 0 0 2.0094-7.003z"
       },
-      levelDefaultsDark: {
-        public: {
-          fill: "#3a2422",
-          stroke: { color: "#c25a54", style: "solid", width: 1.4 }
-        },
-        internal: {
-          fill: "#332a1c",
-          stroke: { color: "#c08a44", style: "solid", width: 1.4 }
-        },
-        restricted: {
-          fill: "#1f2a33",
-          stroke: { color: "#4a7ba6", style: "solid", width: 1.4 }
-        },
-        secret: {
-          fill: "#2a2433",
-          stroke: { color: "#7a5f9e", style: "solid", width: 1.4 }
-        }
+      go: {
+        title: "Go",
+        d: "M1.811 10.231c-.047 0-.058-.023-.035-.059l.246-.315c.023-.035.081-.058.128-.058h4.172c.046 0 .058.035.035.07l-.199.303c-.023.036-.082.07-.117.07zM.047 11.306c-.047 0-.059-.023-.035-.058l.245-.316c.023-.035.082-.058.129-.058h5.328c.047 0 .07.035.058.07l-.093.28c-.012.047-.058.07-.105.07zm2.828 1.075c-.047 0-.059-.035-.035-.07l.163-.292c.023-.035.07-.07.117-.07h2.337c.047 0 .07.035.07.082l-.023.28c0 .047-.047.082-.082.082zm12.129-2.36c-.736.187-1.239.327-1.963.514-.176.046-.187.058-.34-.117-.174-.199-.303-.327-.548-.444-.737-.362-1.45-.257-2.115.175-.795.514-1.204 1.274-1.192 2.22.011.935.654 1.706 1.577 1.835.795.105 1.46-.175 1.987-.77.105-.13.198-.27.315-.434H10.47c-.245 0-.304-.152-.222-.35.152-.362.432-.97.596-1.274a.315.315 0 01.292-.187h4.253c-.023.316-.023.631-.07.947a4.983 4.983 0 01-.958 2.29c-.841 1.11-1.94 1.8-3.33 1.986-1.145.152-2.209-.07-3.143-.77-.865-.655-1.356-1.52-1.484-2.595-.152-1.274.222-2.419.993-3.424.83-1.086 1.928-1.776 3.272-2.02 1.098-.2 2.15-.07 3.096.571.62.41 1.063.97 1.356 1.648.07.105.023.164-.117.2m3.868 6.461c-1.064-.024-2.034-.328-2.852-1.029a3.665 3.665 0 01-1.262-2.255c-.21-1.32.152-2.489.947-3.529.853-1.122 1.881-1.706 3.272-1.95 1.192-.21 2.314-.095 3.33.595.923.63 1.496 1.484 1.648 2.605.198 1.578-.257 2.863-1.344 3.962-.771.783-1.718 1.273-2.805 1.495-.315.06-.63.07-.934.106zm2.78-4.72c-.011-.153-.011-.27-.034-.387-.21-1.157-1.274-1.81-2.384-1.554-1.087.245-1.788.935-2.045 2.033-.21.912.234 1.835 1.075 2.21.643.28 1.285.244 1.905-.07.923-.48 1.425-1.228 1.484-2.233z"
+      },
+      googlecloud: {
+        title: "Google Cloud",
+        d: "M12.19 2.38a9.344 9.344 0 0 0-9.234 6.893c.053-.02-.055.013 0 0-3.875 2.551-3.922 8.11-.247 10.941l.006-.007-.007.03a6.717 6.717 0 0 0 4.077 1.356h5.173l.03.03h5.192c6.687.053 9.376-8.605 3.835-12.35a9.365 9.365 0 0 0-2.821-4.552l-.043.043.006-.05A9.344 9.344 0 0 0 12.19 2.38zm-.358 4.146c1.244-.04 2.518.368 3.486 1.15a5.186 5.186 0 0 1 1.862 4.078v.518c3.53-.07 3.53 5.262 0 5.193h-5.193l-.008.009v-.04H6.785a2.59 2.59 0 0 1-1.067-.23h.001a2.597 2.597 0 1 1 3.437-3.437l3.013-3.012A6.747 6.747 0 0 0 8.11 8.24c.018-.01.04-.026.054-.023a5.186 5.186 0 0 1 3.67-1.69z"
+      },
+      grafana: {
+        title: "Grafana",
+        d: "M23.02 10.59a8.578 8.578 0 0 0-.862-3.034 8.911 8.911 0 0 0-1.789-2.445c.337-1.342-.413-2.505-.413-2.505-1.292-.08-2.113.4-2.416.62-.052-.02-.102-.044-.154-.064-.22-.089-.446-.172-.677-.247-.231-.073-.47-.14-.711-.197a9.867 9.867 0 0 0-.875-.161C14.557.753 12.94 0 12.94 0c-1.804 1.145-2.147 2.744-2.147 2.744l-.018.093c-.098.029-.2.057-.298.088-.138.042-.275.094-.413.143-.138.055-.275.107-.41.166a8.869 8.869 0 0 0-1.557.87l-.063-.029c-2.497-.955-4.716.195-4.716.195-.203 2.658.996 4.33 1.235 4.636a11.608 11.608 0 0 0-.607 2.635C1.636 12.677.953 15.014.953 15.014c1.926 2.214 4.171 2.351 4.171 2.351.003-.002.006-.002.006-.005.285.509.615.994.986 1.446.156.19.32.371.488.548-.704 2.009.099 3.68.099 3.68 2.144.08 3.553-.937 3.849-1.173a9.784 9.784 0 0 0 3.164.501h.08l.055-.003.107-.002.103-.005.003.002c1.01 1.44 2.788 1.646 2.788 1.646 1.264-1.332 1.337-2.653 1.337-2.94v-.058c0-.02-.003-.039-.003-.06.265-.187.52-.387.758-.6a7.875 7.875 0 0 0 1.415-1.7c1.43.083 2.437-.885 2.437-.885-.236-1.49-1.085-2.216-1.264-2.354l-.018-.013-.016-.013a.217.217 0 0 1-.031-.02c.008-.092.016-.18.02-.27.011-.162.016-.323.016-.48v-.253l-.005-.098-.008-.135a1.891 1.891 0 0 0-.01-.13c-.003-.042-.008-.083-.013-.125l-.016-.124-.018-.122a6.215 6.215 0 0 0-2.032-3.73 6.015 6.015 0 0 0-3.222-1.46 6.292 6.292 0 0 0-.85-.048l-.107.002h-.063l-.044.003-.104.008a4.777 4.777 0 0 0-3.335 1.695c-.332.4-.592.84-.768 1.297a4.594 4.594 0 0 0-.312 1.817l.003.091c.005.055.007.11.013.164a3.615 3.615 0 0 0 .698 1.82 3.53 3.53 0 0 0 1.827 1.282c.33.098.66.14.971.137.039 0 .078 0 .114-.002l.063-.003c.02 0 .041-.003.062-.003.034-.002.065-.007.099-.01.007 0 .018-.003.028-.003l.031-.005.06-.008a1.18 1.18 0 0 0 .112-.02c.036-.008.072-.013.109-.024a2.634 2.634 0 0 0 .914-.415c.028-.02.056-.041.085-.065a.248.248 0 0 0 .039-.35.244.244 0 0 0-.309-.06l-.078.042c-.09.044-.184.083-.283.116a2.476 2.476 0 0 1-.475.096c-.028.003-.054.006-.083.006l-.083.002c-.026 0-.054 0-.08-.002l-.102-.006h-.012l-.024.006c-.016-.003-.031-.003-.044-.006-.031-.002-.06-.007-.091-.01a2.59 2.59 0 0 1-.724-.213 2.557 2.557 0 0 1-.667-.438 2.52 2.52 0 0 1-.805-1.475 2.306 2.306 0 0 1-.029-.444l.006-.122v-.023l.002-.031c.003-.021.003-.04.005-.06a3.163 3.163 0 0 1 1.352-2.29 3.12 3.12 0 0 1 .937-.43 2.946 2.946 0 0 1 .776-.101h.06l.07.002.045.003h.026l.07.005a4.041 4.041 0 0 1 1.635.49 3.94 3.94 0 0 1 1.602 1.662 3.77 3.77 0 0 1 .397 1.414l.005.076.003.075c.002.026.002.05.002.075 0 .024.003.052 0 .07v.065l-.002.073-.008.174a6.195 6.195 0 0 1-.08.639 5.1 5.1 0 0 1-.267.927 5.31 5.31 0 0 1-.624 1.13 5.052 5.052 0 0 1-3.237 2.014 4.82 4.82 0 0 1-.649.066l-.039.003h-.287a6.607 6.607 0 0 1-1.716-.265 6.776 6.776 0 0 1-3.4-2.274 6.75 6.75 0 0 1-.746-1.15 6.616 6.616 0 0 1-.714-2.596l-.005-.083-.002-.02v-.056l-.003-.073v-.096l-.003-.104v-.07l.003-.163c.008-.22.026-.45.054-.678a8.707 8.707 0 0 1 .28-1.355c.128-.444.286-.872.473-1.277a7.04 7.04 0 0 1 1.456-2.1 5.925 5.925 0 0 1 .953-.763c.169-.111.343-.213.524-.306.089-.05.182-.091.273-.135.047-.02.093-.042.138-.062a7.177 7.177 0 0 1 .714-.267l.145-.045c.049-.015.098-.026.148-.041.098-.029.197-.052.296-.076.049-.013.1-.02.15-.033l.15-.032.151-.028.076-.013.075-.01.153-.024c.057-.01.114-.013.171-.023l.169-.021c.036-.003.073-.008.106-.01l.073-.008.036-.003.042-.002c.057-.003.114-.008.171-.01l.086-.006h.023l.037-.003.145-.007a7.999 7.999 0 0 1 1.708.125 7.917 7.917 0 0 1 2.048.68 8.253 8.253 0 0 1 1.672 1.09l.09.077.089.078c.06.052.114.107.171.159.057.052.112.106.166.16.052.055.107.107.159.164a8.671 8.671 0 0 1 1.41 1.978c.012.026.028.052.04.078l.04.078.075.156c.023.051.05.1.07.153l.065.15a8.848 8.848 0 0 1 .45 1.34.19.19 0 0 0 .201.142.186.186 0 0 0 .172-.184c.01-.246.002-.532-.024-.856z"
+      },
+      graphql: {
+        title: "GraphQL",
+        d: "M12.002 0a2.138 2.138 0 1 0 0 4.277 2.138 2.138 0 1 0 0-4.277zm8.54 4.931a2.138 2.138 0 1 0 0 4.277 2.138 2.138 0 1 0 0-4.277zm0 9.862a2.138 2.138 0 1 0 0 4.277 2.138 2.138 0 1 0 0-4.277zm-8.54 4.931a2.138 2.138 0 1 0 0 4.276 2.138 2.138 0 1 0 0-4.276zm-8.542-4.93a2.138 2.138 0 1 0 0 4.276 2.138 2.138 0 1 0 0-4.277zm0-9.863a2.138 2.138 0 1 0 0 4.277 2.138 2.138 0 1 0 0-4.277zm8.542-3.378L2.953 6.777v10.448l9.049 5.224 9.047-5.224V6.777zm0 1.601 7.66 13.27H4.34zm-1.387.371L3.97 15.037V7.363zm2.774 0 6.646 3.838v7.674zM5.355 17.44h13.293l-6.646 3.836z"
+      },
+      javascript: {
+        title: "JavaScript",
+        d: "M0 0h24v24H0V0zm22.034 18.276c-.175-1.095-.888-2.015-3.003-2.873-.736-.345-1.554-.585-1.797-1.14-.091-.33-.105-.51-.046-.705.15-.646.915-.84 1.515-.66.39.12.75.42.976.9 1.034-.676 1.034-.676 1.755-1.125-.27-.42-.404-.601-.586-.78-.63-.705-1.469-1.065-2.834-1.034l-.705.089c-.676.165-1.32.525-1.71 1.005-1.14 1.291-.811 3.541.569 4.471 1.365 1.02 3.361 1.244 3.616 2.205.24 1.17-.87 1.545-1.966 1.41-.811-.18-1.26-.586-1.755-1.336l-1.83 1.051c.21.48.45.689.81 1.109 1.74 1.756 6.09 1.666 6.871-1.004.029-.09.24-.705.074-1.65l.046.067zm-8.983-7.245h-2.248c0 1.938-.009 3.864-.009 5.805 0 1.232.063 2.363-.138 2.711-.33.689-1.18.601-1.566.48-.396-.196-.597-.466-.83-.855-.063-.105-.11-.196-.127-.196l-1.825 1.125c.305.63.75 1.172 1.324 1.517.855.51 2.004.675 3.207.405.783-.226 1.458-.691 1.811-1.411.51-.93.402-2.07.397-3.346.012-2.054 0-4.109 0-6.179l.004-.056z",
+        license: "MIT",
+        licenseUrl: "https://spdx.org/licenses/MIT.html",
+        source: "https://github.com/voodootikigod/logo.js/blob/1544bdeed6d618a6cfe4f0650d04ab8d9cfa76d9/js.svg",
+        copyright: "Copyright (c) 2011 Christopher Williams <chris@iterativedesigns.com>"
+      },
+      kotlin: { title: "Kotlin", d: "M24 24H0V0h24L12 12Z" },
+      kubernetes: {
+        title: "Kubernetes",
+        d: "M10.204 14.35l.007.01-.999 2.413a5.171 5.171 0 0 1-2.075-2.597l2.578-.437.004.005a.44.44 0 0 1 .484.606zm-.833-2.129a.44.44 0 0 0 .173-.756l.002-.011L7.585 9.7a5.143 5.143 0 0 0-.73 3.255l2.514-.725.002-.009zm1.145-1.98a.44.44 0 0 0 .699-.337l.01-.005.15-2.62a5.144 5.144 0 0 0-3.01 1.442l2.147 1.523.004-.002zm.76 2.75l.723.349.722-.347.18-.78-.5-.623h-.804l-.5.623.179.779zm1.5-3.095a.44.44 0 0 0 .7.336l.008.003 2.134-1.513a5.188 5.188 0 0 0-2.992-1.442l.148 2.615.002.001zm10.876 5.97l-5.773 7.181a1.6 1.6 0 0 1-1.248.594l-9.261.003a1.6 1.6 0 0 1-1.247-.596l-5.776-7.18a1.583 1.583 0 0 1-.307-1.34L2.1 5.573c.108-.47.425-.864.863-1.073L11.305.513a1.606 1.606 0 0 1 1.385 0l8.345 3.985c.438.209.755.604.863 1.073l2.062 8.955c.108.47-.005.963-.308 1.34zm-3.289-2.057c-.042-.01-.103-.026-.145-.034-.174-.033-.315-.025-.479-.038-.35-.037-.638-.067-.895-.148-.105-.04-.18-.165-.216-.216l-.201-.059a6.45 6.45 0 0 0-.105-2.332 6.465 6.465 0 0 0-.936-2.163c.052-.047.15-.133.177-.159.008-.09.001-.183.094-.282.197-.185.444-.338.743-.522.142-.084.273-.137.415-.242.032-.024.076-.062.11-.089.24-.191.295-.52.123-.736-.172-.216-.506-.236-.745-.045-.034.027-.08.062-.111.088-.134.116-.217.23-.33.35-.246.25-.45.458-.673.609-.097.056-.239.037-.303.033l-.19.135a6.545 6.545 0 0 0-4.146-2.003l-.012-.223c-.065-.062-.143-.115-.163-.25-.022-.268.015-.557.057-.905.023-.163.061-.298.068-.475.001-.04-.001-.099-.001-.142 0-.306-.224-.555-.5-.555-.275 0-.499.249-.499.555l.001.014c0 .041-.002.092 0 .128.006.177.044.312.067.475.042.348.078.637.056.906a.545.545 0 0 1-.162.258l-.012.211a6.424 6.424 0 0 0-4.166 2.003 8.373 8.373 0 0 1-.18-.128c-.09.012-.18.04-.297-.029-.223-.15-.427-.358-.673-.608-.113-.12-.195-.234-.329-.349-.03-.026-.077-.062-.111-.088a.594.594 0 0 0-.348-.132.481.481 0 0 0-.398.176c-.172.216-.117.546.123.737l.007.005.104.083c.142.105.272.159.414.242.299.185.546.338.743.522.076.082.09.226.1.288l.16.143a6.462 6.462 0 0 0-1.02 4.506l-.208.06c-.055.072-.133.184-.215.217-.257.081-.546.11-.895.147-.164.014-.305.006-.48.039-.037.007-.09.02-.133.03l-.004.002-.007.002c-.295.071-.484.342-.423.608.061.267.349.429.645.365l.007-.001.01-.003.129-.029c.17-.046.294-.113.448-.172.33-.118.604-.217.87-.256.112-.009.23.069.288.101l.217-.037a6.5 6.5 0 0 0 2.88 3.596l-.09.218c.033.084.069.199.044.282-.097.252-.263.517-.452.813-.091.136-.185.242-.268.399-.02.037-.045.095-.064.134-.128.275-.034.591.213.71.248.12.556-.007.69-.282v-.002c.02-.039.046-.09.062-.127.07-.162.094-.301.144-.458.132-.332.205-.68.387-.897.05-.06.13-.082.215-.105l.113-.205a6.453 6.453 0 0 0 4.609.012l.106.192c.086.028.18.042.256.155.136.232.229.507.342.84.05.156.074.295.145.457.016.037.043.09.062.129.133.276.442.402.69.282.247-.118.341-.435.213-.71-.02-.039-.045-.096-.065-.134-.083-.156-.177-.261-.268-.398-.19-.296-.346-.541-.443-.793-.04-.13.007-.21.038-.294-.018-.022-.059-.144-.083-.202a6.499 6.499 0 0 0 2.88-3.622c.064.01.176.03.213.038.075-.05.144-.114.28-.104.266.039.54.138.87.256.154.06.277.128.448.173.036.01.088.019.13.028l.009.003.007.001c.297.064.584-.098.645-.365.06-.266-.128-.537-.423-.608zM16.4 9.701l-1.95 1.746v.005a.44.44 0 0 0 .173.757l.003.01 2.526.728a5.199 5.199 0 0 0-.108-1.674A5.208 5.208 0 0 0 16.4 9.7zm-4.013 5.325a.437.437 0 0 0-.404-.232.44.44 0 0 0-.372.233h-.002l-1.268 2.292a5.164 5.164 0 0 0 3.326.003l-1.27-2.296h-.01zm1.888-1.293a.44.44 0 0 0-.27.036.44.44 0 0 0-.214.572l-.003.004 1.01 2.438a5.15 5.15 0 0 0 2.081-2.615l-2.6-.44-.004.005z"
+      },
+      mongodb: {
+        title: "MongoDB",
+        d: "M17.193 9.555c-1.264-5.58-4.252-7.414-4.573-8.115-.28-.394-.53-.954-.735-1.44-.036.495-.055.685-.523 1.184-.723.566-4.438 3.682-4.74 10.02-.282 5.912 4.27 9.435 4.888 9.884l.07.05A73.49 73.49 0 0111.91 24h.481c.114-1.032.284-2.056.51-3.07.417-.296.604-.463.85-.693a11.342 11.342 0 003.639-8.464c.01-.814-.103-1.662-.197-2.218zm-5.336 8.195s0-8.291.275-8.29c.213 0 .49 10.695.49 10.695-.381-.045-.765-1.76-.765-2.405z"
+      },
+      mysql: {
+        title: "MySQL",
+        d: "M16.405 5.501c-.115 0-.193.014-.274.033v.013h.014c.054.104.146.18.214.273.054.107.1.214.154.32l.014-.015c.094-.066.14-.172.14-.333-.04-.047-.046-.094-.08-.14-.04-.067-.126-.1-.18-.153zM5.77 18.695h-.927a50.854 50.854 0 00-.27-4.41h-.008l-1.41 4.41H2.45l-1.4-4.41h-.01a72.892 72.892 0 00-.195 4.41H0c.055-1.966.192-3.81.41-5.53h1.15l1.335 4.064h.008l1.347-4.064h1.095c.242 2.015.384 3.86.428 5.53zm4.017-4.08c-.378 2.045-.876 3.533-1.492 4.46-.482.716-1.01 1.073-1.583 1.073-.153 0-.34-.046-.566-.138v-.494c.11.017.24.026.386.026.268 0 .483-.075.647-.222.197-.18.295-.382.295-.605 0-.155-.077-.47-.23-.944L6.23 14.615h.91l.727 2.36c.164.536.233.91.205 1.123.4-1.064.678-2.227.835-3.483zm12.325 4.08h-2.63v-5.53h.885v4.85h1.745zm-3.32.135l-1.016-.5c.09-.076.177-.158.255-.25.433-.506.648-1.258.648-2.253 0-1.83-.718-2.746-2.155-2.746-.704 0-1.254.232-1.65.697-.43.508-.646 1.256-.646 2.245 0 .972.19 1.686.574 2.14.35.41.877.615 1.583.615.264 0 .506-.033.725-.098l1.325.772.36-.622zM15.5 17.588c-.225-.36-.337-.94-.337-1.736 0-1.393.424-2.09 1.27-2.09.443 0 .77.167.977.5.224.362.336.936.336 1.723 0 1.404-.424 2.108-1.27 2.108-.445 0-.77-.167-.978-.5zm-1.658-.425c0 .47-.172.856-.516 1.156-.344.3-.803.45-1.384.45-.543 0-1.064-.172-1.573-.515l.237-.476c.438.22.833.328 1.19.328.332 0 .593-.073.783-.22a.754.754 0 00.3-.615c0-.33-.23-.61-.648-.845-.388-.213-1.163-.657-1.163-.657-.422-.307-.632-.636-.632-1.177 0-.45.157-.81.47-1.085.315-.278.72-.415 1.22-.415.512 0 .98.136 1.4.41l-.213.476a2.726 2.726 0 00-1.064-.23c-.283 0-.502.068-.654.206a.685.685 0 00-.248.524c0 .328.234.61.666.85.393.215 1.187.67 1.187.67.433.305.648.63.648 1.168zm9.382-5.852c-.535-.014-.95.04-1.297.188-.1.04-.26.04-.274.167.055.053.063.14.11.214.08.134.218.313.346.407.14.11.28.216.427.31.26.16.555.255.81.416.145.094.293.213.44.313.073.05.12.14.214.172v-.02c-.046-.06-.06-.147-.105-.214-.067-.067-.134-.127-.2-.193a3.223 3.223 0 00-.695-.675c-.214-.146-.682-.35-.77-.595l-.013-.014c.146-.013.32-.066.46-.106.227-.06.435-.047.67-.106.106-.027.213-.06.32-.094v-.06c-.12-.12-.21-.283-.334-.395a8.867 8.867 0 00-1.104-.823c-.21-.134-.476-.22-.697-.334-.08-.04-.214-.06-.26-.127-.12-.146-.19-.34-.275-.514a17.69 17.69 0 01-.547-1.163c-.12-.262-.193-.523-.34-.763-.69-1.137-1.437-1.826-2.586-2.5-.247-.14-.543-.2-.856-.274-.167-.008-.334-.02-.5-.027-.11-.047-.216-.174-.31-.235-.38-.24-1.364-.76-1.644-.072-.18.434.267.862.422 1.082.115.153.26.328.34.5.047.116.06.235.107.356.106.294.207.622.347.897.073.14.153.287.247.413.054.073.146.107.167.227-.094.136-.1.334-.154.5-.24.757-.146 1.693.194 2.25.107.166.362.534.703.393.3-.12.234-.5.32-.835.02-.08.007-.133.048-.187v.015c.094.188.188.367.274.555.206.328.566.668.867.895.16.12.287.328.487.402v-.02h-.015c-.043-.058-.1-.086-.154-.133a3.445 3.445 0 01-.35-.4 8.76 8.76 0 01-.747-1.218c-.11-.21-.202-.436-.29-.643-.04-.08-.04-.2-.107-.24-.1.146-.247.273-.32.453-.127.288-.14.642-.188 1.01-.027.007-.014 0-.027.014-.214-.052-.287-.274-.367-.46-.2-.475-.233-1.238-.06-1.785.047-.14.247-.582.167-.716-.042-.127-.174-.2-.247-.303a2.478 2.478 0 01-.24-.427c-.16-.374-.24-.788-.414-1.162-.08-.173-.22-.354-.334-.513-.127-.18-.267-.307-.368-.52-.033-.073-.08-.194-.027-.274.014-.054.042-.075.094-.09.088-.072.335.022.422.062.247.1.455.194.662.334.094.066.195.193.315.226h.14c.214.047.455.014.655.073.355.114.675.28.962.46a5.953 5.953 0 012.085 2.286c.08.154.115.295.188.455.14.33.313.663.455.982.14.315.275.636.476.897.1.14.502.213.682.286.133.06.34.115.46.188.23.14.454.3.67.454.11.076.443.243.463.378z"
+      },
+      natsdotio: {
+        title: "NATS.io",
+        d: "M12.004 0H.404v18.807h9.938l1.714 1.602v-.026L15.966 24v-5.193h7.63V0H12.003zm7.578 14.45H15.38L6.898 6.519v7.93H4.116V4.376h4.349l8.344 7.784V4.375h2.773V14.45z"
+      },
+      nextdotjs: {
+        title: "Next.js",
+        d: "M18.665 21.978C16.758 23.255 14.465 24 12 24 5.377 24 0 18.623 0 12S5.377 0 12 0s12 5.377 12 12c0 3.583-1.574 6.801-4.067 9.001L9.219 7.2H7.2v9.596h1.615V9.251l9.85 12.727Zm-3.332-8.533 1.6 2.061V7.2h-1.6v6.245Z"
+      },
+      nginx: {
+        title: "NGINX",
+        d: "M12 0L1.605 6v12L12 24l10.395-6V6L12 0zm6 16.59c0 .705-.646 1.29-1.529 1.29-.631 0-1.351-.255-1.801-.81l-6-7.141v6.66c0 .721-.57 1.29-1.274 1.29H7.32c-.721 0-1.29-.6-1.29-1.29V7.41c0-.705.63-1.29 1.5-1.29.646 0 1.38.255 1.83.81l5.97 7.141V7.41c0-.721.6-1.29 1.29-1.29h.075c.72 0 1.29.6 1.29 1.29v9.18H18z"
+      },
+      nodedotjs: {
+        title: "Node.js",
+        d: "M11.998,24c-0.321,0-0.641-0.084-0.922-0.247l-2.936-1.737c-0.438-0.245-0.224-0.332-0.08-0.383 c0.585-0.203,0.703-0.25,1.328-0.604c0.065-0.037,0.151-0.023,0.218,0.017l2.256,1.339c0.082,0.045,0.197,0.045,0.272,0l8.795-5.076 c0.082-0.047,0.134-0.141,0.134-0.238V6.921c0-0.099-0.053-0.192-0.137-0.242l-8.791-5.072c-0.081-0.047-0.189-0.047-0.271,0 L3.075,6.68C2.99,6.729,2.936,6.825,2.936,6.921v10.15c0,0.097,0.054,0.189,0.139,0.235l2.409,1.392 c1.307,0.654,2.108-0.116,2.108-0.89V7.787c0-0.142,0.114-0.253,0.256-0.253h1.115c0.139,0,0.255,0.112,0.255,0.253v10.021 c0,1.745-0.95,2.745-2.604,2.745c-0.508,0-0.909,0-2.026-0.551L2.28,18.675c-0.57-0.329-0.922-0.945-0.922-1.604V6.921 c0-0.659,0.353-1.275,0.922-1.603l8.795-5.082c0.557-0.315,1.296-0.315,1.848,0l8.794,5.082c0.57,0.329,0.924,0.944,0.924,1.603 v10.15c0,0.659-0.354,1.273-0.924,1.604l-8.794,5.078C12.643,23.916,12.324,24,11.998,24z M19.099,13.993 c0-1.9-1.284-2.406-3.987-2.763c-2.731-0.361-3.009-0.548-3.009-1.187c0-0.528,0.235-1.233,2.258-1.233 c1.807,0,2.473,0.389,2.747,1.607c0.024,0.115,0.129,0.199,0.247,0.199h1.141c0.071,0,0.138-0.031,0.186-0.081 c0.048-0.054,0.074-0.123,0.067-0.196c-0.177-2.098-1.571-3.076-4.388-3.076c-2.508,0-4.004,1.058-4.004,2.833 c0,1.925,1.488,2.457,3.895,2.695c2.88,0.282,3.103,0.703,3.103,1.269c0,0.983-0.789,1.402-2.642,1.402 c-2.327,0-2.839-0.584-3.011-1.742c-0.02-0.124-0.126-0.215-0.253-0.215h-1.137c-0.141,0-0.254,0.112-0.254,0.253 c0,1.482,0.806,3.248,4.655,3.248C17.501,17.007,19.099,15.91,19.099,13.993z"
+      },
+      openjdk: {
+        title: "OpenJDK",
+        d: "M11.915 0 11.7.215C9.515 2.4 7.47 6.39 6.046 10.483c-1.064 1.024-3.633 2.81-3.711 3.551-.093.87 1.746 2.611 1.55 3.235-.198.625-1.304 1.408-1.014 1.939.1.188.823.011 1.277-.491a13.389 13.389 0 0 0-.017 2.14c.076.906.27 1.668.643 2.232.372.563.956.911 1.667.911.397 0 .727-.114 1.024-.264.298-.149.571-.33.91-.5.68-.34 1.634-.666 3.53-.604 1.903.062 2.872.39 3.559.704.687.314 1.15.664 1.925.664.767 0 1.395-.336 1.807-.9.412-.563.631-1.33.72-2.24.06-.623.055-1.32 0-2.066.454.45 1.117.604 1.213.424.29-.53-.816-1.314-1.013-1.937-.198-.624 1.642-2.366 1.549-3.236-.08-.748-2.707-2.568-3.748-3.586C16.428 6.374 14.308 2.394 12.13.215zm.175 6.038a2.95 2.95 0 0 1 2.943 2.942 2.95 2.95 0 0 1-2.943 2.943A2.95 2.95 0 0 1 9.148 8.98a2.95 2.95 0 0 1 2.942-2.942zM8.685 7.983a3.515 3.515 0 0 0-.145.997c0 1.951 1.6 3.55 3.55 3.55 1.95 0 3.55-1.598 3.55-3.55 0-.329-.046-.648-.132-.951.334.095.64.208.915.336a42.699 42.699 0 0 1 2.042 5.829c.678 2.545 1.01 4.92.846 6.607-.082.844-.29 1.51-.606 1.94-.315.431-.713.651-1.315.651-.593 0-.932-.27-1.673-.61-.741-.338-1.825-.694-3.792-.758-1.974-.064-3.073.293-3.821.669-.375.188-.659.373-.911.5s-.466.2-.752.2c-.53 0-.876-.209-1.16-.64-.285-.43-.474-1.101-.545-1.948-.141-1.693.176-4.069.823-6.614a43.155 43.155 0 0 1 1.934-5.783c.348-.167.749-.31 1.192-.425zm-3.382 4.362a.216.216 0 0 1 .13.031c-.166.56-.323 1.116-.463 1.665a33.849 33.849 0 0 0-.547 2.555 3.9 3.9 0 0 0-.2-.39c-.58-1.012-.914-1.642-1.16-2.08.315-.24 1.679-1.755 2.24-1.781zm13.394.01c.562.027 1.926 1.543 2.24 1.783-.246.438-.58 1.068-1.16 2.08a4.428 4.428 0 0 0-.163.309 32.354 32.354 0 0 0-.562-2.49 40.579 40.579 0 0 0-.482-1.652.216.216 0 0 1 .127-.03z",
+        license: "BSD-3-Clause",
+        licenseUrl: "https://spdx.org/licenses/BSD-3-Clause.html",
+        source: "https://github.com/openjdk/duke/blob/master/vector/Agent.svg"
+      },
+      postgresql: {
+        title: "PostgreSQL",
+        d: "M23.5594 14.7228a.5269.5269 0 0 0-.0563-.1191c-.139-.2632-.4768-.3418-1.0074-.2321-1.6533.3411-2.2935.1312-2.5256-.0191 1.342-2.0482 2.445-4.522 3.0411-6.8297.2714-1.0507.7982-3.5237.1222-4.7316a1.5641 1.5641 0 0 0-.1509-.235C21.6931.9086 19.8007.0248 17.5099.0005c-1.4947-.0158-2.7705.3461-3.1161.4794a9.449 9.449 0 0 0-.5159-.0816 8.044 8.044 0 0 0-1.3114-.1278c-1.1822-.0184-2.2038.2642-3.0498.8406-.8573-.3211-4.7888-1.645-7.2219.0788C.9359 2.1526.3086 3.8733.4302 6.3043c.0409.818.5069 3.334 1.2423 5.7436.4598 1.5065.9387 2.7019 1.4334 3.582.553.9942 1.1259 1.5933 1.7143 1.7895.4474.1491 1.1327.1441 1.8581-.7279.8012-.9635 1.5903-1.8258 1.9446-2.2069.4351.2355.9064.3625 1.39.3772a.0569.0569 0 0 0 .0004.0041 11.0312 11.0312 0 0 0-.2472.3054c-.3389.4302-.4094.5197-1.5002.7443-.3102.064-1.1344.2339-1.1464.8115-.0025.1224.0329.2309.0919.3268.2269.4231.9216.6097 1.015.6331 1.3345.3335 2.5044.092 3.3714-.6787-.017 2.231.0775 4.4174.3454 5.0874.2212.5529.7618 1.9045 2.4692 1.9043.2505 0 .5263-.0291.8296-.0941 1.7819-.3821 2.5557-1.1696 2.855-2.9059.1503-.8707.4016-2.8753.5388-4.1012.0169-.0703.0357-.1207.057-.1362.0007-.0005.0697-.0471.4272.0307a.3673.3673 0 0 0 .0443.0068l.2539.0223.0149.001c.8468.0384 1.9114-.1426 2.5312-.4308.6438-.2988 1.8057-1.0323 1.5951-1.6698zM2.371 11.8765c-.7435-2.4358-1.1779-4.8851-1.2123-5.5719-.1086-2.1714.4171-3.6829 1.5623-4.4927 1.8367-1.2986 4.8398-.5408 6.108-.13-.0032.0032-.0066.0061-.0098.0094-2.0238 2.044-1.9758 5.536-1.9708 5.7495-.0002.0823.0066.1989.0162.3593.0348.5873.0996 1.6804-.0735 2.9184-.1609 1.1504.1937 2.2764.9728 3.0892.0806.0841.1648.1631.2518.2374-.3468.3714-1.1004 1.1926-1.9025 2.1576-.5677.6825-.9597.5517-1.0886.5087-.3919-.1307-.813-.5871-1.2381-1.3223-.4796-.839-.9635-2.0317-1.4155-3.5126zm6.0072 5.0871c-.1711-.0428-.3271-.1132-.4322-.1772.0889-.0394.2374-.0902.4833-.1409 1.2833-.2641 1.4815-.4506 1.9143-1.0002.0992-.126.2116-.2687.3673-.4426a.3549.3549 0 0 0 .0737-.1298c.1708-.1513.2724-.1099.4369-.0417.156.0646.3078.26.3695.4752.0291.1016.0619.2945-.0452.4444-.9043 1.2658-2.2216 1.2494-3.1676 1.0128zm2.094-3.988-.0525.141c-.133.3566-.2567.6881-.3334 1.003-.6674-.0021-1.3168-.2872-1.8105-.8024-.6279-.6551-.9131-1.5664-.7825-2.5004.1828-1.3079.1153-2.4468.079-3.0586-.005-.0857-.0095-.1607-.0122-.2199.2957-.2621 1.6659-.9962 2.6429-.7724.4459.1022.7176.4057.8305.928.5846 2.7038.0774 3.8307-.3302 4.7363-.084.1866-.1633.3629-.2311.5454zm7.3637 4.5725c-.0169.1768-.0358.376-.0618.5959l-.146.4383a.3547.3547 0 0 0-.0182.1077c-.0059.4747-.054.6489-.115.8693-.0634.2292-.1353.4891-.1794 1.0575-.11 1.4143-.8782 2.2267-2.4172 2.5565-1.5155.3251-1.7843-.4968-2.0212-1.2217a6.5824 6.5824 0 0 0-.0769-.2266c-.2154-.5858-.1911-1.4119-.1574-2.5551.0165-.5612-.0249-1.9013-.3302-2.6462.0044-.2932.0106-.5909.019-.8918a.3529.3529 0 0 0-.0153-.1126 1.4927 1.4927 0 0 0-.0439-.208c-.1226-.4283-.4213-.7866-.7797-.9351-.1424-.059-.4038-.1672-.7178-.0869.067-.276.1831-.5875.309-.9249l.0529-.142c.0595-.16.134-.3257.213-.5012.4265-.9476 1.0106-2.2453.3766-5.1772-.2374-1.0981-1.0304-1.6343-2.2324-1.5098-.7207.0746-1.3799.3654-1.7088.5321a5.6716 5.6716 0 0 0-.1958.1041c.0918-1.1064.4386-3.1741 1.7357-4.4823a4.0306 4.0306 0 0 1 .3033-.276.3532.3532 0 0 0 .1447-.0644c.7524-.5706 1.6945-.8506 2.802-.8325.4091.0067.8017.0339 1.1742.081 1.939.3544 3.2439 1.4468 4.0359 2.3827.8143.9623 1.2552 1.9315 1.4312 2.4543-1.3232-.1346-2.2234.1268-2.6797.779-.9926 1.4189.543 4.1729 1.2811 5.4964.1353.2426.2522.4522.2889.5413.2403.5825.5515.9713.7787 1.2552.0696.087.1372.1714.1885.245-.4008.1155-1.1208.3825-1.0552 1.717-.0123.1563-.0423.4469-.0834.8148-.0461.2077-.0702.4603-.0994.7662zm.8905-1.6211c-.0405-.8316.2691-.9185.5967-1.0105a2.8566 2.8566 0 0 0 .135-.0406 1.202 1.202 0 0 0 .1342.103c.5703.3765 1.5823.4213 3.0068.1344-.2016.1769-.5189.3994-.9533.6011-.4098.1903-1.0957.333-1.7473.3636-.7197.0336-1.0859-.0807-1.1721-.151zm.5695-9.2712c-.0059.3508-.0542.6692-.1054 1.0017-.055.3576-.112.7274-.1264 1.1762-.0142.4368.0404.8909.0932 1.3301.1066.887.216 1.8003-.2075 2.7014a3.5272 3.5272 0 0 1-.1876-.3856c-.0527-.1276-.1669-.3326-.3251-.6162-.6156-1.1041-2.0574-3.6896-1.3193-4.7446.3795-.5427 1.3408-.5661 2.1781-.463zm.2284 7.0137a12.3762 12.3762 0 0 0-.0853-.1074l-.0355-.0444c.7262-1.1995.5842-2.3862.4578-3.4385-.0519-.4318-.1009-.8396-.0885-1.2226.0129-.4061.0666-.7543.1185-1.0911.0639-.415.1288-.8443.1109-1.3505.0134-.0531.0188-.1158.0118-.1902-.0457-.4855-.5999-1.938-1.7294-3.253-.6076-.7073-1.4896-1.4972-2.6889-2.0395.5251-.1066 1.2328-.2035 2.0244-.1859 2.0515.0456 3.6746.8135 4.8242 2.2824a.908.908 0 0 1 .0667.1002c.7231 1.3556-.2762 6.2751-2.9867 10.5405zm-8.8166-6.1162c-.025.1794-.3089.4225-.6211.4225a.5821.5821 0 0 1-.0809-.0056c-.1873-.026-.3765-.144-.5059-.3156-.0458-.0605-.1203-.178-.1055-.2844.0055-.0401.0261-.0985.0925-.1488.1182-.0894.3518-.1226.6096-.0867.3163.0441.6426.1938.6113.4186zm7.9305-.4114c.0111.0792-.049.201-.1531.3102-.0683.0717-.212.1961-.4079.2232a.5456.5456 0 0 1-.075.0052c-.2935 0-.5414-.2344-.5607-.3717-.024-.1765.2641-.3106.5611-.352.297-.0414.6111.0088.6356.1851z"
+      },
+      prometheus: {
+        title: "Prometheus",
+        d: "M12 0C5.373 0 0 5.372 0 12c0 6.627 5.373 12 12 12s12-5.373 12-12c0-6.628-5.373-12-12-12zm0 22.46c-1.885 0-3.414-1.26-3.414-2.814h6.828c0 1.553-1.528 2.813-3.414 2.813zm5.64-3.745H6.36v-2.046h11.28v2.046zm-.04-3.098H6.391c-.037-.043-.075-.086-.111-.13-1.155-1.401-1.427-2.133-1.69-2.879-.005-.025 1.4.287 2.395.511 0 0 .513.119 1.262.255-.72-.843-1.147-1.915-1.147-3.01 0-2.406 1.845-4.508 1.18-6.207.648.053 1.34 1.367 1.387 3.422.689-.951.977-2.69.977-3.755 0-1.103.727-2.385 1.454-2.429-.648 1.069.168 1.984.894 4.256.272.854.237 2.29.447 3.201.07-1.892.395-4.652 1.595-5.605-.529 1.2.079 2.702.494 3.424.671 1.164 1.078 2.047 1.078 3.716a4.642 4.642 0 01-1.11 2.996c.792-.149 1.34-.283 1.34-.283l2.573-.502s-.374 1.538-1.81 3.019z"
+      },
+      python: {
+        title: "Python",
+        d: "M14.25.18l.9.2.73.26.59.3.45.32.34.34.25.34.16.33.1.3.04.26.02.2-.01.13V8.5l-.05.63-.13.55-.21.46-.26.38-.3.31-.33.25-.35.19-.35.14-.33.1-.3.07-.26.04-.21.02H8.77l-.69.05-.59.14-.5.22-.41.27-.33.32-.27.35-.2.36-.15.37-.1.35-.07.32-.04.27-.02.21v3.06H3.17l-.21-.03-.28-.07-.32-.12-.35-.18-.36-.26-.36-.36-.35-.46-.32-.59-.28-.73-.21-.88-.14-1.05-.05-1.23.06-1.22.16-1.04.24-.87.32-.71.36-.57.4-.44.42-.33.42-.24.4-.16.36-.1.32-.05.24-.01h.16l.06.01h8.16v-.83H6.18l-.01-2.75-.02-.37.05-.34.11-.31.17-.28.25-.26.31-.23.38-.2.44-.18.51-.15.58-.12.64-.1.71-.06.77-.04.84-.02 1.27.05zm-6.3 1.98l-.23.33-.08.41.08.41.23.34.33.22.41.09.41-.09.33-.22.23-.34.08-.41-.08-.41-.23-.33-.33-.22-.41-.09-.41.09zm13.09 3.95l.28.06.32.12.35.18.36.27.36.35.35.47.32.59.28.73.21.88.14 1.04.05 1.23-.06 1.23-.16 1.04-.24.86-.32.71-.36.57-.4.45-.42.33-.42.24-.4.16-.36.09-.32.05-.24.02-.16-.01h-8.22v.82h5.84l.01 2.76.02.36-.05.34-.11.31-.17.29-.25.25-.31.24-.38.2-.44.17-.51.15-.58.13-.64.09-.71.07-.77.04-.84.01-1.27-.04-1.07-.14-.9-.2-.73-.25-.59-.3-.45-.33-.34-.34-.25-.34-.16-.33-.1-.3-.04-.25-.02-.2.01-.13v-5.34l.05-.64.13-.54.21-.46.26-.38.3-.32.33-.24.35-.2.35-.14.33-.1.3-.06.26-.04.21-.02.13-.01h5.84l.69-.05.59-.14.5-.21.41-.28.33-.32.27-.35.2-.36.15-.36.1-.35.07-.32.04-.28.02-.21V6.07h2.09l.14.01zm-6.47 14.25l-.23.33-.08.41.08.41.23.33.33.23.41.08.41-.08.33-.23.23-.33.08-.41-.08-.41-.23-.33-.33-.23-.41-.08-.41.08z"
+      },
+      rabbitmq: {
+        title: "RabbitMQ",
+        d: "M23.035 9.601h-7.677a.956.956 0 01-.962-.962V.962a.956.956 0 00-.962-.956H10.56a.956.956 0 00-.962.956V8.64a.956.956 0 01-.962.962H5.762a.956.956 0 01-.961-.962V.962A.956.956 0 003.839 0H.959a.956.956 0 00-.956.962v22.076A.956.956 0 00.965 24h22.07a.956.956 0 00.962-.962V10.58a.956.956 0 00-.962-.98zm-3.86 8.152a1.437 1.437 0 01-1.437 1.443h-1.924a1.437 1.437 0 01-1.436-1.443v-1.917a1.437 1.437 0 011.436-1.443h1.924a1.437 1.437 0 011.437 1.443z"
+      },
+      react: {
+        title: "React",
+        d: "M14.23 12.004a2.236 2.236 0 0 1-2.235 2.236 2.236 2.236 0 0 1-2.236-2.236 2.236 2.236 0 0 1 2.235-2.236 2.236 2.236 0 0 1 2.236 2.236zm2.648-10.69c-1.346 0-3.107.96-4.888 2.622-1.78-1.653-3.542-2.602-4.887-2.602-.41 0-.783.093-1.106.278-1.375.793-1.683 3.264-.973 6.365C1.98 8.917 0 10.42 0 12.004c0 1.59 1.99 3.097 5.043 4.03-.704 3.113-.39 5.588.988 6.38.32.187.69.275 1.102.275 1.345 0 3.107-.96 4.888-2.624 1.78 1.654 3.542 2.603 4.887 2.603.41 0 .783-.09 1.106-.275 1.374-.792 1.683-3.263.973-6.365C22.02 15.096 24 13.59 24 12.004c0-1.59-1.99-3.097-5.043-4.032.704-3.11.39-5.587-.988-6.38-.318-.184-.688-.277-1.092-.278zm-.005 1.09v.006c.225 0 .406.044.558.127.666.382.955 1.835.73 3.704-.054.46-.142.945-.25 1.44-.96-.236-2.006-.417-3.107-.534-.66-.905-1.345-1.727-2.035-2.447 1.592-1.48 3.087-2.292 4.105-2.295zm-9.77.02c1.012 0 2.514.808 4.11 2.28-.686.72-1.37 1.537-2.02 2.442-1.107.117-2.154.298-3.113.538-.112-.49-.195-.964-.254-1.42-.23-1.868.054-3.32.714-3.707.19-.09.4-.127.563-.132zm4.882 3.05c.455.468.91.992 1.36 1.564-.44-.02-.89-.034-1.345-.034-.46 0-.915.01-1.36.034.44-.572.895-1.096 1.345-1.565zM12 8.1c.74 0 1.477.034 2.202.093.406.582.802 1.203 1.183 1.86.372.64.71 1.29 1.018 1.946-.308.655-.646 1.31-1.013 1.95-.38.66-.773 1.288-1.18 1.87-.728.063-1.466.098-2.21.098-.74 0-1.477-.035-2.202-.093-.406-.582-.802-1.204-1.183-1.86-.372-.64-.71-1.29-1.018-1.946.303-.657.646-1.313 1.013-1.954.38-.66.773-1.286 1.18-1.868.728-.064 1.466-.098 2.21-.098zm-3.635.254c-.24.377-.48.763-.704 1.16-.225.39-.435.782-.635 1.174-.265-.656-.49-1.31-.676-1.947.64-.15 1.315-.283 2.015-.386zm7.26 0c.695.103 1.365.23 2.006.387-.18.632-.405 1.282-.66 1.933-.2-.39-.41-.783-.64-1.174-.225-.392-.465-.774-.705-1.146zm3.063.675c.484.15.944.317 1.375.498 1.732.74 2.852 1.708 2.852 2.476-.005.768-1.125 1.74-2.857 2.475-.42.18-.88.342-1.355.493-.28-.958-.646-1.956-1.1-2.98.45-1.017.81-2.01 1.085-2.964zm-13.395.004c.278.96.645 1.957 1.1 2.98-.45 1.017-.812 2.01-1.086 2.964-.484-.15-.944-.318-1.37-.5-1.732-.737-2.852-1.706-2.852-2.474 0-.768 1.12-1.742 2.852-2.476.42-.18.88-.342 1.356-.494zm11.678 4.28c.265.657.49 1.312.676 1.948-.64.157-1.316.29-2.016.39.24-.375.48-.762.705-1.158.225-.39.435-.788.636-1.18zm-9.945.02c.2.392.41.783.64 1.175.23.39.465.772.705 1.143-.695-.102-1.365-.23-2.006-.386.18-.63.406-1.282.66-1.933zM17.92 16.32c.112.493.2.968.254 1.423.23 1.868-.054 3.32-.714 3.708-.147.09-.338.128-.563.128-1.012 0-2.514-.807-4.11-2.28.686-.72 1.37-1.536 2.02-2.44 1.107-.118 2.154-.3 3.113-.54zm-11.83.01c.96.234 2.006.415 3.107.532.66.905 1.345 1.727 2.035 2.446-1.595 1.483-3.092 2.295-4.11 2.295-.22-.005-.406-.05-.553-.132-.666-.38-.955-1.834-.73-3.703.054-.46.142-.944.25-1.438zm4.56.64c.44.02.89.034 1.345.034.46 0 .915-.01 1.36-.034-.44.572-.895 1.095-1.345 1.565-.455-.47-.91-.993-1.36-1.565z"
+      },
+      redis: {
+        title: "Redis",
+        d: "M22.71 13.145c-1.66 2.092-3.452 4.483-7.038 4.483-3.203 0-4.397-2.825-4.48-5.12.701 1.484 2.073 2.685 4.214 2.63 4.117-.133 6.94-3.852 6.94-7.239 0-4.05-3.022-6.972-8.268-6.972-3.752 0-8.4 1.428-11.455 3.685C2.59 6.937 3.885 9.958 4.35 9.626c2.648-1.904 4.748-3.13 6.784-3.744C8.12 9.244.886 17.05 0 18.425c.1 1.261 1.66 4.648 2.424 4.648.232 0 .431-.133.664-.365a100.49 100.49 0 0 0 5.54-6.765c.222 3.104 1.748 6.898 6.014 6.898 3.819 0 7.604-2.756 9.33-8.965.2-.764-.73-1.361-1.261-.73zm-4.349-5.013c0 1.959-1.926 2.922-3.685 2.922-.941 0-1.664-.247-2.235-.568 1.051-1.592 2.092-3.225 3.21-4.973 1.972.334 2.71 1.43 2.71 2.619z"
+      },
+      spring: {
+        title: "Spring",
+        d: "M21.8537 1.4158a10.4504 10.4504 0 0 1-1.284 2.2471A11.9666 11.9666 0 1 0 3.8518 20.7757l.4445.3951a11.9543 11.9543 0 0 0 19.6316-8.2971c.3457-3.0126-.568-6.8649-2.0743-11.458zM5.5805 20.8745a1.0174 1.0174 0 1 1-.1482-1.4323 1.0396 1.0396 0 0 1 .1482 1.4323zm16.1991-3.5806c-2.9385 3.9263-9.2601 2.5928-13.2852 2.7904 0 0-.7161.0494-1.4323.1481 0 0 .2717-.1234.6174-.2469 2.8398-.9877 4.1732-1.1853 5.9018-2.0743 3.2349-1.6545 6.4698-5.2844 7.1118-9.0379-1.2347 3.6053-4.9881 6.7167-8.3959 7.9761-2.3459.8643-6.5685 1.7039-6.5685 1.7039l-.1729-.0988c-2.8645-1.4076-2.9632-7.6304 2.2718-9.6306 2.2966-.889 4.4696-.395 6.9637-.9877 2.6422-.6174 5.7043-2.5929 6.939-5.1857 1.3828 4.1732 3.062 10.643.0493 14.6434z"
+      },
+      sqlite: {
+        title: "SQLite",
+        d: "M21.678.521c-1.032-.92-2.28-.55-3.513.544a8.71 8.71 0 0 0-.547.535c-2.109 2.237-4.066 6.38-4.674 9.544.237.48.422 1.093.544 1.561a13.044 13.044 0 0 1 .164.703s-.019-.071-.096-.296l-.05-.146a1.689 1.689 0 0 0-.033-.08c-.138-.32-.518-.995-.686-1.289-.143.423-.27.818-.376 1.176.484.884.778 2.4.778 2.4s-.025-.099-.147-.442c-.107-.303-.644-1.244-.772-1.464-.217.804-.304 1.346-.226 1.478.152.256.296.698.422 1.186.286 1.1.485 2.44.485 2.44l.017.224a22.41 22.41 0 0 0 .056 2.748c.095 1.146.273 2.13.5 2.657l.155-.084c-.334-1.038-.47-2.399-.41-3.967.09-2.398.642-5.29 1.661-8.304 1.723-4.55 4.113-8.201 6.3-9.945-1.993 1.8-4.692 7.63-5.5 9.788-.904 2.416-1.545 4.684-1.931 6.857.666-2.037 2.821-2.912 2.821-2.912s1.057-1.304 2.292-3.166c-.74.169-1.955.458-2.362.629-.6.251-.762.337-.762.337s1.945-1.184 3.613-1.72C21.695 7.9 24.195 2.767 21.678.521m-18.573.543A1.842 1.842 0 0 0 1.27 2.9v16.608a1.84 1.84 0 0 0 1.835 1.834h9.418a22.953 22.953 0 0 1-.052-2.707c-.006-.062-.011-.141-.016-.2a27.01 27.01 0 0 0-.473-2.378c-.121-.47-.275-.898-.369-1.057-.116-.197-.098-.31-.097-.432 0-.12.015-.245.037-.386a9.98 9.98 0 0 1 .234-1.045l.217-.028c-.017-.035-.014-.065-.031-.097l-.041-.381a32.8 32.8 0 0 1 .382-1.194l.2-.019c-.008-.016-.01-.038-.018-.053l-.043-.316c.63-3.28 2.587-7.443 4.8-9.791.066-.069.133-.128.198-.194Z"
+      },
+      terraform: {
+        title: "Terraform",
+        d: "M1.44 0v7.575l6.561 3.79V3.787zm21.12 4.227l-6.561 3.791v7.574l6.56-3.787zM8.72 4.23v7.575l6.561 3.787V8.018zm0 8.405v7.575L15.28 24v-7.578z"
+      },
+      typescript: {
+        title: "TypeScript",
+        d: "M1.125 0C.502 0 0 .502 0 1.125v21.75C0 23.498.502 24 1.125 24h21.75c.623 0 1.125-.502 1.125-1.125V1.125C24 .502 23.498 0 22.875 0zm17.363 9.75c.612 0 1.154.037 1.627.111a6.38 6.38 0 0 1 1.306.34v2.458a3.95 3.95 0 0 0-.643-.361 5.093 5.093 0 0 0-.717-.26 5.453 5.453 0 0 0-1.426-.2c-.3 0-.573.028-.819.086a2.1 2.1 0 0 0-.623.242c-.17.104-.3.229-.393.374a.888.888 0 0 0-.14.49c0 .196.053.373.156.529.104.156.252.304.443.444s.423.276.696.41c.273.135.582.274.926.416.47.197.892.407 1.266.628.374.222.695.473.963.753.268.279.472.598.614.957.142.359.214.776.214 1.253 0 .657-.125 1.21-.373 1.656a3.033 3.033 0 0 1-1.012 1.085 4.38 4.38 0 0 1-1.487.596c-.566.12-1.163.18-1.79.18a9.916 9.916 0 0 1-1.84-.164 5.544 5.544 0 0 1-1.512-.493v-2.63a5.033 5.033 0 0 0 3.237 1.2c.333 0 .624-.03.872-.09.249-.06.456-.144.623-.25.166-.108.29-.234.373-.38a1.023 1.023 0 0 0-.074-1.089 2.12 2.12 0 0 0-.537-.5 5.597 5.597 0 0 0-.807-.444 27.72 27.72 0 0 0-1.007-.436c-.918-.383-1.602-.852-2.053-1.405-.45-.553-.676-1.222-.676-2.005 0-.614.123-1.141.369-1.582.246-.441.58-.804 1.004-1.089a4.494 4.494 0 0 1 1.47-.629 7.536 7.536 0 0 1 1.77-.201zm-15.113.188h9.563v2.166H9.506v9.646H6.789v-9.646H3.375z"
+      },
+      vault: {
+        title: "Vault",
+        d: "M0 0l11.955 24L24 0zm13.366 4.827h1.393v1.38h-1.393zm-2.77 5.569H9.22V8.993h1.389zm0-2.087H9.22V6.906h1.389zm0-2.086H9.22V4.819h1.389zm2.087 6.263h-1.377V11.08h1.388zm0-2.09h-1.377V8.993h1.388zm0-2.087h-1.377V6.906h1.388zm0-2.086h-1.377V4.819h1.388zm.683.683h1.393v1.389h-1.393zm0 3.475V8.993h1.389v1.388Z"
       }
     };
-    views = {
-      logical: logicalView,
-      application: applicationView,
-      infrastructure: infrastructureView,
-      security: securityView
-    };
+    LOGO_NAMES = Object.keys(LOGOS);
   }
 });
 
@@ -94313,8 +94463,8 @@ function validate(model) {
     ...checkMissingLabels(elements),
     ...checkNesting(elements, view),
     ...checkFlows(model, view),
-    ...checkElementAttributes(elements, view),
-    ...checkTrustBoundaries(model, view),
+    ...checkEndpointRoles(model, view),
+    ...checkLogos(elements, view),
     ...checkBusinessObjects(model, view),
     ...checkMinimumCounts(elements, model, view),
     ...checkIsolatedElements(model, view, elements)
@@ -94356,6 +94506,48 @@ function checkUnknownKinds(elements, view) {
   }
   return diagnostics;
 }
+function checkLogos(elements, view) {
+  const diagnostics = [];
+  const logoKinds = view.logoKinds ?? [];
+  for (const element of elements) {
+    const logo = element.logo;
+    if (!logo) continue;
+    if (!logoKinds.includes(element.kind)) {
+      diagnostics.push({
+        code: "E0108",
+        severity: "error",
+        message: `\`${element.kind}\` does not carry a logo`,
+        span: logo.span,
+        note: logoKinds.length ? `the \`${view.name}\` view accepts \`logo\` on: ${logoKinds.join(", ")}` : `the \`${view.name}\` view has no kinds that carry a logo`
+      });
+      continue;
+    }
+    if (logo.source === "builtin") {
+      if (Object.hasOwn(LOGOS, logo.value)) continue;
+      const suggestion = nearest(logo.value, LOGO_NAMES);
+      diagnostics.push({
+        code: "E0107",
+        severity: "error",
+        message: `unknown built-in logo \`${logo.value}\``,
+        span: logo.span,
+        note: `${LOGO_NAMES.length} built-ins available \u2014 run \`cairn logos\` to list them`,
+        help: suggestion !== void 0 ? `did you mean \`${suggestion}\`?` : `use a file instead: \`logo: "./logos/${logo.value}.svg"\``
+      });
+      continue;
+    }
+    if (/^[a-z][a-z0-9+.-]*:/i.test(logo.value) || logo.value.startsWith("//")) {
+      diagnostics.push({
+        code: "E0105",
+        severity: "error",
+        message: `\`logo\` will not fetch \`${logo.value}\``,
+        span: logo.span,
+        note: "a linked logo leaves the diagram depending on a server that can change or vanish",
+        help: 'download it next to the diagram and point at the file: `logo: "./logos/name.svg"`'
+      });
+    }
+  }
+  return diagnostics;
+}
 function checkMissingLabels(elements) {
   const diagnostics = [];
   for (const element of elements) {
@@ -94390,6 +94582,42 @@ function checkNesting(elements, view) {
   }
   return diagnostics;
 }
+function checkEndpointRoles(model, view) {
+  const diagnostics = [];
+  const hubKinds = new Set(view.hubKinds ?? []);
+  const isHub = (id) => hubKinds.has(model.index.get(id)?.kind ?? "");
+  for (const flow of model.flows) {
+    for (const [role, hubId, hubSide] of [
+      [flow.fromRole, flow.to, flow.toSide],
+      [flow.toRole, flow.from, flow.fromSide]
+    ]) {
+      if (!role) continue;
+      if (!model.index.has(hubId)) continue;
+      if (!isHub(hubId)) {
+        const kinds = [...hubKinds];
+        diagnostics.push({
+          code: "E0224",
+          severity: "error",
+          message: `\`${role.value}\` needs a ${kinds.join(" or ") || "queue"} at the other end of the flow`,
+          span: role.span,
+          note: `\`${hubId}\` is ${model.index.get(hubId)?.kind ? `a \`${model.index.get(hubId).kind}\`` : "not one"}`,
+          help: "a role says what this element does with a queue \u2014 between two ordinary elements the arrow already says it"
+        });
+        continue;
+      }
+      if (hubSide)
+        diagnostics.push({
+          code: "E0225",
+          severity: "error",
+          message: `\`${hubId}.${hubSide.value}\` and \`${role.value}\` both decide where this flow meets the queue`,
+          span: hubSide.span,
+          note: "`producer` means the queue's left cap and `consumer` its right",
+          help: "keep the role and drop the side, or keep the side and drop the role"
+        });
+    }
+  }
+  return diagnostics;
+}
 function checkFlows(model, view) {
   const diagnostics = [];
   const isActor = (id) => {
@@ -94447,75 +94675,6 @@ function checkFlows(model, view) {
   }
   return diagnostics;
 }
-function checkElementAttributes(elements, view) {
-  const spec = view.attrSpec;
-  if (!spec) return [];
-  const diagnostics = [];
-  for (const element of elements) {
-    if (element.kind !== spec.kind) continue;
-    if (!element.attr) {
-      diagnostics.push({
-        code: spec.code,
-        severity: "error",
-        message: spec.message + ` (\`${element.id}\`)`,
-        span: element.idSpan,
-        help: spec.help
-      });
-    } else if (!spec.values.includes(element.attr.value)) {
-      const suggestion = nearest(element.attr.value, spec.values);
-      diagnostics.push({
-        code: spec.code,
-        severity: "error",
-        message: `invalid ${spec.kind} value \`${element.attr.value}\` (\`${element.id}\`)`,
-        span: element.attr.span,
-        note: `allowed: ${spec.values.join(", ")}`,
-        help: suggestion ? `did you mean \`${suggestion}\`?` : spec.help
-      });
-    }
-  }
-  return diagnostics;
-}
-function checkTrustBoundaries(model, view) {
-  if (!view.boundaryLint && !view.crossZoneTechRecommended) return [];
-  const diagnostics = [];
-  const zoneOf2 = (id) => {
-    for (let ancestor = model.index.get(id)?.parent; ancestor; ancestor = ancestor.parent)
-      if (ancestor.kind === "trust-zone") return ancestor;
-    return void 0;
-  };
-  const trustLevelOf = (id) => {
-    const level = zoneOf2(id)?.attr?.value;
-    return level && view.trustOrder?.[level] !== void 0 ? view.trustOrder[level] : -1;
-  };
-  const lint = view.boundaryLint;
-  const isSecurityNode = (id) => lint !== void 0 && model.index.get(id)?.kind === lint.nodeKind;
-  for (const flow of model.flows) {
-    if (!model.index.has(flow.from) || !model.index.has(flow.to)) continue;
-    const crossesZone = zoneOf2(flow.from) !== zoneOf2(flow.to);
-    const boundaryViolation = lint !== void 0 && trustLevelOf(flow.to) > trustLevelOf(flow.from) && !isSecurityNode(flow.from) && !isSecurityNode(flow.to);
-    if (boundaryViolation) {
-      diagnostics.push({
-        code: lint.code,
-        severity: "warning",
-        message: lint.message,
-        span: flow.span,
-        note: `flow enters a more-trusted zone without passing a \`${lint.nodeKind}\``,
-        help: lint.help
-      });
-    }
-    if (view.crossZoneTechRecommended && crossesZone && !flow.tech?.protocol) {
-      diagnostics.push({
-        code: view.crossZoneTechRecommended.code,
-        severity: "warning",
-        message: view.crossZoneTechRecommended.message,
-        span: flow.span,
-        note: "inter-zone flow \u2014 state how the traffic is protected",
-        help: view.crossZoneTechRecommended.help
-      });
-    }
-  }
-  return diagnostics;
-}
 function checkForbiddenBusinessObjects(model, view) {
   const diagnostics = [];
   for (const businessObject of model.businessObjects) {
@@ -94674,6 +94833,7 @@ var init_validator = __esm({
     "use strict";
     init_views();
     init_element_tree();
+    init_logos();
   }
 });
 
@@ -94780,13 +94940,15 @@ function wrapText(text, maxChars) {
   if (currentLine) lines.push(currentLine);
   return lines.join("\n");
 }
-var DEFAULT_FONT_SIZE_NODE, FONT_SIZE_BASE, CHAR_WIDTH, fontSizes, measure, CHIP_HEIGHT, chipW, techText, flowLabelBox, nodeSize;
+var DEFAULT_FONT_SIZE_NODE, FONT_SIZE_BASE, CHAR_WIDTH, GLYPH_GUTTER, LOGO_GUTTER, fontSizes, measure, CHIP_HEIGHT, chipW, techText, flowLabelBox, nodeSize;
 var init_text_metrics = __esm({
   "src/text-metrics.ts"() {
     "use strict";
     DEFAULT_FONT_SIZE_NODE = 12.5;
     FONT_SIZE_BASE = 12.5;
     CHAR_WIDTH = 0.56;
+    GLYPH_GUTTER = 26;
+    LOGO_GUTTER = 30;
     fontSizes = (base) => {
       const scale = base / FONT_SIZE_BASE;
       return {
@@ -94823,11 +94985,11 @@ var init_text_metrics = __esm({
         height: measured.height + (tech ? 12 * scale : 0) + (chipNames.length ? CHIP_HEIGHT * scale : 0)
       };
     };
-    nodeSize = (kind, label, fontSize = DEFAULT_FONT_SIZE_NODE) => {
+    nodeSize = (kind, label, fontSize = DEFAULT_FONT_SIZE_NODE, gutter = 0) => {
       const isActor = kind === "actor";
       const measured = measure(label, isActor ? fontSize - 1.5 : fontSize);
       return {
-        width: isActor ? Math.max(64, measured.width + 8) : Math.max(140, measured.width + 16),
+        width: isActor ? Math.max(64, measured.width + 8) : Math.max(140, measured.width + 16 + gutter),
         height: isActor ? 56 + (label.split("\n").length - 1) * 11 : Math.max(46, measured.height + 18)
       };
     };
@@ -94835,12 +94997,13 @@ var init_text_metrics = __esm({
 });
 
 // src/slide-fold.ts
-function foldStyle(model) {
+function foldStyle(model, view) {
   const businessObjectNames = new Map(model.businessObjects.map((bo) => [bo.id, bo.name]));
   const numbered = model.style.flowText === "numbered";
   const { edge, node, cont, scale } = fontSizes(model.style.font.size);
   return {
     numbered,
+    glyphKinds: new Set(view.glyphKinds ?? []),
     edge,
     node,
     cont,
@@ -94855,7 +95018,15 @@ function foldStyle(model) {
     })
   };
 }
-function toElkNode(element, containerFontSize, nodeFontSize) {
+function leafSize(element, style) {
+  return nodeSize(
+    element.kind,
+    element.label ?? element.id,
+    style.node,
+    style.glyphKinds.has(element.kind) ? GLYPH_GUTTER : 0
+  );
+}
+function toElkNode(element, style) {
   if (element.children.length) {
     const lineCount = (element.label ?? element.id).split("\n").length;
     return {
@@ -94866,13 +95037,13 @@ function toElkNode(element, containerFontSize, nodeFontSize) {
       labels: [
         {
           text: element.label ?? element.id,
-          ...measure(element.label ?? element.id, containerFontSize)
+          ...measure(element.label ?? element.id, style.cont)
         }
       ],
-      children: element.children.map((child) => toElkNode(child, containerFontSize, nodeFontSize))
+      children: element.children.map((child) => toElkNode(child, style))
     };
   }
-  const size = nodeSize(element.kind, element.label ?? element.id, nodeFontSize);
+  const size = leafSize(element, style);
   return { id: element.id, width: size.width, height: size.height };
 }
 function walkFoldedNodes(elkNode, offset, elementById, syntheticIds) {
@@ -94951,7 +95122,7 @@ function internalFlowLabels(flow, style) {
   ];
 }
 function buildGroupGraph(group, style, fg) {
-  const node = toElkNode(group, style.cont, style.node);
+  const node = toElkNode(group, style);
   const nodeChildren = node.children ??= [];
   for (const flow of fg.interFlows) {
     if (fg.rootOf.get(flow.from) === group) {
@@ -95009,7 +95180,7 @@ function buildGroupGraph(group, style, fg) {
 function layoutColumn(elements, style) {
   return elements.map((group) => {
     const blocks = group.children.map((child) => {
-      const size = nodeSize(child.kind, child.label ?? child.id, style.node);
+      const size = leafSize(child, style);
       return { element: child, width: size.width, height: size.height, x: 0, y: 0 };
     });
     const columnWidth = Math.max(
@@ -95047,7 +95218,7 @@ function layoutMiddleRows(middles, middleResults, geom, style) {
   let yCursor = 16 + geom.gutterHeight(0);
   middles.forEach((element, index) => {
     const result = middleResults.get(element.id) ?? null;
-    const size = result ? { width: result.children[0].width, height: result.children[0].height } : nodeSize(element.kind, element.label ?? element.id, style.node);
+    const size = result ? { width: result.children[0].width, height: result.children[0].height } : leafSize(element, style);
     rows.push({
       element,
       box: { x: geom.xMiddle, y: yCursor, width: size.width, height: size.height },
@@ -95203,7 +95374,7 @@ function connectorLabel(flow, routed, style) {
 }
 async function foldedLayout(model, view, elk) {
   const roots = model.elements;
-  const style = foldStyle(model);
+  const style = foldStyle(model, view);
   const partitionOf = (element) => view.partitions[element.kind] ?? 1;
   const sources = roots.filter((element) => partitionOf(element) === 0);
   const middles = roots.filter((element) => partitionOf(element) === 1);
@@ -95250,7 +95421,7 @@ async function foldedLayout(model, view, elk) {
   const widthSource = Math.max(0, ...sourceColumns.map((col) => col.width));
   const widthMiddle = Math.max(
     ...middles.map(
-      (element) => element.children.length ? middleResults.get(element.id).children[0].width : nodeSize(element.kind, element.label ?? element.id, style.node).width
+      (element) => element.children.length ? middleResults.get(element.id).children[0].width : leafSize(element, style).width
     )
   );
   const widthSink = Math.max(0, ...sinkColumns.map((col) => col.width));
@@ -96158,13 +96329,34 @@ function compactVertical(scene) {
   }
   scene.height = Math.ceil(heightAfter + bottomMargin);
 }
-var KEEP_GAP, EDGE_MARGIN, MIN_SAVING;
+function fitCanvas(scene) {
+  let maxX = 0;
+  let maxY = 0;
+  for (const node of scene.nodes) {
+    maxX = Math.max(maxX, node.x + node.width);
+    maxY = Math.max(maxY, node.y + node.height);
+  }
+  for (const edge of scene.edges) {
+    for (const point of edge.pts) {
+      maxX = Math.max(maxX, point.x);
+      maxY = Math.max(maxY, point.y);
+    }
+    for (const label of edge.labels) {
+      maxX = Math.max(maxX, label.x + label.width);
+      maxY = Math.max(maxY, label.y + label.height);
+    }
+  }
+  scene.width = Math.max(scene.width, Math.ceil(maxX) + CANVAS_MARGIN);
+  scene.height = Math.max(scene.height, Math.ceil(maxY) + CANVAS_MARGIN);
+}
+var KEEP_GAP, EDGE_MARGIN, MIN_SAVING, CANVAS_MARGIN;
 var init_compact = __esm({
   "src/compact.ts"() {
     "use strict";
     KEEP_GAP = 14;
     EDGE_MARGIN = 22;
     MIN_SAVING = 4;
+    CANVAS_MARGIN = 10;
   }
 });
 
@@ -96288,8 +96480,7 @@ function labelSeatable(blockers, pts, label) {
 function scanLabelSeats(ctx, subj, profile) {
   for (const label of subj.edge.labels) {
     if (!label.width || !label.height) continue;
-    if (!labelSeatable(ctx.blockers, subj.pts, label))
-      profile.set(`unlabelled:${subj.edge.id}`, 1);
+    if (!labelSeatable(ctx.blockers, subj.pts, label)) profile.set(`unlabelled:${subj.edge.id}`, 1);
   }
 }
 function scanArrowRoom(subj, profile) {
@@ -96362,8 +96553,7 @@ function scanCrossings(a, b, key, profile) {
         if (!end) continue;
         const dx = Math.max(0, end.node.x - hit.x, hit.x - (end.node.x + end.node.width));
         const dy = Math.max(0, end.node.y - hit.y, hit.y - (end.node.y + end.node.height));
-        if (dx * dx + dy * dy <= FAN_REACH * FAN_REACH)
-          profile.set(`fan:${key}@${end.node.id}`, 2);
+        if (dx * dx + dy * dy <= FAN_REACH * FAN_REACH) profile.set(`fan:${key}@${end.node.id}`, 2);
       }
     }
 }
@@ -96391,8 +96581,7 @@ function scanSharedSeats(a, b, key, profile) {
       }
       const side = vertical ? seatA.node.height : seatA.node.width;
       const need = Math.min(12, (side - 6) / 2);
-      if (apart < need * 0.8)
-        profile.set(`tight:${key}@${seatA.node.id}|${seatA.side}`, 4);
+      if (apart < need * 0.8) profile.set(`tight:${key}@${seatA.node.id}|${seatA.side}`, 4);
     }
 }
 function scanPairs(ctx, subj, query) {
@@ -96407,7 +96596,11 @@ function scanPairs(ctx, subj, query) {
     if (ids.has(other.id) && other.id < subj.edge.id) continue;
     const overridden = overrides.has(other.id);
     if (farApart(myBounds, ctx.boundsFor(other, theirs, overridden))) continue;
-    const them = { edge: other, pts: theirs, ends: ctx.endsFor(other, theirs, overridden) };
+    const them = {
+      edge: other,
+      pts: theirs,
+      ends: ctx.endsFor(other, theirs, overridden)
+    };
     const key = pair(subj.edge.id, other.id);
     scanCrossings(subj, them, key, profile);
     scanParallelRuns(mine, ctx.runsFor(other, theirs, overridden), key, profile);
@@ -98841,8 +99034,8 @@ function optimiseRoutes(scene, titleBoxes = [], folded = false) {
       const subject = { ends, edge };
       const out = [];
       const seen = /* @__PURE__ */ new Set();
-      const aSides = edge.pinned?.start ? [ends[0].side] : SIDES;
-      const bSides = edge.pinned?.end ? [ends[1].side] : SIDES;
+      const aSides = sideFixed(edge, "start") ? [ends[0].side] : SIDES;
+      const bSides = sideFixed(edge, "end") ? [ends[1].side] : SIDES;
       for (const aSide of aSides)
         for (const bSide of bSides) {
           const sides = { a: aSide, b: bSide };
@@ -98901,12 +99094,13 @@ function optimiseRoutes(scene, titleBoxes = [], folded = false) {
   }
   for (const edge of scene.edges) if (edge.pts.length >= 2) enforceOrthogonal(edge);
 }
-var ORTHOGONAL_EPSILON, MIN_HUG_SPAN, CHANNEL_INSET, SNAP, JOG_SNAP, SIDE_INSET, MIN_SIDE_INSET, FAN_REACH2, SEAT_OFFSETS, segmentsCross, segmentLength, wouldMerge, seatWithAlong, crossingsOf, SEAT_GRID, SEAT_CLEAR, CHANNEL_MARGIN, CHANNEL_STEP, CHANNEL_CLEAR;
+var sideFixed, ORTHOGONAL_EPSILON, MIN_HUG_SPAN, CHANNEL_INSET, SNAP, JOG_SNAP, SIDE_INSET, MIN_SIDE_INSET, FAN_REACH2, SEAT_OFFSETS, segmentsCross, segmentLength, wouldMerge, seatWithAlong, crossingsOf, SEAT_GRID, SEAT_CLEAR, CHANNEL_MARGIN, CHANNEL_STEP, CHANNEL_CLEAR;
 var init_edge_tidy = __esm({
   "src/edge-tidy.ts"() {
     "use strict";
     init_readability();
     init_geometry();
+    sideFixed = (edge, end) => !!(edge.pinned?.[end] || edge.hubSided?.[end]);
     ORTHOGONAL_EPSILON = 0.5;
     MIN_HUG_SPAN = 24;
     CHANNEL_INSET = 24;
@@ -99233,7 +99427,8 @@ function computeIngressExternalElements(model) {
   }
   return ingressExternalElements;
 }
-function toElkNode2(element, compact, fonts, root = false) {
+function toElkNode2(element, sizing, root = false) {
+  const { compact, fonts, glyphKinds } = sizing;
   const { cont: containerFontSize, node: nodeFontSize } = fonts;
   if (element.children.length) {
     const lineCount = (element.label ?? element.id).split("\n").length;
@@ -99250,17 +99445,16 @@ function toElkNode2(element, compact, fonts, root = false) {
           ...measure(element.label ?? element.id, containerFontSize)
         }
       ],
-      children: element.children.map(
-        (child) => toElkNode2(child, compact, fonts)
-      )
+      children: element.children.map((child) => toElkNode2(child, sizing))
     };
   }
   const measured = measure(element.label ?? element.id, nodeFontSize);
   const isActor = element.kind === "actor";
+  const gutter = (glyphKinds.has(element.kind) ? GLYPH_GUTTER : 0) + (element.logo ? LOGO_GUTTER : 0);
   return {
     id: element.id,
     ...element.order && !root ? { layoutOptions: orderOption(element) } : {},
-    width: isActor ? Math.max(64, measure(element.label ?? element.id, nodeFontSize - 1.5).width + 8) : Math.max(compact ? 98 : 108, measured.width + (compact ? 10 : 12)),
+    width: isActor ? Math.max(64, measure(element.label ?? element.id, nodeFontSize - 1.5).width + 8) : Math.max(compact ? 98 : 108, measured.width + (compact ? 10 : 12) + gutter),
     height: isActor ? 54 + ((element.label ?? element.id).split("\n").length - 1) * 11 : Math.max(compact ? 36 : 38, measured.height + (compact ? 10 : 12))
   };
 }
@@ -99418,20 +99612,20 @@ function selectionExtras(scene, model) {
   }
   return extra;
 }
-function relayoutVerdict(before, after) {
+function tallyProfile(profile) {
   const normalize = (key) => key.replace(/@[-\d.,]+$/, "").replace(/:\d+(?=@|$)/, "");
-  const tally = (profile) => {
-    const out = /* @__PURE__ */ new Map();
-    for (const [key, tier] of profile) {
-      const id = normalize(key);
-      const entry = out.get(id) ?? { tier, count: 0 };
-      entry.count++;
-      out.set(id, entry);
-    }
-    return out;
-  };
-  const was = tally(before);
-  const now = tally(after);
+  const out = /* @__PURE__ */ new Map();
+  for (const [key, tier] of profile) {
+    const id = normalize(key);
+    const entry = out.get(id) ?? { tier, count: 0 };
+    entry.count++;
+    out.set(id, entry);
+  }
+  return out;
+}
+function relayoutVerdict(before, after) {
+  const was = tallyProfile(before);
+  const now = tallyProfile(after);
   for (let tier = 0; tier < 5; tier++) {
     let gained = false;
     let lost = false;
@@ -99447,6 +99641,62 @@ function relayoutVerdict(before, after) {
   }
   return -1;
 }
+function noLadderRegression(before, after) {
+  const perTier = (profile) => {
+    const totals = [0, 0, 0, 0, 0];
+    for (const { tier, count } of tallyProfile(profile).values()) totals[tier] += count;
+    return totals;
+  };
+  const was = perTier(before);
+  const now = perTier(after);
+  return now.every((count, tier) => count <= was[tier]);
+}
+function nodeCoverage(scene) {
+  if (!scene.nodes.length) return 1;
+  const left = Math.min(...scene.nodes.map((n) => n.x));
+  const top = Math.min(...scene.nodes.map((n) => n.y));
+  const right = Math.max(...scene.nodes.map((n) => n.x + n.width));
+  const bottom = Math.max(...scene.nodes.map((n) => n.y + n.height));
+  const width = right - left;
+  const height = bottom - top;
+  if (width <= 0 || height <= 0) return 1;
+  const COLUMNS = 32;
+  const ROWS = 16;
+  let covered = 0;
+  for (let row = 0; row < ROWS; row++) {
+    for (let column = 0; column < COLUMNS; column++) {
+      const cellLeft = left + column * width / COLUMNS;
+      const cellRight = left + (column + 1) * width / COLUMNS;
+      const cellTop = top + row * height / ROWS;
+      const cellBottom = top + (row + 1) * height / ROWS;
+      if (scene.nodes.some(
+        (n) => n.x < cellRight && n.x + n.width > cellLeft && n.y < cellBottom && n.y + n.height > cellTop
+      ))
+        covered++;
+    }
+  }
+  return covered / (COLUMNS * ROWS);
+}
+async function denserLayout(base, elkPass) {
+  const densitySpecs = [
+    { minLayers: true, dense: true },
+    { placement: "LINEAR_SEGMENTS", dense: true }
+  ];
+  const laidOut = await Promise.allSettled(densitySpecs.map((spec) => elkPass.layout(spec)));
+  const areaOf = (scene) => scene.width * scene.height;
+  const baseProfile = elkPass.profile(base);
+  let bestArea = areaOf(base) * DENSITY_GAIN;
+  let winner = null;
+  for (const [index, settled] of laidOut.entries()) {
+    if (settled.status !== "fulfilled") continue;
+    const candidate = elkPass.toScene(settled.value);
+    if (areaOf(candidate) > bestArea) continue;
+    if (!noLadderRegression(baseProfile, elkPass.profile(candidate))) continue;
+    bestArea = areaOf(candidate);
+    winner = { scene: candidate, options: densitySpecs[index] };
+  }
+  return winner;
+}
 function sideToward(from, to) {
   const dx = centerOf(to).x - centerOf(from).x;
   const dy = centerOf(to).y - centerOf(from).y;
@@ -99509,7 +99759,7 @@ function constrainPorts(graph, scene, flagged, model) {
 }
 function elkPartitionOf(element, index, view, ingressExternal) {
   if (!view.partitionByOrder) return view.partitions[element.kind] ?? 1;
-  if (element.kind === "actor" || element.kind === "actor-group") return INGRESS_PARTITION;
+  if ((view.ingressKinds ?? DEFAULT_INGRESS_KINDS).includes(element.kind)) return INGRESS_PARTITION;
   if (element.kind === "external")
     return ingressExternal.has(element.id) ? INGRESS_PARTITION : EGRESS_PARTITION;
   if (view.partitions[element.kind] !== void 0) return 90 + view.partitions[element.kind];
@@ -99533,16 +99783,13 @@ function readingSlots(model, view, ingressExternal) {
   const lowestOf = /* @__PURE__ */ new Map();
   for (const band of new Set(bandOf.values())) {
     const members = model.elements.filter((element) => bandOf.get(element.id) === band);
-    const declared = [
-      ...new Set(members.filter((m) => m.order).map((m) => m.order.value))
-    ].sort((a, b) => a - b);
+    const declared = [...new Set(members.filter((m) => m.order).map((m) => m.order.value))].sort(
+      (a, b) => a - b
+    );
     const lowest = declared.length ? 1 : 0;
     lowestOf.set(band, lowest);
     for (const member of members)
-      slotOf.set(
-        member.id,
-        member.order ? declared.indexOf(member.order.value) + 1 : lowest
-      );
+      slotOf.set(member.id, member.order ? declared.indexOf(member.order.value) + 1 : lowest);
   }
   const ordered = new Set(model.elements.filter((element) => element.order).map((e) => e.id));
   for (let pass = 0; pass < model.elements.length; pass++) {
@@ -99561,13 +99808,15 @@ function readingSlots(model, view, ingressExternal) {
   }
   return slotOf;
 }
+function elkEnds(flow) {
+  return laidOutReversed(flow) ? { sources: [flow.to], targets: [flow.from] } : { sources: [flow.from], targets: [flow.to] };
+}
 function elkFlowEdge(flow, ctx, labelWrap) {
   const { compact, numbered, fonts, businessObjectName } = ctx;
   if (numbered)
     return {
       id: flow.id,
-      sources: [flow.from],
-      targets: [flow.to],
+      ...elkEnds(flow),
       labels: [
         {
           text: String(parseInt(flow.id.slice(1), 10)),
@@ -99592,13 +99841,35 @@ function elkFlowEdge(flow, ctx, labelWrap) {
   });
   return {
     id: flow.id,
-    sources: [flow.from],
-    targets: [flow.to],
+    ...elkEnds(flow),
     labels: text || chips.length ? [{ text, ...labelBox }] : []
   };
 }
-function applyDeclaredPorts(graph, model) {
-  const pinned = model.flows.filter((flow) => flow.fromSide || flow.toSide);
+function laidOutReversed(flow) {
+  return flow.fromRole?.value === "consumer" || flow.toRole?.value === "producer";
+}
+function roleCap(role) {
+  if (!role) return null;
+  return role.value === "producer" ? "left" : "right";
+}
+function hubFlowSides(model, view) {
+  const derived = /* @__PURE__ */ new Map();
+  const hubKinds = new Set(view.hubKinds ?? []);
+  if (!hubKinds.size) return derived;
+  const hubs = new Set(
+    indexElementsById(model.elements).filter(([, element]) => hubKinds.has(element.kind)).map(([id]) => id)
+  );
+  if (!hubs.size) return derived;
+  for (const flow of model.flows) {
+    const sides = {};
+    if (hubs.has(flow.to) && !flow.toSide) sides.to = roleCap(flow.fromRole) ?? "left";
+    if (hubs.has(flow.from) && !flow.fromSide) sides.from = roleCap(flow.toRole) ?? "right";
+    if (sides.to || sides.from) derived.set(flow.id, sides);
+  }
+  return derived;
+}
+function applyDeclaredPorts(graph, model, derived) {
+  const pinned = model.flows.filter((flow) => flow.fromSide || flow.toSide || derived.has(flow.id));
   if (!pinned.length) return;
   const elkById = /* @__PURE__ */ new Map();
   const register = (node) => {
@@ -99609,14 +99880,15 @@ function applyDeclaredPorts(graph, model) {
   for (const flow of pinned) {
     const elkEdge = (graph.edges ?? []).find((edge) => edge.id === flow.id);
     if (!elkEdge) continue;
+    const hub = derived.get(flow.id);
     for (const [role, declared, nodeId] of [
-      ["out", flow.fromSide, flow.from],
-      ["in", flow.toSide, flow.to]
+      ["out", flow.fromSide ?? sideRequest(hub?.from), flow.from],
+      ["in", flow.toSide ?? sideRequest(hub?.to), flow.to]
     ]) {
       if (!declared) continue;
       const elkNode = elkById.get(nodeId);
       if (!elkNode) continue;
-      const portId = `${flow.id}#${role}`;
+      const portId = `${flow.id}#${role === "out" !== laidOutReversed(flow) ? "out" : "in"}`;
       elkNode.ports = [
         ...elkNode.ports ?? [],
         {
@@ -99627,7 +99899,7 @@ function applyDeclaredPorts(graph, model) {
         }
       ];
       elkNode.layoutOptions = { ...elkNode.layoutOptions, "elk.portConstraints": "FIXED_SIDE" };
-      if (role === "out") elkEdge.sources = [portId];
+      if (role === "out" !== laidOutReversed(flow)) elkEdge.sources = [portId];
       else elkEdge.targets = [portId];
     }
   }
@@ -99672,6 +99944,7 @@ function attachSideDiagnostics(scene, model) {
 }
 function buildElkGraph(ctx, direction, options) {
   const { model, view, ingressExternal, slotOf, compact, numbered, fonts } = ctx;
+  const glyphKinds = new Set(view.glyphKinds ?? []);
   const graph = {
     id: "root",
     layoutOptions: {
@@ -99688,7 +99961,7 @@ function buildElkGraph(ctx, direction, options) {
       "elk.edgeRouting": "ORTHOGONAL",
       "elk.partitioning.activate": "true",
       "elk.layered.nodePlacement.strategy": "NETWORK_SIMPLEX",
-      "elk.layered.compaction.postCompaction.strategy": "EDGE_LENGTH",
+      "elk.layered.compaction.postCompaction.strategy": options?.postCompaction ?? "EDGE_LENGTH",
       "elk.layered.feedbackEdges": "true",
       "elk.layered.thoroughness": "30",
       "elk.separateConnectedComponents": "false",
@@ -99707,25 +99980,38 @@ function buildElkGraph(ctx, direction, options) {
         "elk.spacing.edgeNode": "18",
         "elk.layered.thoroughness": "80",
         "elk.layered.nodePlacement.favorStraightEdges": "true"
-      } : {}
+      } : {},
+      // Spread last, after every spacing default above, because overriding them
+      // is the whole point — a density candidate that lands before them is
+      // silently shadowed and lays out exactly like the layout it was meant to
+      // beat.
+      ...options?.dense ? {
+        "elk.layered.spacing.nodeNodeBetweenLayers": "14",
+        "elk.spacing.nodeNode": "10",
+        "elk.spacing.edgeEdge": "8",
+        "elk.spacing.edgeNode": "9"
+      } : {},
+      ...options?.placement ? { "elk.layered.nodePlacement.strategy": options.placement } : {}
     },
     children: model.elements.map((element, index) => {
-      const elkNode = toElkNode2(element, compact, fonts, true);
+      const elkNode = toElkNode2(element, { compact, fonts, glyphKinds }, true);
       const band = elkPartitionOf(element, index, view, ingressExternal);
       const slot = slotOf.get(element.id);
       elkNode.layoutOptions = {
         ...elkNode.layoutOptions,
         // Without an `order:` anywhere the band is emitted as it always was, so
         // the drawing is byte-identical to one from before the hint existed.
-        "elk.partitioning.partition": String(
-          slot === void 0 ? band : band * SLOT_SCALE + slot
-        )
+        "elk.partitioning.partition": String(slot === void 0 ? band : band * SLOT_SCALE + slot)
       };
       return elkNode;
     }),
     edges: model.flows.map((flow) => elkFlowEdge(flow, ctx, options?.labelWrap))
   };
-  applyDeclaredPorts(graph, model);
+  applyDeclaredPorts(
+    graph,
+    model,
+    options?.hubPorts === false ? /* @__PURE__ */ new Map() : hubFlowSides(model, view)
+  );
   return graph;
 }
 function recordRepairs(scene, routesBefore) {
@@ -99738,8 +100024,127 @@ function recordRepairs(scene, routesBefore) {
     if (moved) edge.repairedFrom = original;
   }
 }
+function segmentsCross2(a1, a2, b1, b2) {
+  const aH = Math.abs(a1.y - a2.y) < 0.5;
+  const bH = Math.abs(b1.y - b2.y) < 0.5;
+  if (aH === bH) return false;
+  const [h1, h2, v1, v2] = aH ? [a1, a2, b1, b2] : [b1, b2, a1, a2];
+  const hy = h1.y;
+  const vx = v1.x;
+  return vx > Math.min(h1.x, h2.x) + 0.5 && vx < Math.max(h1.x, h2.x) - 0.5 && hy > Math.min(v1.y, v2.y) + 0.5 && hy < Math.max(v1.y, v2.y) - 0.5;
+}
+function shortJogs(edges) {
+  let total = 0;
+  for (const edge of edges)
+    for (let i = 1; i + 2 < edge.pts.length; i++) {
+      const run = Math.abs(edge.pts[i + 1].x - edge.pts[i].x) + Math.abs(edge.pts[i + 1].y - edge.pts[i].y);
+      if (run > 0 && run <= 20) total++;
+    }
+  return total;
+}
+function crossingsAround(scene, subject) {
+  let total = 0;
+  const subjectIds = new Set(subject.map((edge) => edge.id));
+  for (const edge of subject)
+    for (const other of scene.edges) {
+      if (other.id === edge.id) continue;
+      if (subjectIds.has(other.id) && other.id < edge.id) continue;
+      for (let i = 1; i < edge.pts.length; i++)
+        for (let j = 1; j < other.pts.length; j++)
+          if (segmentsCross2(edge.pts[i - 1], edge.pts[i], other.pts[j - 1], other.pts[j])) total++;
+    }
+  return total;
+}
+function leafBoxesOf(scene) {
+  return scene.nodes.filter((node) => !node.container);
+}
+function crossesLeaf(edge, leaves, attached) {
+  for (let i = 1; i < edge.pts.length; i++) {
+    const a = edge.pts[i - 1];
+    const b = edge.pts[i];
+    const horizontal = Math.abs(a.y - b.y) < 0.5;
+    const vertical = Math.abs(a.x - b.x) < 0.5;
+    if (!horizontal && !vertical) continue;
+    const at = horizontal ? a.y : a.x;
+    const lo = horizontal ? Math.min(a.x, b.x) : Math.min(a.y, b.y);
+    const hi = horizontal ? Math.max(a.x, b.x) : Math.max(a.y, b.y);
+    for (const node of leaves) {
+      if (attached.has(node.id)) continue;
+      const struck = horizontal ? at > node.y + 1 && at < node.y + node.height - 1 && lo < node.x + node.width - 1 && hi > node.x + 1 : at > node.x + 1 && at < node.x + node.width - 1 && lo < node.y + node.height - 1 && hi > node.y + 1;
+      if (struck) return true;
+    }
+  }
+  return false;
+}
+function snapLanes(scene, laneOf, axis) {
+  if (!laneOf.size) return;
+  const leaves = leafBoxesOf(scene);
+  const tilted = (edges) => edges.reduce(
+    (total, edge) => total + edge.pts.filter(
+      (point, i) => i > 0 && Math.abs(point.x - edge.pts[i - 1].x) >= 0.5 && Math.abs(point.y - edge.pts[i - 1].y) >= 0.5
+    ).length,
+    0
+  );
+  const touching = /* @__PURE__ */ new Map();
+  const attachedTo = /* @__PURE__ */ new Map();
+  for (const edge of scene.edges) {
+    const ends = /* @__PURE__ */ new Set();
+    for (const point of [edge.pts[0], edge.pts[edge.pts.length - 1]]) {
+      if (!point) continue;
+      for (const node of scene.nodes)
+        if (point.x >= node.x - 1 && point.x <= node.x + node.width + 1 && point.y >= node.y - 1 && point.y <= node.y + node.height + 1) {
+          ends.add(node.id);
+          if (!touching.has(node.id)) touching.set(node.id, []);
+          touching.get(node.id).push(edge);
+        }
+    }
+    attachedTo.set(edge.id, ends);
+  }
+  const byLane = /* @__PURE__ */ new Map();
+  for (const node of scene.nodes) {
+    const lane = laneOf.get(node.id);
+    if (lane === void 0) continue;
+    if (!byLane.has(lane)) byLane.set(lane, []);
+    byLane.get(lane).push(node);
+  }
+  for (const members of [...byLane.entries()].sort((a, b) => a[0] - b[0]).map((e) => e[1])) {
+    if (members.length < 2) continue;
+    const target = Math.max(...members.map((node) => node[axis]));
+    for (const node of members) {
+      const delta = target - node[axis];
+      if (!delta) continue;
+      const box = { x: node.x, y: node.y, w: node.width, h: node.height };
+      const edges = touching.get(node.id) ?? [];
+      const before = edges.map((edge) => edge.pts.map((point) => ({ ...point })));
+      const crossingsBefore = crossingsAround(scene, edges);
+      const jogsBefore = shortJogs(edges);
+      const tiltsBefore = tilted(edges);
+      node[axis] = target;
+      for (const edge of edges)
+        for (const point of edge.pts)
+          if (point.x >= box.x - 1 && point.x <= box.x + box.w + 1 && point.y >= box.y - 1 && point.y <= box.y + box.h + 1)
+            point[axis] += delta;
+      const broke = crossingsAround(scene, edges) > crossingsBefore || shortJogs(edges) > jogsBefore || tilted(edges) > tiltsBefore || edges.some((edge) => crossesLeaf(edge, leaves, attachedTo.get(edge.id) ?? /* @__PURE__ */ new Set())) || // Containers included: a lane member is top-level, so it has no
+      // legitimate container ancestor and may not land on one.
+      scene.nodes.some(
+        (other) => other !== node && !node.container && other.x < node.x + node.width && node.x < other.x + other.width && other.y < node.y + node.height && node.y < other.y + other.height
+      );
+      if (broke) {
+        node[axis] = target - delta;
+        edges.forEach((edge, i) => {
+          edge.pts = before[i];
+        });
+      }
+    }
+  }
+  const maxX = Math.max(...scene.nodes.map((node) => node.x + node.width));
+  const maxY = Math.max(...scene.nodes.map((node) => node.y + node.height));
+  scene.width = Math.max(scene.width, Math.ceil(maxX) + 10);
+  scene.height = Math.max(scene.height, Math.ceil(maxY) + 10);
+}
 function runGeometryPasses(scene, model, options) {
   const { numbered, sideways } = options;
+  if (options.laneOf) snapLanes(scene, options.laneOf, sideways ? "y" : "x");
   const titleBoxes = titleBoxesOf(scene, model);
   if (sideways) transpose(scene, titleBoxes);
   rerouteDetours(scene, model, numbered, titleBoxes);
@@ -99758,6 +100163,95 @@ function runGeometryPasses(scene, model, options) {
   clearSideHugs(scene, settledTitles);
   anchorFlowLabels(scene, settledTitles);
   swapCrossingSiblingSeats(scene);
+  fitCanvas(scene);
+}
+function laneAssignment(model, view) {
+  const laneOf = /* @__PURE__ */ new Map();
+  const laneKinds = new Set(view.laneKinds ?? []);
+  if (!laneKinds.size || model.style.compact) return laneOf;
+  const rootOf = /* @__PURE__ */ new Map();
+  const walk = (element, root) => {
+    rootOf.set(element.id, root);
+    for (const child of element.children ?? []) walk(child, root);
+  };
+  for (const element of model.elements) walk(element, element.id);
+  const adjacency = /* @__PURE__ */ new Map();
+  for (const flow of model.flows) {
+    const from = rootOf.get(flow.from);
+    const to = rootOf.get(flow.to);
+    if (!from || !to || from === to) continue;
+    if (!adjacency.has(from)) adjacency.set(from, /* @__PURE__ */ new Set());
+    adjacency.get(from).add(to);
+  }
+  const reaches = (from, to) => {
+    const seen = /* @__PURE__ */ new Set([from]);
+    const queue = [from];
+    while (queue.length) {
+      for (const next of adjacency.get(queue.pop()) ?? []) {
+        if (next === to) return true;
+        if (!seen.has(next)) {
+          seen.add(next);
+          queue.push(next);
+        }
+      }
+    }
+    return false;
+  };
+  const byKind = /* @__PURE__ */ new Map();
+  for (const element of model.elements) {
+    if (!laneKinds.has(element.kind)) continue;
+    if ((element.children ?? []).length) continue;
+    if (!byKind.has(element.kind)) byKind.set(element.kind, []);
+    byKind.get(element.kind).push(element);
+  }
+  const pinned = /* @__PURE__ */ new Set();
+  for (const flow of model.flows) {
+    if (!flow.fromSide && !flow.toSide) continue;
+    pinned.add(rootOf.get(flow.from) ?? flow.from);
+    pinned.add(rootOf.get(flow.to) ?? flow.to);
+  }
+  let laneId = 0;
+  for (const members of byKind.values()) {
+    if (members.length < 2) continue;
+    if (members.some((member) => pinned.has(member.id))) continue;
+    if (members.some((member) => member.order)) continue;
+    if (members.some((a) => members.some((b) => a !== b && reaches(a.id, b.id)))) continue;
+    laneId++;
+    for (const member of members) laneOf.set(member.id, laneId);
+  }
+  return laneOf;
+}
+async function withHubPortFallback(elk, makeGraph, direction, options) {
+  const run = async (spec) => await elk.layout(makeGraph(direction, spec));
+  const rungs = options?.hubPorts === false ? [] : [
+    { ...options, postCompaction: "EDGE_LENGTH_CONSTRAINT_LOCKING" },
+    { ...options, postCompaction: "NONE" },
+    { ...options, hubPorts: false }
+  ];
+  try {
+    return { result: await run(options), options };
+  } catch (error) {
+    for (const [index, rung] of rungs.entries()) {
+      try {
+        return { result: await run(rung), options: rung };
+      } catch (rungError) {
+        if (index === rungs.length - 1) throw rungError;
+      }
+    }
+    throw error;
+  }
+}
+function markDeclaredTerminals(edges, model, view, hubPorts) {
+  const pinnedFlows = new Map(
+    model.flows.filter((flow) => flow.fromSide || flow.toSide).map((flow) => [flow.id, { start: !!flow.fromSide, end: !!flow.toSide }])
+  );
+  const hubSides = hubPorts ? hubFlowSides(model, view) : /* @__PURE__ */ new Map();
+  for (const edge of edges) {
+    const pinned = pinnedFlows.get(edge.id);
+    if (pinned) edge.pinned = { ...pinned };
+    const hub = hubSides.get(edge.id);
+    if (hub) edge.hubSided = { start: !!hub.from, end: !!hub.to };
+  }
 }
 async function layout(model, view) {
   const elk = await getElk();
@@ -99771,10 +100265,6 @@ async function layout(model, view) {
     scale: fontScale
   } = fontSizes(model.style.font.size);
   const disposition = model.style.disposition;
-  const ASPECT_TARGETS = {
-    slide: 16 / 9,
-    page: 0.71
-  };
   const aspectTarget = ASPECT_TARGETS[disposition];
   const ingressExternalElements = view.partitionByOrder ? computeIngressExternalElements(model) : /* @__PURE__ */ new Set();
   const graphContext = {
@@ -99794,7 +100284,7 @@ async function layout(model, view) {
   };
   const makeGraph = (direction, options) => buildElkGraph(graphContext, direction, options);
   const kindOf = new Map(indexElementsById(model.elements));
-  const sceneFromResult = (result2, layoutMs2) => {
+  const sceneFromResult = (result2, layoutMs2, laidOutWith, lanes = true) => {
     const origins = {
       root: { x: 0, y: 0 }
     };
@@ -99802,13 +100292,9 @@ async function layout(model, view) {
     const nodes = walkedNodes.map((walked) => walked.node);
     for (const walked of walkedNodes) origins[walked.id] = { x: walked.x, y: walked.y };
     const edges = collectSceneEdges(result2, origins, numbered, edgeFontSize);
-    const pinnedFlows = new Map(
-      model.flows.filter((flow) => flow.fromSide || flow.toSide).map((flow) => [flow.id, { start: !!flow.fromSide, end: !!flow.toSide }])
-    );
-    for (const edge of edges) {
-      const pinned = pinnedFlows.get(edge.id);
-      if (pinned) edge.pinned = { ...pinned };
-    }
+    const reversed = new Set(model.flows.filter(laidOutReversed).map((flow) => flow.id));
+    for (const edge of edges) if (reversed.has(edge.id)) edge.pts.reverse();
+    markDeclaredTerminals(edges, model, view, laidOutWith?.hubPorts !== false);
     const scene = {
       width: Math.ceil(result2.width),
       height: Math.ceil(result2.height),
@@ -99818,11 +100304,14 @@ async function layout(model, view) {
     };
     runGeometryPasses(scene, model, {
       numbered,
-      sideways: disposition === "page" || disposition === "tall"
+      sideways: disposition === "page" || disposition === "tall",
+      laneOf: lanes ? laneOf : void 0
     });
     return scene;
   };
+  const laneOf = laneAssignment(model, view);
   const startTime = Date.now();
+  const layoutGraph = (direction, options) => withHubPortFallback(elk, makeGraph, direction, options);
   let result;
   let winnerDirection;
   let winnerOptions;
@@ -99833,9 +100322,10 @@ async function layout(model, view) {
       { direction: "RIGHT", options: { labelWrap: 14, tight: true } },
       { direction: "RIGHT", options: { labelWrap: 14, tight: true, minLayers: true } }
     ] : [{ direction: "DOWN" }, { direction: "DOWN", options: { labelWrap: 16 } }];
-    const candidates = await Promise.all(
-      graphSpecs.map((spec) => elk.layout(makeGraph(spec.direction, spec.options)))
+    const laidOutSpecs = await Promise.all(
+      graphSpecs.map((spec) => layoutGraph(spec.direction, spec.options))
     );
+    const candidates = laidOutSpecs.map((laidOut) => laidOut.result);
     const preferWide = disposition === "slide";
     const orientedLayouts = candidates.map((layoutResult, index) => ({ layoutResult, index })).filter(
       ({ layoutResult }) => preferWide ? layoutResult.width >= layoutResult.height : layoutResult.height >= layoutResult.width
@@ -99848,7 +100338,7 @@ async function layout(model, view) {
     );
     result = winner.layoutResult;
     winnerDirection = graphSpecs[winner.index].direction;
-    winnerOptions = graphSpecs[winner.index].options;
+    winnerOptions = laidOutSpecs[winner.index].options;
     if (disposition === "slide") {
       const folded = await foldedLayout(model, view, elk);
       if (folded && fitScore(result) >= fitScore(folded) * 1.1) {
@@ -99862,20 +100352,32 @@ async function layout(model, view) {
     }
   } else {
     winnerDirection = disposition === "tall" ? "DOWN" : "RIGHT";
-    winnerOptions = void 0;
-    result = await elk.layout(makeGraph(winnerDirection));
+    ({ result, options: winnerOptions } = await layoutGraph(winnerDirection));
   }
   const layoutMs = Date.now() - startTime;
-  const base = sceneFromResult(result, layoutMs);
-  const skipPortPass = !!globalThis.process?.env?.CAIRN_NO_PORT_PASS;
-  if (skipPortPass) return base;
+  let base = sceneFromResult(result, layoutMs, winnerOptions);
   const layoutProfile = (candidate) => {
     const everyEdge = new Set(candidate.edges.map((edge) => edge.id));
     const profile = inspect(candidate, titleBoxesOf(candidate, model)).local(everyEdge, /* @__PURE__ */ new Map());
     for (const [key, tier] of selectionExtras(candidate, model)) profile.set(key, tier);
     return profile;
   };
+  if (!aspectTarget && nodeCoverage(base) < DENSE_ENOUGH) {
+    const denser = await denserLayout(base, {
+      layout: (spec) => elk.layout(makeGraph(winnerDirection, spec)),
+      // Its specs carry the hub ports (none of them sets `hubPorts: false`), and
+      // a candidate elk refuses is dropped rather than retried without them.
+      toScene: (laidOut) => sceneFromResult(laidOut, Date.now() - startTime),
+      profile: layoutProfile
+    });
+    if (denser) {
+      base = denser.scene;
+      winnerOptions = denser.options;
+    }
+  }
   const baseProfile = layoutProfile(base);
+  const skipPortPass = !!globalThis.process?.env?.CAIRN_NO_PORT_PASS;
+  if (skipPortPass) return base;
   let current = base;
   let best = null;
   for (let round = 0; round < PORT_PASS_ROUNDS; round++) {
@@ -99886,7 +100388,7 @@ async function layout(model, view) {
       const constrained = makeGraph(winnerDirection, winnerOptions);
       constrainPorts(constrained, current, flagged, model);
       const reresult = await elk.layout(constrained);
-      candidate = sceneFromResult(reresult, Date.now() - startTime);
+      candidate = sceneFromResult(reresult, Date.now() - startTime, winnerOptions);
     } catch {
       break;
     }
@@ -99898,7 +100400,7 @@ async function layout(model, view) {
   }
   return best?.scene ?? base;
 }
-var orderOption, semiInteractiveOption, PORT_PASS_ROUNDS, centerOf, INGRESS_PARTITION, EGRESS_PARTITION, COMPACT_WRAP, SLOT_SCALE, SIDE_TO_ELK;
+var orderOption, semiInteractiveOption, PORT_PASS_ROUNDS, centerOf, DENSE_ENOUGH, DENSITY_GAIN, INGRESS_PARTITION, DEFAULT_INGRESS_KINDS, EGRESS_PARTITION, COMPACT_WRAP, SLOT_SCALE, SIDE_TO_ELK, sideRequest, ASPECT_TARGETS;
 var init_scene_layout = __esm({
   "src/scene-layout.ts"() {
     "use strict";
@@ -99916,7 +100418,10 @@ var init_scene_layout = __esm({
     semiInteractiveOption = (children) => children.some((child) => child.order) ? { "elk.layered.crossingMinimization.semiInteractive": "true" } : {};
     PORT_PASS_ROUNDS = 2;
     centerOf = (n) => ({ x: n.x + n.width / 2, y: n.y + n.height / 2 });
+    DENSE_ENOUGH = 0.6;
+    DENSITY_GAIN = 0.95;
     INGRESS_PARTITION = -1;
+    DEFAULT_INGRESS_KINDS = ["actor", "actor-group"];
     EGRESS_PARTITION = 900;
     COMPACT_WRAP = 10;
     SLOT_SCALE = 1e3;
@@ -99926,6 +100431,11 @@ var init_scene_layout = __esm({
       top: "NORTH",
       bottom: "SOUTH"
     };
+    sideRequest = (side) => side ? { value: side } : void 0;
+    ASPECT_TARGETS = {
+      slide: 16 / 9,
+      page: 0.71
+    };
   }
 });
 
@@ -99976,16 +100486,62 @@ var init_localization = __esm({
 });
 
 // src/xml-escape.ts
-var esc, escAttr;
+var esc, escAttr, escComment;
 var init_xml_escape = __esm({
   "src/xml-escape.ts"() {
     "use strict";
     esc = (text) => text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
     escAttr = (text) => esc(text).replace(/"/g, "&quot;");
+    escComment = (text) => text.replace(/-{2,}/g, (run) => [...run].join(" ")).replace(/-$/, "- ");
+  }
+});
+
+// src/logo-attribution.ts
+function logoAttributionComment(drawn) {
+  const licensed = [...drawn].sort().map((slug) => ({ slug, logo: LOGOS[slug] })).filter((entry) => entry.logo?.license);
+  if (licensed.length === 0) return "";
+  const lines = [...PREAMBLE];
+  for (const { slug, logo } of licensed) {
+    lines.push("", `${logo.title} (${slug}) \u2014 ${logo.license}`);
+    if (logo.copyright) lines.push(`  ${logo.copyright}`);
+    if (logo.source) lines.push(`  artwork: ${logo.source}`);
+    if (logo.licenseUrl) lines.push(`  licence: ${logo.licenseUrl}`);
+  }
+  return `<!--
+${lines.map((line) => escComment(`  ${line}`).trimEnd()).join("\n")}
+-->
+`;
+}
+var PREAMBLE;
+var init_logo_attribution = __esm({
+  "src/logo-attribution.ts"() {
+    "use strict";
+    init_logos();
+    init_xml_escape();
+    PREAMBLE = [
+      "This diagram contains third-party artwork under its own licence.",
+      "Keep this notice with the file \u2014 it is the attribution those licences ask for.",
+      "",
+      "Every mark below is modified from the original: simple-icons redrew it as a",
+      "single monochrome path, and cairn paints that path in the diagram's colours."
+    ];
   }
 });
 
 // src/svg-render.ts
+function bandLines(text, from, right, fontSize) {
+  const chars = Math.floor((right - from) / (fontSize * RENDER_CHAR_WIDTH));
+  return bandWrap(text, Math.max(8, chars));
+}
+function bandWrap(text, maxChars) {
+  return wrapText(text, maxChars).split("\n").flatMap((line) => {
+    if (line.length <= maxChars) return [line];
+    const parts = [];
+    for (let index = 0; index < line.length; index += maxChars)
+      parts.push(line.slice(index, index + maxChars));
+    return parts;
+  });
+}
 function assignSourceHues(model, hues) {
   const sourceHue = /* @__PURE__ */ new Map();
   for (const flow of model.flows) {
@@ -99996,7 +100552,7 @@ function assignSourceHues(model, hues) {
 }
 function collectElementStyles(elements) {
   return elements.flatMap((element) => [
-    { id: element.id, style: element.style, attrValue: element.attr?.value },
+    { id: element.id, style: element.style, logo: element.logo },
     ...collectElementStyles(element.children)
   ]);
 }
@@ -100038,19 +100594,39 @@ function auditRouteRepairs(deps) {
     for (let tier = 0; tier < 5; tier++) if (a[tier] !== b[tier]) return a[tier] < b[tier];
     return false;
   };
+  const flowOfBreach = (key) => {
+    if (key.startsWith("adrift:"))
+      return labels[Number.parseInt(key.slice("adrift:".length), 10)]?.flowId ?? null;
+    const body = key.slice(key.indexOf(":") + 1);
+    const cut = body.search(/[~:]/);
+    return cut < 0 ? body : body.slice(0, cut);
+  };
   const withRepair = stateHarm();
   const breachesWith = breaches();
   const repairedRoutes = repaired.map((edge) => edge.pts);
-  for (const edge of repaired) edge.pts = edge.repairedFrom;
-  resettle();
-  const withoutRepair = stateHarm();
-  const breachesWithout = breaches();
-  const breaksAPromise = [...breachesWith].some((key) => !breachesWithout.has(key));
-  if (!breaksAPromise && !lessDamaged(withoutRepair, withRepair)) {
+  const replacedRoutes = repaired.map((edge) => edge.repairedFrom);
+  const applyKeep = (keep2) => {
     repaired.forEach((edge, index) => {
-      edge.pts = repairedRoutes[index];
+      edge.pts = keep2[index] ? repairedRoutes[index] : replacedRoutes[index];
     });
     resettle();
+  };
+  applyKeep(repaired.map(() => false));
+  const withoutRepair = stateHarm();
+  const breachesWithout = breaches();
+  const broken = [...breachesWith].filter((key) => !breachesWithout.has(key));
+  if (!broken.length) {
+    if (!lessDamaged(withoutRepair, withRepair)) applyKeep(repaired.map(() => true));
+    for (const edge of repaired) edge.repairedFrom = void 0;
+    return;
+  }
+  const blamed = new Set(broken.map(flowOfBreach).filter((id) => id !== null));
+  const keep = repaired.map((edge) => !blamed.has(edge.id));
+  if (keep.some(Boolean) && keep.some((kept) => !kept)) {
+    applyKeep(keep);
+    const partly = stateHarm();
+    const stillBroken = [...breaches()].some((key) => !breachesWithout.has(key));
+    if (stillBroken || lessDamaged(withoutRepair, partly)) applyKeep(repaired.map(() => false));
   }
   for (const edge of repaired) edge.repairedFrom = void 0;
 }
@@ -100091,13 +100667,66 @@ function settleOneLabel(s, label) {
   label.x = origin.x;
   label.y = origin.y;
 }
-function createNodeRenderers(paint) {
-  const { palette, style, annot, nodeFontSize, containerFontSize, resolveStyle, elementAttr } = paint;
+function glyphSvg(kind, stroke, box) {
+  const glyph = GLYPHS[kind];
+  if (!glyph) return "";
+  const { x, y, scale = 1 } = box;
+  const width = round1(1.3 * scale);
+  return glyph({
+    x: (v) => round1(x + v * scale),
+    y: (v) => round1(y + v * scale),
+    r: (v) => round1(v * scale),
+    line: `fill="none" stroke="${stroke}" stroke-width="${width}"`,
+    stroke
+  });
+}
+function logoSvg(mark) {
+  const { logo, resolved, node, stroke, drawn, inset = {} } = mark;
+  if (!logo) return "";
+  const x = round1(node.x + node.width - (inset.right ?? LOGO_BOX.right) - LOGO_BOX.size);
+  const y = round1(node.y + (inset.top ?? LOGO_BOX.top));
+  if (logo.source === "file") {
+    const href = resolved?.get(node.id);
+    if (!href) return "";
+    return `<image x="${x}" y="${y}" width="${LOGO_BOX.size}" height="${LOGO_BOX.size}" href="${escAttr(href)}" preserveAspectRatio="xMidYMid meet"/>
+`;
+  }
+  const builtin = Object.hasOwn(LOGOS, logo.value) ? LOGOS[logo.value] : void 0;
+  if (!builtin) return "";
+  drawn.add(logo.value);
+  const scale = Math.round(LOGO_BOX.size / 24 * 1e4) / 1e4;
+  return `<g transform="translate(${x} ${y}) scale(${scale})" fill="${stroke}"><title>${esc(builtin.title)}</title><path d="${builtin.d}"/></g>
+`;
+}
+function createNodeLabelHelpers(nodeFontSize) {
   const centeredNodeLabel = (lines, centerX2, topBaseline, fill) => lines.map(
     (line, index) => `<text x="${centerX2}" y="${topBaseline + index * (nodeFontSize + 2)}" font-size="${nodeFontSize}" text-anchor="middle" fill="${fill}">${esc(line)}</text>
 `
   ).join("");
   const centerLinesY = (top, height, lineCount) => top + height / 2 - (lineCount - 1) * (nodeFontSize + 2) / 2 + 4;
+  const glyphLabelCenterX = (node) => node.x + GLYPH_GUTTER + (node.width - GLYPH_GUTTER) / 2;
+  const logoLabelCenterX = (node, hasLogo) => node.x + (node.width - (hasLogo ? LOGO_GUTTER : 0)) / 2;
+  return { centeredNodeLabel, centerLinesY, glyphLabelCenterX, logoLabelCenterX };
+}
+function createNodeRenderers(paint) {
+  const {
+    palette,
+    nodeFontSize,
+    containerFontSize,
+    resolveStyle,
+    elementLogo,
+    resolvedLogos,
+    drawnLogos
+  } = paint;
+  const logoFor = (node, stroke, inset) => logoSvg({
+    logo: elementLogo.get(node.id),
+    resolved: resolvedLogos,
+    node,
+    stroke,
+    drawn: drawnLogos,
+    inset
+  });
+  const { centeredNodeLabel, centerLinesY, glyphLabelCenterX, logoLabelCenterX } = createNodeLabelHelpers(nodeFontSize);
   const renderContainerNode = (node) => {
     const nodeStyle = resolveStyle(node.kind, node.id);
     const fill = escAttr(nodeStyle.fill ?? palette.containerFill), stroke = escAttr(nodeStyle.stroke?.color ?? palette.containerStroke), text = escAttr(nodeStyle.text ?? palette.containerLabel);
@@ -100108,12 +100737,7 @@ function createNodeRenderers(paint) {
       svg += `<text x="${node.x + 10}" y="${node.y + 18 + index * 14}" font-size="${containerFontSize}" font-weight="bold" fill="${text}">${esc(line)}</text>
 `;
     });
-    const level = node.kind === "trust-zone" ? elementAttr.get(node.id) : void 0;
-    if (level) {
-      const word = (style.lang === "fr" ? SEC_LEVEL_FR[level] : level) ?? level;
-      svg += `<text x="${node.x + node.width - 9}" y="${node.y + node.height - 6}" font-size="${annot.tag}" text-anchor="end" font-weight="bold" fill="${stroke}" letter-spacing="0.5">${esc(word.toUpperCase())}</text>
-`;
-    }
+    svg += logoFor(node, stroke);
     return svg;
   };
   const renderActor = (node, nodeStyle, lines) => {
@@ -100136,9 +100760,12 @@ function createNodeRenderers(paint) {
 <ellipse cx="${node.x + node.width / 2}" cy="${node.y + ry}" rx="${node.width / 2}" ry="${ry}" fill="${fill}" stroke="${stroke}" stroke-width="1.3"/>
 `;
     const centerY2 = node.y + ry + (node.height - ry) / 2 - (lines.length - 1) * (nodeFontSize + 2) / 2 + 4;
-    return body + centeredNodeLabel(
+    const logo = logoFor(node, stroke, {
+      top: ry + (node.height - 2 * ry - LOGO_BOX.size) / 2
+    });
+    return body + logo + centeredNodeLabel(
       lines,
-      node.x + node.width / 2,
+      logoLabelCenterX(node, logo !== ""),
       centerY2,
       escAttr(nodeStyle.text ?? palette.nodeText)
     );
@@ -100149,50 +100776,38 @@ function createNodeRenderers(paint) {
     const body = `<path d="M ${node.x + rx} ${node.y} h ${node.width - 2 * rx} a ${rx} ${node.height / 2} 0 0 1 0 ${node.height} h ${-(node.width - 2 * rx)} a ${rx} ${node.height / 2} 0 0 1 0 ${-node.height}" fill="${fill}" stroke="${stroke}" stroke-width="1.3"/>
 <ellipse cx="${node.x + rx}" cy="${node.y + node.height / 2}" rx="${rx}" ry="${node.height / 2}" fill="${fill}" stroke="${stroke}" stroke-width="1.3"/>
 `;
-    return body + centeredNodeLabel(
+    const logo = logoFor(node, stroke, { right: LOGO_BOX.right + rx });
+    return body + logo + centeredNodeLabel(
       lines,
-      node.x + rx + (node.width - rx) / 2,
+      node.x + rx + (node.width - rx - (logo === "" ? 0 : LOGO_GUTTER)) / 2,
       centerLinesY(node.y, node.height, lines.length),
       text
     );
   };
-  const renderGateway = (node, nodeStyle, lines) => {
-    const centerX2 = node.x + node.width / 2;
-    const fill = escAttr(nodeStyle.fill ?? palette.nodeFill), stroke = escAttr(nodeStyle.stroke?.color ?? palette.nodeStroke), text = escAttr(nodeStyle.text ?? palette.nodeText);
-    const body = `<rect x="${node.x}" y="${node.y}" width="${node.width}" height="${node.height}" rx="4" fill="${fill}" stroke="${stroke}" stroke-width="1.3"/>
-<path d="M ${round1(node.x + 8)} ${round1(node.y + 8)} L ${round1(node.x + 22)} ${round1(node.y + 8)} Q ${round1(node.x + 24)} ${round1(node.y + 13)} ${round1(node.x + 15)} ${round1(node.y + 20)} Q ${round1(node.x + 6)} ${round1(node.y + 13)} ${round1(node.x + 8)} ${round1(node.y + 8)}" fill="none" stroke="${stroke}" stroke-width="1.3"/>
-`;
-    return body + centeredNodeLabel(lines, centerX2 + 10, centerLinesY(node.y, node.height, lines.length), text);
-  };
-  const renderAuth = (node, nodeStyle, lines) => {
-    const centerX2 = node.x + node.width / 2;
-    const fill = escAttr(nodeStyle.fill ?? palette.nodeFill), stroke = escAttr(nodeStyle.stroke?.color ?? palette.nodeStroke), text = escAttr(nodeStyle.text ?? palette.nodeText);
-    const body = `<rect x="${node.x}" y="${node.y}" width="${node.width}" height="${node.height}" rx="4" fill="${fill}" stroke="${stroke}" stroke-width="1.3"/>
-<rect x="${node.x + 6}" y="${node.y + 6}" width="18" height="14" rx="3" fill="none" stroke="${stroke}" stroke-width="1.3"/>
-<path d="M ${node.x + 10} ${node.y + 9} v -4 a 5 5 0 0 1 10 0 v 4" fill="none" stroke="${stroke}" stroke-width="1.3"/>
-<circle cx="${node.x + 15}" cy="${node.y + 16}" r="2.5" fill="${stroke}"/>
-`;
-    return body + centeredNodeLabel(lines, centerX2 + 10, centerLinesY(node.y, node.height, lines.length), text);
-  };
-  const renderPlainBox = (node, nodeStyle, lines) => {
+  const renderGlyphBox = (node, nodeStyle, lines) => {
     const fill = escAttr(nodeStyle.fill ?? palette.nodeFill), stroke = escAttr(nodeStyle.stroke?.color ?? palette.nodeStroke), text = escAttr(nodeStyle.text ?? palette.nodeText);
     const dash = dashArray(nodeStyle.stroke?.style);
     const body = `<rect x="${node.x}" y="${node.y}" width="${node.width}" height="${node.height}" rx="4" fill="${fill}" stroke="${stroke}" stroke-width="${nodeStyle.stroke?.width ?? 1.3}"${dash ? ` stroke-dasharray="${dash}"` : ""}/>
-`;
+` + glyphSvg(node.kind, stroke, {
+      x: node.x + GLYPH_BOX.left,
+      y: node.y + GLYPH_BOX.top
+    }) + "\n";
     return body + centeredNodeLabel(
       lines,
-      node.x + node.width / 2,
+      glyphLabelCenterX(node),
       centerLinesY(node.y, node.height, lines.length),
       text
     );
   };
-  const renderIdp = (node, nodeStyle, lines) => {
+  const renderPlainBox = (node, nodeStyle, lines) => {
     const fill = escAttr(nodeStyle.fill ?? palette.nodeFill), stroke = escAttr(nodeStyle.stroke?.color ?? palette.nodeStroke), text = escAttr(nodeStyle.text ?? palette.nodeText);
-    const body = `<rect x="${node.x}" y="${node.y}" width="${node.width}" height="${node.height}" rx="4" fill="${fill}" stroke="${stroke}" stroke-width="${nodeStyle.stroke?.width ?? 1.3}"/>
+    const dash = dashArray(nodeStyle.stroke?.style);
+    const logo = logoFor(node, stroke);
+    const body = `<rect x="${node.x}" y="${node.y}" width="${node.width}" height="${node.height}" rx="4" fill="${fill}" stroke="${stroke}" stroke-width="${nodeStyle.stroke?.width ?? 1.3}"${dash ? ` stroke-dasharray="${dash}"` : ""}/>
 `;
-    return body + centeredNodeLabel(
+    return body + logo + centeredNodeLabel(
       lines,
-      node.x + node.width / 2,
+      logoLabelCenterX(node, logo !== ""),
       centerLinesY(node.y, node.height, lines.length),
       text
     );
@@ -100207,14 +100822,8 @@ function createNodeRenderers(paint) {
         return renderDatastore(node, nodeStyle, lines);
       case "queue":
         return renderQueue(node, nodeStyle, lines);
-      case "gateway":
-        return renderGateway(node, nodeStyle, lines);
-      case "auth":
-        return renderAuth(node, nodeStyle, lines);
-      case "idp":
-        return renderIdp(node, nodeStyle, lines);
       default:
-        return renderPlainBox(node, nodeStyle, lines);
+        return GLYPHS[node.kind] ? renderGlyphBox(node, nodeStyle, lines) : renderPlainBox(node, nodeStyle, lines);
     }
   };
   return { renderContainerNode, renderLeafNode };
@@ -100281,15 +100890,20 @@ function createLabelSettler(deps) {
       const a = edge.pts[index];
       const b = edge.pts[index + 1];
       const vertical = Math.abs(a.x - b.x) < Math.abs(a.y - b.y);
-      const span = vertical ? Math.abs(b.y - a.y) : Math.abs(b.x - a.x);
-      const room = Math.max(0, (span - (vertical ? label.height : label.width)) / 2);
-      if (room === 0) continue;
-      for (const fraction of [-0.25, 0.25, -0.5, 0.5, -0.75, 0.75, -1, 1]) {
-        const shift = room * fraction;
-        seats.push(
-          vertical ? { x: (a.x + b.x) / 2 - label.width / 2, y: (a.y + b.y) / 2 + shift - lead } : { x: (a.x + b.x) / 2 + shift - label.width / 2, y: (a.y + b.y) / 2 - lead }
-        );
-      }
+      const size = vertical ? label.height : label.width;
+      const start = vertical ? Math.min(a.y, b.y) : Math.min(a.x, b.x);
+      const end = vertical ? Math.max(a.y, b.y) : Math.max(a.x, b.x);
+      const seat = vertical ? (a.y + b.y) / 2 - lead : (a.x + b.x) / 2 - label.width / 2;
+      const back = Math.max(0, seat - start);
+      const ahead = Math.max(0, end - size - seat);
+      if (back === 0 && ahead === 0) continue;
+      for (const fraction of [0.25, 0.5, 0.75, 1])
+        for (const room of [-back, ahead]) {
+          const shift = room * fraction;
+          seats.push(
+            vertical ? { x: (a.x + b.x) / 2 - label.width / 2, y: seat + shift } : { x: seat + shift, y: (a.y + b.y) / 2 - lead }
+          );
+        }
     }
     return seats;
   };
@@ -100336,27 +100950,103 @@ function createLabelSettler(deps) {
     settleLabelPositions
   };
 }
+function kindKeysSvg(paint, kinds, y, x) {
+  const { scene, palette, legendNames, scaled, resolveStyle } = paint;
+  let svg = "";
+  let keyX = x;
+  let bandY = y;
+  const LINE_H = scaled(12);
+  for (const kind of kinds) {
+    const nodeStyle = resolveStyle(kind, "");
+    if (kind === "actor") {
+      const stroke = nodeStyle.stroke?.color ?? palette.actorStroke;
+      svg += `<circle cx="${keyX + scaled(13)}" cy="${bandY + scaled(5)}" r="${scaled(3)}" fill="none" stroke="${stroke}" stroke-width="1.2"/>
+`;
+      svg += `<path d="M ${keyX + scaled(8)} ${bandY + scaled(15)} q ${scaled(5)} ${scaled(-7)} ${scaled(10)} 0" fill="none" stroke="${stroke}" stroke-width="1.2"/>
+`;
+    } else {
+      const dash = dashArray(nodeStyle.stroke?.style);
+      const stroke = nodeStyle.stroke?.color ?? palette.nodeStroke;
+      svg += `<rect x="${keyX}" y="${bandY + 2}" width="${scaled(26)}" height="${scaled(14)}" rx="3" fill="${nodeStyle.fill ?? palette.nodeFill}" stroke="${escAttr(stroke)}"${dash ? ` stroke-dasharray="${dash}"` : ""}/>
+`;
+      const glyphScale = (scaled(14) - scaled(4)) / GLYPH_BOX.height;
+      svg += glyphSvg(kind, escAttr(stroke), {
+        x: keyX + (scaled(26) - GLYPH_BOX.width * glyphScale) / 2,
+        y: bandY + 2 + (scaled(14) - GLYPH_BOX.height * glyphScale) / 2,
+        scale: glyphScale
+      });
+    }
+    const name = legendNames[kind];
+    const lines = bandLines(name, keyX + scaled(32), bandRightMargin(scene), scaled(10));
+    for (const [row, line] of lines.entries())
+      svg += `<text x="${keyX + scaled(32)}" y="${bandY + scaled(13) + row * LINE_H}" font-size="${scaled(10)}" fill="${palette.bandText}">${esc(line)}</text>
+`;
+    keyX += scaled(40) + Math.ceil(name.length * scaled(10) * RENDER_CHAR_WIDTH) + scaled(24);
+    bandY += (lines.length - 1) * LINE_H;
+    if (lines.length > 1 || keyX > scene.width - 220) {
+      keyX = x;
+      bandY += scaled(22);
+    }
+  }
+  return { svg, bandY: kinds.length ? bandY + scaled(24) : bandY };
+}
+function lineStyleKeysSvg(paint, y, x) {
+  const { scene, model, style, palette, legendLineStyles, scaled, defaultEdgeColor, markerName } = paint;
+  const styles = LINE_STYLES2.filter(
+    (lineStyle) => model.flows.some((flow) => lineStyleOf(flow, style) === lineStyle)
+  );
+  if (styles.length < 2) return { svg: "", bandY: y };
+  const maxX = scene.width - 20;
+  let svg = "";
+  let keyX = x;
+  let bandY = y;
+  const LINE_H = scaled(12);
+  for (const [index, lineStyle] of styles.entries()) {
+    const meaning = legendLineStyles[lineStyle];
+    const keyWidth = scaled(40) + Math.ceil(meaning.length * scaled(10) * RENDER_CHAR_WIDTH) + scaled(24);
+    if (keyX > x && keyX + keyWidth > maxX) {
+      keyX = x;
+      bandY += scaled(22);
+    }
+    const dash = dashArray(lineStyle);
+    svg += `<line x1="${keyX}" y1="${bandY + 8}" x2="${keyX + scaled(26)}" y2="${bandY + 8}" stroke="${escAttr(defaultEdgeColor)}" stroke-width="1.3"${dash ? ` stroke-dasharray="${dash}"` : ""} marker-end="url(#${markerName(defaultEdgeColor)})"/>
+`;
+    const lines = bandLines(meaning, keyX + scaled(40), maxX, scaled(10));
+    for (const [row, line] of lines.entries())
+      svg += `<text x="${keyX + scaled(32)}" y="${bandY + scaled(12) + row * LINE_H}" font-size="${scaled(10)}" fill="${palette.bandText}">${esc(line)}</text>
+`;
+    if (lines.length === 1) {
+      keyX += keyWidth;
+      continue;
+    }
+    bandY += (lines.length - 1) * LINE_H;
+    if (index < styles.length - 1) {
+      bandY += scaled(22);
+      keyX = x;
+    }
+  }
+  return { svg, bandY: bandY + scaled(24) };
+}
 function createBandRenderers(paint) {
   const {
     scene,
     model,
-    view,
     style,
     palette,
     annot,
     ui,
-    legendNames,
     legendFlowLabel,
     scaled,
     objectName,
-    resolveStyle,
     defaultEdgeColor,
     markerName,
     numbered
   } = paint;
   let bandY = scene.height;
   let bandsSvg = "";
-  const contentX = 150;
+  const rightMargin = bandRightMargin(scene);
+  const stackedTitle = rightMargin - BAND_CONTENT_X < MIN_BAND_TEXT;
+  const contentX = stackedTitle ? 20 : BAND_CONTENT_X;
   const chip = (x, y, name) => {
     const width = chipW(name, annot.scale);
     return {
@@ -100371,7 +101061,7 @@ function createBandRenderers(paint) {
 `;
     bandsSvg += `<text x="20" y="${bandY + scaled(32)}" font-size="${scaled(11)}" font-weight="bold" fill="${palette.bandTitle}">${esc(title)}</text>
 `;
-    bandY += scaled(20);
+    bandY += scaled(stackedTitle ? 34 : 20);
   };
   const flowChipsSvg = (flow, startX, startY) => {
     if (!flow.objects?.length) return "";
@@ -100403,7 +101093,7 @@ function createBandRenderers(paint) {
       const textW = Math.max(60, colW - BADGE - (chipsW ? chipsW + 6 : 0));
       const maxChars = Math.max(6, Math.floor(textW / (scaled(10) * RENDER_CHAR_WIDTH)));
       const raw = (flow.label ?? "") + (tech ? "  " + tech : "");
-      const lines = raw.split("\n").flatMap((segment) => wrapText(segment, maxChars).split("\n"));
+      const lines = raw.split("\n").flatMap((segment) => bandWrap(segment, maxChars));
       return { flow, lines };
     });
     const rows = Math.ceil(entries.length / cols);
@@ -100430,59 +101120,50 @@ function createBandRenderers(paint) {
   };
   const renderObjectsBand = () => {
     beginBand(ui.objects);
-    for (const bo of model.businessObjects) {
-      const chipResult = chip(contentX, bandY + 2, bo.name);
+    const LINE_H = scaled(12);
+    const chipRow = (name, reading) => {
+      const chipResult = chip(contentX, bandY + 2, name);
       bandsSvg += chipResult.svg;
-      if (bo.description)
-        bandsSvg += `<text x="${contentX + chipResult.width + 10}" y="${bandY + scaled(13)}" font-size="${scaled(10)}" fill="${palette.bandMuted}">\u2014 ${esc(bo.description)}</text>
-`;
-      bandY += scaled(24);
-    }
-    const keyChip = chip(contentX, bandY + 2, ui.businessObject);
-    bandsSvg += keyChip.svg;
-    bandsSvg += `<text x="${contentX + keyChip.width + 10}" y="${bandY + scaled(13)}" font-size="${scaled(10)}" fill="${palette.bandMuted}">${esc(ui.carriedByFlow)}</text>
+      const textX = contentX + chipResult.width + 10;
+      const lines = reading ? bandLines(reading, textX, rightMargin, scaled(10)) : [];
+      for (const [row, line] of lines.entries())
+        bandsSvg += `<text x="${textX}" y="${bandY + scaled(13) + row * LINE_H}" font-size="${scaled(10)}" fill="${palette.bandMuted}">${esc(line)}</text>
 `;
-    bandY += scaled(24) + 6;
+      bandY += scaled(24) + Math.max(0, lines.length - 1) * LINE_H;
+    };
+    for (const bo of model.businessObjects)
+      chipRow(bo.name, bo.description ? `\u2014 ${bo.description}` : "");
+    if (model.flows.some((flow) => flow.objects?.length))
+      chipRow(ui.businessObject, ui.carriedByFlow);
+    bandY += 6;
   };
   const renderLegendBand = () => {
+    const kinds = legendKinds(paint);
+    if (!kinds.length && !model.flows.length && !model.legendNotes.length) return;
     beginBand(ui.legend);
-    let lx = contentX;
-    const kindsUsed = [...new Set(scene.nodes.map((node) => node.kind))].filter(
-      (kind) => legendNames[kind] && (kind !== "actor" || view.actorLegend)
-    );
-    for (const kind of kindsUsed) {
-      const nodeStyle = resolveStyle(kind, "");
-      if (kind === "actor") {
-        const stroke = nodeStyle.stroke?.color ?? palette.actorStroke;
-        bandsSvg += `<circle cx="${lx + scaled(13)}" cy="${bandY + scaled(5)}" r="${scaled(3)}" fill="none" stroke="${stroke}" stroke-width="1.2"/>
-`;
-        bandsSvg += `<path d="M ${lx + scaled(8)} ${bandY + scaled(15)} q ${scaled(5)} ${scaled(-7)} ${scaled(10)} 0" fill="none" stroke="${stroke}" stroke-width="1.2"/>
-`;
-      } else {
-        const dash = dashArray(nodeStyle.stroke?.style);
-        bandsSvg += `<rect x="${lx}" y="${bandY + 2}" width="${scaled(26)}" height="${scaled(14)}" rx="3" fill="${nodeStyle.fill ?? palette.nodeFill}" stroke="${nodeStyle.stroke?.color ?? palette.nodeStroke}"${dash ? ` stroke-dasharray="${dash}"` : ""}/>
+    const kindKeys = kindKeysSvg(paint, kinds, bandY, contentX);
+    bandsSvg += kindKeys.svg;
+    bandY = kindKeys.bandY;
+    if (model.flows.length) {
+      bandsSvg += `<line x1="${contentX}" y1="${bandY + 8}" x2="${contentX + scaled(26)}" y2="${bandY + 8}" stroke="${escAttr(defaultEdgeColor)}" stroke-width="1.3" marker-end="url(#${markerName(defaultEdgeColor)})"/>
 `;
-      }
-      const name = legendNames[kind];
-      bandsSvg += `<text x="${lx + scaled(32)}" y="${bandY + scaled(13)}" font-size="${scaled(10)}" fill="${palette.bandText}">${esc(name)}</text>
+      const flowLabelText = (numbered ? legendFlowLabel + " \u2014 " + ui.numberedSuffix : legendFlowLabel) + (style.flowColor === "by-source" ? style.lang === "fr" ? " \u2014 couleur = source" : " \u2014 colour = source" : "");
+      const flowKeyX = contentX + scaled(32);
+      const flowKeyLines = bandLines(flowLabelText, flowKeyX, rightMargin, scaled(10));
+      for (const [row, line] of flowKeyLines.entries())
+        bandsSvg += `<text x="${flowKeyX}" y="${bandY + scaled(12) + row * scaled(12)}" font-size="${scaled(10)}" fill="${palette.bandText}">${esc(line)}</text>
 `;
-      lx += scaled(40) + Math.ceil(name.length * scaled(10) * RENDER_CHAR_WIDTH) + scaled(24);
-      if (lx > scene.width - 220) {
-        lx = contentX;
-        bandY += scaled(22);
-      }
+      bandY += scaled(24) + (flowKeyLines.length - 1) * scaled(12);
+      const lineStyleKeys = lineStyleKeysSvg(paint, bandY, contentX);
+      bandsSvg += lineStyleKeys.svg;
+      bandY = lineStyleKeys.bandY;
     }
-    bandY += scaled(24);
-    bandsSvg += `<line x1="${contentX}" y1="${bandY + 8}" x2="${contentX + scaled(26)}" y2="${bandY + 8}" stroke="${escAttr(defaultEdgeColor)}" stroke-width="1.3" marker-end="url(#${markerName(defaultEdgeColor)})"/>
-`;
-    const flowLabelText = (numbered ? legendFlowLabel + " \u2014 " + ui.numberedSuffix : legendFlowLabel) + (style.flowColor === "by-source" ? style.lang === "fr" ? " \u2014 couleur = source" : " \u2014 colour = source" : "");
-    bandsSvg += `<text x="${contentX + scaled(32)}" y="${bandY + scaled(12)}" font-size="${scaled(10)}" fill="${palette.bandText}">${esc(flowLabelText)}</text>
-`;
-    bandY += scaled(24);
     for (const note of model.legendNotes) {
-      bandsSvg += `<text x="${contentX}" y="${bandY + scaled(12)}" font-size="${scaled(10)}" fill="${palette.bandText}" font-style="italic">${esc(note)}</text>
+      const lines = bandLines(note, contentX, rightMargin, scaled(10));
+      for (const [row, line] of lines.entries())
+        bandsSvg += `<text x="${contentX}" y="${bandY + scaled(12) + row * scaled(12)}" font-size="${scaled(10)}" fill="${palette.bandText}" font-style="italic">${esc(line)}</text>
 `;
-      bandY += scaled(20);
+      bandY += scaled(20) + (lines.length - 1) * scaled(12);
     }
   };
   return {
@@ -100581,7 +101262,7 @@ function createEdgePainter(paint) {
     const flowStyle = flow?.style;
     const color = flowColorOf(flow);
     const headColor = style.flowColor === "by-source" ? color : defaultEdgeColor;
-    const dash = dashArray(flowStyle?.stroke?.style ?? flow?.lineStyle ?? style.flowStroke.style);
+    const dash = dashArray(lineStyleOf(flow, style));
     const width = flowStyle?.stroke?.width ?? style.flowStroke.width;
     return `<path d="${edgePath(edge.pts)}" fill="none" stroke="${escAttr(color)}" stroke-width="${width}"${dash ? ` stroke-dasharray="${dash}"` : ""} marker-end="url(#${markerName(headColor)})"/>
 `;
@@ -100597,7 +101278,28 @@ function createEdgePainter(paint) {
   };
   return { renderEdgePath, renderEdgeLabels };
 }
-function render(model, view, scene) {
+function svgDocument(args2) {
+  const {
+    width,
+    height,
+    fontFamily,
+    background,
+    arrowMarkers,
+    markerSize,
+    body,
+    bandsSvg,
+    attribution
+  } = args2;
+  const markers = [...arrowMarkers].map(
+    ([color, markerName]) => `<marker id="${markerName}" viewBox="0 0 10 10" refX="9" refY="5" markerWidth="${markerSize}" markerHeight="${markerSize}" orient="auto-start-reverse">
+<path d="M0,0 L10,5 L0,10 z" fill="${escAttr(color)}"/></marker>`
+  ).join("\n");
+  return `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${width} ${height}" font-family="${escAttr(fontFamily)},Arial,sans-serif">
+${attribution}<defs>${markers}</defs>
+<rect width="${width}" height="${height}" fill="${escAttr(background)}"/>
+` + body + bandsSvg + "</svg>\n";
+}
+function render(model, view, scene, options) {
   const style = model.style;
   const fonts = fontSizes(style.font.size);
   const { edge: edgeFontSize, node: nodeFontSize, cont: containerFontSize } = fonts;
@@ -100613,10 +101315,10 @@ function render(model, view, scene) {
     chipTextDy: round1(11 * fonts.scale)
   };
   const scaled = (n) => round1(n * fonts.scale);
-  const { palette, kinds: kindDefaults, levels: levelDefaults } = themeFor(style.theme, view);
-  const isDarkTheme = ["dark", "nord", "classic-dark"].includes(style.theme);
+  const { palette, kinds: kindDefaults } = options?.theme ? themeFromSpec(options.theme, view) : themeFor(style.theme, view);
+  const onDarkGround = options?.theme ? options.theme.dark === true : isDarkTheme(style.theme);
   const defaultEdgeColor = style.flowStrokeColorSet ? style.flowStroke.color : style.accent ?? palette.edge;
-  const sourceHue = style.flowColor === "by-source" ? assignSourceHues(model, flowPalette[isDarkTheme ? "dark" : "light"]) : /* @__PURE__ */ new Map();
+  const sourceHue = style.flowColor === "by-source" ? assignSourceHues(model, flowPalette[onDarkGround ? "dark" : "light"]) : /* @__PURE__ */ new Map();
   const flowColorOf = (flow) => flow?.style?.stroke?.color ?? (style.flowColor === "by-source" ? sourceHue.get(flow?.from ?? "") ?? defaultEdgeColor : defaultEdgeColor);
   const arrowMarkers = /* @__PURE__ */ new Map();
   const markerName = (color) => {
@@ -100633,16 +101335,15 @@ function render(model, view, scene) {
   const ui = UI[style.lang] ?? UI.en;
   const legendNames = style.lang === "fr" ? view.legendNamesFr : view.legendNames;
   const legendFlowLabel = style.lang === "fr" ? view.legendFlowLabelFr : view.legendFlowLabel;
+  const legendLineStyles = style.lang === "fr" ? view.legendLineStylesFr : view.legendLineStyles;
   const elementStyle = /* @__PURE__ */ new Map();
-  const elementAttr = /* @__PURE__ */ new Map();
+  const elementLogo = /* @__PURE__ */ new Map();
   for (const entry of collectElementStyles(model.elements)) {
     elementStyle.set(entry.id, entry.style);
-    elementAttr.set(entry.id, entry.attrValue);
+    if (entry.logo) elementLogo.set(entry.id, entry.logo);
   }
   const resolveStyle = (kind, id) => {
-    let base = kindDefaults[kind] ?? {};
-    const level = elementAttr.get(id);
-    if (kind === "trust-zone" && level && levelDefaults?.[level]) base = levelDefaults[level];
+    const base = kindDefaults[kind] ?? {};
     const perKind = style.kind[kind] ?? {};
     const inline = elementStyle.get(id) ?? {};
     return {
@@ -100677,14 +101378,16 @@ function render(model, view, scene) {
   });
   const overlapsAfter = countLabelOverlaps();
   compactVertical(scene);
+  fitCanvas(scene);
+  const drawnLogos = /* @__PURE__ */ new Set();
   const { renderContainerNode, renderLeafNode } = createNodeRenderers({
     palette,
-    style,
-    annot,
     nodeFontSize,
     containerFontSize,
     resolveStyle,
-    elementAttr
+    elementLogo,
+    resolvedLogos: options?.logos,
+    drawnLogos
   });
   const { renderEdgePath, renderEdgeLabels } = createEdgePainter({
     scene,
@@ -100715,6 +101418,7 @@ function render(model, view, scene) {
     ui,
     legendNames,
     legendFlowLabel,
+    legendLineStyles,
     scaled,
     objectName,
     resolveStyle,
@@ -100727,24 +101431,28 @@ function render(model, view, scene) {
   if (style.legend === "auto") bands.renderLegendBand();
   const bandsSvg = bands.bandsSvg();
   const bandY = bands.bandY();
-  const viewWidth = scene.width, viewHeight = scene.height;
-  const totalHeight = bandY > viewHeight ? bandY + 14 : viewHeight;
-  const markerSize = style.arrows === "large" ? round1(11 * fonts.scale) : 7;
+  const viewHeight = scene.height;
   if (arrowMarkers.size === 0) markerName(defaultEdgeColor);
-  const markers = [...arrowMarkers].map(
-    ([color, markerName2]) => `<marker id="${markerName2}" viewBox="0 0 10 10" refX="9" refY="5" markerWidth="${markerSize}" markerHeight="${markerSize}" orient="auto-start-reverse">
-<path d="M0,0 L10,5 L0,10 z" fill="${escAttr(color)}"/></marker>`
-  ).join("\n");
-  const svg = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 ${viewWidth} ${totalHeight}" font-family="${escAttr(style.font.family)},Arial,sans-serif">
-<defs>${markers}</defs>
-<rect width="${viewWidth}" height="${totalHeight}" fill="${escAttr(style.background ?? palette.background)}"/>
-` + body + bandsSvg + "</svg>\n";
+  const svg = svgDocument({
+    width: scene.width,
+    height: bandY > viewHeight ? bandY + 14 : viewHeight,
+    fontFamily: style.font.family,
+    background: style.background ?? palette.background,
+    arrowMarkers,
+    markerSize: style.arrows === "large" ? round1(11 * fonts.scale) : 7,
+    body,
+    bandsSvg,
+    // Read after the body is built, so it names the marks that were painted
+    // rather than the ones the model asked for.
+    attribution: logoAttributionComment(drawnLogos)
+  });
   return { svg, overlapsBefore, overlapsAfter };
 }
-var HOP_RADIUS, LABEL_HALO, RENDER_CHAR_WIDTH, SEC_LEVEL_FR, dashArray, round1, ADRIFT_SQ, ATTACHED_SQ;
+var HOP_RADIUS, LABEL_HALO, RENDER_CHAR_WIDTH, BAND_CONTENT_X, MIN_BAND_TEXT, bandRightMargin, dashArray, lineStyleOf, round1, ADRIFT_SQ, ATTACHED_SQ, GLYPH_BOX, GLYPHS, LOGO_BOX, legendKinds;
 var init_svg_render = __esm({
   "src/svg-render.ts"() {
     "use strict";
+    init_views();
     init_themes();
     init_localization();
     init_xml_escape();
@@ -100755,19 +101463,283 @@ var init_svg_render = __esm({
     init_route_detour();
     init_readability();
     init_text_metrics();
+    init_logo_attribution();
+    init_logos();
     HOP_RADIUS = 5;
     LABEL_HALO = 4;
     RENDER_CHAR_WIDTH = 0.52;
-    SEC_LEVEL_FR = {
-      public: "public",
-      internal: "interne",
-      restricted: "restreint",
-      secret: "secret"
-    };
+    BAND_CONTENT_X = 150;
+    MIN_BAND_TEXT = 200;
+    bandRightMargin = (scene) => scene.width - 20;
     dashArray = (lineStyle) => lineStyle === "dashed" ? "5 3" : lineStyle === "dotted" ? "2 2.5" : void 0;
+    lineStyleOf = (flow, style) => flow?.style?.stroke?.style ?? flow?.lineStyle ?? style.flowStroke.style;
     round1 = (n) => Math.round(n * 10) / 10;
     ADRIFT_SQ = 20 * 20;
     ATTACHED_SQ = 6 * 6;
+    GLYPH_BOX = { width: 18, height: 16, left: 6, top: 7 };
+    GLYPHS = {
+      // Padlock: authentication is a check something must pass.
+      auth: ({ x, y, r, line, stroke }) => `<rect x="${x(3)}" y="${y(7)}" width="${r(12)}" height="${r(9)}" rx="${r(2)}" ${line}/><path d="M ${x(6)} ${y(7)} v ${-r(3)} a ${r(3)} ${r(3)} 0 0 1 ${r(6)} 0 v ${r(3)}" ${line}/><circle cx="${x(9)}" cy="${y(11)}" r="${r(1.5)}" fill="${stroke}"/>`,
+      // Two posts with traffic passing between them: a gateway routes, it does not block.
+      gateway: ({ x, y, r, line }) => `<path d="M ${x(2)} ${y(1)} V ${y(15)} M ${x(16)} ${y(1)} V ${y(15)}" ${line}/><path d="M ${x(4)} ${y(8)} H ${x(14)}" ${line}/><path d="M ${x(11)} ${y(5)} l ${r(3)} ${r(3)} l ${-r(3)} ${r(3)}" ${line}/>`,
+      // ID badge: an identity provider issues who-you-are, it does not check it.
+      idp: ({ x, y, r, line }) => `<rect x="${x(3)}" y="${y(2)}" width="${r(12)}" height="${r(13)}" rx="${r(2)}" ${line}/><path d="M ${x(7)} ${y(2)} H ${x(11)}" ${line}/><circle cx="${x(9)}" cy="${y(7)}" r="${r(2)}" ${line}/><path d="M ${x(5)} ${y(13)} q ${r(4)} ${-r(4)} ${r(8)} 0" ${line}/>`,
+      // Brick wall: a firewall is a barrier, and no other kind reads as one.
+      firewall: ({ x, y, r, line }) => `<rect x="${x(2)}" y="${y(2)}" width="${r(14)}" height="${r(12)}" rx="${r(1)}" ${line}/><path d="M ${x(2)} ${y(6)} H ${x(16)} M ${x(2)} ${y(10)} H ${x(16)}" ${line}/><path d="M ${x(9)} ${y(2)} V ${y(6)} M ${x(6)} ${y(6)} V ${y(10)} M ${x(12)} ${y(6)} V ${y(10)} M ${x(9)} ${y(10)} V ${y(14)}" ${line}/>`,
+      // Monitor on a stand: a device is the machine a person works at. The screen is
+      // left empty on purpose — that is what separates it from the firewall's wall
+      // at legend size, where both are a rectangle and little else survives.
+      device: ({ x, y, r, line }) => `<rect x="${x(2)}" y="${y(1)}" width="${r(14)}" height="${r(9)}" rx="${r(1)}" ${line}/><path d="M ${x(9)} ${y(10)} V ${y(13)}" ${line}/><path d="M ${x(4)} ${y(13)} H ${x(14)}" ${line}/>`
+    };
+    LOGO_BOX = { size: 18, right: 7, top: 6 };
+    legendKinds = (paint) => [...new Set(paint.scene.nodes.map((node) => node.kind))].filter(
+      (kind) => paint.legendNames[kind] && (kind !== "actor" || paint.view.actorLegend)
+    );
+  }
+});
+
+// src/css-colours.ts
+var HEX, NUMBER, PERCENT, AMOUNT, ANGLE, commaForm, spaceForm, RGB, HSL, NUMERIC_COLOUR, COLOUR_KEYWORDS, isColour;
+var init_css_colours = __esm({
+  "src/css-colours.ts"() {
+    "use strict";
+    HEX = "#(?:[0-9a-f]{3,4}|[0-9a-f]{6}|[0-9a-f]{8})";
+    NUMBER = String.raw`[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?`;
+    PERCENT = `${NUMBER}%`;
+    AMOUNT = `${NUMBER}%?`;
+    ANGLE = `${NUMBER}(?:deg|grad|rad|turn)?`;
+    commaForm = (first, second, third) => `${first}\\s*,\\s*${second}\\s*,\\s*${third}(?:\\s*,\\s*${AMOUNT})?`;
+    spaceForm = (first, second, third) => `${first}\\s+${second}\\s+${third}(?:\\s*/\\s*${AMOUNT})?`;
+    RGB = `rgba?\\(\\s*(?:${commaForm(NUMBER, NUMBER, NUMBER)}|${commaForm(PERCENT, PERCENT, PERCENT)}|${spaceForm(AMOUNT, AMOUNT, AMOUNT)})\\s*\\)`;
+    HSL = `hsla?\\(\\s*(?:${commaForm(ANGLE, PERCENT, PERCENT)}|${spaceForm(ANGLE, AMOUNT, AMOUNT)})\\s*\\)`;
+    NUMERIC_COLOUR = new RegExp(`^(?:${HEX}|${RGB}|${HSL})$`, "i");
+    COLOUR_KEYWORDS = /* @__PURE__ */ new Set([
+      "currentcolor",
+      "transparent",
+      "aliceblue",
+      "antiquewhite",
+      "aqua",
+      "aquamarine",
+      "azure",
+      "beige",
+      "bisque",
+      "black",
+      "blanchedalmond",
+      "blue",
+      "blueviolet",
+      "brown",
+      "burlywood",
+      "cadetblue",
+      "chartreuse",
+      "chocolate",
+      "coral",
+      "cornflowerblue",
+      "cornsilk",
+      "crimson",
+      "cyan",
+      "darkblue",
+      "darkcyan",
+      "darkgoldenrod",
+      "darkgray",
+      "darkgreen",
+      "darkgrey",
+      "darkkhaki",
+      "darkmagenta",
+      "darkolivegreen",
+      "darkorange",
+      "darkorchid",
+      "darkred",
+      "darksalmon",
+      "darkseagreen",
+      "darkslateblue",
+      "darkslategray",
+      "darkslategrey",
+      "darkturquoise",
+      "darkviolet",
+      "deeppink",
+      "deepskyblue",
+      "dimgray",
+      "dimgrey",
+      "dodgerblue",
+      "firebrick",
+      "floralwhite",
+      "forestgreen",
+      "fuchsia",
+      "gainsboro",
+      "ghostwhite",
+      "gold",
+      "goldenrod",
+      "gray",
+      "green",
+      "greenyellow",
+      "grey",
+      "honeydew",
+      "hotpink",
+      "indianred",
+      "indigo",
+      "ivory",
+      "khaki",
+      "lavender",
+      "lavenderblush",
+      "lawngreen",
+      "lemonchiffon",
+      "lightblue",
+      "lightcoral",
+      "lightcyan",
+      "lightgoldenrodyellow",
+      "lightgray",
+      "lightgreen",
+      "lightgrey",
+      "lightpink",
+      "lightsalmon",
+      "lightseagreen",
+      "lightskyblue",
+      "lightslategray",
+      "lightslategrey",
+      "lightsteelblue",
+      "lightyellow",
+      "lime",
+      "limegreen",
+      "linen",
+      "magenta",
+      "maroon",
+      "mediumaquamarine",
+      "mediumblue",
+      "mediumorchid",
+      "mediumpurple",
+      "mediumseagreen",
+      "mediumslateblue",
+      "mediumspringgreen",
+      "mediumturquoise",
+      "mediumvioletred",
+      "midnightblue",
+      "mintcream",
+      "mistyrose",
+      "moccasin",
+      "navajowhite",
+      "navy",
+      "oldlace",
+      "olive",
+      "olivedrab",
+      "orange",
+      "orangered",
+      "orchid",
+      "palegoldenrod",
+      "palegreen",
+      "paleturquoise",
+      "palevioletred",
+      "papayawhip",
+      "peachpuff",
+      "peru",
+      "pink",
+      "plum",
+      "powderblue",
+      "purple",
+      "rebeccapurple",
+      "red",
+      "rosybrown",
+      "royalblue",
+      "saddlebrown",
+      "salmon",
+      "sandybrown",
+      "seagreen",
+      "seashell",
+      "sienna",
+      "silver",
+      "skyblue",
+      "slateblue",
+      "slategray",
+      "slategrey",
+      "snow",
+      "springgreen",
+      "steelblue",
+      "tan",
+      "teal",
+      "thistle",
+      "tomato",
+      "turquoise",
+      "violet",
+      "wheat",
+      "white",
+      "whitesmoke",
+      "yellow",
+      "yellowgreen"
+    ]);
+    isColour = (value) => NUMERIC_COLOUR.test(value) || COLOUR_KEYWORDS.has(value.toLowerCase());
+  }
+});
+
+// src/theme-spec.ts
+function checkEntry(path, value, arity) {
+  if (arity === 1) {
+    if (typeof value !== "string") {
+      throw new ThemeSpecError(`\`${path}\` must be a colour, got ${describe(value)}`);
+    }
+  } else if (!Array.isArray(value) || value.length !== arity) {
+    throw new ThemeSpecError(`\`${path}\` must be ${arity} colours, got ${describe(value)}`);
+  }
+  for (const colour of Array.isArray(value) ? value : [value]) {
+    if (typeof colour !== "string" || !isColour(colour)) {
+      throw new ThemeSpecError(`\`${path}\`: \`${String(colour)}\` is not a colour`);
+    }
+  }
+}
+function resolveThemeSpec(input) {
+  if (!isObject(input)) throw new ThemeSpecError("a theme must be an object");
+  const base = input.extends ?? DEFAULT_BASE;
+  if (typeof base !== "string") throw new ThemeSpecError("`extends` must be a theme name");
+  const baseSpec = Object.hasOwn(THEME_SPECS, base) ? THEME_SPECS[base] : void 0;
+  if (!baseSpec) {
+    throw new ThemeSpecError(
+      `extends unknown theme \`${base}\` \u2014 pick one of: ${Object.keys(THEME_SPECS).join(", ")}`
+    );
+  }
+  if ("dark" in input && typeof input.dark !== "boolean") {
+    throw new ThemeSpecError("`dark` must be true or false");
+  }
+  for (const [section, value] of Object.entries(input)) {
+    if (section === "extends" || section === "dark") continue;
+    if (!SECTIONS.includes(section)) {
+      throw new ThemeSpecError(
+        `unknown section \`${section}\` \u2014 a theme overrides ${SECTIONS.join(", ")}`
+      );
+    }
+    if (!isObject(value)) {
+      throw new ThemeSpecError(
+        `\`${section}\` must be an object of colours, got ${describe(value)}`
+      );
+    }
+    for (const [key, colour] of Object.entries(value)) {
+      checkEntry(`${section}.${key}`, colour, arityOf(section, key));
+    }
+  }
+  return merge(baseSpec, input);
+}
+var DEFAULT_BASE, ThemeSpecError, isObject, merge, SECTIONS, arityOf, describe;
+var init_theme_spec = __esm({
+  "src/theme-spec.ts"() {
+    "use strict";
+    init_css_colours();
+    init_themes();
+    DEFAULT_BASE = "light";
+    ThemeSpecError = class extends Error {
+    };
+    isObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+    merge = (base, patch) => {
+      const merged = { ...base };
+      for (const [key, value] of Object.entries(patch)) {
+        if (key === "extends") continue;
+        const current = merged[key];
+        merged[key] = isObject(value) && isObject(current) ? { ...current, ...value } : value;
+      }
+      return merged;
+    };
+    SECTIONS = ["pal", "accentColors"];
+    arityOf = (section, key) => {
+      if (section === "pal") return key === "chip" ? 3 : key === "badge" ? 2 : 1;
+      return 1;
+    };
+    describe = (value) => Array.isArray(value) ? `an array of ${value.length}` : typeof value;
   }
 });
 
@@ -100834,8 +101806,9 @@ function matrixMd(matrix) {
   for (const row of matrix.rows) outLines.push("| " + row.cells.map(mdCell).join(" | ") + " |");
   return outLines.join("\n") + "\n";
 }
-function matrixSvg(matrix) {
-  const pal = palettes[matrix.style.theme] ?? lightPalette;
+function matrixSvg(matrix, options) {
+  const requested = options?.theme;
+  const pal = typeof requested === "object" ? paletteFromSpec(resolveThemeSpec(requested)) : paletteFor(requested ?? matrix.style.theme);
   const title = matrix.heading;
   const headers = matrix.columns.map((column) => column.label);
   const cells = matrix.rows.map((row) => row.cells);
@@ -100903,6 +101876,7 @@ var init_flow_matrix = __esm({
     "use strict";
     init_localization();
     init_themes();
+    init_theme_spec();
     init_xml_escape();
     init_text_metrics();
     COLUMN_PRESENTATION = {
@@ -100939,9 +101913,81 @@ var init_flow_matrix = __esm({
   }
 });
 
+// src/logo-files.ts
+import { closeSync, constants, fstatSync, openSync, readSync } from "node:fs";
+import { dirname, resolve, extname } from "node:path";
+function resolveLogoFiles(model, sourceFile) {
+  const logos = /* @__PURE__ */ new Map();
+  const diagnostics = [];
+  const base = dirname(resolve(sourceFile));
+  for (const element of model.elements.flatMap((root) => subtreeElements(root))) {
+    const logo = element.logo;
+    if (logo?.source !== "file") continue;
+    const warn = (message, help) => diagnostics.push({
+      code: "W0580",
+      severity: "warning",
+      message,
+      span: logo.span,
+      help
+    });
+    const mime = MIME_BY_EXT[extname(logo.value).toLowerCase()];
+    if (!mime) {
+      warn(
+        `unsupported logo file type \`${extname(logo.value) || logo.value}\``,
+        `use one of: ${Object.keys(MIME_BY_EXT).join(", ")}`
+      );
+      continue;
+    }
+    const path = resolve(base, logo.value);
+    let bytes;
+    try {
+      const fd = openSync(path, constants.O_RDONLY | (constants.O_NONBLOCK ?? 0));
+      try {
+        const stat = fstatSync(fd);
+        if (!stat.isFile()) {
+          warn(`logo file \`${logo.value}\` is not a regular file`, "point at an image file");
+          continue;
+        }
+        if (stat.size > MAX_BYTES) {
+          warn(
+            `logo file is ${Math.round(stat.size / 1024)} KB, over the ${MAX_BYTES / 1024} KB limit`,
+            "a corner mark needs very little \u2014 export it smaller, or use a built-in"
+          );
+          continue;
+        }
+        bytes = Buffer.alloc(stat.size);
+        const read = readSync(fd, bytes, 0, stat.size, 0);
+        if (read < stat.size) bytes = bytes.subarray(0, read);
+      } finally {
+        closeSync(fd);
+      }
+    } catch {
+      warn(`cannot read logo file \`${logo.value}\``, `looked in \`${base}\``);
+      continue;
+    }
+    logos.set(element.id, `data:${mime};base64,${bytes.toString("base64")}`);
+  }
+  return { logos, diagnostics };
+}
+var MIME_BY_EXT, MAX_BYTES;
+var init_logo_files = __esm({
+  "src/logo-files.ts"() {
+    "use strict";
+    init_element_tree();
+    MIME_BY_EXT = {
+      ".svg": "image/svg+xml",
+      ".png": "image/png",
+      ".jpg": "image/jpeg",
+      ".jpeg": "image/jpeg",
+      ".webp": "image/webp"
+    };
+    MAX_BYTES = 256 * 1024;
+  }
+});
+
 // src/watch.ts
 import { watch as fsWatch, readFileSync, writeFileSync, existsSync } from "node:fs";
-import { dirname, basename } from "node:path";
+import { dirname as dirname2, basename } from "node:path";
 function errorPanelSvg(file, diagnostics) {
   const errors = diagnostics.filter((diagnostic) => diagnostic.severity === "error").slice(0, 10);
   const more = diagnostics.filter((diagnostic) => diagnostic.severity === "error").length - errors.length;
@@ -100966,7 +102012,7 @@ function errorPanelSvg(file, diagnostics) {
 `;
   return out + "</svg>\n";
 }
-function watchCommand(file, outFile) {
+function watchCommand(file, outFile, theme) {
   if (!existsSync(file)) {
     console.error(`error: file not found \`${file}\``);
     process.exit(2);
@@ -100982,6 +102028,7 @@ function watchCommand(file, outFile) {
     const src = readFileSync(file, "utf8");
     const { model, diags } = parse(src);
     diags.push(...validate(model));
+    if (theme) model.style.theme = theme;
     const errors = diags.filter((diagnostic) => diagnostic.severity === "error");
     const stamp = (/* @__PURE__ */ new Date()).toLocaleTimeString();
     console.clear();
@@ -101000,7 +102047,9 @@ function watchCommand(file, outFile) {
         const view = views[model.type];
         const scene = await layout(model, view);
         diags.push(...attachSideDiagnostics(scene, model));
-        const { svg, overlapsAfter } = render(model, view, scene);
+        const { logos, diagnostics: logoDiagnostics } = resolveLogoFiles(model, file);
+        diags.push(...logoDiagnostics);
+        const { svg, overlapsAfter } = render(model, view, scene, { logos });
         writeFileSync(outFile, svg);
         if (diags.length)
           console.log(renderHuman(file, src, diags, process.stdout.isTTY ?? false) + "\n");
@@ -101033,7 +102082,7 @@ function watchCommand(file, outFile) {
     }
   };
   let timer = null;
-  fsWatch(dirname(file) || ".", (_event, fileName) => {
+  fsWatch(dirname2(file) || ".", (_event, fileName) => {
     if (fileName && fileName !== basename(file)) return;
     if (timer) clearTimeout(timer);
     timer = setTimeout(rebuild, 120);
@@ -101050,28 +102099,113 @@ var init_watch = __esm({
     init_svg_render();
     init_views();
     init_xml_escape();
+    init_logo_files();
+  }
+});
+
+// src/theme-file.ts
+import { readFileSync as readFileSync2 } from "node:fs";
+function loadThemeFile(path) {
+  let raw;
+  try {
+    raw = readFileSync2(path, "utf8");
+  } catch {
+    throw new ThemeFileError(`cannot read theme file \`${path}\``);
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch (error) {
+    throw new ThemeFileError(
+      `\`${path}\` is not valid JSON: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+  let spec;
+  try {
+    spec = resolveThemeSpec(parsed);
+  } catch (error) {
+    if (error instanceof ThemeSpecError) throw new ThemeFileError(`\`${path}\`: ${error.message}`);
+    throw error;
+  }
+  const name = (path.split(/[\\/]/).pop() ?? path).replace(/\.json$/i, "");
+  if (!name) throw new ThemeFileError(`\`${path}\` has no usable theme name`);
+  return { name, spec };
+}
+var ThemeFileError;
+var init_theme_file = __esm({
+  "src/theme-file.ts"() {
+    "use strict";
+    init_theme_spec();
+    ThemeFileError = class extends Error {
+    };
+  }
+});
+
+// src/notice.ts
+function notice({ bun = embedsBun() } = {}) {
+  return COMMON + (bun ? BUN_NOTICE : "") + "\n" + FOOTER;
+}
+var ELKJS_VERSION, SIMPLE_ICONS_VERSION, BUN_VERSION, NOTICES_URL, COMMON, BUN_NOTICE, FOOTER, embedsBun;
+var init_notice = __esm({
+  "src/notice.ts"() {
+    "use strict";
+    ELKJS_VERSION = "0.12.0";
+    SIMPLE_ICONS_VERSION = "16.29.0";
+    BUN_VERSION = "1.4.0";
+    NOTICES_URL = "https://github.com/R0kshan/cairn/blob/main/THIRD-PARTY-NOTICES.md";
+    COMMON = `cairn \u2014 Apache-2.0 \u2014 https://github.com/R0kshan/cairn
+Copyright 2026 R\xF8kshan.
+
+This artifact contains third-party code and artwork:
+
+elkjs ${ELKJS_VERSION} \u2014 (c) 2017 Kiel University and others.
+  Dual-licensed EPL-2.0 OR GPL-3.0-or-later; cairn elects EPL-2.0.
+  Full text: licenses/elkjs-EPL-2.0.md \u2014 https://www.eclipse.org/legal/epl-2.0
+
+Simple Icons ${SIMPLE_ICONS_VERSION} artwork \u2014 CC0-1.0 project-wide.
+  Six of the vendored icons carry their own terms instead \u2014 MIT,
+  BSD-3-Clause, CC-BY-4.0 or Apache-2.0 \u2014 and are attributed individually.
+  Full texts: licenses/`;
+    BUN_NOTICE = `
+
+Bun ${BUN_VERSION} runtime \u2014 MIT \u2014 embedded by \`bun build --compile\`.
+  It statically links JavaScriptCore/WebKit, which is LGPL-2.1 in part,
+  alongside BSD- and Apache-licensed components. Bun's own LICENSE.md
+  enumerates all of them verbatim: licenses/bun-LICENSE.md
+  Relinking under LGPL-2.1 \xA76: see THIRD-PARTY-NOTICES.md.`;
+    FOOTER = `
+Per-icon attribution and the full licence texts ship with this artifact:
+  the package root (npm), the app directory (Scoop), or
+  share/doc/cairn (Homebrew, install.sh). Also at
+  ${NOTICES_URL}`;
+    embedsBun = () => typeof CAIRN_EMBEDS_BUN !== "undefined" && CAIRN_EMBEDS_BUN;
   }
 });
 
 // src/cli.ts
 var cli_exports = {};
-import { readFileSync as readFileSync2, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "node:fs";
+import { readFileSync as readFileSync3, writeFileSync as writeFileSync2, existsSync as existsSync2 } from "node:fs";
 function usage() {
   console.log(`cairn \u2014 architecture diagrams as code
 
 Usage:
-  cairn new (--logical-architecture|-L|-A|-I|-S) <file.cairn>   scaffold a typed template
+  cairn new (--logical-architecture|-L|-A|-I) <file.cairn>      scaffold a typed template
                                                       (-L logical, -A application,
-                                                       -I infrastructure, -S security)
+                                                       -I infrastructure)
   cairn validate <file.cairn> [--format json] [--strict]
-  cairn build <file.cairn> [-o output.svg]
-  cairn matrix <file.cairn> [--format csv|md|svg] [-o out]   matrice des flux techniques
+  cairn build <file.cairn> [-o output.svg] [--theme <name|file.json>]
+  cairn matrix <file.cairn> [--format csv|md|svg] [-o out] [--theme <name|file.json>]
+                                                      matrice des flux techniques
                                                       (default csv; honors style { lang })
-  cairn watch <file.cairn> [-o output.svg]             rebuild on save; SVG stays fresh
+  cairn watch <file.cairn> [-o output.svg] [--theme <name|file.json>]
+                                                      rebuild on save; SVG stays fresh
                                                       (error panel on failure) for an
                                                       editor auto-refresh preview
   cairn explain <code>                                rule rationale (e.g. E0203)
+  cairn logos                                         list the built-in \`logo:\` names
+  cairn themes                                        list the built-in theme names
   cairn version | --version | -v                      print the installed version
+  cairn version --licenses                            third-party notices this build carries
 `);
   process.exit(2);
 }
@@ -101080,7 +102214,7 @@ function loadAndCheck(file) {
     console.error(`error: file not found \`${file}\``);
     process.exit(2);
   }
-  const src = readFileSync2(file, "utf8");
+  const src = readFileSync3(file, "utf8");
   const { model, diags } = parse(src);
   diags.push(...validate(model));
   return { src, model, diagnostics: diags };
@@ -101111,13 +102245,41 @@ function densityReport(disposition, scene, typeSpan) {
     }
   };
 }
+function themeFromArgs() {
+  const index = args.indexOf("--theme");
+  if (index === -1) return void 0;
+  const value = args[index + 1];
+  if (!value || value.startsWith("-")) {
+    console.error("error: `--theme` needs a theme name or a path to a .json theme file");
+    process.exit(2);
+  }
+  if (!value.toLowerCase().endsWith(".json")) {
+    if (!themeNames.includes(value)) {
+      console.error(
+        `error: unknown theme \`${value}\`
+  available: ${themeNames.join(", ")}
+  or pass a path to a .json theme file`
+      );
+      process.exit(2);
+    }
+    return value;
+  }
+  try {
+    const { name, spec } = loadThemeFile(value);
+    registerTheme(name, spec);
+    return name;
+  } catch (error) {
+    console.error(`error: ${error instanceof Error ? error.message : String(error)}`);
+    process.exit(2);
+  }
+}
 function exitIfErrors(file, src, diagnostics) {
   if (diagnostics.some((diagnostic) => diagnostic.severity === "error")) {
     console.error(renderHuman(file, src, diagnostics, process.stderr.isTTY ?? false));
     process.exit(1);
   }
 }
-var TYPE_FLAGS, TEMPLATE_LOGICAL, TEMPLATE_APPLICATION, TEMPLATE_INFRASTRUCTURE, TEMPLATE_SECURITY, TEMPLATES, args, command, version, VALUE_FLAGS, positionalFile, PRINT_FRAMES;
+var TYPE_FLAGS, TEMPLATE_LOGICAL, TEMPLATE_APPLICATION, TEMPLATE_INFRASTRUCTURE, TEMPLATES, args, command, version, VALUE_FLAGS, positionalFile, PRINT_FRAMES;
 var init_cli = __esm({
   "src/cli.ts"() {
     "use strict";
@@ -101130,15 +102292,18 @@ var init_cli = __esm({
     init_views();
     init_ast();
     init_watch();
+    init_logo_files();
+    init_theme_file();
+    init_themes();
+    init_logos();
+    init_notice();
     TYPE_FLAGS = {
       "--logical-architecture": "logical",
       "-L": "logical",
       "--application-architecture": "application",
       "-A": "application",
       "--infrastructure-architecture": "infrastructure",
-      "-I": "infrastructure",
-      "--security-architecture": "security",
-      "-S": "security"
+      "-I": "infrastructure"
     };
     TEMPLATE_LOGICAL = `diagram logical "Diagram title"
 
@@ -101259,45 +102424,16 @@ CORE_I   -> PARTNER : "Nightly export" (SFTP/22)
 # Export the flow matrix beside the physical diagram (French DA deliverable):
 #   cairn matrix this-file.cairn --format csv    # or md | svg
 # Add \`style { lang: fr }\` above to get French column headers (N\xB0, Protocole\u2026).
-`;
-    TEMPLATE_SECURITY = `diagram security "Diagram title"
-
-# A security diagram shows trust zones (each with a sensitivity level), the
-# filtering/security nodes between them, and the sensitive assets they protect.
-# Zones band left\u2192right in declaration order (most exposed \u2192 most protected).
-# Levels, least\u2192most trusted: public | internal | restricted | secret.
-
-trust-zone INTERNET "Internet" (public) {
-  security-node WAF "WAF / reverse proxy"
-}
-
-trust-zone LAN "Internal zone" (internal) {
-  asset APP "Business application"
-}
-
-trust-zone DATA "Data zone" (restricted) {
-  asset DB "Customer database"
-}
-
-external USERS "End users"
-
-# ---- security flows (cross-zone flows should be filtered + encrypted) ----
-USERS -> WAF : "HTTPS access" (TLS1.3)
-WAF   -> APP : "Filtered traffic" (mTLS)
-APP   -> DB  : "Read/write" (TLS1.3)
-
-# W0560 warns on any flow entering a more-trusted zone without a security-node.
 `;
     TEMPLATES = {
       logical: TEMPLATE_LOGICAL,
       application: TEMPLATE_APPLICATION,
-      infrastructure: TEMPLATE_INFRASTRUCTURE,
-      security: TEMPLATE_SECURITY
+      infrastructure: TEMPLATE_INFRASTRUCTURE
     };
     args = process.argv.slice(2);
     command = args[0];
-    version = true ? "1.0.0-RC13" : pkg.version;
-    VALUE_FLAGS = /* @__PURE__ */ new Set(["-o", "--format"]);
+    version = true ? "1.0.0-RC15" : pkg.version;
+    VALUE_FLAGS = /* @__PURE__ */ new Set(["-o", "--format", "--theme"]);
     positionalFile = () => {
       for (let index = 0; index < args.length; index++) {
         const arg = args[index];
@@ -101315,7 +102451,24 @@ APP   -> DB  : "Read/write" (TLS1.3)
       page: { width: 700, height: 1e3, name: "A4 page" }
     };
     if (command === "version" || command === "--version" || command === "-v") {
-      console.log(`cairn v${version}`);
+      const LICENCE_FLAGS = /* @__PURE__ */ new Set(["--licenses", "--licences"]);
+      const unknown = args.slice(1).filter((arg) => arg.startsWith("-") && !LICENCE_FLAGS.has(arg));
+      if (unknown.length) {
+        console.error(
+          `unknown flag${unknown.length > 1 ? "s" : ""} for \`cairn version\`: ${unknown.join(", ")}
+the only one it takes is \`--licenses\` (third-party notices for this build)`
+        );
+        process.exit(2);
+      }
+      if (args.some((arg) => LICENCE_FLAGS.has(arg))) {
+        console.log(`cairn v${version}
+`);
+        console.log(notice());
+      } else {
+        console.log(`cairn v${version}`);
+        if (process.stdout.isTTY)
+          console.log("Apache-2.0, and bundles third-party code \u2014 `cairn version --licenses`");
+      }
     } else if (command === "validate") {
       const file = positionalFile();
       if (!file) usage();
@@ -101332,12 +102485,16 @@ APP   -> DB  : "Read/write" (TLS1.3)
     } else if (command === "build") {
       const file = positionalFile();
       if (!file) usage();
+      const themeOverride = themeFromArgs();
       const outFile = resolveOutputPath(file, ".svg");
       const { src, model, diagnostics } = loadAndCheck(file);
       exitIfErrors(file, src, diagnostics);
+      if (themeOverride) model.style.theme = themeOverride;
       const view = views[model.type];
       layout(model, view).then((scene) => {
-        const { svg, overlapsBefore, overlapsAfter } = render(model, view, scene);
+        const { logos, diagnostics: logoDiagnostics } = resolveLogoFiles(model, file);
+        diagnostics.push(...logoDiagnostics);
+        const { svg, overlapsBefore, overlapsAfter } = render(model, view, scene, { logos });
         writeFileSync2(outFile, svg);
         const { fitInfo, diagnostic } = densityReport(
           model.style.disposition,
@@ -101360,6 +102517,7 @@ APP   -> DB  : "Read/write" (TLS1.3)
     } else if (command === "matrix") {
       const file = positionalFile();
       if (!file) usage();
+      const themeOverride = themeFromArgs();
       const formatIndex = args.indexOf("--format");
       const format = formatIndex >= 0 ? args[formatIndex + 1] : "csv";
       if (!["csv", "md", "svg"].includes(format)) {
@@ -101372,6 +102530,7 @@ APP   -> DB  : "Read/write" (TLS1.3)
         console.error(`error: \`${file}\` declares no flows \u2014 nothing to tabulate`);
         process.exit(1);
       }
+      if (themeOverride) model.style.theme = themeOverride;
       const ext = format === "svg" ? "svg" : format === "md" ? "md" : "csv";
       const outFile = resolveOutputPath(file, ".flow." + ext);
       const lang = model.style.lang;
@@ -101384,7 +102543,7 @@ APP   -> DB  : "Read/write" (TLS1.3)
     } else if (command === "watch") {
       const file = positionalFile();
       if (!file) usage();
-      watchCommand(file, resolveOutputPath(file, ".svg"));
+      watchCommand(file, resolveOutputPath(file, ".svg"), themeFromArgs());
     } else if (command === "new") {
       const type = args.map((arg) => TYPE_FLAGS[arg]).find(Boolean);
       const file = positionalFile();
@@ -101408,6 +102567,25 @@ APP   -> DB  : "Read/write" (TLS1.3)
       console.log(
         `\u2713 ${file} created (${type} view) \u2014 fill in the sections, then run \`cairn validate ${file}\``
       );
+    } else if (command === "logos") {
+      const width = LOGO_NAMES.reduce((widest, name) => Math.max(widest, name.length), 0) + 2;
+      const perLine = Math.max(1, Math.floor(78 / width));
+      console.log(`${LOGO_NAMES.length} built-in logos \u2014 use as \`logo: <name>\` on an element:
+`);
+      for (let index = 0; index < LOGO_NAMES.length; index += perLine)
+        console.log(
+          "  " + LOGO_NAMES.slice(index, index + perLine).map((n) => n.padEnd(width)).join("").trimEnd()
+        );
+      console.log('\nAnything else: point at a file \u2014 `logo: "./logos/name.svg"`.');
+    } else if (command === "themes") {
+      console.log(
+        `${themeNames.length} built-in themes \u2014 \`--theme <name>\`, or \`style { theme: \u2026 }\`:
+`
+      );
+      for (const name of themeNames) console.log(`  ${name}`);
+      console.log(
+        '\nFor your own colours, pass a JSON file instead \u2014 `--theme ./my-theme.json`.\nIt extends a built-in and overrides only what it names:\n\n  { "extends": "dark", "pal": { "bg": "#0d1117" } }\n'
+      );
     } else if (command === "explain") {
       const code = args[1];
       if (!code) usage();