@diagrammo/dgmo 0.33.0 → 0.35.0

package/dist/index.cjs

@@ -37,6 +37,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 function makeDgmoError(line11, message, severity = "error", code) {
   return code !== void 0 ? { line: line11, message, severity, code } : { line: line11, message, severity };
 }
+function dedupeDiagnostics(diagnostics) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const d of diagnostics) {
+    const key = `${d.line}\0${d.column ?? ""}\0${d.severity}\0${d.code ?? ""}\0${d.message}`;
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(d);
+  }
+  return out;
+}
 function formatDgmoError(err) {
   return err.line > 0 ? `Line ${err.line}: ${err.message}` : err.message;
 }
@@ -94,7 +105,7 @@ function vennAliasKeywordRemovedMessage(args) {
   return `Venn 'alias' keyword was removed. Use 'as' instead \u2014 '${args.name} as ${args.alias}'.`;
 }
 function pipeOperatorRemovedMessage() {
-  return `'|' removed \u2014 'Node | c: red' \u2192 'Node c: red'. Run 'dgmo migrate'`;
+  return `'|' removed \u2014 'Node | c: red' \u2192 'Node c: red'`;
 }
 function ganttBarePercentRemovedMessage(percent) {
   return `Bare-percent progress shorthand '| ${percent}' was removed. Use 'progress: ${percent.replace(/%$/, "")}' (integer 0\u2013100, no '%').`;
@@ -1150,7 +1161,7 @@ var init_parsing = __esm({
       "no-title",
       "no-notes"
     ]);
-    MULTIPLE_PIPE_ERROR = 'Use a single "|" to start metadata, then separate items with commas.';
+    MULTIPLE_PIPE_ERROR = "'|' is no longer metadata syntax \u2014 put metadata on the same line as 'key: value, key2: value2' (no pipes), per \xA71.4.";
     RESERVED_KEY_RE = /^[A-Za-z][A-Za-z0-9_-]*$/;
     AS_ALIAS_RE = /\s+as\s+([A-Za-z][A-Za-z0-9_]{0,11})$/;
     POTENTIAL_META_RE = /\b([\w-]+)\s*:/;
@@ -1331,12 +1342,10 @@ function validateTagValues(entities, tagGroups, pushWarning, suggestFn) {
         );
         if (!isPrefix) {
           const defined = group.entries.map((e) => e.value);
-          let msg = `Unknown value '${value}' for tag group '${group.name}'`;
+          let msg = `Unknown value '${value}' for tag group '${group.name}' \u2014 use one of: ${defined.join(", ")}`;
           const hint = suggestFn?.(value, defined);
           if (hint) {
             msg += `. ${hint}`;
-          } else {
-            msg += ` \u2014 defined values: ${defined.join(", ")}`;
           }
           pushWarning(entity.lineNumber, msg);
         }
@@ -2112,7 +2121,10 @@ function parseVisualizationFull(content, palette) {
             lineNumber
           });
         } else {
-          warn(lineNumber, `Unrecognized era entry: "${line11}"`);
+          warn(
+            lineNumber,
+            `Unrecognized era entry: "${line11}" \u2014 use '<start> -> <end> Label [color]' (e.g. '1716 -> 1717 Reign').`
+          );
         }
         continue;
       }
@@ -2140,7 +2152,10 @@ function parseVisualizationFull(content, palette) {
             lineNumber
           });
         } else {
-          warn(lineNumber, `Unrecognized marker entry: "${line11}"`);
+          warn(
+            lineNumber,
+            `Unrecognized marker entry: "${line11}" \u2014 use '<date> Label [color]' (e.g. '1776 Independence').`
+          );
         }
         continue;
       }
@@ -2818,7 +2833,7 @@ function parseVisualizationFull(content, palette) {
           result.diagnostics.push(
             makeDgmoError(
               ov.lineNumber,
-              `Intersection references unknown set or alias "${ref}"`
+              `Intersection references unknown set or alias "${ref}" \u2014 declare the set first on its own line ('Name [as <alias>] [color]', e.g. 'Navigation as nav blue'), then reference it by that name or alias. (\xA716.4)`
             )
           );
           if (!result.error)
@@ -6262,10 +6277,10 @@ function parseSequenceDgmo(content, palette) {
         const rawInside = fallbackMatch[1];
         const pipeIdx = rawInside.indexOf("|");
         const cleanName = rawInside.substring(0, pipeIdx).trim().replace(/\([^)]*\)$/, "").trim();
-        const metaPart = rawInside.substring(pipeIdx).trim();
+        const metaPart = rawInside.substring(pipeIdx).replace(/^\|\s*/, "").trim();
         pushError(
           lineNumber,
-          `Pipe metadata must go outside brackets \u2014 use '[${cleanName}] ${metaPart}' instead of '[${rawInside.trim()}]'`
+          `Metadata goes after the bracket with no pipe \u2014 use '[${cleanName}] ${metaPart}' (e.g. '[Backend] t: Product'), not '[${rawInside.trim()}]'`
         );
         continue;
       }
@@ -6875,7 +6890,7 @@ function parseSequenceDgmo(content, palette) {
     }
     pushWarning(
       lineNumber,
-      `Unexpected line: '${trimmed}'. Expected a message (A -> B), participant, section (== Name ==), or block keyword (if/loop/parallel).`
+      `Unexpected line: '${trimmed}'. Expected a message ('A -> B' or 'A -label-> B'), participant ('Name' or 'Name is a actor'), note ('note right of A Text'), section ('== Name =='), or block ('if/loop/parallel <label>').`
     );
   }
   if (!hasExplicitChart && result.messages.length === 0) {
@@ -8037,7 +8052,11 @@ function parseFlowchart(content, palette) {
         const value = optMatch[2].trim();
         if (key === "no-color") {
           result.diagnostics.push(
-            makeDgmoError(lineNumber, '"no-color" has been removed.', "warning")
+            makeDgmoError(
+              lineNumber,
+              '"no-color" was removed \u2014 node colors are assigned automatically by shape; delete this line.',
+              "warning"
+            )
           );
           continue;
         }
@@ -8366,7 +8385,11 @@ function parseState(content, palette) {
         const value = optMatch[2].trim();
         if (key === "no-color") {
           result.diagnostics.push(
-            makeDgmoError(lineNumber, '"no-color" has been removed.', "warning")
+            makeDgmoError(
+              lineNumber,
+              '"no-color" was removed \u2014 state colors are assigned automatically; delete this line.',
+              "warning"
+            )
           );
           continue;
         }
@@ -8681,7 +8704,7 @@ function parseClassDiagram(content, palette) {
         result.diagnostics.push(
           makeDgmoError(
             lineNumber,
-            '"no-auto-color" has been removed.',
+            '"no-auto-color" was removed \u2014 colors are always auto-assigned from the palette; delete this line.',
             "warning"
           )
         );
@@ -8796,7 +8819,11 @@ function parseClassDiagram(content, palette) {
       continue;
     }
     result.diagnostics.push(
-      makeDgmoError(lineNumber, `Unexpected line: '${trimmed}'.`, "warning")
+      makeDgmoError(
+        lineNumber,
+        `Unexpected line: '${trimmed}'. Classes start uppercase at indent 0 ('Ship'); members are indented and colon-typed ('+ name: string', '+ sail(): void'); relationships are indented arrows ('--|> Vessel'). (\xA710)`,
+        "warning"
+      )
     );
   }
   if (notes.length > 0) {
@@ -9274,7 +9301,11 @@ function parseERDiagram(content, palette) {
       continue;
     }
     result.diagnostics.push(
-      makeDgmoError(lineNumber, `Unexpected line: '${trimmed}'.`, "warning")
+      makeDgmoError(
+        lineNumber,
+        `Unexpected line: '${trimmed}'. A table is a bare name at indent 0 ('users'); columns are indented and SPACE-separated, no colon ('id int pk'); relationships are indented ('1--* orders'). (\xA79)`,
+        "warning"
+      )
     );
   }
   if (result.tables.length === 0 && !result.error) {
@@ -9618,7 +9649,10 @@ function parseOrg(content, palette) {
       const value = metadataMatch[2].trim();
       const parent = findMetadataParent(indent, indentStack);
       if (!parent) {
-        pushError(lineNumber, "Metadata has no parent node");
+        pushError(
+          lineNumber,
+          "Metadata 'key: value' must be indented under a node \u2014 no node precedes it."
+        );
       } else {
         parent.metadata = { ...parent.metadata, [key]: value };
       }
@@ -9636,7 +9670,10 @@ function parseOrg(content, palette) {
         );
         attachNode(node, indent, indentStack, result);
       } else {
-        pushError(lineNumber, "Metadata has no parent node");
+        pushError(
+          lineNumber,
+          "Metadata 'key: value' must be indented under a node \u2014 no node precedes it."
+        );
       }
     } else {
       const node = parseNodeLabel(
@@ -9985,7 +10022,10 @@ function parseSitemap(content, palette) {
     if (arrowInfo) {
       const source = findParentNode(indent, indentStack);
       if (!source) {
-        pushError(lineNumber, "Arrow has no source node");
+        pushError(
+          lineNumber,
+          "Arrow '-> target' must be indented under its source page \u2014 no page precedes it."
+        );
       } else {
         deferredArrows.push({
           sourceNode: source,
@@ -10055,7 +10095,10 @@ function parseSitemap(content, palette) {
       const value = metadataMatch[2].trim();
       const parent = findParentNode(indent, indentStack);
       if (!parent) {
-        pushError(lineNumber, "Metadata has no parent node");
+        pushError(
+          lineNumber,
+          "Metadata 'key: value' must be indented under a page \u2014 no page precedes it."
+        );
       } else {
         parent.metadata = { ...parent.metadata, [key]: value };
       }
@@ -10075,7 +10118,10 @@ function parseSitemap(content, palette) {
         const key = normalizeName(node.label);
         labelToNode.set(key, node);
       } else {
-        pushError(lineNumber, "Metadata has no parent node");
+        pushError(
+          lineNumber,
+          "Metadata 'key: value' must be indented under a page \u2014 no page precedes it."
+        );
       }
     } else {
       const descResult = tryStripDescriptionKeyword(trimmed);
@@ -11893,7 +11939,7 @@ function parseChart(content, palette) {
       result.diagnostics.push(
         makeDgmoError(
           lineNumber,
-          `'${trimmed}' \u2014 ## syntax is no longer supported. Use [Group] containers instead`
+          `'${trimmed}' removed \u2014 use a bracket container '[${trimmed.replace(/^#+\s*/, "")}]' instead (## headers are no longer supported).`
         )
       );
       continue;
@@ -12850,7 +12896,11 @@ function parseExtendedChartFull(content, palette) {
       continue;
     }
     result.diagnostics.push(
-      makeDgmoError(lineNumber, `Unexpected line: '${trimmed}'.`, "warning")
+      makeDgmoError(
+        lineNumber,
+        `Unexpected line: '${trimmed}'. Expected a data row ('Label value', space-separated) or a known option.`,
+        "warning"
+      )
     );
   }
   const warn = (line11, message) => {
@@ -15212,7 +15262,10 @@ function parseKanban(content, palette) {
       continue;
     }
     if (!currentColumn) {
-      warn(lineNumber, "Card line found before any column");
+      warn(
+        lineNumber,
+        "Card line found before any column. Declare a column first with '[Column Name]', then indent cards beneath it. (\xA711)"
+      );
       continue;
     }
     if (currentCard && indent > cardBaseIndent) {
@@ -15351,7 +15404,7 @@ var init_parser13 = __esm({
     KNOWN_OPTIONS4 = /* @__PURE__ */ new Set(["hide", "active-tag"]);
     KNOWN_BOOLEANS3 = /* @__PURE__ */ new Set(["solid-fill", "no-title"]);
     REMOVED_BOOLEANS = {
-      "no-auto-color": '"no-auto-color" has been removed.'
+      "no-auto-color": '"no-auto-color" was removed \u2014 colors are always auto-assigned from the palette; delete this line.'
     };
   }
 });
@@ -15588,7 +15641,7 @@ function parseC4(content, palette) {
           } else {
             pushError(
               lineNumber,
-              `"container ${refName}" must be inside a deployment node`
+              `"container ${refName}" must be indented under a deployment node (e.g. under 'Prod is a deployment-node')`
             );
           }
           continue;
@@ -15643,7 +15696,10 @@ function parseC4(content, palette) {
           indent
         });
       } else {
-        pushError(lineNumber, `"${sectionType}" must be inside an element`);
+        pushError(
+          lineNumber,
+          `"${sectionType}" must be indented under an element (e.g. under 'Web App is a container')`
+        );
       }
       continue;
     }
@@ -15670,7 +15726,10 @@ function parseC4(content, palette) {
           indent
         });
       } else {
-        pushError(lineNumber, `Group [${groupName}] must be inside an element`);
+        pushError(
+          lineNumber,
+          `Group [${groupName}] must be indented under an element (e.g. under 'Web App is a container')`
+        );
       }
       continue;
     }
@@ -16000,7 +16059,10 @@ function parseC4(content, palette) {
       }
       desc.push(descResult.text);
     } else {
-      pushError(lineNumber, `Unexpected content: "${trimmed}"`);
+      pushError(
+        lineNumber,
+        `Unexpected content: "${trimmed}". Expected an element ('Web App is a container'), a relationship ('-Uses-> Database'), indented metadata ('tech: React'), or a group ('[Backend]'). (\xA78)`
+      );
     }
   }
   finalizeAutoTagColors(result.tagGroups, palette);
@@ -16062,7 +16124,7 @@ function validateRelationshipTargets(result, knownNames, pushWarning) {
     for (const el of elements) {
       for (const rel of el.relationships) {
         if (!knownNames.has(normalizeName(rel.target))) {
-          let msg = `Relationship target "${rel.target}" not found`;
+          let msg = `Relationship target "${rel.target}" not found \u2014 declare it first (e.g. '${rel.target} is a container'), then reference it in the arrow`;
           const hint = suggest(normalizeName(rel.target), allNames);
           if (hint) msg += `. ${hint}`;
           pushWarning(rel.lineNumber, msg, "warning");
@@ -16090,7 +16152,7 @@ function validateDeploymentRefs(result, knownNames, pushWarning) {
     for (const node of nodes) {
       for (const ref of node.containerRefs) {
         if (!knownNames.has(normalizeName(ref))) {
-          let msg = `Deployment reference "container ${ref}" not found`;
+          let msg = `Deployment reference "container ${ref}" not found \u2014 declare the container element first, then reference it under the deployment node`;
           const hint = suggest(normalizeName(ref), allNames);
           if (hint) msg += `. ${hint}`;
           pushWarning(node.lineNumber, msg, "warning");
@@ -16809,7 +16871,7 @@ function parseInfra(content) {
       }
       warn(
         lineNumber,
-        `Invalid tag value '${trimmed}' in tag group '${currentTagGroup.name}'.`
+        `Invalid tag value '${trimmed}' in tag group '${currentTagGroup.name}' \u2014 a value is a bare word with an optional trailing color (e.g. 'Production red'); no ':' or '|'.`
       );
       continue;
     }
@@ -16882,7 +16944,7 @@ function parseInfra(content) {
         const n = deprecatedFanout[1];
         setError(
           lineNumber,
-          `'x${n}' fanout syntax is no longer supported \u2014 use '| fanout: ${n}' instead`
+          `'x${n}' fanout syntax is no longer supported \u2014 use 'fanout: ${n}' instead`
         );
         continue;
       }
@@ -17056,8 +17118,10 @@ function parseInfra(content) {
           const hint = suggest(key, allKeys);
           const valueLooksNumeric = /^[\d.]+%?$/.test(rawVal);
           if (hint || valueLooksNumeric) {
-            let msg = `Unknown property '${key}'.`;
+            let msg = `Unknown infra property '${key}'.`;
             if (hint) msg += ` ${hint}`;
+            else
+              msg += ` Properties are colon-keyed 'key: value' from the known schema (e.g. latency-ms, max-rps, cache-hit, instances, concurrency).`;
             warn(lineNumber, msg);
           } else if (!currentNode.isEdge) {
             pushDescription(currentNode, trimmed);
@@ -17068,7 +17132,7 @@ function parseInfra(content) {
         if (EDGE_ONLY_KEYS.has(key) && !currentNode.isEdge) {
           warn(
             lineNumber,
-            `Property '${key}' is only valid on the entry point (Edge/Internet).`
+            `Property '${key}' belongs on the entry point \u2014 declare it indented under an 'internet' or 'edge' node, not on '${currentNode.label}'.`
           );
         }
         const value = parsePropertyValue(rawVal);
@@ -17175,7 +17239,7 @@ function parseInfra(content) {
     }
     warn(
       lineNumber,
-      currentGroup ? `Unexpected line: '${trimmed}'. Expected an indented component name.` : `Unexpected line: '${trimmed}'. Expected a component name, [Group Name], tag group, or option.`
+      currentGroup ? `Unexpected line: '${trimmed}'. Inside a group, indent a component name under the '[Group]'.` : `Unexpected line: '${trimmed}'. Expected a node ('Api Gateway'), a group ('[Backend]'), a tag group ('tag Tier as t'), or an option ('default-rps 100'); node properties go indented under a node as 'key: value'.`
     );
   }
   finishCurrentNode();
@@ -17551,7 +17615,10 @@ function parseGantt(content, palette) {
           continue;
         }
         if (COMMENT_RE.test(line11)) continue;
-        warn(lineNumber, `Unrecognized holiday entry: "${line11}"`);
+        warn(
+          lineNumber,
+          `Unrecognized holiday entry: "${line11}". Use a date '2024-02-19 Presidents Day' or a range '2024-05-27 -> 2024-05-29 Memorial Weekend'. (\xA713.3)`
+        );
         continue;
       }
     }
@@ -17577,7 +17644,10 @@ function parseGantt(content, palette) {
             lineNumber
           });
         } else {
-          warn(lineNumber, `Unrecognized era entry: "${line11}"`);
+          warn(
+            lineNumber,
+            `Unrecognized era entry: "${line11}". Use 'YYYY-MM-DD -> YYYY-MM-DD Label [color]' (e.g. '2026-04-06 -> 2026-04-10 Conference purple'). (\xA713.5)`
+          );
         }
         continue;
       }
@@ -17603,7 +17673,10 @@ function parseGantt(content, palette) {
             lineNumber
           });
         } else {
-          warn(lineNumber, `Unrecognized marker entry: "${line11}"`);
+          warn(
+            lineNumber,
+            `Unrecognized marker entry: "${line11}". Use 'YYYY-MM-DD Label [color]' (e.g. '2026-03-27 Board Review' or '2026-06-15 Release green'). (\xA713.6)`
+          );
         }
         continue;
       }
@@ -17769,7 +17842,7 @@ function parseGantt(content, palette) {
           } else {
             softError(
               lineNumber,
-              `Arrow reference "${content2.name}" has no parent task context.`
+              `Arrow '-> ${content2.name}' has no source task \u2014 indent it under the task it follows (e.g. 'Design 5bd' then indented '-> ${content2.name} 3bd'). (\xA713)`
             );
           }
         }
@@ -18989,7 +19062,10 @@ function parseMap(content, palette) {
   function handleTag(trimmed, line11) {
     const m = matchTagBlockHeading(trimmed);
     if (!m) {
-      pushError(line11, `Malformed tag declaration: "${trimmed}".`);
+      pushError(
+        line11,
+        `Malformed tag declaration: "${trimmed}" \u2014 write 'tag <Group>' (optionally 'tag <Group> as <alias>'), e.g. 'tag Market as m', with indented 'Value color' entries below.`
+      );
       return;
     }
     emitTagLegacyDiagnostic(m, line11, diagnostics);
@@ -19101,7 +19177,7 @@ function parseMap(content, palette) {
     if (!pos || pos.kind === "name" && !pos.name) {
       pushError(
         line11,
-        "route requires an origin: `route <origin> [style: arc]`."
+        "route needs an origin place \u2014 `route <origin>` then indented legs (`-> dest`); origin may be a city name, IATA code, or `<lat> <lon>`. (\xA724B)"
       );
       return;
     }
@@ -19164,7 +19240,10 @@ function parseMap(content, palette) {
   function handleEdges(trimmed, line11) {
     const parts = trimmed.split(ARROW_SPLIT);
     if (parts.length < 3) {
-      pushError(line11, `Malformed edge: "${trimmed}".`);
+      pushError(
+        line11,
+        `Malformed edge: "${trimmed}" \u2014 an edge is 'A -> B' (or 'A -label-> B', '~>' for arc, '--' undirected), both endpoints non-empty. (\xA724B)`
+      );
       return;
     }
     const endpoints = [];
@@ -19187,7 +19266,10 @@ function parseMap(content, palette) {
       const from = endpoints[k];
       const to = endpoints[k + 1];
       if (!from || !to) {
-        pushError(line11, `Edge has an empty endpoint: "${trimmed}".`);
+        pushError(
+          line11,
+          `Edge has an empty endpoint: "${trimmed}" \u2014 both sides of the arrow need a place, e.g. 'Paris -> Berlin'. (\xA724B)`
+        );
         continue;
       }
       const isLast = k === links.length - 1;
@@ -21306,7 +21388,10 @@ function parseTechRadar(content) {
     }
     if (indent === 0 && trimmed.toLowerCase() === "rings") {
       if (result.rings.length > 0) {
-        warn(lineNumber, 'Duplicate "rings" block \u2014 using last one');
+        warn(
+          lineNumber,
+          'Duplicate "rings" block \u2014 only the last is kept; merge all ring names into one "rings" block.'
+        );
         result.rings = [];
       }
       inRingsBlock = true;
@@ -21525,7 +21610,7 @@ function parseTechRadar(content) {
       result.diagnostics.push(
         makeDgmoError(
           lineNumber,
-          `Blip "${trimmed}" has no ring assignment. Place it under a ring section header or use: ${trimmed} | ring: RingName`
+          `Blip "${trimmed}" has no ring. Put it under a ring section header, or add a colon-keyed ring \u2014 '${trimmed} ring: RingName' (per \xA720).`
         )
       );
       continue;
@@ -21534,7 +21619,7 @@ function parseTechRadar(content) {
       if (!trimmed.includes("|") && headerParsed && result.rings.length > 0) {
         warn(
           lineNumber,
-          `Unrecognized line "${trimmed}". Quadrant headers require pipe metadata: ${trimmed} | quadrant: top-left`
+          `Unrecognized line "${trimmed}". A quadrant header is 'Name quadrant: <top-left|top-right|bottom-left|bottom-right>' (per \xA720).`
         );
       }
     }
@@ -21827,7 +21912,10 @@ function parseCycle(content) {
         currentNode.description.push(descLine);
         continue;
       }
-      warn(lineNum, `Unexpected indented line: "${trimmed}".`);
+      warn(
+        lineNum,
+        `Indented line "${trimmed}" has no step above it \u2014 add a step on a non-indented line first, then indent its details. (\xA721)`
+      );
       continue;
     }
   }
@@ -22130,7 +22218,7 @@ function parseJourneyMap(content, palette) {
       if (trimmed.includes("|") || !PHASE_RE.test(trimmed)) {
         warn(
           lineNumber,
-          "Steps outside phases will be ignored when phases are present"
+          `Step "${trimmed}" sits outside any phase and is ignored \u2014 indent it under a '[Phase]' header (per \xA722).`
         );
         continue;
       }
@@ -22187,7 +22275,10 @@ function parseJourneyMap(content, palette) {
       continue;
     }
     if (indent > 0 && !currentPhase && hasPhases) {
-      warn(lineNumber, `Unexpected indented line outside of a phase`);
+      warn(
+        lineNumber,
+        `Indented line outside any phase \u2014 add a '[Phase]' header above it, or unindent it to a top-level step. (\xA722)`
+      );
     }
   }
   if (currentStep) {
@@ -22533,7 +22624,10 @@ function parsePyramid(content) {
       continue;
     }
     if (!currentLayer) {
-      warn(lineNum, `Unexpected indented line: "${trimmed}".`);
+      warn(
+        lineNum,
+        `Indented description "${trimmed}" has no layer above it \u2014 add a layer name on a non-indented line first. (\xA723)`
+      );
       continue;
     }
     const descLine = trimmed.startsWith("- ") ? `\u2022 ${trimmed.substring(2)}` : trimmed;
@@ -22707,7 +22801,10 @@ function parseRing(content) {
       continue;
     }
     if (!currentLayer) {
-      warn(lineNum, `Unexpected indented line: "${trimmed}".`);
+      warn(
+        lineNum,
+        `Indented description "${trimmed}" has no layer above it \u2014 add a layer name on a non-indented line first. (\xA724)`
+      );
       continue;
     }
     const descLine = trimmed.startsWith("- ") ? `\u2022 ${trimmed.substring(2)}` : trimmed;
@@ -23433,7 +23530,10 @@ function parseRaci(content, palette) {
       continue;
     }
     if (bodyStarted) {
-      errorAt(lineNumber, `Unexpected line: '${trimmed}'.`);
+      errorAt(
+        lineNumber,
+        `Unexpected line: '${trimmed}'. In the body expect a '[Phase]' header, an indented task name, or an assignment 'Role: A R C I' under a task. (\xA724A)`
+      );
     } else {
       warn(lineNumber, `Unrecognized directive: '${trimmed}'.`);
     }
@@ -23980,6 +24080,13 @@ function getAllChartTypes() {
   return chartTypes.map((c) => c.id);
 }
 function parseDgmo(content) {
+  const result = parseDgmoUndeduped(content);
+  return {
+    diagnostics: dedupeDiagnostics(result.diagnostics),
+    chartType: result.chartType
+  };
+}
+function parseDgmoUndeduped(content) {
   const chartType = parseDgmoChartType(content);
   if (!chartType) {
     const colonDiag = detectColonChartType(content);
@@ -29044,63 +29151,6 @@ function ensureArrowMarkers(defs, colors) {
     ).attr("fill", color);
   }
 }
-function edgePolylineMidpoint(points) {
-  if (points.length === 0) return { x: 0, y: 0 };
-  if (points.length === 1) return { x: points[0].x, y: points[0].y };
-  let total = 0;
-  const segLen = [];
-  for (let k = 1; k < points.length; k++) {
-    const len = Math.hypot(
-      points[k].x - points[k - 1].x,
-      points[k].y - points[k - 1].y
-    );
-    segLen.push(len);
-    total += len;
-  }
-  let half = total / 2;
-  for (let k = 1; k < points.length; k++) {
-    const len = segLen[k - 1];
-    if (half <= len || k === points.length - 1) {
-      const t = len === 0 ? 0 : Math.min(1, half / len);
-      return {
-        x: points[k - 1].x + (points[k].x - points[k - 1].x) * t,
-        y: points[k - 1].y + (points[k].y - points[k - 1].y) * t
-      };
-    }
-    half -= len;
-  }
-  const last = points[points.length - 1];
-  return { x: last.x, y: last.y };
-}
-function resolveEdgeLabelOverlaps(labels) {
-  const MAX_PASSES = 8;
-  const PAD = 4;
-  for (let pass = 0; pass < MAX_PASSES; pass++) {
-    let moved = false;
-    for (let i = 0; i < labels.length; i++) {
-      for (let j = i + 1; j < labels.length; j++) {
-        const a = labels[i];
-        const b = labels[j];
-        const dx = Math.abs(a.x - b.x);
-        const dy = Math.abs(a.y - b.y);
-        const overlapX = (a.width + b.width) / 2 + PAD - dx;
-        const overlapY = (a.height + b.height) / 2 + PAD - dy;
-        if (overlapX > 0 && overlapY > 0) {
-          const shift = overlapY / 2 + 1;
-          if (a.y < b.y) {
-            a.y -= shift;
-            b.y += shift;
-          } else {
-            a.y += shift;
-            b.y -= shift;
-          }
-          moved = true;
-        }
-      }
-    }
-    if (!moved) break;
-  }
-}
 function renderBoxesAndLines(container, parsed, layout, palette, isDark, options) {
   const {
     onClickItem,
@@ -29307,8 +29357,6 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
       groupG.append("text").attr("class", "bl-group-label").attr("x", gx + group.width / 2).attr("y", gy + 18).attr("text-anchor", "middle").attr("font-family", FONT_FAMILY).attr("font-size", sGroupLabelFontSize).attr("font-weight", "600").attr("fill", palette.text).text(group.label);
     }
   }
-  const labelPositions = [];
-  const edgeGroups = /* @__PURE__ */ new Map();
   for (let i = 0; i < layout.edges.length; i++) {
     const le = layout.edges[i];
     const color = edgeColorMap.get(i) ?? palette.textMuted;
@@ -29327,7 +29375,6 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
       const nodeLayout = layoutNodeMap.get(le.source);
       if (nodeLayout) {
         const edgeG2 = diagramG.append("g").attr("class", "bl-edge-group").attr("data-line-number", String(le.lineNumber));
-        edgeGroups.set(i, edgeG2);
         const markerId2 = `bl-arrow-${color.replace("#", "")}`;
         const cx = nodeLayout.x;
         const cy = nodeLayout.y;
@@ -29376,7 +29423,6 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
     }
     if (points.length < 2) continue;
     const edgeG = diagramG.append("g").attr("class", "bl-edge-group").attr("data-line-number", String(le.lineNumber));
-    edgeGroups.set(i, edgeG);
     const markerId = `bl-arrow-${color.replace("#", "")}`;
     const gen = le.straight ? lineGeneratorStraight : parsed.direction === "TB" ? lineGeneratorTB : lineGeneratorLR;
     const path = edgeG.append("path").attr("class", "bl-edge").attr("d", gen(points) ?? "").attr("fill", "none").attr("stroke", color).attr("stroke-width", sEdgeStrokeWidth).attr("marker-end", `url(#${markerId})`);
@@ -29384,31 +29430,6 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
       const revId = `bl-arrow-rev-${color.replace("#", "")}`;
       path.attr("marker-start", `url(#${revId})`);
     }
-    if (le.label && le.points.length > 0) {
-      const lw = measureText(le.label, sEdgeLabelFontSize);
-      const labelH = sEdgeLabelFontSize + 6;
-      const mid = edgePolylineMidpoint(le.points);
-      let ly = mid.y;
-      if (le.parallelCount > 1 && le.yOffset !== 0) {
-        ly += (le.yOffset < 0 ? -labelH : labelH) * 0.5;
-      }
-      labelPositions.push({
-        x: mid.x,
-        y: ly,
-        width: lw + 8,
-        height: labelH,
-        idx: i
-      });
-    }
-  }
-  resolveEdgeLabelOverlaps(labelPositions);
-  for (const lp of labelPositions) {
-    const le = layout.edges[lp.idx];
-    if (!le.label) continue;
-    const edgeG = edgeGroups.get(lp.idx);
-    const target = edgeG ?? diagramG;
-    target.append("rect").attr("x", lp.x - lp.width / 2).attr("y", lp.y - lp.height / 2).attr("width", lp.width).attr("height", lp.height).attr("rx", 3).attr("fill", palette.bg).attr("opacity", 0.85);
-    target.append("text").attr("x", lp.x).attr("y", lp.y + sEdgeLabelFontSize / 3).attr("text-anchor", "middle").attr("font-size", sEdgeLabelFontSize).attr("fill", palette.textMuted).text(le.label);
   }
   for (const ln of layout.nodes) {
     const node = nodeMap.get(ln.label);
@@ -29459,8 +29480,8 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
     nodeG.append("rect").attr("x", x).attr("y", y).attr("width", ln.width).attr("height", ln.height).attr("rx", NODE_RX).attr("ry", NODE_RX).attr("fill", colors.fill).attr("stroke", colors.stroke).attr("stroke-width", sNodeStrokeWidth);
     const desc = node.description;
     if (desc && desc.length > 0 && !hideDescriptions) {
-      const MAX_LABEL_LINES3 = 3;
-      const fitted = fitLabelToHeader(node.label, ln.width, MAX_LABEL_LINES3);
+      const MAX_LABEL_LINES4 = 3;
+      const fitted = fitLabelToHeader(node.label, ln.width, MAX_LABEL_LINES4);
       const labelLines = fitted.lines;
       const labelLineH = fitted.fontSize * 1.3;
       const labelTotalH = labelLines.length * labelLineH;
@@ -29594,6 +29615,35 @@ function renderBoxesAndLines(container, parsed, layout, palette, isDark, options
       }
     }
   }
+  const labelLayer = diagramG.append("g").attr("class", "bl-edge-labels");
+  const labelLineHeight = sEdgeLabelFontSize * 1.3;
+  for (const le of layout.edges) {
+    if (!le.labelLines || le.labelLines.length === 0) continue;
+    if (le.labelX === void 0 || le.labelY === void 0) continue;
+    const lx = le.labelX;
+    const ly = le.labelY;
+    if (hidden.size > 0) {
+      let isHidden = false;
+      for (const [groupKey, hiddenVals] of hidden) {
+        const val = le.metadata[groupKey];
+        if (val && hiddenVals.has(val.toLowerCase())) {
+          isHidden = true;
+          break;
+        }
+      }
+      if (isHidden) continue;
+    }
+    const lw = le.labelWidth ?? 0;
+    const lh = le.labelHeight ?? sEdgeLabelFontSize + 6;
+    const lines = le.labelLines;
+    const labelG = labelLayer.append("g").attr("class", "bl-edge-label").attr("data-line-number", String(le.lineNumber));
+    labelG.append("rect").attr("x", lx - lw / 2).attr("y", ly - lh / 2).attr("width", lw).attr("height", lh).attr("rx", 3).attr("fill", palette.bg).attr("opacity", 0.72);
+    const text = labelG.append("text").attr("x", lx).attr("text-anchor", "middle").attr("font-family", FONT_FAMILY).attr("font-size", sEdgeLabelFontSize).attr("fill", palette.textMuted);
+    const firstY = ly - (lines.length - 1) / 2 * labelLineHeight + sEdgeLabelFontSize / 3;
+    lines.forEach((line11, k) => {
+      text.append("tspan").attr("x", lx).attr("y", firstY + k * labelLineHeight).text(line11);
+    });
+  }
   const hasDescriptions = parsed.nodes.some(
     (n) => n.description && n.description.length > 0
   );
@@ -29710,6 +29760,222 @@ var init_renderer6 = __esm({
   }
 });
 
+// src/boxes-and-lines/label-placement.ts
+function measureEdgeLabel(label, fontSize = EDGE_LABEL_FONT_SIZE6, maxWidth = LABEL_MAX_WIDTH) {
+  let lines = wrapTextToWidth(label, fontSize, maxWidth, { hardBreak: true });
+  if (lines.length > MAX_LABEL_LINES) {
+    const kept = lines.slice(0, MAX_LABEL_LINES - 1);
+    const rest = lines.slice(MAX_LABEL_LINES - 1).join(" ");
+    kept.push(truncateText(rest, fontSize, maxWidth));
+    lines = kept;
+  }
+  let textW = 0;
+  for (const ln of lines) {
+    const w = measureText(ln, fontSize);
+    if (w > textW) textW = w;
+  }
+  return {
+    lines,
+    width: textW + 2 * H_PAD,
+    height: lines.length * fontSize * LABEL_LINE_HEIGHT + 2 * V_PAD
+  };
+}
+function edgePolylineMidpoint(points) {
+  return pointAtArcFraction(points, 0.5).p;
+}
+function pointAtArcFraction(points, t) {
+  if (points.length === 0) return { p: { x: 0, y: 0 }, nx: 0, ny: 1 };
+  if (points.length === 1)
+    return { p: { x: points[0].x, y: points[0].y }, nx: 0, ny: 1 };
+  const segLen = [];
+  let total = 0;
+  for (let k = 1; k < points.length; k++) {
+    const len = Math.hypot(
+      points[k].x - points[k - 1].x,
+      points[k].y - points[k - 1].y
+    );
+    segLen.push(len);
+    total += len;
+  }
+  let want = total * Math.max(0, Math.min(1, t));
+  for (let k = 1; k < points.length; k++) {
+    const len = segLen[k - 1];
+    if (want <= len || k === points.length - 1) {
+      const f = len === 0 ? 0 : Math.min(1, want / len);
+      const ax = points[k - 1].x;
+      const ay = points[k - 1].y;
+      const bx = points[k].x;
+      const by = points[k].y;
+      const dx = bx - ax;
+      const dy = by - ay;
+      const dlen = Math.hypot(dx, dy) || 1;
+      return {
+        p: { x: ax + dx * f, y: ay + dy * f },
+        nx: -dy / dlen,
+        ny: dx / dlen
+      };
+    }
+    want -= len;
+  }
+  const last = points[points.length - 1];
+  return { p: { x: last.x, y: last.y }, nx: 0, ny: 1 };
+}
+function rectFromCenter(cx, cy, w, h) {
+  return {
+    minX: cx - w / 2,
+    minY: cy - h / 2,
+    maxX: cx + w / 2,
+    maxY: cy + h / 2
+  };
+}
+function overlapsAny(cx, cy, w, h, obstacles, pad2) {
+  const minX = cx - w / 2 - pad2;
+  const minY = cy - h / 2 - pad2;
+  const maxX = cx + w / 2 + pad2;
+  const maxY = cy + h / 2 + pad2;
+  for (const o of obstacles) {
+    if (minX < o.maxX && maxX > o.minX && minY < o.maxY && maxY > o.minY)
+      return true;
+  }
+  return false;
+}
+function slideFractions() {
+  const out = [0.5];
+  for (let k = 1; k <= SLIDE_SAMPLES; k++) {
+    const off = k * 0.08;
+    if (0.5 - off >= 0.12) out.push(0.5 - off);
+    if (0.5 + off <= 0.88) out.push(0.5 + off);
+  }
+  return out;
+}
+function findClearPosition(w, h, points, obstacles) {
+  const ts = slideFractions();
+  for (const t of ts) {
+    const { p } = pointAtArcFraction(points, t);
+    if (!overlapsAny(p.x, p.y, w, h, obstacles, BOX_CLEAR_PAD)) return p;
+  }
+  for (let mag = PERP_STEP; mag <= PERP_MAX; mag += PERP_STEP) {
+    for (const t of ts) {
+      const { p, nx, ny } = pointAtArcFraction(points, t);
+      for (const sign of [-1, 1]) {
+        const x = p.x + nx * mag * sign;
+        const y = p.y + ny * mag * sign;
+        if (!overlapsAny(x, y, w, h, obstacles, BOX_CLEAR_PAD)) return { x, y };
+      }
+    }
+  }
+  return null;
+}
+function resolveLabelOverlaps(boxes) {
+  const MAX_PASSES = 8;
+  const PAD = 4;
+  for (let pass = 0; pass < MAX_PASSES; pass++) {
+    let moved = false;
+    for (let i = 0; i < boxes.length; i++) {
+      for (let j = i + 1; j < boxes.length; j++) {
+        const a = boxes[i];
+        const b = boxes[j];
+        const dx = Math.abs(a.cx - b.cx);
+        const dy = Math.abs(a.cy - b.cy);
+        const overlapX = (a.w + b.w) / 2 + PAD - dx;
+        const overlapY = (a.h + b.h) / 2 + PAD - dy;
+        if (overlapX > 0 && overlapY > 0) {
+          const shift = overlapY / 2 + 1;
+          if (a.cy < b.cy) {
+            a.cy -= shift;
+            b.cy += shift;
+          } else {
+            a.cy += shift;
+            b.cy -= shift;
+          }
+          moved = true;
+        }
+      }
+    }
+    if (!moved) break;
+  }
+}
+function placeEdgeLabels(layout, opts) {
+  const fontSize = opts?.fontSize ?? EDGE_LABEL_FONT_SIZE6;
+  const maxWidth = opts?.maxWidth ?? LABEL_MAX_WIDTH;
+  const obstacles = [];
+  for (const n of layout.nodes)
+    obstacles.push(rectFromCenter(n.x, n.y, n.width, n.height));
+  for (const g of layout.groups)
+    if (g.collapsed)
+      obstacles.push(rectFromCenter(g.x, g.y, g.width, g.height));
+  const boxes = [];
+  layout.edges.forEach((e, idx) => {
+    if (!e.label || e.points.length < 2) return;
+    const m = measureEdgeLabel(e.label, fontSize, maxWidth);
+    const mid = edgePolylineMidpoint(e.points);
+    let cy = mid.y;
+    if (e.parallelCount > 1 && e.yOffset !== 0)
+      cy += (e.yOffset < 0 ? -1 : 1) * (m.height / 2);
+    boxes.push({
+      edgeIdx: idx,
+      cx: mid.x,
+      cy,
+      w: m.width,
+      h: m.height,
+      lines: m.lines,
+      resolved: true
+    });
+  });
+  for (const box of boxes) {
+    if (!overlapsAny(box.cx, box.cy, box.w, box.h, obstacles, BOX_CLEAR_PAD))
+      continue;
+    const e = layout.edges[box.edgeIdx];
+    const clear = findClearPosition(box.w, box.h, e.points, obstacles);
+    if (clear) {
+      box.cx = clear.x;
+      box.cy = clear.y;
+    } else {
+      box.resolved = false;
+    }
+  }
+  resolveLabelOverlaps(boxes);
+  for (const box of boxes) {
+    if (overlapsAny(box.cx, box.cy, box.w, box.h, obstacles, BOX_CLEAR_PAD))
+      box.resolved = false;
+  }
+  const boxByIdx = /* @__PURE__ */ new Map();
+  for (const b of boxes) boxByIdx.set(b.edgeIdx, b);
+  const edges = layout.edges.map((e, idx) => {
+    const b = boxByIdx.get(idx);
+    if (!b) return e;
+    return {
+      ...e,
+      labelX: b.cx,
+      labelY: b.cy,
+      labelWidth: b.w,
+      labelHeight: b.h,
+      labelLines: b.lines
+    };
+  });
+  return {
+    layout: { ...layout, edges },
+    unresolved: boxes.filter((b) => !b.resolved).map((b) => b.edgeIdx)
+  };
+}
+var EDGE_LABEL_FONT_SIZE6, LABEL_MAX_WIDTH, MAX_LABEL_LINES, LABEL_LINE_HEIGHT, H_PAD, V_PAD, BOX_CLEAR_PAD, PERP_STEP, PERP_MAX, SLIDE_SAMPLES;
+var init_label_placement = __esm({
+  "src/boxes-and-lines/label-placement.ts"() {
+    "use strict";
+    init_text_measure();
+    EDGE_LABEL_FONT_SIZE6 = 11;
+    LABEL_MAX_WIDTH = 160;
+    MAX_LABEL_LINES = 3;
+    LABEL_LINE_HEIGHT = 1.3;
+    H_PAD = 6;
+    V_PAD = 3;
+    BOX_CLEAR_PAD = 4;
+    PERP_STEP = 8;
+    PERP_MAX = 40;
+    SLIDE_SAMPLES = 9;
+  }
+});
+
 // src/boxes-and-lines/layout-layered.ts
 function rng(s) {
   return () => {
@@ -31497,6 +31763,7 @@ function edgeLength(layout) {
 }
 async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
   const hideDescriptions = opts?.hideDescriptions ?? false;
+  const reserveEdgeLabels = opts?.reserveEdgeLabels ?? false;
   const onProgress = opts?.onProgress;
   const tick = onProgress ? () => new Promise((r) => setTimeout(r)) : () => void 0;
   const collapsedGroupLabels = /* @__PURE__ */ new Set();
@@ -31789,8 +32056,14 @@ async function layoutBoxesAndLinesSearch(parsed, collapseInfo, opts) {
     for (const e of ord(parsed.edges)) {
       const s = srcRep(e.source);
       const t = tgtRep(e.target);
-      if (s !== t && g.hasNode(s) && g.hasNode(t))
-        g.setEdge(s, t, {}, edgeKey(e));
+      if (s !== t && g.hasNode(s) && g.hasNode(t)) {
+        let edgeLabel = {};
+        if (reserveEdgeLabels && e.label) {
+          const m = measureEdgeLabel(e.label, EDGE_LABEL_FONT_SIZE6);
+          edgeLabel = { width: m.width, height: m.height, labelpos: "c" };
+        }
+        g.setEdge(s, t, edgeLabel, edgeKey(e));
+      }
     }
     import_dagre4.default.layout(g);
     const nodes = parsed.nodes.map((n2) => {
@@ -32021,6 +32294,7 @@ var init_layout_search = __esm({
     init_layout5();
     init_layout_layered();
     init_layout_grouped();
+    init_label_placement();
     DEFAULT_LAMBDA = 4;
     ESCALATE_THRESHOLD = 4;
     ESCALATE_MAX_N = 45;
@@ -32079,9 +32353,9 @@ function estimateLabelLines(label, nodeWidth = NODE_WIDTH) {
         current = word;
       }
     }
-    if (lines <= MAX_LABEL_LINES) return Math.min(lines, MAX_LABEL_LINES);
+    if (lines <= MAX_LABEL_LINES2) return Math.min(lines, MAX_LABEL_LINES2);
   }
-  return MAX_LABEL_LINES;
+  return MAX_LABEL_LINES2;
 }
 function computeNodeSize(node, reserveValueRow) {
   if (!node.description || node.description.length === 0) {
@@ -32089,7 +32363,7 @@ function computeNodeSize(node, reserveValueRow) {
   }
   const w = DESC_NODE_WIDTH;
   const labelLines = estimateLabelLines(node.label, w);
-  const labelHeight = labelLines * 13 * LABEL_LINE_HEIGHT + LABEL_PAD;
+  const labelHeight = labelLines * 13 * LABEL_LINE_HEIGHT2 + LABEL_PAD;
   const maxTextWidth = w - 24;
   let totalRenderedLines = 0;
   for (const line11 of node.description) {
@@ -32113,7 +32387,7 @@ function computeNodeSize(node, reserveValueRow) {
 }
 async function layoutBoxesAndLines(parsed, collapseInfo, layoutOptions) {
   const { layoutBoxesAndLinesSearch: layoutBoxesAndLinesSearch2 } = await Promise.resolve().then(() => (init_layout_search(), layout_search_exports));
-  const searched = await layoutBoxesAndLinesSearch2(parsed, collapseInfo, {
+  const searchOpts = {
     ...layoutOptions?.hideDescriptions !== void 0 && {
       hideDescriptions: layoutOptions.hideDescriptions
     },
@@ -32123,12 +32397,23 @@ async function layoutBoxesAndLines(parsed, collapseInfo, layoutOptions) {
     ...layoutOptions?.onProgress !== void 0 && {
       onProgress: layoutOptions.onProgress
     }
-  });
-  return attachNotes(
-    applyParallelEdgeOffsets(searched),
+  };
+  const searched = await layoutBoxesAndLinesSearch2(
     parsed,
-    layoutOptions?.collapsedNotes
-  );
+    collapseInfo,
+    searchOpts
+  );
+  let placed = placeEdgeLabels(applyParallelEdgeOffsets(searched));
+  if (placed.unresolved.length > 0) {
+    const relaid = await layoutBoxesAndLinesSearch2(parsed, collapseInfo, {
+      ...searchOpts,
+      reserveEdgeLabels: true
+    });
+    const relaidPlaced = placeEdgeLabels(applyParallelEdgeOffsets(relaid));
+    if (relaidPlaced.unresolved.length < placed.unresolved.length)
+      placed = relaidPlaced;
+  }
+  return attachNotes(placed.layout, parsed, layoutOptions?.collapsedNotes);
 }
 function attachNotes(layout, parsed, collapsedNotes) {
   const notesSuppressed = parsed.options?.["no-notes"] === "on";
@@ -32196,6 +32481,7 @@ function attachNotes(layout, parsed, collapsedNotes) {
     points: e.points.map((pt) => ({ x: pt.x + shiftX, y: pt.y + shiftY })),
     ...e.labelX !== void 0 && { labelX: e.labelX + shiftX },
     ...e.labelY !== void 0 && { labelY: e.labelY + shiftY }
+    // labelWidth/labelHeight/labelLines are shift-invariant — carried via spread.
   })) : layout.edges;
   const finalGroups = shifted ? layout.groups.map((grp) => ({
     ...grp,
@@ -32240,11 +32526,12 @@ function applyParallelEdgeOffsets(layout) {
     }))
   };
 }
-var MARGIN5, MAX_PARALLEL_EDGES, PARALLEL_SPACING, PHI, NODE_HEIGHT, NODE_WIDTH, DESC_NODE_WIDTH, DESC_FONT_SIZE2, DESC_LINE_HEIGHT2, DESC_PADDING, SEPARATOR_GAP4, MAX_DESC_LINES2, MAX_LABEL_LINES, LABEL_LINE_HEIGHT, LABEL_PAD, VALUE_ROW_FONT, VALUE_ROW_H;
+var MARGIN5, MAX_PARALLEL_EDGES, PARALLEL_SPACING, PHI, NODE_HEIGHT, NODE_WIDTH, DESC_NODE_WIDTH, DESC_FONT_SIZE2, DESC_LINE_HEIGHT2, DESC_PADDING, SEPARATOR_GAP4, MAX_DESC_LINES2, MAX_LABEL_LINES2, LABEL_LINE_HEIGHT2, LABEL_PAD, VALUE_ROW_FONT, VALUE_ROW_H;
 var init_layout5 = __esm({
   "src/boxes-and-lines/layout.ts"() {
     "use strict";
     init_text_measure();
+    init_label_placement();
     init_notes();
     MARGIN5 = 40;
     MAX_PARALLEL_EDGES = 5;
@@ -32258,8 +32545,8 @@ var init_layout5 = __esm({
     DESC_PADDING = 8;
     SEPARATOR_GAP4 = 4;
     MAX_DESC_LINES2 = 6;
-    MAX_LABEL_LINES = 3;
-    LABEL_LINE_HEIGHT = 1.3;
+    MAX_LABEL_LINES2 = 3;
+    LABEL_LINE_HEIGHT2 = 1.3;
     LABEL_PAD = 12;
     VALUE_ROW_FONT = 11;
     VALUE_ROW_H = SEPARATOR_GAP4 + VALUE_ROW_FONT * DESC_LINE_HEIGHT2 + DESC_PADDING;
@@ -32278,7 +32565,7 @@ function tokenize(text) {
   return tokens;
 }
 function tryWrap(tokens, maxWidth, fontSize, maxLines) {
-  const availWidth = maxWidth - H_PAD;
+  const availWidth = maxWidth - H_PAD2;
   const lines = [];
   let currentLine = "";
   for (const token of tokens) {
@@ -32303,7 +32590,7 @@ function tryWrap(tokens, maxWidth, fontSize, maxLines) {
   return lines;
 }
 function truncateLastLine(lines, maxWidth, fontSize) {
-  const availWidth = maxWidth - H_PAD;
+  const availWidth = maxWidth - H_PAD2;
   const result = [...lines];
   const last = result[result.length - 1];
   if (measureText(last, fontSize) > availWidth) {
@@ -32311,7 +32598,7 @@ function truncateLastLine(lines, maxWidth, fontSize) {
   }
   return result;
 }
-function wrapText(text, maxWidth, baseFontSize, minFontSize, maxLines = MAX_LABEL_LINES2) {
+function wrapText(text, maxWidth, baseFontSize, minFontSize, maxLines = MAX_LABEL_LINES3) {
   if (!text) return { lines: [""], fontSize: baseFontSize };
   const tokens = tokenize(text);
   for (let fs = baseFontSize; fs >= minFontSize; fs--) {
@@ -32326,7 +32613,7 @@ function wrapText(text, maxWidth, baseFontSize, minFontSize, maxLines = MAX_LABE
   if (allLines.length > maxLines) {
     const last = truncated[truncated.length - 1];
     if (!last.endsWith("\u2026")) {
-      const availWidth = maxWidth - H_PAD;
+      const availWidth = maxWidth - H_PAD2;
       if (measureText(last + "\u2026", minFontSize) > availWidth) {
         truncated[truncated.length - 1] = truncateText(
           last,
@@ -32353,7 +32640,7 @@ function computeNodeText(label, description, depth, nodeWidth, hideDescriptions)
     nodeWidth,
     baseFontSize,
     MIN_FONT_SIZE,
-    MAX_LABEL_LINES2
+    MAX_LABEL_LINES3
   );
   const descLines = [];
   let descFontSize = DESC_FONT_SIZE3;
@@ -32381,14 +32668,14 @@ function computeNodeText(label, description, depth, nodeWidth, hideDescriptions)
     descFontSize
   };
 }
-var H_PAD, MAX_LABEL_LINES2, MAX_DESC_LINES3, ROOT_FONT_SIZE, MIN_FONT_SIZE, FONT_STEP, DESC_FONT_SIZE3;
+var H_PAD2, MAX_LABEL_LINES3, MAX_DESC_LINES3, ROOT_FONT_SIZE, MIN_FONT_SIZE, FONT_STEP, DESC_FONT_SIZE3;
 var init_text_wrap = __esm({
   "src/mindmap/text-wrap.ts"() {
     "use strict";
     init_description_helpers();
     init_text_measure();
-    H_PAD = 16;
-    MAX_LABEL_LINES2 = 3;
+    H_PAD2 = 16;
+    MAX_LABEL_LINES3 = 3;
     MAX_DESC_LINES3 = 2;
     ROOT_FONT_SIZE = 17;
     MIN_FONT_SIZE = 9;
@@ -32775,7 +33062,7 @@ function nodeHeightS(node, hideDescriptions, sc) {
     hideDescriptions
   );
   const labelLineCount = text.labelLines.length;
-  const labelH = labelLineCount <= 1 ? SINGLE_LABEL_HEIGHT : LABEL_LINE_HEIGHT2 * labelLineCount;
+  const labelH = labelLineCount <= 1 ? SINGLE_LABEL_HEIGHT : LABEL_LINE_HEIGHT3 * labelLineCount;
   let h = labelH + NODE_V_PAD;
   if (text.descLines.length > 0) {
     h += DESC_LINE_HEIGHT3 * text.descLines.length + 4;
@@ -32795,7 +33082,7 @@ function populateDepthCache(roots) {
   };
   walk(roots, 0);
 }
-var ROOT_WIDTH, DEPTH1_WIDTH, LEAF_WIDTH, SINGLE_LABEL_HEIGHT, LABEL_LINE_HEIGHT2, DESC_LINE_HEIGHT3, NODE_V_PAD, H_GAP2, V_GAP2, MARGIN6, MULTI_ROOT_GAP, nodeDepthCache;
+var ROOT_WIDTH, DEPTH1_WIDTH, LEAF_WIDTH, SINGLE_LABEL_HEIGHT, LABEL_LINE_HEIGHT3, DESC_LINE_HEIGHT3, NODE_V_PAD, H_GAP2, V_GAP2, MARGIN6, MULTI_ROOT_GAP, nodeDepthCache;
 var init_layout6 = __esm({
   "src/mindmap/layout.ts"() {
     "use strict";
@@ -32806,7 +33093,7 @@ var init_layout6 = __esm({
     DEPTH1_WIDTH = 150;
     LEAF_WIDTH = 120;
     SINGLE_LABEL_HEIGHT = 28;
-    LABEL_LINE_HEIGHT2 = 18;
+    LABEL_LINE_HEIGHT3 = 18;
     DESC_LINE_HEIGHT3 = 14;
     NODE_V_PAD = 10;
     H_GAP2 = 40;
@@ -33097,18 +33384,18 @@ function renderMindmap(container, parsed, layout, palette, isDark, onClickItem,
       descFontSize
     } = textLayout;
     const labelLineCount = labelLines.length;
-    const labelZoneH = labelLineCount <= 1 ? SINGLE_LABEL_HEIGHT2 : LABEL_LINE_HEIGHT3 * labelLineCount;
+    const labelZoneH = labelLineCount <= 1 ? SINGLE_LABEL_HEIGHT2 : LABEL_LINE_HEIGHT4 * labelLineCount;
     const labelZoneHeight = showDesc ? labelZoneH : node.height;
     const centerX = node.x + node.width / 2;
     if (labelLineCount <= 1) {
       const labelY = node.y + labelZoneHeight / 2 + fontSize * 0.35;
       nodeG.append("text").attr("x", centerX).attr("y", labelY).attr("text-anchor", "middle").attr("font-size", fontSize).attr("font-weight", isRoot ? "bold" : "normal").attr("fill", onFillText).text(labelLines[0]);
     } else {
-      const blockH = LABEL_LINE_HEIGHT3 * (labelLineCount - 1);
+      const blockH = LABEL_LINE_HEIGHT4 * (labelLineCount - 1);
       const firstBaselineY = node.y + labelZoneHeight / 2 - blockH / 2 + fontSize * 0.35;
       const textEl = nodeG.append("text").attr("x", centerX).attr("text-anchor", "middle").attr("font-size", fontSize).attr("font-weight", isRoot ? "bold" : "normal").attr("fill", onFillText);
       for (let i = 0; i < labelLines.length; i++) {
-        textEl.append("tspan").attr("x", centerX).attr("y", firstBaselineY + i * LABEL_LINE_HEIGHT3).text(labelLines[i]);
+        textEl.append("tspan").attr("x", centerX).attr("y", firstBaselineY + i * LABEL_LINE_HEIGHT4).text(labelLines[i]);
       }
     }
     if (labelLines.length > 1 || labelLines[0] !== node.label) {
@@ -33183,7 +33470,7 @@ function renderMindmapForExport(content, theme, palette) {
     return extractExportSvg(container, theme);
   });
 }
-var d3Selection12, DIAGRAM_PADDING7, TITLE_HEIGHT4, SINGLE_LABEL_HEIGHT2, LABEL_LINE_HEIGHT3, DESC_LINE_HEIGHT4, NODE_RADIUS, ROOT_STROKE_WIDTH, DEPTH_COLOR_KEYS;
+var d3Selection12, DIAGRAM_PADDING7, TITLE_HEIGHT4, SINGLE_LABEL_HEIGHT2, LABEL_LINE_HEIGHT4, DESC_LINE_HEIGHT4, NODE_RADIUS, ROOT_STROKE_WIDTH, DEPTH_COLOR_KEYS;
 var init_renderer7 = __esm({
   "src/mindmap/renderer.ts"() {
     "use strict";
@@ -33206,7 +33493,7 @@ var init_renderer7 = __esm({
     DIAGRAM_PADDING7 = 20;
     TITLE_HEIGHT4 = 30;
     SINGLE_LABEL_HEIGHT2 = 28;
-    LABEL_LINE_HEIGHT3 = 18;
+    LABEL_LINE_HEIGHT4 = 18;
     DESC_LINE_HEIGHT4 = 14;
     NODE_RADIUS = 6;
     ROOT_STROKE_WIDTH = 2.5;
@@ -35873,7 +36160,7 @@ function renderC4Context(container, parsed, layout, palette, isDark, onClickItem
       const labelText = edge.label ?? "";
       const techText = edge.technology ? `[${edge.technology}]` : "";
       const textW = Math.max(
-        measureText(labelText, EDGE_LABEL_FONT_SIZE6),
+        measureText(labelText, EDGE_LABEL_FONT_SIZE7),
         measureText(techText, TECH_FONT_SIZE)
       );
       const bgW = textW + 12;
@@ -35884,7 +36171,7 @@ function renderC4Context(container, parsed, layout, palette, isDark, onClickItem
         textY = midPt.y - 4;
       }
       if (labelText) {
-        edgeG.append("text").attr("x", midPt.x).attr("y", textY + 4).attr("text-anchor", "middle").attr("fill", edgeColor3).attr("font-size", EDGE_LABEL_FONT_SIZE6).attr("class", "c4-edge-label").text(labelText);
+        edgeG.append("text").attr("x", midPt.x).attr("y", textY + 4).attr("text-anchor", "middle").attr("fill", edgeColor3).attr("font-size", EDGE_LABEL_FONT_SIZE7).attr("class", "c4-edge-label").text(labelText);
       }
       if (techText) {
         edgeG.append("text").attr("x", midPt.x).attr("y", labelText ? textY + 18 : textY + 4).attr("text-anchor", "middle").attr("fill", edgeColor3).attr("font-size", TECH_FONT_SIZE).attr("font-style", "italic").attr("class", "c4-edge-tech").text(techText);
@@ -36068,7 +36355,7 @@ function renderEdges(contentG, edges, palette, onClickItem, obstacleRects) {
       const labelText = edge.label ?? "";
       const techText = edge.technology ? `[${edge.technology}]` : "";
       const textW = Math.max(
-        measureText(labelText, EDGE_LABEL_FONT_SIZE6),
+        measureText(labelText, EDGE_LABEL_FONT_SIZE7),
         measureText(techText, TECH_FONT_SIZE)
       );
       const bgW = textW + 12;
@@ -36086,7 +36373,7 @@ function renderEdges(contentG, edges, palette, onClickItem, obstacleRects) {
       });
     }
   }
-  placeEdgeLabels(pendingLabels, edges, obstacleRects);
+  placeEdgeLabels2(pendingLabels, edges, obstacleRects);
   for (const lbl of pendingLabels) {
     lbl.edgeG.append("rect").attr("x", lbl.x - lbl.bgW / 2).attr("y", lbl.y - lbl.bgH / 2).attr("width", lbl.bgW).attr("height", lbl.bgH).attr("rx", 3).attr("fill", palette.bg).attr("opacity", 0.9).attr("class", "c4-edge-label-bg");
     let textY = lbl.y;
@@ -36094,7 +36381,7 @@ function renderEdges(contentG, edges, palette, onClickItem, obstacleRects) {
       textY = lbl.y - 4;
     }
     if (lbl.labelText) {
-      lbl.edgeG.append("text").attr("x", lbl.x).attr("y", textY + 4).attr("text-anchor", "middle").attr("fill", lbl.edgeColor).attr("font-size", EDGE_LABEL_FONT_SIZE6).attr("class", "c4-edge-label").text(lbl.labelText);
+      lbl.edgeG.append("text").attr("x", lbl.x).attr("y", textY + 4).attr("text-anchor", "middle").attr("fill", lbl.edgeColor).attr("font-size", EDGE_LABEL_FONT_SIZE7).attr("class", "c4-edge-label").text(lbl.labelText);
     }
     if (lbl.techText) {
       lbl.edgeG.append("text").attr("x", lbl.x).attr("y", lbl.labelText ? textY + 18 : textY + 4).attr("text-anchor", "middle").attr("fill", lbl.edgeColor).attr("font-size", TECH_FONT_SIZE).attr("font-style", "italic").attr("class", "c4-edge-tech").text(lbl.techText);
@@ -36175,7 +36462,7 @@ function tangentAt(points, t) {
   }
   return { x: 0, y: 1 };
 }
-function placeEdgeLabels(labels, edges, obstacleRects) {
+function placeEdgeLabels2(labels, edges, obstacleRects) {
   if (labels.length === 0) return;
   const allPaths = edges.map((e) => e.points);
   const placedRects = [];
@@ -36713,7 +37000,7 @@ function renderC4DeploymentForExport(content, theme, palette) {
     document.body.removeChild(el);
   }
 }
-var d3Selection14, d3Shape6, DIAGRAM_PADDING8, MAX_SCALE5, TITLE_HEIGHT6, TYPE_FONT_SIZE, NAME_FONT_SIZE2, DESC_FONT_SIZE5, DESC_LINE_HEIGHT6, EDGE_LABEL_FONT_SIZE6, TECH_FONT_SIZE, CARD_H_PAD4, CARD_V_PAD4, TYPE_LABEL_HEIGHT2, DIVIDER_GAP2, NAME_HEIGHT2, BOUNDARY_LABEL_FONT_SIZE, BOUNDARY_STROKE_WIDTH, BOUNDARY_RADIUS, DRILL_BAR_HEIGHT, CYLINDER_RY, PERSON_HEAD_R, PERSON_ARM_SPAN, PERSON_LEG_SPAN, PERSON_ICON_W, PERSON_SW, lineGenerator4;
+var d3Selection14, d3Shape6, DIAGRAM_PADDING8, MAX_SCALE5, TITLE_HEIGHT6, TYPE_FONT_SIZE, NAME_FONT_SIZE2, DESC_FONT_SIZE5, DESC_LINE_HEIGHT6, EDGE_LABEL_FONT_SIZE7, TECH_FONT_SIZE, CARD_H_PAD4, CARD_V_PAD4, TYPE_LABEL_HEIGHT2, DIVIDER_GAP2, NAME_HEIGHT2, BOUNDARY_LABEL_FONT_SIZE, BOUNDARY_STROKE_WIDTH, BOUNDARY_RADIUS, DRILL_BAR_HEIGHT, CYLINDER_RY, PERSON_HEAD_R, PERSON_ARM_SPAN, PERSON_LEG_SPAN, PERSON_ICON_W, PERSON_SW, lineGenerator4;
 var init_renderer9 = __esm({
   "src/c4/renderer.ts"() {
     "use strict";
@@ -36738,7 +37025,7 @@ var init_renderer9 = __esm({
     NAME_FONT_SIZE2 = 14;
     DESC_FONT_SIZE5 = 11;
     DESC_LINE_HEIGHT6 = 16;
-    EDGE_LABEL_FONT_SIZE6 = 11;
+    EDGE_LABEL_FONT_SIZE7 = 11;
     TECH_FONT_SIZE = 10;
     CARD_H_PAD4 = 20;
     CARD_V_PAD4 = 14;
@@ -37362,7 +37649,7 @@ function renderFlowchart(container, graph, layout, palette, isDark, onClickItem,
   const sTitleFontSize = ctx.text(TITLE_FONT_SIZE);
   const sTitleY = ctx.structural(TITLE_Y);
   const sNodeFontSize = ctx.text(NODE_FONT_SIZE2);
-  const sEdgeLabelFontSize = ctx.text(EDGE_LABEL_FONT_SIZE7);
+  const sEdgeLabelFontSize = ctx.text(EDGE_LABEL_FONT_SIZE8);
   const sEdgeStrokeWidth = ctx.structural(EDGE_STROKE_WIDTH);
   const sNodeStrokeWidth = ctx.structural(NODE_STROKE_WIDTH);
   const sArrowheadW = ctx.structural(ARROWHEAD_W3);
@@ -37588,7 +37875,7 @@ function renderFlowchartForExport(content, theme, palette) {
     document.body.removeChild(container);
   }
 }
-var d3Selection15, DIAGRAM_PADDING9, MAX_SCALE6, NODE_FONT_SIZE2, EDGE_LABEL_FONT_SIZE7, ARROWHEAD_W3, ARROWHEAD_H3, IO_SKEW, SUBROUTINE_INSET, DOC_WAVE_HEIGHT;
+var d3Selection15, DIAGRAM_PADDING9, MAX_SCALE6, NODE_FONT_SIZE2, EDGE_LABEL_FONT_SIZE8, ARROWHEAD_W3, ARROWHEAD_H3, IO_SKEW, SUBROUTINE_INSET, DOC_WAVE_HEIGHT;
 var init_flowchart_renderer = __esm({
   "src/graph/flowchart-renderer.ts"() {
     "use strict";
@@ -37608,7 +37895,7 @@ var init_flowchart_renderer = __esm({
     DIAGRAM_PADDING9 = 20;
     MAX_SCALE6 = 3;
     NODE_FONT_SIZE2 = 13;
-    EDGE_LABEL_FONT_SIZE7 = 11;
+    EDGE_LABEL_FONT_SIZE8 = 11;
     ARROWHEAD_W3 = 10;
     ARROWHEAD_H3 = 7;
     IO_SKEW = 15;
@@ -39042,7 +39329,7 @@ function layoutInfra(computed, expandedNodeIds, collapsedNodes) {
       const midIdx = Math.floor(edge.points.length / 2);
       const midPt = edge.points[midIdx];
       if (midPt) {
-        const halfWidth = (measureText(edge.label, EDGE_LABEL_FONT_SIZE8) + 8) / 2;
+        const halfWidth = (measureText(edge.label, EDGE_LABEL_FONT_SIZE9) + 8) / 2;
         if (midPt.x - halfWidth < minX) minX = midPt.x - halfWidth;
         if (midPt.x + halfWidth > maxX) maxX = midPt.x + halfWidth;
       }
@@ -39076,7 +39363,7 @@ function layoutInfra(computed, expandedNodeIds, collapsedNodes) {
     height: totalHeight
   };
 }
-var import_dagre7, MIN_NODE_WIDTH2, NODE_HEADER_HEIGHT, META_LINE_HEIGHT5, NODE_SEPARATOR_GAP, NODE_PAD_BOTTOM, ROLE_DOT_ROW, COLLAPSE_BAR_HEIGHT3, NODE_FONT_SIZE3, META_FONT_SIZE5, EDGE_LABEL_FONT_SIZE8, PADDING_X3, GROUP_PADDING2, GROUP_HEADER_HEIGHT, EDGE_MARGIN, DISPLAY_KEYS, DISPLAY_NAMES, GROUP_GAP2;
+var import_dagre7, MIN_NODE_WIDTH2, NODE_HEADER_HEIGHT, META_LINE_HEIGHT5, NODE_SEPARATOR_GAP, NODE_PAD_BOTTOM, ROLE_DOT_ROW, COLLAPSE_BAR_HEIGHT3, NODE_FONT_SIZE3, META_FONT_SIZE5, EDGE_LABEL_FONT_SIZE9, PADDING_X3, GROUP_PADDING2, GROUP_HEADER_HEIGHT, EDGE_MARGIN, DISPLAY_KEYS, DISPLAY_NAMES, GROUP_GAP2;
 var init_layout10 = __esm({
   "src/infra/layout.ts"() {
     "use strict";
@@ -39091,7 +39378,7 @@ var init_layout10 = __esm({
     COLLAPSE_BAR_HEIGHT3 = 6;
     NODE_FONT_SIZE3 = 13;
     META_FONT_SIZE5 = 10;
-    EDGE_LABEL_FONT_SIZE8 = 11;
+    EDGE_LABEL_FONT_SIZE9 = 11;
     PADDING_X3 = 24;
     GROUP_PADDING2 = 20;
     GROUP_HEADER_HEIGHT = 24;
@@ -39196,7 +39483,7 @@ function buildScaledConstants(ctx) {
     sNodeFontSize: ctx.text(NODE_FONT_SIZE4),
     sMetaFontSize: ctx.text(META_FONT_SIZE6),
     sMetaLineHeight: ctx.structural(META_LINE_HEIGHT6),
-    sEdgeLabelFontSize: ctx.text(EDGE_LABEL_FONT_SIZE9),
+    sEdgeLabelFontSize: ctx.text(EDGE_LABEL_FONT_SIZE10),
     sGroupLabelFontSize: ctx.text(GROUP_LABEL_FONT_SIZE2),
     sNodeBorderRadius: ctx.structural(NODE_BORDER_RADIUS),
     sEdgeStrokeWidth: ctx.structural(EDGE_STROKE_WIDTH),
@@ -39925,7 +40212,7 @@ function renderEdgeLabels(svg, edges, nodes, groups, palette, _isDark, animate,
     if (!midPt) continue;
     const labelText = edge.label;
     const g = svg.append("g").attr("class", animate ? "infra-edge-label" : "");
-    const textWidth = measureText(labelText, EDGE_LABEL_FONT_SIZE9) + 8;
+    const textWidth = measureText(labelText, EDGE_LABEL_FONT_SIZE10) + 8;
     g.append("rect").attr("x", midPt.x - textWidth / 2).attr("y", midPt.y - 8).attr("width", textWidth).attr("height", 16).attr("rx", 3).attr("fill", palette.bg).attr("opacity", 0.9);
     g.append("text").attr("x", midPt.x).attr("y", midPt.y + 4).attr("text-anchor", "middle").attr("font-family", FONT_FAMILY).attr("font-size", sc.sEdgeLabelFontSize).attr("fill", palette.textMuted).text(labelText);
     if (animate) {
@@ -40535,7 +40822,7 @@ function parseAndLayoutInfra(content) {
   const layout = layoutInfra(computed);
   return { parsed, computed, layout };
 }
-var d3Selection16, d3Shape8, NODE_FONT_SIZE4, META_FONT_SIZE6, META_LINE_HEIGHT6, EDGE_LABEL_FONT_SIZE9, GROUP_LABEL_FONT_SIZE2, NODE_BORDER_RADIUS, OVERLOAD_STROKE_WIDTH, ROLE_DOT_RADIUS, NODE_HEADER_HEIGHT2, NODE_SEPARATOR_GAP2, NODE_PAD_BOTTOM2, LEGEND_FIXED_GAP3, SPEED_BADGE_H_PAD, SPEED_BADGE_V_PAD, SPEED_BADGE_GAP, COLOR_HEALTHY, COLOR_WARNING, COLOR_OVERLOADED, FLOW_SPEED_MIN, FLOW_SPEED_MAX, PARTICLE_R, PARTICLE_COUNT_MIN, PARTICLE_COUNT_MAX, NODE_PULSE_SPEED, NODE_PULSE_OVERLOAD, REJECT_DROP_DISTANCE, REJECT_DURATION_MIN, REJECT_DURATION_MAX, REJECT_COUNT_MIN, REJECT_COUNT_MAX, PROP_DISPLAY, DESC_MAX_CHARS, DESC_MAX_WIDTH, RPS_FORMAT_KEYS, MS_FORMAT_KEYS, PCT_FORMAT_KEYS;
+var d3Selection16, d3Shape8, NODE_FONT_SIZE4, META_FONT_SIZE6, META_LINE_HEIGHT6, EDGE_LABEL_FONT_SIZE10, GROUP_LABEL_FONT_SIZE2, NODE_BORDER_RADIUS, OVERLOAD_STROKE_WIDTH, ROLE_DOT_RADIUS, NODE_HEADER_HEIGHT2, NODE_SEPARATOR_GAP2, NODE_PAD_BOTTOM2, LEGEND_FIXED_GAP3, SPEED_BADGE_H_PAD, SPEED_BADGE_V_PAD, SPEED_BADGE_GAP, COLOR_HEALTHY, COLOR_WARNING, COLOR_OVERLOADED, FLOW_SPEED_MIN, FLOW_SPEED_MAX, PARTICLE_R, PARTICLE_COUNT_MIN, PARTICLE_COUNT_MAX, NODE_PULSE_SPEED, NODE_PULSE_OVERLOAD, REJECT_DROP_DISTANCE, REJECT_DURATION_MIN, REJECT_DURATION_MAX, REJECT_COUNT_MIN, REJECT_COUNT_MAX, PROP_DISPLAY, DESC_MAX_CHARS, DESC_MAX_WIDTH, RPS_FORMAT_KEYS, MS_FORMAT_KEYS, PCT_FORMAT_KEYS;
 var init_renderer10 = __esm({
   "src/infra/renderer.ts"() {
     "use strict";
@@ -40561,7 +40848,7 @@ var init_renderer10 = __esm({
     NODE_FONT_SIZE4 = 13;
     META_FONT_SIZE6 = 10;
     META_LINE_HEIGHT6 = 14;
-    EDGE_LABEL_FONT_SIZE9 = 11;
+    EDGE_LABEL_FONT_SIZE10 = 11;
     GROUP_LABEL_FONT_SIZE2 = 14;
     NODE_BORDER_RADIUS = 8;
     OVERLOAD_STROKE_WIDTH = 3;
@@ -46949,7 +47236,7 @@ function renderState(container, graph, layout, palette, isDark, onClickItem, exp
   const sTitleFontSize = ctx.text(TITLE_FONT_SIZE);
   const sTitleY = ctx.structural(TITLE_Y);
   const sNodeFontSize = ctx.text(NODE_FONT_SIZE6);
-  const sEdgeLabelFontSize = ctx.text(EDGE_LABEL_FONT_SIZE10);
+  const sEdgeLabelFontSize = ctx.text(EDGE_LABEL_FONT_SIZE11);
   const sGroupLabelFontSize = ctx.text(GROUP_LABEL_FONT_SIZE3);
   const sEdgeStrokeWidth = ctx.structural(EDGE_STROKE_WIDTH);
   const sNodeStrokeWidth = ctx.structural(NODE_STROKE_WIDTH);
@@ -47229,7 +47516,7 @@ function renderStateForExport(content, theme, palette) {
     document.body.removeChild(container);
   }
 }
-var d3Selection19, DIAGRAM_PADDING12, MAX_SCALE7, NODE_FONT_SIZE6, EDGE_LABEL_FONT_SIZE10, GROUP_LABEL_FONT_SIZE3, ARROWHEAD_W5, ARROWHEAD_H5, PSEUDOSTATE_RADIUS, STATE_CORNER_RADIUS, GROUP_EXTRA_PADDING;
+var d3Selection19, DIAGRAM_PADDING12, MAX_SCALE7, NODE_FONT_SIZE6, EDGE_LABEL_FONT_SIZE11, GROUP_LABEL_FONT_SIZE3, ARROWHEAD_W5, ARROWHEAD_H5, PSEUDOSTATE_RADIUS, STATE_CORNER_RADIUS, GROUP_EXTRA_PADDING;
 var init_state_renderer = __esm({
   "src/graph/state-renderer.ts"() {
     "use strict";
@@ -47249,7 +47536,7 @@ var init_state_renderer = __esm({
     DIAGRAM_PADDING12 = 20;
     MAX_SCALE7 = 3;
     NODE_FONT_SIZE6 = 13;
-    EDGE_LABEL_FONT_SIZE10 = 11;
+    EDGE_LABEL_FONT_SIZE11 = 11;
     GROUP_LABEL_FONT_SIZE3 = 11;
     ARROWHEAD_W5 = 10;
     ARROWHEAD_H5 = 7;
@@ -50071,10 +50358,10 @@ function renderedDescNodeHeight(numLines, scale) {
   return headerH + textBlockH + bottomPad;
 }
 function wrapEdgeLabelText(label, description, maxWidth = EDGE_LABEL_MAX_WIDTH) {
-  const labelLines = label ? wrapTextToWidth(label, EDGE_LABEL_FONT_SIZE11, maxWidth) : [];
+  const labelLines = label ? wrapTextToWidth(label, EDGE_LABEL_FONT_SIZE12, maxWidth) : [];
   const descLines = [];
   for (const d of description) {
-    descLines.push(...wrapTextToWidth(d, EDGE_LABEL_FONT_SIZE11, maxWidth));
+    descLines.push(...wrapTextToWidth(d, EDGE_LABEL_FONT_SIZE12, maxWidth));
   }
   return { labelLines, descLines };
 }
@@ -50212,9 +50499,9 @@ function computeEdgePaths(layoutNodes, parsed, cx, cy, radius, isClockwise) {
     const lineCount = labelLines.length + descLines.length;
     let labelPxW = 0;
     for (const l of labelLines)
-      labelPxW = Math.max(labelPxW, measureText(l, EDGE_LABEL_FONT_SIZE11));
+      labelPxW = Math.max(labelPxW, measureText(l, EDGE_LABEL_FONT_SIZE12));
     for (const l of descLines)
-      labelPxW = Math.max(labelPxW, measureText(l, EDGE_LABEL_FONT_SIZE11));
+      labelPxW = Math.max(labelPxW, measureText(l, EDGE_LABEL_FONT_SIZE12));
     const { labelX, labelY, labelAngle } = computeEdgeLabelPosition(
       midAngle,
       radius,
@@ -50316,9 +50603,9 @@ function fitToCanvas(nodes, edges, parsed, _cx, _cy, radius, width, height, _isC
     );
     let textWidth = 0;
     for (const l of labelLines)
-      textWidth = Math.max(textWidth, measureText(l, EDGE_LABEL_FONT_SIZE11));
+      textWidth = Math.max(textWidth, measureText(l, EDGE_LABEL_FONT_SIZE12));
     for (const l of descLines)
-      textWidth = Math.max(textWidth, measureText(l, EDGE_LABEL_FONT_SIZE11));
+      textWidth = Math.max(textWidth, measureText(l, EDGE_LABEL_FONT_SIZE12));
     if (textWidth === 0) continue;
     const normAngle = (le.labelAngle % (2 * Math.PI) + 2 * Math.PI) % (2 * Math.PI);
     const isRight = normAngle < Math.PI * 0.4 || normAngle > Math.PI * 1.6;
@@ -50392,7 +50679,7 @@ function buildEdgeArc(src, tgt, cx, cy, radius, isClockwise, arrowLength = 0) {
   const midAngle = srcExitAngle + dir * visibleSweep / 2;
   return { path, midAngle };
 }
-var MIN_ARC_ANGLE, LABEL_FONT_SIZE4, CIRCLE_LABEL_FONT_SIZE, DESC_FONT_SIZE6, EDGE_LABEL_FONT_SIZE11, MIN_NODE_WIDTH4, MAX_NODE_WIDTH3, DESC_MIN_WIDTH, DESC_WIDTH_STEP, DESC_TARGET_RATIO, PLAIN_NODE_HEIGHT, HEADER_HEIGHT4, DESC_LINE_HEIGHT7, DESC_PAD_Y, NODE_PAD_X, MIN_CIRCLE_RADIUS, CIRCLE_PAD, RENDERER_DESC_FONT, RENDERER_DESC_FONT_MIN, RENDERER_DESC_LINE_H, RENDERER_DESC_LINE_H_MIN, EDGE_LABEL_MAX_WIDTH;
+var MIN_ARC_ANGLE, LABEL_FONT_SIZE4, CIRCLE_LABEL_FONT_SIZE, DESC_FONT_SIZE6, EDGE_LABEL_FONT_SIZE12, MIN_NODE_WIDTH4, MAX_NODE_WIDTH3, DESC_MIN_WIDTH, DESC_WIDTH_STEP, DESC_TARGET_RATIO, PLAIN_NODE_HEIGHT, HEADER_HEIGHT4, DESC_LINE_HEIGHT7, DESC_PAD_Y, NODE_PAD_X, MIN_CIRCLE_RADIUS, CIRCLE_PAD, RENDERER_DESC_FONT, RENDERER_DESC_FONT_MIN, RENDERER_DESC_LINE_H, RENDERER_DESC_LINE_H_MIN, EDGE_LABEL_MAX_WIDTH;
 var init_layout14 = __esm({
   "src/cycle/layout.ts"() {
     "use strict";
@@ -50403,7 +50690,7 @@ var init_layout14 = __esm({
     LABEL_FONT_SIZE4 = 13;
     CIRCLE_LABEL_FONT_SIZE = 16;
     DESC_FONT_SIZE6 = 11;
-    EDGE_LABEL_FONT_SIZE11 = 11;
+    EDGE_LABEL_FONT_SIZE12 = 11;
     MIN_NODE_WIDTH4 = 70;
     MAX_NODE_WIDTH3 = 260;
     DESC_MIN_WIDTH = 140;
@@ -50548,7 +50835,7 @@ function renderCycle(container, parsed, palette, isDark, onClickItem, exportDims
   const scaledNodeFont = Math.max(6, Math.round(NODE_FONT_SIZE7 * layout.scale));
   const scaledEdgeLabelFont = Math.max(
     6,
-    Math.round(EDGE_LABEL_FONT_SIZE12 * layout.scale)
+    Math.round(EDGE_LABEL_FONT_SIZE13 * layout.scale)
   );
   const CIRCLE_LABEL_FONT_SIZE2 = 16;
   const scaledCircleLabelFont = Math.max(
@@ -50711,7 +50998,7 @@ function ensureArrowMarker(defs, color, strokeWidth) {
   const mh = Math.max(1.5, mw * 0.5);
   defs.append("marker").attr("id", id).attr("viewBox", `0 0 ${mw} ${mh}`).attr("refX", mw * 0.1).attr("refY", mh / 2).attr("markerWidth", mw).attr("markerHeight", mh).attr("orient", "auto").append("polygon").attr("points", `0,0 ${mw},${mh / 2} 0,${mh}`).attr("fill", color);
 }
-var d3Selection22, NODE_FONT_SIZE7, DESC_FONT_SIZE7, EDGE_LABEL_FONT_SIZE12, DESC_LINE_HEIGHT8, TITLE_AREA_HEIGHT;
+var d3Selection22, NODE_FONT_SIZE7, DESC_FONT_SIZE7, EDGE_LABEL_FONT_SIZE13, DESC_LINE_HEIGHT8, TITLE_AREA_HEIGHT;
 var init_renderer15 = __esm({
   "src/cycle/renderer.ts"() {
     "use strict";
@@ -50729,7 +51016,7 @@ var init_renderer15 = __esm({
     init_text_measure();
     NODE_FONT_SIZE7 = 13;
     DESC_FONT_SIZE7 = 11;
-    EDGE_LABEL_FONT_SIZE12 = 11;
+    EDGE_LABEL_FONT_SIZE13 = 11;
     DESC_LINE_HEIGHT8 = 15;
     TITLE_AREA_HEIGHT = 50;
   }
@@ -51127,7 +51414,7 @@ function resolveMap(parsed, data) {
       const hint = suggest(r.name, allNames);
       err(
         r.lineNumber,
-        `Unknown subdivision "${r.name}".${hint ? " " + hint : ""}`,
+        `Unknown region "${r.name}" \u2014 not a known country or US state.${hint ? " " + hint : ""} Search the exact token with \`dgmo map-search "${r.name}"\` (or the lookup_map_location tool), use an ISO code (e.g. FR, US-CA), or coordinates.`,
         "E_MAP_UNKNOWN_SUBDIVISION"
       );
       continue;
@@ -51207,7 +51494,7 @@ function resolveMap(parsed, data) {
       const hint = suggest(name, cityNames);
       err(
         line11,
-        `Unknown place "${name}" (not in the gazetteer; use coordinates).${hint ? " " + hint : ""}`,
+        `Unknown place "${name}" \u2014 not in the gazetteer.${hint ? " " + hint : ""} Search the exact token with \`dgmo map-search "${name}"\` (or the lookup_map_location tool), or use coordinates \`poi <lat> <lon>\`.`,
         "E_MAP_UNKNOWN_PLACE"
       );
       return { kind: "miss" };
@@ -51749,6 +52036,21 @@ function mapLegendBand(legend, opts) {
   if (height <= 0) return 0;
   return mapLegendTop(opts.hasTitle, opts.hasSubtitle) + height + LEGEND_BOTTOM_GAP2;
 }
+function mapLegendBox(legend, opts) {
+  if (!legend) return null;
+  const groups = mapLegendGroups(legend);
+  if (groups.length === 0) return null;
+  const config = mapLegendConfig(groups, opts.mode);
+  const state = { activeGroup: legend.activeGroup };
+  const { width, height } = computeLegendLayout(config, state, opts.width);
+  if (height <= 0 || width <= 0) return null;
+  return {
+    x: (opts.width - width) / 2,
+    y: mapLegendTop(opts.hasTitle, opts.hasSubtitle),
+    width,
+    height
+  };
+}
 var LEGEND_TOP_GAP2, LEGEND_BOTTOM_GAP2;
 var init_legend_band = __esm({
   "src/map/legend-band.ts"() {
@@ -51873,6 +52175,8 @@ function placeContextLabels(args) {
     waterBodies,
     countries,
     palette,
+    countryTone,
+    waterTone,
     project,
     collides,
     contentPoints,
@@ -51882,8 +52186,8 @@ function placeContextLabels(args) {
   const band = tierBand(Math.max(dLonSpan, dLatSpan));
   const budget = labelBudget(width, height, band);
   if (budget <= 0) return [];
-  const waterColor = mix(palette.colors.blue, palette.textMuted, 50);
-  const countryColor = palette.textMuted;
+  const waterColor = waterTone ?? mix(palette.colors.blue, palette.textMuted, 50);
+  const countryColor = countryTone ?? palette.textMuted;
   const haloColor = palette.bg;
   const candidates = [];
   const center = [width / 2, height / 2];
@@ -51972,8 +52276,7 @@ function placeContextLabels(args) {
       )
     );
     const fontSize = Math.round(FONT + t * (COUNTRY_FONT_MAX - FONT));
-    const fade = Math.round(t * COUNTRY_FADE_MAX);
-    const color = fade > 0 ? mix(countryColor, palette.bg, 100 - fade) : countryColor;
+    const color = countryColor;
     const text = c.name;
     const tw = labelWidth(text, 0, fontSize);
     if (tw > w || fontSize + 2 * PADY > h) continue;
@@ -52067,7 +52370,7 @@ function placeContextLabels(args) {
   }
   return placed;
 }
-var FONT, LINE_HEIGHT, PADX, PADY, WATER_LETTER_SPACING, CONTEXT_PAD, EDGE_CLAMP_MARGIN, EDGE_CLAMP_OVERSHOOT, COUNTRY_FONT_MAX, COUNTRY_SIZE_FRAC_MIN, COUNTRY_SIZE_FRAC_MAX, COUNTRY_FADE_MAX, MAX_COUNTRY_POSITIONS, COUNTRY_POS_GRID, COUNTRY_POS_TOPN_MARGIN, KIND_ORDER;
+var FONT, LINE_HEIGHT, PADX, PADY, WATER_LETTER_SPACING, CONTEXT_PAD, EDGE_CLAMP_MARGIN, EDGE_CLAMP_OVERSHOOT, COUNTRY_FONT_MAX, COUNTRY_SIZE_FRAC_MIN, COUNTRY_SIZE_FRAC_MAX, MAX_COUNTRY_POSITIONS, COUNTRY_POS_GRID, COUNTRY_POS_TOPN_MARGIN, KIND_ORDER;
 var init_context_labels = __esm({
   "src/map/context-labels.ts"() {
     "use strict";
@@ -52084,7 +52387,6 @@ var init_context_labels = __esm({
     COUNTRY_FONT_MAX = 22;
     COUNTRY_SIZE_FRAC_MIN = 0.06;
     COUNTRY_SIZE_FRAC_MAX = 0.32;
-    COUNTRY_FADE_MAX = 45;
     MAX_COUNTRY_POSITIONS = 4;
     COUNTRY_POS_GRID = 5;
     COUNTRY_POS_TOPN_MARGIN = 3;
@@ -52211,36 +52513,23 @@ function countryLabelPositions(args) {
     return n;
   };
   const dist2ToCentre = (c) => (c.sx - cx) ** 2 + (c.sy - cy) ** 2;
-  const pool = [...kept];
-  pool.sort((a, b) => {
-    const d = interiorness(b) - interiorness(a);
-    return d !== 0 ? d : dist2ToCentre(a) - dist2ToCentre(b);
-  });
-  const ordered = [pool.shift()];
-  while (ordered.length < MAX_COUNTRY_POSITIONS && pool.length) {
-    let bestIdx = 0;
-    let bestMin = -1;
-    for (let k = 0; k < pool.length; k++) {
-      const c = pool[k];
-      let minD = Infinity;
-      for (const o of ordered) {
-        const d = (c.sx - o.sx) ** 2 + (c.sy - o.sy) ** 2;
-        if (d < minD) minD = d;
-      }
-      if (minD > bestMin) {
-        bestMin = minD;
-        bestIdx = k;
-      }
+  const centreLon = kept.reduce((s, c) => s + c.lon, 0) / kept.length;
+  const centreLat = kept.reduce((s, c) => s + c.lat, 0) / kept.length;
+  const centreScreen = project(centreLon, centreLat);
+  const lead = pointInGeometry(geometry, centreLon, centreLat) && centreScreen && Number.isFinite(centreScreen[0]) && Number.isFinite(centreScreen[1]) && centreScreen[0] >= 0 && centreScreen[0] <= width && centreScreen[1] >= 0 && centreScreen[1] <= height ? [
+    {
+      lonLat: [centreLon, centreLat],
+      screen: [centreScreen[0], centreScreen[1]]
     }
-    ordered.push(pool.splice(bestIdx, 1)[0]);
-  }
-  const grid = ordered.map((c) => ({
+  ] : [];
+  const grid = [...kept].sort(
+    (a, b) => interiorness(b) - interiorness(a) || dist2ToCentre(a) - dist2ToCentre(b)
+  ).map((c) => ({
     lonLat: [c.lon, c.lat],
     screen: [c.sx, c.sy]
   }));
   const curatedPos = curated ? mkCurated(curated, project) : [];
-  const out = [...curatedPos, ...grid].slice(0, MAX_COUNTRY_POSITIONS);
-  return out;
+  return [...curatedPos, ...lead, ...grid].slice(0, MAX_COUNTRY_POSITIONS);
 }
 function mkCurated(curated, project) {
   if (!curated) return [];
@@ -52506,6 +52795,25 @@ function layoutMap(resolvedIn, data, size, opts) {
     palette.bg,
     mutedBasemap ? isDark ? MUTED_FOREIGN_DARK : MUTED_FOREIGN_LIGHT : isDark ? FOREIGN_TINT_DARK : FOREIGN_TINT_LIGHT
   );
+  const contrastFloorTone = (tone, ...substrates) => {
+    const clears = (t) => substrates.every((s) => contrastRatio(t, s) >= REGION_LABEL_HALO_RATIO);
+    if (clears(tone)) return tone;
+    for (let s = 10; s <= 100; s += 10) {
+      const t = mix(palette.text, tone, s);
+      if (clears(t)) return t;
+    }
+    return palette.text;
+  };
+  const backdropLandTone = contrastFloorTone(
+    palette.textMuted,
+    neutralFill,
+    water
+  );
+  const backdropWaterTone = contrastFloorTone(
+    mix(palette.colors.blue, palette.textMuted, 50),
+    water,
+    neutralFill
+  );
   const hasDirectColor = resolved.regions.some((r) => r.color !== void 0);
   const colorizeActive = resolved.directives.noColorize !== true && !hasRamp && !hasDirectColor && fillGroupNames.size === 0;
   const colorByIso = /* @__PURE__ */ new Map();
@@ -52620,6 +52928,33 @@ function layoutMap(resolvedIn, data, size, opts) {
     hasSubtitle: Boolean(resolved.subtitle)
   });
   if (legendBand > topPad) topPad = legendBand;
+  const topReserved = [];
+  if (shownTitle) {
+    const lines = resolved.subtitle ? 2 : 1;
+    const tw = Math.max(
+      measureLegendText(shownTitle, TITLE_FONT_SIZE),
+      resolved.subtitle ? measureLegendText(resolved.subtitle, TITLE_FONT_SIZE) : 0
+    ) + 2 * TITLE_FONT_SIZE;
+    topReserved.push({
+      x: width / 2 - tw / 2,
+      y: TITLE_Y - TITLE_FONT_SIZE,
+      w: tw,
+      h: TITLE_FONT_SIZE * (lines + 0.5)
+    });
+  }
+  const legendBox = mapLegendBox(legend, {
+    width,
+    mode: opts.legendMode ?? "preview",
+    hasTitle: Boolean(shownTitle),
+    hasSubtitle: Boolean(resolved.subtitle)
+  });
+  if (legendBox)
+    topReserved.push({
+      x: legendBox.x,
+      y: legendBox.y,
+      w: legendBox.width,
+      h: legendBox.height
+    });
   const reserve = opts._calloutReserve;
   const fitLeft = FIT_PAD + (reserve?.left ?? 0);
   const fitRight = width - FIT_PAD - (reserve?.right ?? 0);
@@ -53349,6 +53684,19 @@ function layoutMap(resolvedIn, data, size, opts) {
     const by = b.cy - (b.cy - py) / tb * trimB;
     return `M${ax},${ay}Q${px},${py} ${bx},${by}`;
   };
+  const legLabelPoint = (a, b, curved, offset) => {
+    const mx = (a.cx + b.cx) / 2;
+    const my = (a.cy + b.cy) / 2;
+    if (!curved && offset === 0) return { x: mx, y: my - 4 };
+    const dx = b.cx - a.cx;
+    const dy = b.cy - a.cy;
+    const len = Math.hypot(dx, dy) || 1;
+    const nx = -dy / len;
+    const ny = dx / len;
+    const bow = offset !== 0 ? offset : len * ARC_CURVE_FRAC;
+    const off = bow * 0.5 + Math.sign(bow || 1) * 8;
+    return { x: mx + nx * off, y: my + ny * off };
+  };
   const routeLegVals = resolved.routes.flatMap((rt) => rt.legs).map((l) => Number(l.value)).filter((n) => Number.isFinite(n) && n > 0);
   const rlMin = routeLegVals.length ? Math.min(...routeLegVals) : 0;
   const rlMax = routeLegVals.length ? Math.max(...routeLegVals) : 0;
@@ -53362,13 +53710,12 @@ function layoutMap(resolvedIn, data, size, opts) {
       const a = poiScreen.get(leg.fromId);
       const b = poiScreen.get(leg.toId);
       if (!a || !b) continue;
-      const mx = (a.cx + b.cx) / 2;
-      const my = (a.cy + b.cy) / 2;
+      const lp = legLabelPoint(a, b, leg.style === "arc", 0);
       const bow = {
         curved: leg.style === "arc",
         offset: 0,
-        labelX: mx,
-        labelY: my - 4
+        labelX: lp.x,
+        labelY: lp.y
       };
       const routeLabelStyle = leg.label !== void 0 ? labelOnFill(fillAt(bow.labelX, bow.labelY)) : void 0;
       legs.push({
@@ -53415,13 +53762,13 @@ function layoutMap(resolvedIn, data, size, opts) {
       const b = poiScreen.get(e.toId);
       if (!a || !b) return;
       const fanOffset = n > 1 ? (i - (n - 1) / 2) * FAN_STEP : 0;
-      const mx = (a.cx + b.cx) / 2;
-      const my = (a.cy + b.cy) / 2;
+      const curved = e.style === "arc" || n > 1;
+      const lp = legLabelPoint(a, b, curved, fanOffset);
       const bow = {
-        curved: e.style === "arc" || n > 1,
+        curved,
         offset: fanOffset,
-        labelX: mx,
-        labelY: my - 4
+        labelX: lp.x,
+        labelY: lp.y
       };
       const edgeLabelStyle = e.label !== void 0 ? labelOnFill(fillAt(bow.labelX, bow.labelY)) : void 0;
       legs.push({
@@ -53445,7 +53792,7 @@ function layoutMap(resolvedIn, data, size, opts) {
     });
   }
   const labels = [];
-  const obstacles = [];
+  const obstacles = [...topReserved];
   const regionLabelGuards = [];
   const markers = pois.map((p) => ({
     cx: p.cx,
@@ -53483,6 +53830,7 @@ function layoutMap(resolvedIn, data, size, opts) {
   }
   const collides = (rect) => markers.some((m) => rectCircleOverlap(rect, m)) || obstacles.some((o) => rectsOverlap(rect, o)) || legSegments.some((s) => segmentRectOverlap(s[0], s[1], s[2], s[3], rect));
   const showRegionLabels = resolved.directives.noRegionLabels !== true;
+  const labeledRegionIds = /* @__PURE__ */ new Set();
   const showRegionValues = resolved.directives.noRegionValue !== true && activeIsScore;
   const regionValueStr = (value) => showRegionValues && value !== void 0 ? compactNumber(value) : void 0;
   const isCompact = width < COMPACT_WIDTH_PX;
@@ -53503,7 +53851,9 @@ function layoutMap(resolvedIn, data, size, opts) {
   const REGION_FONT_MAX_ORIENT = 22;
   const REGION_SIZE_FRAC_MIN = 0.06;
   const REGION_SIZE_FRAC_MAX = 0.32;
-  const REGION_FADE_ORIENT = 45;
+  const SUBJECT_FONT_MAX = 18;
+  const SUBJECT_MIN_PROMINENCE = 13;
+  const SUBJECT_LEADER_FONT = 15;
   const canvasLinear = Math.sqrt(Math.max(1, width * height));
   const sizeT = (boxW, boxH) => {
     const frac = Math.sqrt(Math.max(0, boxW * boxH)) / canvasLinear;
@@ -53515,9 +53865,9 @@ function layoutMap(resolvedIn, data, size, opts) {
       )
     );
   };
-  const pushRegionLabel = (x, y, text, fill2, lineNumber, valueLine, fontSize = FONT2, fade = 0) => {
+  const pushRegionLabel = (x, y, text, fill2, lineNumber, valueLine, fontSize = FONT2, colorOverride) => {
     const { color: baseColor, haloColor } = labelOnFill(fill2);
-    const color = fade > 0 ? mix(baseColor, palette.bg, fade) : baseColor;
+    const color = colorOverride ?? baseColor;
     const vf = Math.round(fontSize * 0.82);
     const halfW = Math.max(
       measureLegendText(text, fontSize),
@@ -53532,7 +53882,11 @@ function layoutMap(resolvedIn, data, size, opts) {
       text,
       anchor: "middle",
       color,
-      halo: overflows,
+      // A backdrop label (colorOverride) NEVER haloes: the placement gate above
+      // guarantees it sits on a floored-readable substrate (own fill, neutral
+      // land, foreign land, or water), so a halo is pure noise. Data labels keep
+      // the containment-gated halo until the role-tier pass (Phase 3).
+      halo: colorOverride ? false : overflows,
       haloColor,
       ...fontSize !== FONT2 && { fontSize },
       ...valueLine !== void 0 && { valueLine },
@@ -53568,7 +53922,7 @@ function layoutMap(resolvedIn, data, size, opts) {
       if (!c || !Number.isFinite(c[0])) return null;
       return { r, c, boxW, boxH, area: boxW * boxH, candidates };
     }).filter((e) => e !== null).sort((a, b) => b.area - a.area || a.r.lineNumber - b.r.lineNumber);
-    const placedRegionRects = [];
+    const placedRegionRects = [...topReserved];
     const placedLeaders = [];
     const isEmptyFill = (f) => f === water || f === neutralFill || f === foreignFill;
     const POI_LABEL_PAD = 14;
@@ -53581,9 +53935,9 @@ function layoutMap(resolvedIn, data, size, opts) {
     const SHORT_HOP_MAX = Math.max(46, Math.min(width, height) * 0.11);
     const STEP = 4;
     const HOP_GAP = 9;
-    const tryShortHopCallout = (cx, cy, fill2, name, value) => {
-      const chipW = stackW(name, value);
-      const chipH = stackH(value !== void 0);
+    const tryShortHopCallout = (cx, cy, fill2, name, value, font = FONT2, gap = HOP_GAP, maxLen = SHORT_HOP_MAX) => {
+      const chipW = stackW(name, value, font);
+      const chipH = stackH(value !== void 0, font);
       const dirs = [
         [0, -1],
         // north (over Canada)
@@ -53599,7 +53953,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         let ex = cx;
         let ey = cy;
         let steps = 0;
-        const maxSteps = Math.ceil(SHORT_HOP_MAX / STEP) + 1;
+        const maxSteps = Math.ceil(maxLen / STEP) + 1;
         while (steps < maxSteps && fillAt(ex, ey) === fill2) {
           ex += dx * STEP;
           ey += dy * STEP;
@@ -53607,8 +53961,8 @@ function layoutMap(resolvedIn, data, size, opts) {
         }
         if (fillAt(ex, ey) === fill2) continue;
         const halfAlong = (Math.abs(dx) * chipW + Math.abs(dy) * chipH) / 2;
-        const ccx = ex + dx * (HOP_GAP + halfAlong);
-        const ccy = ey + dy * (HOP_GAP + halfAlong);
+        const ccx = ex + dx * (gap + halfAlong);
+        const ccy = ey + dy * (gap + halfAlong);
         const rect = {
           x: ccx - chipW / 2,
           y: ccy - chipH / 2,
@@ -53633,7 +53987,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         const innerX = ccx - dx * (chipW / 2);
         const innerY = ccy - dy * (chipH / 2);
         const len = Math.hypot(innerX - cx, innerY - cy);
-        if (len > SHORT_HOP_MAX) continue;
+        if (len > maxLen) continue;
         if (placedLeaders.some(
           (l) => segmentsCross(cx, cy, innerX, innerY, l[0], l[1], l[2], l[3])
         ))
@@ -53657,6 +54011,78 @@ function layoutMap(resolvedIn, data, size, opts) {
       const valStr = regionValueStr(r.value);
       const fitsRegions = (rect) => !placedRegionRects.some((p) => rectsOverlap(rect, p));
       const fitsPois = (rect) => !poiObstacles.some((o) => rectsOverlap(rect, o));
+      const isSubject = regionById.has(r.id);
+      const extremesOnFill = (ax, ay, text) => {
+        const halfW = measureLegendText(text, FONT2) / 2;
+        return fillAt(ax - halfW, ay) === r.fill && fillAt(ax + halfW, ay) === r.fill;
+      };
+      if (isSubject && valStr === void 0 && r.label !== void 0) {
+        const name = candidates[0];
+        let best = -1;
+        for (let f = SUBJECT_FONT_MAX; f >= FONT2; f--) {
+          if (measureLegendText(name, f) > boxW || f + 2 * LABEL_PADY > boxH)
+            continue;
+          const rect = regionLabelRect(c[0], c[1], name, void 0, f);
+          if (!fitsRegions(rect) || !fitsPois(rect) || collides(rect)) continue;
+          const halfW = measureLegendText(name, f) / 2;
+          if (fillAt(c[0] - halfW, c[1]) !== r.fill || fillAt(c[0] + halfW, c[1]) !== r.fill)
+            continue;
+          best = f;
+          break;
+        }
+        if (best >= SUBJECT_MIN_PROMINENCE) {
+          const rect = regionLabelRect(c[0], c[1], name, void 0, best);
+          placedRegionRects.push(rect);
+          pushRegionLabel(
+            c[0],
+            c[1],
+            name,
+            r.fill,
+            r.lineNumber,
+            void 0,
+            best
+          );
+          labeledRegionIds.add(r.id);
+          regionLabelGuards.push({ label: labels[labels.length - 1], rect });
+        } else {
+          const hop = tryShortHopCallout(
+            c[0],
+            c[1],
+            r.fill,
+            r.label,
+            void 0,
+            SUBJECT_LEADER_FONT,
+            HOP_GAP + SUBJECT_LEADER_FONT,
+            SHORT_HOP_MAX * 2.2
+          );
+          if (hop) {
+            placedRegionRects.push(hop.rect);
+            placedLeaders.push(hop.leader);
+            const dark = mix(r.fill, palette.text, 60);
+            labels.push({
+              x: hop.x,
+              y: hop.y,
+              text: r.label,
+              anchor: "middle",
+              color: palette.text,
+              halo: false,
+              haloColor: palette.bg,
+              fontSize: SUBJECT_LEADER_FONT,
+              leader: {
+                x1: hop.leader[0],
+                y1: hop.leader[1],
+                x2: hop.leader[2],
+                y2: hop.leader[3]
+              },
+              leaderColor: dark,
+              calloutDot: { x: c[0], y: c[1], color: dark },
+              lineNumber: r.lineNumber
+            });
+            labeledRegionIds.add(r.id);
+          }
+        }
+        continue;
+      }
       const seekAnchors = [
         { x: c[0], y: c[1], guard: false }
       ];
@@ -53679,13 +54105,13 @@ function layoutMap(resolvedIn, data, size, opts) {
           const nameRect = regionLabelRect(a.x, a.y, t);
           if (valStr && stackW(t, valStr) <= boxW && stackH(true) <= boxH) {
             const stackRect = regionLabelRect(a.x, a.y, t, valStr);
-            if (fitsRegions(stackRect) && fitsPois(nameRect)) {
+            if (fitsRegions(stackRect) && fitsPois(nameRect) && extremesOnFill(a.x, a.y, t)) {
               chosen = { text: t, valueLine: valStr, ax: a.x, ay: a.y };
               break;
             }
           }
           if (labelW(t) <= boxW && labelH <= boxH) {
-            if (fitsRegions(nameRect) && fitsPois(nameRect)) {
+            if (fitsRegions(nameRect) && fitsPois(nameRect) && (valStr === void 0 || extremesOnFill(a.x, a.y, t))) {
               chosen = { text: t, ax: a.x, ay: a.y };
               break;
             }
@@ -53693,7 +54119,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         }
         if (chosen) break;
       }
-      if (chosen === void 0 && valStr && r.label !== void 0) {
+      if (chosen === void 0 && r.label !== void 0 && isSubject) {
         const hop = tryShortHopCallout(c[0], c[1], r.fill, r.label, valStr);
         if (hop) {
           placedRegionRects.push(hop.rect);
@@ -53705,9 +54131,9 @@ function layoutMap(resolvedIn, data, size, opts) {
             text: r.label,
             anchor: "middle",
             color: palette.text,
-            halo: true,
+            halo: false,
             haloColor: palette.bg,
-            valueLine: valStr,
+            ...valStr !== void 0 && { valueLine: valStr },
             leader: {
               x1: hop.leader[0],
               y1: hop.leader[1],
@@ -53718,20 +54144,28 @@ function layoutMap(resolvedIn, data, size, opts) {
             calloutDot: { x: c[0], y: c[1], color: dark },
             lineNumber: r.lineNumber
           });
+          labeledRegionIds.add(r.id);
         }
         continue;
       }
       if (chosen === void 0) continue;
       const isOrient = r.value === void 0 && r.layer === "base";
       let font = FONT2;
-      let fade = 0;
       if (isOrient) {
         const growT = sizeT(boxW, boxH);
         const desiredFont = Math.round(
           FONT2 + growT * (REGION_FONT_MAX_ORIENT - FONT2)
         );
         const hasVal = chosen.valueLine !== void 0;
-        for (let f = desiredFont; f > FONT2; f--) {
+        const extremesClean = (f) => {
+          const halfW = measureLegendText(chosen.text, f) / 2;
+          return [chosen.ax - halfW, chosen.ax + halfW].every((sx) => {
+            const fAt = fillAt(sx, chosen.ay);
+            return fAt === r.fill || isEmptyFill(fAt);
+          });
+        };
+        let fit = -1;
+        for (let f = desiredFont; f >= FONT2; f--) {
           if (stackW(chosen.text, chosen.valueLine, f) > boxW || stackH(hasVal, f) > boxH)
             continue;
           const gRect = regionLabelRect(
@@ -53748,14 +54182,18 @@ function layoutMap(resolvedIn, data, size, opts) {
             void 0,
             f
           );
-          if (!fitsRegions(gRect) || !fitsPois(gName)) continue;
-          const halfW = measureLegendText(chosen.text, f) / 2;
-          if (fillAt(chosen.ax - halfW, chosen.ay) !== r.fill || fillAt(chosen.ax + halfW, chosen.ay) !== r.fill)
+          if (!fitsRegions(gRect) || !fitsPois(gName) || collides(gName))
             continue;
-          font = f;
+          if (!extremesClean(f)) continue;
+          fit = f;
           break;
         }
-        fade = font > FONT2 ? Math.round(growT * REGION_FADE_ORIENT) : 0;
+        if (fit < 0) {
+          if (!frameContainers.has(r.id)) continue;
+          font = FONT2;
+        } else {
+          font = fit;
+        }
       }
       const rRect = regionLabelRect(
         chosen.ax,
@@ -53773,8 +54211,9 @@ function layoutMap(resolvedIn, data, size, opts) {
         r.lineNumber,
         chosen.valueLine,
         font,
-        fade
+        isOrient ? backdropLandTone : void 0
       );
+      labeledRegionIds.add(r.id);
       regionLabelGuards.push({
         label: labels[labels.length - 1],
         rect: rRect
@@ -53792,6 +54231,7 @@ function layoutMap(resolvedIn, data, size, opts) {
         seed.lineNumber,
         valStr
       );
+      labeledRegionIds.add(seed.iso);
       regionLabelGuards.push({
         label: labels[labels.length - 1],
         rect: regionLabelRect(seed.x, seed.y, text, valStr)
@@ -54223,13 +54663,30 @@ function layoutMap(resolvedIn, data, size, opts) {
       const nx = -dy / len;
       const ny = dx / len;
       const perp = labelH + 2;
+      const pm = /^M(-?[\d.]+),(-?[\d.]+)(?:L(-?[\d.]+),(-?[\d.]+)|Q(-?[\d.]+),(-?[\d.]+) (-?[\d.]+),(-?[\d.]+))$/.exec(
+        lg.d
+      );
+      const pointAt = (t) => {
+        if (pm?.[5] !== void 0) {
+          const u = 1 - t;
+          return [
+            u * u * +pm[1] + 2 * u * t * +pm[5] + t * t * +pm[7],
+            u * u * +pm[2] + 2 * u * t * +pm[6] + t * t * +pm[8]
+          ];
+        }
+        if (pm?.[3] !== void 0)
+          return [
+            +pm[1] + (+pm[3] - +pm[1]) * t,
+            +pm[2] + (+pm[4] - +pm[2]) * t
+          ];
+        return [a.cx + dx * t, a.cy + dy * t];
+      };
       const candidates = [];
       for (const off of [0, perp, -perp, 2 * perp, -2 * perp])
-        for (const t of T_LIST)
-          candidates.push([
-            a.cx + dx * t + nx * off,
-            a.cy + dy * t + ny * off - 4
-          ]);
+        for (const t of T_LIST) {
+          const [bx, by] = pointAt(t);
+          candidates.push([bx + nx * off, by + ny * off - 4]);
+        }
       const clean = ([cx2, cy2]) => {
         const rect2 = { x: cx2 - w / 2, y: cy2 - labelH / 2, w, h: labelH };
         if (rect2.x < 0 || rect2.x + w > width || rect2.y < 0 || rect2.y + rect2.h > height)
@@ -54239,10 +54696,8 @@ function layoutMap(resolvedIn, data, size, opts) {
         if (placedEdge.some((o) => rectsOverlap(o, rect2))) return false;
         return true;
       };
-      const [cx, cy] = candidates.find(clean) ?? [
-        a.cx + dx * 0.5,
-        a.cy + dy * 0.5 - 4
-      ];
+      const mid = pointAt(0.5);
+      const [cx, cy] = candidates.find(clean) ?? [mid[0], mid[1] - 4];
       const style = labelOnFill(fillAt(cx, cy));
       legs[i] = {
         ...lg,
@@ -54270,7 +54725,7 @@ function layoutMap(resolvedIn, data, size, opts) {
     const rawCountries = [];
     for (const f of worldLayer.values()) {
       const iso = typeof f.id === "string" ? f.id : String(f.id ?? "");
-      if (!iso || regionById.has(iso)) continue;
+      if (!iso || regionById.has(iso) || labeledRegionIds.has(iso)) continue;
       let hasReferencedSub = false;
       for (const k of regionById.keys())
         if (k.startsWith(iso + "-")) {
@@ -54344,7 +54799,7 @@ function layoutMap(resolvedIn, data, size, opts) {
     );
     if (usLayer && framedStateContainers) {
       for (const [iso, f] of usLayer) {
-        if (regionById.has(iso)) continue;
+        if (regionById.has(iso) || labeledRegionIds.has(iso)) continue;
         const viewF = cullFeatureToView(f);
         if (!viewF) continue;
         const b = path.bounds(viewF);
@@ -54368,6 +54823,11 @@ function layoutMap(resolvedIn, data, size, opts) {
       waterBodies: data.waterBodies,
       countries: countryCandidates,
       palette,
+      // One muted, contrast-floored tone shared with the orientation backdrop
+      // (region pass) so a context country (Canada) and an orientation region
+      // (Minnesota) read identically — never below the WCAG-AA floor, no fade.
+      countryTone: backdropLandTone,
+      waterTone: backdropWaterTone,
       project,
       collides,
       contentPoints,
@@ -54922,19 +55382,60 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
       sel.style("cursor", "pointer").on("click", () => onClickItem(lineNumber));
   };
   const gLegs = svg.append("g").attr("class", "dgmo-map-legs").attr("fill", "none");
-  layout.legs.forEach((leg, i) => {
-    const p = gLegs.append("path").attr("d", leg.d).attr("stroke", leg.color).attr("stroke-width", leg.width).attr("stroke-linecap", "round").attr("data-from-id", leg.fromId).attr("data-to-id", leg.toId);
+  const legEnd = (d) => {
+    const m = /^M(-?[\d.]+),(-?[\d.]+)(?:L(-?[\d.]+),(-?[\d.]+)|Q(-?[\d.]+),(-?[\d.]+) (-?[\d.]+),(-?[\d.]+))$/.exec(
+      d
+    );
+    if (!m) return null;
+    const x0 = +m[1];
+    const y0 = +m[2];
+    let ex;
+    let ey;
+    let fromX;
+    let fromY;
+    if (m[3] !== void 0) {
+      ex = +m[3];
+      ey = +m[4];
+      fromX = x0;
+      fromY = y0;
+    } else {
+      ex = +m[7];
+      ey = +m[8];
+      fromX = +m[5];
+      fromY = +m[6];
+    }
+    const dx = ex - fromX;
+    const dy = ey - fromY;
+    const len = Math.hypot(dx, dy);
+    if (!(len > 0)) return null;
+    return { ex, ey, tx: dx / len, ty: dy / len };
+  };
+  layout.legs.forEach((leg) => {
+    const end = leg.arrow ? legEnd(leg.d) : null;
+    let drawD = leg.d;
+    let arrowTri = null;
+    if (end) {
+      const aLen = arrowSize(leg.width);
+      const aHalf = Math.max(aLen * 0.5, leg.width * 0.6 + 1);
+      const bx = end.ex - end.tx * aLen;
+      const by = end.ey - end.ty * aLen;
+      const px = -end.ty;
+      const py = end.tx;
+      arrowTri = `M${bx + px * aHalf},${by + py * aHalf}L${end.ex},${end.ey}L${bx - px * aHalf},${by - py * aHalf}z`;
+      drawD = leg.d.replace(
+        /(-?[\d.]+),(-?[\d.]+)$/,
+        `${bx.toFixed(2)},${by.toFixed(2)}`
+      );
+    }
+    const p = gLegs.append("path").attr("d", drawD).attr("stroke", leg.color).attr("stroke-width", leg.width).attr("stroke-linecap", "round").attr("data-from-id", leg.fromId).attr("data-to-id", leg.toId);
     if (leg.tags) {
       for (const [group, value] of Object.entries(leg.tags)) {
         p.attr(`data-tag-${group.toLowerCase()}`, value.toLowerCase());
       }
     }
     wireSync(p, leg.lineNumber);
-    if (leg.arrow) {
-      const id = nid(`dgmo-map-arrow-${i}`);
-      const s = arrowSize(leg.width);
-      defs.append("marker").attr("id", id).attr("viewBox", "0 0 10 10").attr("refX", 10).attr("refY", 5).attr("markerUnits", "userSpaceOnUse").attr("markerWidth", s).attr("markerHeight", s).attr("orient", "auto-start-reverse").append("path").attr("d", "M0,0L10,5L0,10z").attr("fill", leg.color);
-      p.attr("marker-end", `url(#${id})`);
+    if (arrowTri) {
+      gLegs.append("path").attr("d", arrowTri).attr("fill", leg.color).attr("stroke", leg.color).attr("stroke-width", 1).attr("stroke-linejoin", "round").attr("data-from-id", leg.fromId).attr("data-to-id", leg.toId);
     }
     if (leg.label !== void 0 && leg.labelX !== void 0) {
       const lt = emitText(
@@ -58563,9 +59064,9 @@ var init_renderer20 = __esm({
   }
 });
 
-// node_modules/.pnpm/lz-string@1.5.0/node_modules/lz-string/libs/lz-string.js
+// ../../diagrammo/dgmo/node_modules/.pnpm/lz-string@1.5.0/node_modules/lz-string/libs/lz-string.js
 var require_lz_string = __commonJS({
-  "node_modules/.pnpm/lz-string@1.5.0/node_modules/lz-string/libs/lz-string.js"(exports2, module2) {
+  "../../diagrammo/dgmo/node_modules/.pnpm/lz-string@1.5.0/node_modules/lz-string/libs/lz-string.js"(exports2, module2) {
     "use strict";
     var LZString = (function() {
       var f = String.fromCharCode;