@cardenelabs/dragon 0.26.0 → 0.28.0

package/dist/index.js

@@ -1,4 +1,4 @@
-import { NODE_KINDS, TONES, EDGE_STYLES, EDGE_REVEALS, parseFormula, EDGE_HEADS, EDGE_HEAD_FILLS, extractIdentifiers, inputDefaultValue, layout, applyDerivedValues, diagram, classDiagram, sequence, sequenceStepId, flow, swimlane, er, stateMachine, topology, CLASS_RELATION_LOOK, SEQUENCE_MESSAGE_LOOK, FSM_ACTION_MARK } from '@cardenelabs/cdl';
+import { NODE_KINDS, TONES, EDGE_STYLES, EDGE_REVEALS, RELATION_FOCUSES, parseFormula, EDGE_HEADS, EDGE_HEAD_FILLS, extractIdentifiers, inputDefaultValue, layout, applyDerivedValues, diagram, classDiagram, sequence, sequenceStepId, flow, swimlane, er, stateMachine, topology, CLASS_RELATION_LOOK, SEQUENCE_MESSAGE_LOOK, FSM_ACTION_MARK } from '@cardenelabs/cdl';
 
 // src/keywords.ts
 var HEADERS = {
@@ -1795,7 +1795,7 @@ var \u3064\u307E\u307F\u306E\u8868 = {
   dropdown: {
     \u5FC5\u9808: ["options", "defaultValue"],
     \u6B04: {
-      options: "\u6587\u5B57\u5217\u306E\u4E26\u3073",
+      options: "\u9078\u629E\u80A2\u306E\u4E26\u3073",
       defaultValue: "\u6587\u5B57\u5217",
       label: "\u6587\u5B57\u5217"
     }
@@ -1803,7 +1803,7 @@ var \u3064\u307E\u307F\u306E\u8868 = {
   "multi-select": {
     \u5FC5\u9808: ["options", "defaultValues"],
     \u6B04: {
-      options: "\u6587\u5B57\u5217\u306E\u4E26\u3073",
+      options: "\u9078\u629E\u80A2\u306E\u4E26\u3073",
       defaultValues: "\u6587\u5B57\u5217\u306E\u4E26\u3073",
       label: "\u6587\u5B57\u5217"
     }
@@ -1820,7 +1820,7 @@ var \u3064\u307E\u307F\u306E\u8868 = {
   radio: {
     \u5FC5\u9808: ["options", "defaultValue"],
     \u6B04: {
-      options: "\u6587\u5B57\u5217\u306E\u4E26\u3073",
+      options: "\u9078\u629E\u80A2\u306E\u4E26\u3073",
       defaultValue: "\u6587\u5B57\u5217",
       label: "\u6587\u5B57\u5217"
     }
@@ -1859,7 +1859,7 @@ var \u3064\u307E\u307F\u306E\u8868 = {
   tabs: {
     \u5FC5\u9808: ["options", "defaultValue"],
     \u6B04: {
-      options: "\u6587\u5B57\u5217\u306E\u4E26\u3073",
+      options: "\u9078\u629E\u80A2\u306E\u4E26\u3073",
       defaultValue: "\u6587\u5B57\u5217",
       label: "\u6587\u5B57\u5217"
     }
@@ -1888,7 +1888,9 @@ var \u3064\u307E\u307F\u306E\u8868 = {
     \u5FC5\u9808: ["defaultValue"],
     \u6B04: {
       defaultValue: "\u771F\u507D",
-      label: "\u6587\u5B57\u5217"
+      label: "\u6587\u5B57\u5217",
+      onLabel: "\u6587\u5B57\u5217",
+      offLabel: "\u6587\u5B57\u5217"
     }
   },
   xypad: {
@@ -1942,6 +1944,8 @@ var TOP_LEVEL_KEYS = [
   "bands",
   // 矢印をいつ出すか (#1470)
   "reveal",
+  // 箱に触れると関係する線だけを光らせるか (#1757)
+  "relations",
   /*
    * 図の並ぶ向き (#1494)。
    *
@@ -2126,6 +2130,7 @@ function parseTextDslV05(src) {
   let eyebrow = null;
   let eyebrowLine = 0;
   let reveal = null;
+  let relations = null;
   let direction = null;
   let directionLine = 0;
   let palette = null;
@@ -2186,6 +2191,22 @@ function parseTextDslV05(src) {
       i += 1;
       continue;
     }
+    if (head.key === "relations") {
+      const v = (head.value ?? "").trim();
+      if (v.length > 0) {
+        if (RELATION_FOCUSES.includes(v)) {
+          relations = v;
+        } else {
+          errors.push({
+            line: line.no,
+            message: `relations \u304C\u8AAD\u3081\u307E\u305B\u3093 (\u66F8\u3044\u305F\u5024: ${v})`,
+            hint: `\u4F7F\u3048\u308B\u8A9E = ${RELATION_FOCUSES.join(" / ")}`
+          });
+        }
+      }
+      i += 1;
+      continue;
+    }
     if (head.key === "direction") {
       const v = (head.value ?? "").trim();
       if (v.length > 0) {
@@ -2340,6 +2361,13 @@ function parseTextDslV05(src) {
       const inline = head.value?.trim();
       if (inline && inline.startsWith("{") && inline.endsWith("}")) {
         const opts2 = parseInlineMapping(inline.slice(1, -1));
+        \u4E2D\u62EC\u5F27\u306E\u77E5\u3089\u306A\u3044\u9805\u76EE\u540D\u3092\u77E5\u3089\u305B\u308B(
+          inline.slice(1, -1),
+          Object.keys(VIEWPORT_VALUE_KINDS),
+          "viewport \u306E ",
+          line.no,
+          errors
+        );
         viewport = {
           ...\u8868\u3067\u8AAD\u3080(VIEWPORT_VALUE_KINDS, opts2, "viewport \u306E ", line.no, errors),
           pos: { line: line.no }
@@ -2347,13 +2375,31 @@ function parseTextDslV05(src) {
         i += 1;
         continue;
       }
-      const { items, next } = collectIndentedList(lines, i + 1, line.indent);
+      const { items, next } = collectIndentedRaw(lines, i + 1, line.indent);
       const opts = {};
       const optLines = {};
+      const \u4F7F\u3048\u308B = Object.keys(VIEWPORT_VALUE_KINDS);
       for (const it of items) {
-        const m = it.trimmed.match(/^([a-zA-Z][a-zA-Z0-9_]*)\s*:\s*(.+)$/);
-        if (!m) continue;
+        const \u884C = it.trimmed.replace(/^-\s+/, "");
+        const m = \u884C.match(/^([a-zA-Z][a-zA-Z0-9_]*)\s*:\s*(.*)$/);
+        if (!m) {
+          errors.push({
+            line: it.no,
+            message: `viewport \u306E\u884C\u304C\u8AAD\u3081\u307E\u305B\u3093: "${it.trimmed}"`,
+            hint: `use \`width: 1400\` (\u4F7F\u3048\u308B\u9805\u76EE = ${\u4F7F\u3048\u308B.join(", ")})`
+          });
+          continue;
+        }
         const \u6B04 = m[1] ?? "";
+        if (!\u4F7F\u3048\u308B.includes(\u6B04)) {
+          errors.push({
+            line: it.no,
+            message: `viewport \u306E\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${\u6B04}"`,
+            hint: `\u4F7F\u3048\u308B\u9805\u76EE = ${\u4F7F\u3048\u308B.join(", ")}`
+          });
+          continue;
+        }
+        if ((m[2] ?? "").trim() === "") continue;
         opts[\u6B04] = stripQuotes((m[2] ?? "").trim());
         optLines[\u6B04] = it.no;
       }
@@ -2394,6 +2440,13 @@ function parseTextDslV05(src) {
           continue;
         }
         const opts = parseInlineMapping(m[2] ?? "");
+        \u4E2D\u62EC\u5F27\u306E\u77E5\u3089\u306A\u3044\u9805\u76EE\u540D\u3092\u77E5\u3089\u305B\u308B(
+          m[2] ?? "",
+          m[1] === "x" ? AXIS_X_KEYS : AXIS_Y_KEYS,
+          `\u8EF8 ${m[1]} \u306E `,
+          it.no,
+          errors
+        );
         if (m[1] === "x") \u7D44\u307F\u7ACB\u3066.x = { left: opts.left, right: opts.right };
         else \u7D44\u307F\u7ACB\u3066.y = { bottom: opts.bottom, top: opts.top };
       }
@@ -2427,10 +2480,21 @@ function parseTextDslV05(src) {
         if (m) {
           const id = m[1];
           const opts = parseInlineMapping(m[2]);
+          \u4E2D\u62EC\u5F27\u306E\u77E5\u3089\u306A\u3044\u9805\u76EE\u540D\u3092\u77E5\u3089\u305B\u308B(
+            m[2],
+            LANE_INLINE_KEYS,
+            `\u7E26\u5217 ${id} \u306E `,
+            it.no,
+            errors
+          );
           lanesMap[id] = {
             id,
             ...\u8868\u3067\u8AAD\u3080(LANE_VALUE_KINDS, opts, `\u7E26\u5217 ${id} \u306E `, it.no, errors),
             label: opts.label,
+            // 位置のずらし (#1971)
+            layoutPos: \u305A\u3089\u3057\u306B\u307E\u3068\u3081\u308B(
+              \u8868\u3067\u8AAD\u3080(OFFSET_VALUE_KINDS, opts, `\u7E26\u5217 ${id} \u306E `, it.no, errors)
+            ),
             pos: { line: it.no }
           };
         } else {
@@ -2586,6 +2650,7 @@ function parseTextDslV05(src) {
         if (m) {
           const id = m[1];
           const opts = parseInlineMapping(m[2]);
+          \u4E2D\u62EC\u5F27\u306E\u77E5\u3089\u306A\u3044\u9805\u76EE\u540D\u3092\u77E5\u3089\u305B\u308B(m[2], GROUP_INLINE_KEYS, `\u7D44 ${id} \u306E `, it.no, errors);
           const lanesList = (opts.lanes ?? "").replace(/^\[|\]$/g, "").split(",").map((x) => x.trim()).filter(Boolean);
           groupsMap[id] = {
             id,
@@ -2634,6 +2699,7 @@ function parseTextDslV05(src) {
       type,
       ...eyebrow !== null ? { eyebrow, eyebrowPos: { line: eyebrowLine } } : {},
       ...reveal !== null ? { reveal } : {},
+      ...relations !== null ? { relations } : {},
       ...direction !== null ? { direction, directionPos: { line: directionLine } } : {},
       ...palette !== null ? { palette } : {},
       ...axes !== void 0 ? { axes, axesPos: { line: axesLine } } : {},
@@ -2838,12 +2904,29 @@ var VIEWPORT_VALUE_KINDS = {
   nodeGap: "\u6570",
   labelMargin: "\u6570"
 };
+var OFFSET_VALUE_KINDS = {
+  offsetX: "\u6570",
+  offsetY: "\u6570"
+};
+function \u305A\u3089\u3057\u306B\u307E\u3068\u3081\u308B(v) {
+  if (v.offsetX === void 0 && v.offsetY === void 0) return void 0;
+  return { x: v.offsetX ?? 0, y: v.offsetY ?? 0 };
+}
 var LANE_VALUE_KINDS = {
   x: "\u6570",
   width: "\u6570",
   contain: "\u771F\u507D",
   lifeline: "\u771F\u507D"
 };
+var LANE_INLINE_KEYS = [
+  ...Object.keys(LANE_VALUE_KINDS),
+  // 位置のずらし (#1971)。 JSON の縦列の `pos` と同じ `layoutPos` に入る
+  ...Object.keys(OFFSET_VALUE_KINDS),
+  "label"
+];
+var GROUP_INLINE_KEYS = ["label", "lanes"];
+var AXIS_X_KEYS = ["left", "right"];
+var AXIS_Y_KEYS = ["bottom", "top"];
 var \u56F3\u5F62\u306E\u8868 = {
   rect: {
     \u5FC5\u9808: ["source", "fillMax"],
@@ -2954,6 +3037,42 @@ function \u7D44\u306E\u4E26\u3073\u3068\u3057\u3066\u8AAD\u3080(raw) {
   }
   return \u51FA;
 }
+var \u9078\u629E\u80A2\u306E\u7D44\u306E\u9805\u76EE = ["value", "label"];
+function \u9078\u629E\u80A2\u306E\u4E26\u3073\u3068\u3057\u3066\u8AAD\u3080(\u5024, \u540D, line, errors) {
+  const \u4E2D\u8EAB = \u5024.trim();
+  if (!\u4E2D\u8EAB.startsWith("[") || !\u4E2D\u8EAB.endsWith("]")) {
+    errors.push({ line, message: `${\u540D} \u306E\u4E26\u3073\u304C\u8AAD\u3081\u307E\u305B\u3093: "${\u5024}"`, hint: '`["green", { value: "red", label: "\u5931\u6557" }]` \u306E\u5F62\u3067\u66F8\u304F' });
+    return void 0;
+  }
+  const \u51FA = [];
+  const \u8AA4\u308A\u306E\u6570 = errors.length;
+  splitInlineFields(\u4E2D\u8EAB.slice(1, -1)).forEach((\u751F, i) => {
+    const \u8981\u7D20 = \u751F.trim();
+    if (!\u8981\u7D20.startsWith("{")) {
+      const \u6587\u5B57\u5217 = stripQuotes(\u8981\u7D20);
+      if (\u6587\u5B57\u5217 !== "") \u51FA.push(\u6587\u5B57\u5217);
+      return;
+    }
+    if (!\u8981\u7D20.endsWith("}")) {
+      errors.push({ line, message: `${\u540D}[${i}] \u306E\u7D44\u304C\u8AAD\u3081\u307E\u305B\u3093: "${\u8981\u7D20}"`, hint: '`{ value: "red", label: "\u5931\u6557" }` \u306E\u5F62\u3067\u66F8\u304F' });
+      return;
+    }
+    const \u7D44 = parseInlineMapping(\u8981\u7D20.slice(1, -1));
+    for (const k of Object.keys(\u7D44)) {
+      if (\u9078\u629E\u80A2\u306E\u7D44\u306E\u9805\u76EE.includes(k)) continue;
+      errors.push({ line, message: `${\u540D}[${i}] \u306E\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${k}"`, hint: `\u4F7F\u3048\u308B\u9805\u76EE = ${\u9078\u629E\u80A2\u306E\u7D44\u306E\u9805\u76EE.join(", ")}` });
+    }
+    for (const k of \u9078\u629E\u80A2\u306E\u7D44\u306E\u9805\u76EE) {
+      if (\u7D44[k] === void 0) {
+        errors.push({ line, message: `${\u540D}[${i}].${k} \u306F\u5FC5\u305A\u66F8\u304D\u307E\u3059`, hint: `\u5FC5\u9808\u306E\u9805\u76EE = ${\u9078\u629E\u80A2\u306E\u7D44\u306E\u9805\u76EE.join(", ")}` });
+      } else if (\u7D44[k] === "") {
+        errors.push({ line, message: `${\u540D}[${i}].${k} \u304C\u7A7A\u3067\u3059`, hint: k === "label" ? "\u540D\u524D\u3092\u66F8\u304B\u306A\u3044\u306A\u3089\u6587\u5B57\u5217\u3060\u3051\u3092\u4E26\u3079\u308B" : "\u5024\u3092 1 \u6587\u5B57\u4EE5\u4E0A\u66F8\u304F" });
+      }
+    }
+    if (\u7D44.value && \u7D44.label) \u51FA.push({ value: \u7D44.value, label: \u7D44.label });
+  });
+  return errors.length === \u8AA4\u308A\u306E\u6570 ? \u51FA : void 0;
+}
 function \u90E8\u54C1\u306E\u7D44\u3092\u691C\u67FB\u3059\u308B(kind, \u8AAD\u3081\u305F, line, errors) {
   for (const [\u6B04, \u5B9A\u7FA9] of Object.entries(\u90E8\u54C1\u306E\u7D44\u306E\u8868[kind] ?? {})) {
     const \u4E26\u3073 = \u8AAD\u3081\u305F[\u6B04];
@@ -2987,7 +3106,8 @@ function \u8868\u306B\u5F93\u3063\u3066\u8AAD\u3080(\u5B9A\u7FA9, opts, \u63A5\u
     if (\u5F62 === void 0) {
       errors.push({
         line,
-        message: `${\u63A5\u982D}\u306E\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${\u6B04}"`,
+        // 接頭は呼び手が「の」 まで書く (`図形の ` / `部品 ring の `)。 ここで足すと「の の」 に重なる (#1968)
+        message: `${\u63A5\u982D.trimEnd()}\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${\u6B04}"`,
         hint: `\u4F7F\u3048\u308B\u9805\u76EE = ${Object.keys(\u5B9A\u7FA9.\u6B04).join(", ")}`
       });
       continue;
@@ -3013,6 +3133,9 @@ function \u8868\u306B\u5F93\u3063\u3066\u8AAD\u3080(\u5B9A\u7FA9, opts, \u63A5\u
       } else {
         out[\u6B04] = \u6570;
       }
+    } else if (\u5F62 === "\u9078\u629E\u80A2\u306E\u4E26\u3073") {
+      const \u9078\u629E\u80A2 = \u9078\u629E\u80A2\u306E\u4E26\u3073\u3068\u3057\u3066\u8AAD\u3080(\u5024, `${\u63A5\u982D}${\u6B04}`, line, errors);
+      if (\u9078\u629E\u80A2 !== void 0) out[\u6B04] = \u9078\u629E\u80A2;
     } else if (\u5F62 === "\u7D44\u306E\u4E26\u3073") {
       const \u7D44 = \u7D44\u306E\u4E26\u3073\u3068\u3057\u3066\u8AAD\u3080(\u5024);
       if (\u7D44 !== void 0) out[\u6B04] = \u7D44;
@@ -3288,11 +3411,21 @@ function \u5F0F\u3068\u3057\u3066\u8AAD\u3080(\u884C, line, errors) {
     return void 0;
   }
   const \u540D\u524D = \u884C.slice(0, c).trim();
-  const \u5F0F = stripQuotes(\u884C.slice(c + 1).trim());
   if (!isValueName(\u540D\u524D)) {
     errors.push({ line, ...valueNameIssue(\u540D\u524D) });
     return void 0;
   }
+  const \u7D44 = \u5F0F\u306E\u7D44\u306B\u5272\u308B(\u884C);
+  let \u5F0F;
+  let \u540D\u672D;
+  if (\u7D44 === void 0) {
+    \u5F0F = stripQuotes(\u884C.slice(c + 1).trim());
+  } else {
+    const \u8AAD\u3081\u305F = \u5F0F\u306E\u7D44\u3092\u8AAD\u3080(\u540D\u524D, \u7D44, line, errors);
+    if (\u8AAD\u3081\u305F === void 0) return void 0;
+    \u5F0F = \u8AAD\u3081\u305F.expression;
+    \u540D\u672D = \u8AAD\u3081\u305F.label;
+  }
   if (\u5F0F === "") {
     errors.push({
       line,
@@ -3311,7 +3444,50 @@ function \u5F0F\u3068\u3057\u3066\u8AAD\u3080(\u884C, line, errors) {
     });
     return void 0;
   }
-  return { id: \u540D\u524D, expression: \u5F0F, pos: { line } };
+  return { id: \u540D\u524D, expression: \u5F0F, ...\u540D\u672D !== void 0 ? { label: \u540D\u672D } : {}, pos: { line } };
+}
+var \u7D44\u306E\u9805\u76EE\u540D = /^([^\s:,{}[\]"']+)\s*:\s*(.*)$/s;
+function \u5F0F\u306E\u7D44\u306B\u5272\u308B(\u884C) {
+  const \u5272\u308C\u305F = \u540D\u524D\u3068\u4E2D\u62EC\u5F27\u306B\u5272\u308B(\u884C);
+  if (\u5272\u308C\u305F === void 0) return void 0;
+  const \u6700\u521D = splitInlineFields(\u5272\u308C\u305F[1])[0]?.trim() ?? "";
+  return \u7D44\u306E\u9805\u76EE\u540D.test(\u6700\u521D) ? \u5272\u308C\u305F[1] : void 0;
+}
+function \u5F0F\u306E\u7D44\u3092\u8AAD\u3080(\u540D\u524D, \u4E2D\u8EAB, line, errors) {
+  const \u4F7F\u3048\u308B = ["expression", "label"];
+  const \u8AAD\u3081\u305F = {};
+  for (const \u6B04 of splitInlineFields(\u4E2D\u8EAB).map((s) => s.trim()).filter((s) => s !== "")) {
+    const m = \u6B04.match(\u7D44\u306E\u9805\u76EE\u540D);
+    if (!m) {
+      errors.push({
+        line,
+        message: `\u5F0F "${\u540D\u524D}" \u306E\u9805\u76EE\u304C\u8AAD\u3081\u307E\u305B\u3093: "${\u6B04}"`,
+        hint: '`{ expression: "input * 2", label: "2 \u500D" }` \u306E\u5F62\u3067\u66F8\u304F\u3002 `,` \u3092\u542B\u3080\u5F0F\u306F\u5F15\u7528\u7B26\u3067\u56F2\u3080'
+      });
+      return void 0;
+    }
+    if (!\u4F7F\u3048\u308B.includes(m[1])) {
+      errors.push({
+        line,
+        message: `\u5F0F "${\u540D\u524D}" \u306E\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${m[1]}"`,
+        hint: `\u4F7F\u3048\u308B\u9805\u76EE = ${\u4F7F\u3048\u308B.join(", ")}`
+      });
+      return void 0;
+    }
+    \u8AAD\u3081\u305F[m[1]] = stripQuotes(m[2].trim());
+  }
+  if (\u8AAD\u3081\u305F.label !== void 0 && \u8AAD\u3081\u305F.label.trim() === "") {
+    errors.push({
+      line,
+      message: `\u5F0F "${\u540D\u524D}" \u306E\u540D\u672D\u304C\u7A7A\u3067\u3059`,
+      hint: '\u540D\u672D\u3092\u4ED8\u3051\u306A\u3044\u306A\u3089 `label` \u3092\u66F8\u304B\u306A\u3044\u3002 \u4ED8\u3051\u308B\u306A\u3089 `label: "2 \u500D"` \u306E\u3088\u3046\u306B\u66F8\u304F'
+    });
+    return void 0;
+  }
+  return {
+    expression: \u8AAD\u3081\u305F.expression ?? "",
+    ...\u8AAD\u3081\u305F.label !== void 0 ? { label: \u8AAD\u3081\u305F.label } : {}
+  };
 }
 function \u3064\u307E\u307F\u3068\u3057\u3066\u8AAD\u3080(id, raw, line, errors) {
   const opts = parseInlineMapping(raw);
@@ -3329,12 +3505,6 @@ function \u3064\u307E\u307F\u3068\u3057\u3066\u8AAD\u3080(id, raw, line, errors)
   for (const \u6B04 of \u5B9A\u7FA9.\u5FC5\u9808) if (\u8AAD\u3081\u305F[\u6B04] === void 0) return void 0;
   return { id, kind, ...\u8AAD\u3081\u305F };
 }
-var ACTOR_NODE_VALUE_KINDS = {
-  posX: "\u6570",
-  posY: "\u6570",
-  posW: "\u6570",
-  posH: "\u6570"
-};
 var ACTOR_INLINE_VALUE_KINDS = {
   stack: "\u6570",
   initial: "\u771F\u507D",
@@ -3650,6 +3820,17 @@ function applyContinuationLines(actor, rest, errors) {
       case "posY":
         out.posY = \u6570\u3068\u3057\u3066\u8AAD\u3080(raw, "\u7BB1\u306E posY", ln.no, errors);
         break;
+      // 位置のずらし (#1971)。 中括弧の形と同じ表で読み、片方だけ書いた時は残りを 0 とする
+      case "offsetX":
+      case "offsetY": {
+        const \u8AAD\u3081\u305F = \u8868\u3067\u8AAD\u3080(OFFSET_VALUE_KINDS, { [key]: raw }, "\u7BB1\u306E ", ln.no, errors);
+        const \u524D = out.layoutPos;
+        out.layoutPos = \u305A\u3089\u3057\u306B\u307E\u3068\u3081\u308B({
+          offsetX: key === "offsetX" ? \u8AAD\u3081\u305F.offsetX : \u524D?.x,
+          offsetY: key === "offsetY" ? \u8AAD\u3081\u305F.offsetY : \u524D?.y
+        });
+        break;
+      }
       case "\u5927\u304D\u3055":
       case "size": {
         const value = stripQuotes(raw);
@@ -3707,6 +3888,10 @@ function applyContinuationLines(actor, rest, errors) {
       touchedState = true;
     }
     if (touchedState) out.stateOverride = state;
+    if (out.tone !== void 0) {
+      out.partColorName = out.tone;
+      delete out.tone;
+    }
     return out;
   }
   for (const [\u6B04, { \u5024, line }] of \u8FFD\u968F\u3059\u308B\u6B04\u306E\u751F\u5024) {
@@ -3760,6 +3945,9 @@ var ACTOR_ITEM_KEYS = /* @__PURE__ */ new Set([
   "pos",
   "posX",
   "posY",
+  // 位置のずらし (#1971)
+  "offsetX",
+  "offsetY",
   "\u5927\u304D\u3055",
   "size",
   "\u500D\u7387",
@@ -3880,11 +4068,15 @@ var ACTOR_RESERVED_FIELDS = /* @__PURE__ */ new Set([
   "posY",
   "posW",
   "posH",
-  // canvas pivot UX 修正 (B1) = sub-node 単位 override map (nested `nodes: { header: {...} }`)
-  "nodes",
+  // 位置のずらし (#1971)。 見本では見本 1 つ分をまとめてずらす欄で、状態の名前としては読まない
+  "offsetX",
+  "offsetY",
   // 図形の倍率 (#1026)。 状態の名前としては読まない
   "scale",
   "\u500D\u7387",
+  // 色番号 (#1973)。 見本の色の状態へまとめて入れる欄で、状態の名前としては読まない。
+  // 縦に並べた形 (`COLOR_KEYS`) と JSON は元から色として読んでいた
+  "color",
   // 日本語の項目名 (#1026)。 中括弧の形が日本語の項目名を読めるようになったため、
   // ここに載せないと状態の名前として拾われる。 縦に並べた形での意味 (位置 / 大きさ 等) は
   // 中括弧の形では未対応なので、これまでどおり落とす方に揃える
@@ -3915,39 +4107,6 @@ function extractStateOverride(opts) {
   }
   return count > 0 ? out : void 0;
 }
-function parseActorNodesField(raw, line, errors) {
-  if (!raw) return void 0;
-  const trimmed = raw.trim();
-  if (!trimmed.startsWith("{") || !trimmed.endsWith("}")) return void 0;
-  const inner = trimmed.slice(1, -1).trim();
-  if (!inner) return void 0;
-  const parts = [];
-  let depth = 0;
-  let buf = "";
-  for (let i = 0; i < inner.length; i += 1) {
-    const c = inner[i];
-    if (c === "[" || c === "{") depth += 1;
-    else if (c === "]" || c === "}") depth -= 1;
-    if (c === "," && depth === 0) {
-      parts.push(buf);
-      buf = "";
-      continue;
-    }
-    buf += c;
-  }
-  if (buf.trim()) parts.push(buf);
-  const out = {};
-  for (const p of parts) {
-    const colonIdx = p.indexOf(":");
-    if (colonIdx < 0) continue;
-    const key = p.slice(0, colonIdx).trim();
-    const val = p.slice(colonIdx + 1).trim();
-    if (!key || !val.startsWith("{") || !val.endsWith("}")) continue;
-    const nodeOpts = parseInlineMapping(val.slice(1, -1));
-    out[key] = \u8868\u3067\u8AAD\u3080(ACTOR_NODE_VALUE_KINDS, nodeOpts, `nodes \u306E ${key} \u306E `, line, errors);
-  }
-  return Object.keys(out).length > 0 ? out : void 0;
-}
 function coerceStateValue(raw) {
   const stripped = stripQuotes(raw);
   if (stripped === "true") return true;
@@ -3996,7 +4155,9 @@ var INLINE_ACTOR_KEYS = /* @__PURE__ */ new Set([
   "initial",
   "final",
   "tone",
-  "nodes",
+  // 色の欄 (#1969)。 縦に並べた形と JSON は `color` を受けるのに、中括弧の形だけが知らない
+  // 項目名として落としていた。 見本 (parts) では従来どおり状態の上書きとして読む
+  "color",
   // 体験の道筋の欄 (#1251)。 他の図種では組み立て側が知らせる
   "touchpoint",
   "opportunity",
@@ -4007,6 +4168,9 @@ var INLINE_ACTOR_KEYS = /* @__PURE__ */ new Set([
   "posY",
   "posW",
   "posH",
+  // 位置のずらし (#1971)
+  "offsetX",
+  "offsetY",
   // 箱の中に描く図形 (#1374)
   "shape",
   // その箱を出すかどうかの条件 (#1381)
@@ -4026,6 +4190,9 @@ var INLINE_ACTOR_KEYS = /* @__PURE__ */ new Set([
   // 英語が読める欄の日本語別名 (#1301)。 一覧は `INLINE_ACTOR_ALIASES` が持つ
   ...Object.keys(INLINE_ACTOR_ALIASES)
 ]);
+var PART_INLINE_UNREADABLE_KEYS = new Set(
+  [...ACTOR_RESERVED_FIELDS].filter((key) => !INLINE_ACTOR_KEYS.has(key) && key !== "state")
+);
 var EDGE_BIND_INLINE_READERS = {
   widthBind: (v) => v,
   strokeBind: (v) => v,
@@ -4033,6 +4200,8 @@ var EDGE_BIND_INLINE_READERS = {
 };
 var FLOW_INLINE_READERS = {
   sub: (v) => v,
+  // クラス図の出どころ側の多重度 (#1771)。 `sub` (行き先の端) と対
+  tailSub: (v) => v,
   guard: (v) => v,
   cardinality: (v) => v,
   /*
@@ -4054,7 +4223,7 @@ var FLOW_INLINE_READERS = {
   head: (v) => v !== void 0 && EDGE_HEAD_VALUES.includes(v) ? v : void 0,
   // 出どころ側の端の形 (#1466)。 ER は端ごとに違う個数を示すので両端に要る
   tailHead: (v) => v !== void 0 && EDGE_HEAD_VALUES.includes(v) ? v : void 0,
-  // 端の印の塗り (#1466)。 白抜きの菱が「持つ」、塗った菱が「抱える」
+  // 端の印の塗り (#1466)。 白抜きの菱が集約、塗った菱がコンポジション
   headFill: (v) => v !== void 0 && EDGE_HEAD_FILL_VALUES.includes(v) ? v : void 0,
   tailHeadFill: (v) => v !== void 0 && EDGE_HEAD_FILL_VALUES.includes(v) ? v : void 0,
   /*
@@ -4078,6 +4247,12 @@ var FLOW_INLINE_READERS = {
    * 持たないため、知らせを出せる場所で見る)。
    */
   ...EDGE_BIND_INLINE_READERS,
+  /*
+   * 部品の端で矢印を繋ぐ要素の id (#1979)。 部品かどうか、要素が在るかは組み立てで部品の図を
+   * 引いてから決まるため、ここでは字をそのまま通す
+   */
+  fromPartNode: (v) => v,
+  toPartNode: (v) => v,
   // 数と真偽の欄は `FLOW_INLINE_VALUE_KINDS` の表が読む (#1306)。 ここでは名前だけを持つ =
   // 読める欄の一覧 (`FLOW_INLINE_KEYS`) は本表から導くため、載せないと欄ごと消える
   labelOffsetX: null,
@@ -4088,12 +4263,20 @@ var FLOW_INLINE_KEYS = Object.keys(
   FLOW_INLINE_READERS
 );
 function reportUnknownInlineKeys(isPart, inner, line, errors) {
-  if (isPart) return;
   for (const field of splitInlineFields(inner)) {
     const idx = field.indexOf(":");
     if (idx < 0) continue;
     const key = field.slice(0, idx).trim();
     if (!key) continue;
+    if (isPart) {
+      if (!PART_INLINE_UNREADABLE_KEYS.has(key)) continue;
+      errors.push({
+        line,
+        message: `\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${key}"`,
+        hint: `1 \u884C\u306E\u4E2D\u62EC\u5F27\u3067\u306F\u8AAD\u3081\u307E\u305B\u3093\u3002\u540D\u524D\u306E\u4E0B\u306B\u6BB5\u3092\u5206\u3051\u305F\u5F62\u3067\u66F8\u304F\u3068\u52B9\u304D\u307E\u3059`
+      });
+      continue;
+    }
     if (INLINE_ACTOR_KEYS.has(key)) continue;
     errors.push({
       line,
@@ -4102,6 +4285,19 @@ function reportUnknownInlineKeys(isPart, inner, line, errors) {
     });
   }
 }
+function \u4E2D\u62EC\u5F27\u306E\u77E5\u3089\u306A\u3044\u9805\u76EE\u540D\u3092\u77E5\u3089\u305B\u308B(inner, \u4F7F\u3048\u308B, \u63A5\u982D, line, errors) {
+  for (const field of splitInlineFields(inner)) {
+    const idx = field.indexOf(":");
+    if (idx < 0) continue;
+    const key = field.slice(0, idx).trim();
+    if (!key || \u4F7F\u3048\u308B.includes(key)) continue;
+    errors.push({
+      line,
+      message: `${\u63A5\u982D.trimEnd()}\u9805\u76EE\u540D\u304C\u8AAD\u3081\u307E\u305B\u3093: "${key}"`,
+      hint: `\u4F7F\u3048\u308B\u9805\u76EE = ${\u4F7F\u3048\u308B.join(", ")}`
+    });
+  }
+}
 function parseActor2(line, errors) {
   const raw = line.trimmed.trim();
   if (!raw) return null;
@@ -4119,6 +4315,10 @@ function parseActor2(line, errors) {
     if (!isPart && opts.tone !== void 0 && resolveTone(opts.tone) === void 0) {
       report\u8AAD\u3081\u306A\u3044\u8272(opts.tone, line.no, errors, { \u7DDA\u7A2E\u3082\u53D7\u3051\u308B: false });
     }
+    const \u8272 = opts.color !== void 0 ? splitColorValue(opts.color) : {};
+    if (opts.color !== void 0 && !\u8272.tone && !\u8272.hex) {
+      report\u8AAD\u3081\u306A\u3044\u8272(opts.color, line.no, errors, { \u7DDA\u7A2E\u3082\u53D7\u3051\u308B: false });
+    }
     const kind = isPart ? NODE_KIND_DEFAULT : resolveNodeKind(NODE_KIND_VALID.has(kindRaw) ? kindRaw : "");
     return {
       name: namePart2,
@@ -4155,15 +4355,18 @@ function parseActor2(line, errors) {
       renderOffsetY: isPart ? void 0 : \u5024\u306B\u8FFD\u968F\u3059\u308B\u6B04\u3068\u3057\u3066\u8AAD\u3080(opts.renderOffsetY, "\u7BB1\u306E renderOffsetY ", line.no, errors),
       ...\u8868\u3067\u8AAD\u3080(ACTOR_INLINE_VALUE_KINDS, opts, "\u7BB1\u306E ", line.no, errors),
       // parts では `tone` を状態の上書きとして従来から使えるため、 色として横取りしない
-      tone: isPart ? void 0 : resolveTone(opts.tone),
+      // `tone` と `color` を両方書いた時は `tone` を採る (JSON の読み方と揃える)
+      tone: isPart ? void 0 : resolveTone(opts.tone) ?? \u8272.tone,
+      colorHex: \u8272.hex,
+      partColorName: isPart ? \u8272.tone : void 0,
       partId: isPart ? kindRaw : void 0,
       stateOverride: isPart ? extractStateOverride(opts) : void 0,
       // canvas pivot 新 spec = 絶対座標 field は `ACTOR_INLINE_VALUE_KINDS` の表が読む (#1306)
       // 図形の倍率 (#1026)。 どれが効くかは `resolveScale` が 1 箇所で決める
       scale: inlineScale.scale,
       scaleKeys: inlineScale.keys.length ? inlineScale.keys : void 0,
-      // canvas pivot UX 修正 (B1) = sub-node 単位 override map (`nodes: { header: {posX:..., ...}, ...}`)
-      nodes: parseActorNodesField(opts.nodes, line.no, errors),
+      // 位置のずらし (#1971)。 見本 (parts) でも見本 1 つ分をまとめてずらす
+      layoutPos: \u305A\u3089\u3057\u306B\u307E\u3068\u3081\u308B(\u8868\u3067\u8AAD\u3080(OFFSET_VALUE_KINDS, opts, "\u7BB1\u306E ", line.no, errors)),
       pos: { line: line.no }
     };
   }
@@ -4215,6 +4418,7 @@ function parseFlowStep(line, no, errors) {
   let \u6570\u3068\u771F\u507D;
   if (\u584A) {
     const opts = parseInlineMapping(\u584A.\u4E2D\u8EAB);
+    \u4E2D\u62EC\u5F27\u306E\u77E5\u3089\u306A\u3044\u9805\u76EE\u540D\u3092\u77E5\u3089\u305B\u308B(\u584A.\u4E2D\u8EAB, FLOW_INLINE_KEYS, "\u77E2\u5370\u306E ", line.no, errors);
     for (const field of splitInlineFields(\u584A.\u4E2D\u8EAB)) {
       const idx = field.indexOf(":");
       if (idx < 0) continue;
@@ -4254,6 +4458,7 @@ function parseFlowStep(line, no, errors) {
     rest = \u584A.\u524D.trim();
   }
   const sub = \u4E2D\u62EC\u5F27.sub;
+  const tailSub = \u4E2D\u62EC\u5F27.tailSub;
   const guard = \u4E2D\u62EC\u5F27.guard;
   const cardinality = \u4E2D\u62EC\u5F27.cardinality;
   const side = \u4E2D\u62EC\u5F27.side;
@@ -4286,6 +4491,8 @@ function parseFlowStep(line, no, errors) {
   const labelOffsetX = \u6570\u3068\u771F\u507D?.labelOffsetX;
   const labelOffsetY = \u6570\u3068\u771F\u507D?.labelOffsetY;
   const overlay = \u6570\u3068\u771F\u507D?.overlay;
+  const fromPartNode = \u4E2D\u62EC\u5F27.fromPartNode || void 0;
+  const toPartNode = \u4E2D\u62EC\u5F27.toPartNode || void 0;
   const optMatch = rest.match(/\s*\(([^)]*)\)\s*$/);
   if (optMatch) {
     const opts = (optMatch[1] ?? "").split(",").map((s) => s.trim());
@@ -4331,6 +4538,7 @@ function parseFlowStep(line, no, errors) {
     tone,
     style,
     sub,
+    tailSub,
     guard,
     cardinality,
     side,
@@ -4348,6 +4556,8 @@ function parseFlowStep(line, no, errors) {
     labelOffsetX,
     labelOffsetY,
     overlay,
+    ...fromPartNode !== void 0 ? { fromPartNode } : {},
+    ...toPartNode !== void 0 ? { toPartNode } : {},
     pos: { line: line.no }
   };
 }
@@ -4610,7 +4820,11 @@ var DRAW_TARGETS = /* @__PURE__ */ new Map([
   ["tree", "tree"],
   ["gantt", "gantt"],
   ["funnel", "funnel"],
-  ["slope", "slope"]
+  ["slope", "slope"],
+  ["gauge", "gauge"],
+  ["radial", "radial"],
+  ["stacked", "stacked"],
+  ["waffle", "waffle"]
 ]);
 var DRAW_WORDS = new Set(DRAW_TARGETS.keys());
 var \u6BB5\u306E\u9805\u76EE\u306E\u65E5\u672C\u8A9E = {
@@ -5040,7 +5254,7 @@ function compileToCdl(doc, opts) {
       diagram2 = compileSequence(doc);
       break;
     case "flow":
-      diagram2 = compileFlow(doc);
+      diagram2 = compileFlow(doc, opts?.partsCatalog);
       break;
     case "swimlane":
       diagram2 = compileSwimlane(doc);
@@ -5113,22 +5327,25 @@ function compileToCdl(doc, opts) {
   }
   const \u4F5C\u308A\u66FF\u3048\u305F\u5BFE\u8C61 = collectRenamedTargets(diagram2, \u5206\u3051\u305F.\u5143\u306E\u540D\u524D);
   const edgeSourceLines = opts?.onEdgeSource ? /* @__PURE__ */ new Map() : void 0;
-  applyEdgeInlineOptions(diagram2, doc, edgeSourceLines);
-  applyGroupContainers(diagram2, doc);
+  const \u77E2\u5370\u306E\u884C = /* @__PURE__ */ new Map();
+  applyEdgeInlineOptions(diagram2, doc, edgeSourceLines, \u77E2\u5370\u306E\u884C, opts?.partsCatalog);
+  const \u4F5C\u3063\u305F\u7D44\u306E\u67A0 = applyGroupContainers(diagram2, doc);
   applyNodeTones(diagram2, doc);
   reportMissingFocusTargets(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportMissingFlowActors(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
-  reportFlowEndpointNotHonored(doc, \u5206\u3051\u305F.\u5143\u306E\u540D\u524D, opts?.onNotice);
+  reportFlowEndpointNotHonored(doc, \u5206\u3051\u305F.\u5143\u306E\u540D\u524D, opts?.onNotice, opts?.partsCatalog);
   reportLaneNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportActorKindNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportMessageOptionNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportFlowOffsetNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportDocEyebrowNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportDirectionNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportDrawNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportChartFieldsNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   reportAxesNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportPartNodeNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   const placed = resolveRelativeDoc(diagram2, doc, opts?.onNotice, opts?.partsCatalog);
-  applyCanvasPivotPositions(diagram2, placed, opts?.onNotice);
+  applyCanvasPivotPositions(diagram2, placed);
   const \u8FFD\u52A0\u3057\u305F\u7E26\u5217 = [];
   const extended = applyV05Extensions(diagram2, placed, \u8FFD\u52A0\u3057\u305F\u7E26\u5217);
   const inheritedDerivedSourceLines = opts?.onNotice ? /* @__PURE__ */ new Map() : void 0;
@@ -5140,7 +5357,8 @@ function compileToCdl(doc, opts) {
     placed,
     opts?.partsCatalog,
     opts?.onNotice,
-    inheritedDerivedSourceLines
+    inheritedDerivedSourceLines,
+    \u77E2\u5370\u306E\u884C
   );
   reportEmptyDeclaredLanes(merged, \u8FFD\u52A0\u3057\u305F\u7E26\u5217, opts?.onNotice);
   if (edgeSourceLines && opts?.onEdgeSource) {
@@ -5152,6 +5370,7 @@ function compileToCdl(doc, opts) {
   injectStaticPhase(merged);
   materializeStates(merged, doc);
   if (doc.reveal !== void 0) merged.edgeReveal = doc.reveal;
+  if (doc.relations !== void 0) merged.relationFocus = doc.relations;
   \u8A9E\u306E\u72B6\u614B\u3092\u56F3\u306E\u8A9E\u3078\u76F4\u3059(merged);
   const \u7573\u3093\u3060\u304D\u3063\u304B\u3051 = foldValueTriggers(merged, doc, opts?.onNotice);
   attachDerivedValues(merged, doc, opts?.onNotice, inheritedDerivedSourceLines, \u7573\u3093\u3060\u304D\u3063\u304B\u3051);
@@ -5171,6 +5390,8 @@ function compileToCdl(doc, opts) {
     const ownFormulas = doc.formulas.map((formula) => ({
       id: formula.id,
       expression: formula.expression,
+      // 名札は操作部が式の名前として描く (#1916、cdl#853)。 書かなければ欄ごと付けない
+      ...formula.label !== void 0 ? { label: formula.label } : {},
       line: formula.pos?.line ?? 0
     }));
     const \u3064\u307E\u307F = new Map((merged.inputs ?? []).map((input) => [input.id, input]));
@@ -5220,7 +5441,11 @@ function compileToCdl(doc, opts) {
         });
       }
       if (\u89E3\u3051\u306A\u3044) continue;
-      \u8F09\u305B\u308B\u5F0F.push({ id: formula.id, expression: formula.expression });
+      \u8F09\u305B\u308B\u5F0F.push({
+        id: formula.id,
+        expression: formula.expression,
+        ...formula.label !== void 0 ? { label: formula.label } : {}
+      });
       \u5148\u306B\u66F8\u304B\u308C\u305F\u5F0F.add(formula.id);
     }
     if (\u8F09\u305B\u308B\u5F0F.length > 0) merged.formulas = \u8F09\u305B\u308B\u5F0F;
@@ -5268,6 +5493,8 @@ function compileToCdl(doc, opts) {
   restoreActorNames(merged, \u5206\u3051\u305F.\u5143\u306E\u540D\u524D, \u4F5C\u308A\u66FF\u3048\u305F\u5BFE\u8C61);
   \u914D\u8272\u3068\u7E1E\u3092\u5F53\u3066\u308B(merged, doc);
   \u9759\u6B62\u3057\u305F\u56F3\u306E\u7126\u70B9\u3092\u5916\u3059(merged, doc);
+  applyLayoutOffsets(merged, doc, opts?.onNotice);
+  applyGroupFrames(merged, doc, \u4F5C\u3063\u305F\u7D44\u306E\u67A0, opts?.onNotice);
   return merged;
 }
 function \u9759\u6B62\u3057\u305F\u56F3\u306E\u7126\u70B9\u3092\u5916\u3059(diagram2, doc) {
@@ -5444,13 +5671,14 @@ function reportLaneMixed(doc, onNotice) {
     hint: "\u66F8\u304B\u306A\u304B\u3063\u305F\u7BB1\u3092\u3069\u306E\u7E26\u5217\u306B\u7F6E\u304F\u304B\u3092\u6C7A\u3081\u3089\u308C\u306A\u3044\u305F\u3081\u3001\u5168\u90E8\u66F8\u304F\u304B 1 \u3064\u3082\u66F8\u304B\u306A\u3044\u304B\u306B\u3057\u3066\u304F\u3060\u3055\u3044"
   });
 }
-function reportFlowEndpointNotHonored(doc, \u5143\u306E\u540D\u524D, onNotice) {
+function reportFlowEndpointNotHonored(doc, \u5143\u306E\u540D\u524D, onNotice, partsCatalog) {
   if (!onNotice) return;
   if (!\u9396\u3067\u3064\u306A\u3050\u5F62\u304B(doc)) return;
   const \u66F8\u3044\u305F\u540D\u524D = (name) => \u5143\u306E\u540D\u524D.get(name) ?? name;
   const \u9396\u306E\u7D44 = /* @__PURE__ */ new Set();
-  doc.actors.forEach((a, i) => {
-    const \u6B21 = doc.actors[i + 1];
+  const \u4E26\u3073 = \u9396\u306B\u4E26\u3079\u308B\u767B\u5834\u4EBA\u7269(doc, partsCatalog);
+  \u4E26\u3073.forEach((a, i) => {
+    const \u6B21 = \u4E26\u3073[i + 1];
     if (\u6B21 === void 0) return;
     \u9396\u306E\u7D44.add(`${a.name}\0${\u6B21.name}`);
   });
@@ -5461,7 +5689,7 @@ function reportFlowEndpointNotHonored(doc, \u5143\u306E\u540D\u524D, onNotice) {
       actor: \u66F8\u3044\u305F\u540D\u524D(s.from),
       line: s.pos.line,
       message: `"${truncateForMessage(\u66F8\u3044\u305F\u540D\u524D(s.from))} -> ${truncateForMessage(\u66F8\u3044\u305F\u540D\u524D(s.to))}" \u306E\u7AEF\u306F\u4F7F\u308F\u308C\u307E\u305B\u3093 (type: flow \u306F\u767B\u5834\u4EBA\u7269\u3092\u66F8\u3044\u305F\u9806\u306B\u7E4B\u304E\u307E\u3059)`,
-      hint: "\u66F8\u3044\u305F\u7AEF\u3069\u304A\u308A\u306B\u7E4B\u3050\u306B\u306F\u3001\u7BB1\u306B lane: \u3092\u66F8\u3044\u3066\u304F\u3060\u3055\u3044 (\u7E26\u5217\u3092\u66F8\u3044\u305F\u5F62\u306F\u66F8\u3044\u305F\u7AEF\u304C\u305D\u306E\u307E\u307E\u77E2\u5370\u306B\u306A\u308A\u307E\u3059)"
+      hint: "\u66F8\u3044\u305F\u7AEF\u3069\u304A\u308A\u306B\u7E4B\u3050\u306B\u306F\u3001direction: \u7E26 \u3092\u66F8\u304F\u304B\u7BB1\u306B lane: \u3092\u66F8\u3044\u3066\u304F\u3060\u3055\u3044 (\u5411\u304D\u304B\u7E26\u5217\u3092\u66F8\u3044\u305F\u5F62\u306F\u66F8\u3044\u305F\u7AEF\u304C\u305D\u306E\u307E\u307E\u77E2\u5370\u306B\u306A\u308A\u307E\u3059)"
     });
   }
 }
@@ -5472,7 +5700,9 @@ function reportMessageOptionNotHonored(doc, onNotice) {
     const \u52B9\u304B\u306A\u3044 = [
       s.tone !== void 0 ? "\u8272\u5473" : "",
       s.sub !== void 0 ? "\u6DFB\u3048\u5B57" : "",
-      s.side !== void 0 ? "\u5BC4\u305B" : ""
+      s.side !== void 0 ? "\u5BC4\u305B" : "",
+      // 名前のずらしも板には載せる先が無い (#1971)。 位置のずらし (`pos`) は名前のずらしに足す欄なので同じ扱い
+      s.layoutPos !== void 0 || s.labelOffsetX !== void 0 || s.labelOffsetY !== void 0 ? "\u540D\u524D\u306E\u305A\u3089\u3057" : ""
     ].filter((x) => x !== "");
     if (\u52B9\u304B\u306A\u3044.length === 0) continue;
     onNotice({
@@ -5484,6 +5714,21 @@ function reportMessageOptionNotHonored(doc, onNotice) {
     });
   }
 }
+function reportFlowOffsetNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.type === "sequence" || doc.type === "solidity") return;
+  for (const s of doc.flow) {
+    if (s.layoutPos === void 0) continue;
+    if (s.label !== void 0 && s.label.trim() !== "") continue;
+    onNotice({
+      kind: "position-offset-ignored",
+      actor: s.from,
+      line: s.pos?.line ?? 0,
+      message: `${s.from} -> ${s.to} \u306E\u4F4D\u7F6E\u306E\u305A\u3089\u3057\u306F\u3001\u540D\u524D\u306E\u7121\u3044\u77E2\u5370\u3067\u306F\u52D5\u304B\u3059\u3082\u306E\u304C\u3042\u308A\u307E\u305B\u3093`,
+      hint: "\u77E2\u5370\u306E\u4F4D\u7F6E\u306E\u305A\u3089\u3057\u306F\u540D\u524D\u3092\u305A\u3089\u3057\u307E\u3059\u3002 \u540D\u524D\u3092\u66F8\u304F\u304B\u3001\u305A\u3089\u3057\u3092\u5916\u3059"
+    });
+  }
+}
 function reportActorKindNotHonored(doc, onNotice) {
   if (!onNotice) return;
   if (doc.type !== "sequence" && doc.type !== "solidity") return;
@@ -5501,7 +5746,8 @@ function reportActorKindNotHonored(doc, onNotice) {
        */
       doc.type === "sequence" && a.kindWritten !== false && a.kind !== void 0 ? "\u7A2E\u985E" : "",
       a.posW !== void 0 || a.posH !== void 0 ? "\u5927\u304D\u3055" : "",
-      a.posX !== void 0 || a.posY !== void 0 || a.posRel !== void 0 ? "\u4F4D\u7F6E" : "",
+      a.posX !== void 0 || a.posY !== void 0 || a.posRel !== void 0 || // 位置のずらし (#1971)。 板は面ごとの箱を持たないので動かす相手が無い
+      a.layoutPos !== void 0 ? "\u4F4D\u7F6E" : "",
       a.rows !== void 0 ? "\u884C" : "",
       a.tone !== void 0 ? "\u8272" : "",
       a.eyebrow !== void 0 ? "\u5C0F\u898B\u51FA\u3057" : "",
@@ -5910,6 +6156,220 @@ function withPositions(diagram2, doc, assign) {
   applyCanvasPivotPositions(probe, withDocPositions(doc, assign));
   return probe;
 }
+function applyLayoutOffsets(diagram2, doc, onNotice) {
+  const \u305A\u3089\u3059\u7BB1 = doc.type === "mind" ? [] : doc.actors.filter((a) => a.layoutPos !== void 0);
+  const \u305A\u3089\u3059\u7E26\u5217 = Object.entries(doc.lanes ?? {}).filter(([, l]) => l.layoutPos !== void 0);
+  if (\u305A\u3089\u3059\u7BB1.length === 0 && \u305A\u3089\u3059\u7E26\u5217.length === 0) return;
+  if (doc.type === "sequence" || doc.type === "solidity") return;
+  const \u524D = layout(diagram2);
+  const \u7BB1\u306E\u914D\u7F6E = new Map(\u524D.nodes.map((n) => [n.id, n]));
+  const \u7E26\u5217\u306E\u914D\u7F6E = new Map(\u524D.lanes.map((l) => [l.id, l]));
+  const \u76F8\u624B\u305F\u3061 = [];
+  const \u7E26\u5217\u306E\u305A\u3089\u3057 = /* @__PURE__ */ new Map();
+  const \u7BB1\u3060\u3051\u306E\u72D9\u3044 = /* @__PURE__ */ new Map();
+  for (const [id, lane] of \u305A\u3089\u3059\u7E26\u5217) {
+    const laid = \u7E26\u5217\u306E\u914D\u7F6E.get(id);
+    const d = lane.layoutPos;
+    if (!laid) {
+      onNotice?.({
+        kind: "position-offset-ignored",
+        actor: id,
+        line: lane.pos?.line ?? 0,
+        message: `\u7E26\u5217 "${id}" \u306E\u4F4D\u7F6E\u306E\u305A\u3089\u3057\u3092\u8F09\u305B\u308B\u7E26\u5217\u304C\u56F3\u306B\u3042\u308A\u307E\u305B\u3093 (type: ${doc.type})`,
+        hint: "\u7E26\u5217\u3092\u4F5C\u308B\u56F3\u7A2E\u3067\u66F8\u304F\u304B\u3001\u305A\u3089\u3057\u3092\u5916\u3059"
+      });
+      continue;
+    }
+    \u7E26\u5217\u306E\u305A\u3089\u3057.set(id, d);
+    \u76F8\u624B\u305F\u3061.push({
+      \u540D\u524D: id,
+      line: lane.pos?.line ?? 0,
+      // 縦列を固定しただけでは、中の箱は縦列の並ぶ向きにしか付いて来ない (実測 = flow の縦列を
+      // 右へ 120、下へ 40 ずらすと、見出しは両方動き箱は右へ 120 だけ動いた)。 箱も同じ量で固定する
+      \u7BB1: diagram2.nodes.flatMap((n) => {
+        const \u7BB1laid = n.lane === id ? \u7BB1\u306E\u914D\u7F6E.get(n.id) : void 0;
+        return \u7BB1laid ? [{ id: n.id, \u72D9\u3044X: \u7BB1laid.cx + d.x, \u72D9\u3044Y: \u7BB1laid.cy + d.y }] : [];
+      }),
+      \u7E26\u5217: [{ id, \u72D9\u3044X: (laid.x ?? 0) + d.x, \u72D9\u3044Y: (laid.y ?? 0) + d.y }],
+      \u305A\u3089\u3057\u305F\u7E26\u5217: id
+    });
+  }
+  for (const a of \u305A\u3089\u3059\u7BB1) {
+    const d = a.layoutPos;
+    const \u524D\u7F6E\u304D = `${a.name}__`;
+    const \u7BB1 = a.partId !== void 0 ? diagram2.nodes.filter((n) => n.id.startsWith(\u524D\u7F6E\u304D)) : diagram2.nodes.filter((n) => n.id === slugify(a.name));
+    const \u7E26\u5217 = a.partId !== void 0 ? diagram2.lanes.filter((l) => l.id.startsWith(\u524D\u7F6E\u304D)) : [];
+    if (\u7BB1.length === 0) {
+      onNotice?.({
+        kind: "position-offset-ignored",
+        actor: a.name,
+        line: a.pos?.line ?? 0,
+        message: `"${truncateForMessage(a.name)}" \u306E\u4F4D\u7F6E\u306E\u305A\u3089\u3057\u3092\u8F09\u305B\u308B\u7BB1\u304C\u56F3\u306B\u3042\u308A\u307E\u305B\u3093 (type: ${doc.type})`,
+        hint: "\u7BB1\u3092\u63CF\u304F\u56F3\u7A2E\u3067\u66F8\u304F\u304B\u3001\u305A\u3089\u3057\u3092\u5916\u3059"
+      });
+      continue;
+    }
+    \u76F8\u624B\u305F\u3061.push({
+      \u540D\u524D: a.name,
+      line: a.pos?.line ?? 0,
+      \u7BB1: \u7BB1.map((n) => {
+        const laid = \u7BB1\u306E\u914D\u7F6E.get(n.id);
+        \u7BB1\u3060\u3051\u306E\u72D9\u3044.set(n.id, { x: laid.cx + d.x, y: laid.cy + d.y });
+        const \u5217 = \u7E26\u5217\u306E\u305A\u3089\u3057.get(n.lane);
+        return { id: n.id, \u72D9\u3044X: laid.cx + d.x + (\u5217?.x ?? 0), \u72D9\u3044Y: laid.cy + d.y + (\u5217?.y ?? 0) };
+      }),
+      \u7E26\u5217: \u7E26\u5217.map((l) => {
+        const laid = \u7E26\u5217\u306E\u914D\u7F6E.get(l.id);
+        return { id: l.id, \u72D9\u3044X: (laid.x ?? 0) + d.x, \u72D9\u3044Y: (laid.y ?? 0) + d.y };
+      })
+    });
+  }
+  if (\u76F8\u624B\u305F\u3061.length === 0) return;
+  const \u5143\u306E\u7BB1 = new Map(diagram2.nodes.map((n) => [n.id, { posX: n.posX, posY: n.posY }]));
+  const \u5143\u306E\u7E26\u5217 = new Map(
+    diagram2.lanes.map((l) => [l.id, { posX: l.posX, posY: l.posY, posW: l.posW, posH: l.posH }])
+  );
+  const \u7BB1\u306E\u72D9\u3044 = /* @__PURE__ */ new Map();
+  const \u7E26\u5217\u306E\u72D9\u3044 = /* @__PURE__ */ new Map();
+  for (const t of \u76F8\u624B\u305F\u3061) {
+    for (const b of t.\u7BB1) \u7BB1\u306E\u72D9\u3044.set(b.id, { x: b.\u72D9\u3044X, y: b.\u72D9\u3044Y });
+    for (const l of t.\u7E26\u5217) \u7E26\u5217\u306E\u72D9\u3044.set(l.id, { x: l.\u72D9\u3044X, y: l.\u72D9\u3044Y });
+  }
+  const \u7E26\u5217\u3092\u56FA\u5B9A\u3059\u308B = \u7E26\u5217\u306E\u72D9\u3044.size > 0;
+  const \u7559\u3081\u308B\u4F4D\u7F6E = /* @__PURE__ */ new Map();
+  if (\u7E26\u5217\u3092\u56FA\u5B9A\u3059\u308B) {
+    let \u57FA\u6E96 = \u524D;
+    if (\u7BB1\u3060\u3051\u306E\u72D9\u3044.size > 0) {
+      for (const node of diagram2.nodes) {
+        const \u72D9\u3044 = \u7BB1\u3060\u3051\u306E\u72D9\u3044.get(node.id);
+        if (!\u72D9\u3044) continue;
+        node.posX = \u72D9\u3044.x;
+        node.posY = \u72D9\u3044.y;
+      }
+      \u57FA\u6E96 = layout(diagram2);
+      for (const node of diagram2.nodes) {
+        if (!\u7BB1\u3060\u3051\u306E\u72D9\u3044.has(node.id)) continue;
+        const \u5143 = \u5143\u306E\u7BB1.get(node.id);
+        node.posX = \u5143.posX;
+        node.posY = \u5143.posY;
+      }
+    }
+    const \u57FA\u6E96\u306E\u7BB1 = new Map(\u57FA\u6E96.nodes.map((n) => [n.id, n]));
+    for (const t of \u76F8\u624B\u305F\u3061) {
+      const d = t.\u305A\u3089\u3057\u305F\u7E26\u5217 === void 0 ? void 0 : \u7E26\u5217\u306E\u305A\u3089\u3057.get(t.\u305A\u3089\u3057\u305F\u7E26\u5217);
+      if (!d) continue;
+      for (const b of t.\u7BB1) {
+        const n = \u57FA\u6E96\u306E\u7BB1.get(b.id);
+        if (!n || \u7BB1\u3060\u3051\u306E\u72D9\u3044.has(b.id)) continue;
+        \u7BB1\u306E\u72D9\u3044.set(b.id, { x: n.cx + d.x, y: n.cy + d.y });
+      }
+    }
+    for (const n of \u57FA\u6E96.nodes) {
+      if (!\u7BB1\u306E\u72D9\u3044.has(n.id)) \u7559\u3081\u308B\u4F4D\u7F6E.set(n.id, { x: n.cx, y: n.cy });
+    }
+  }
+  const \u7559\u3081\u305F\u7BB1 = /* @__PURE__ */ new Set();
+  const \u66F8\u304F = (\u76F4\u30572) => {
+    if (\u7E26\u5217\u3092\u56FA\u5B9A\u3059\u308B) {
+      for (const lane of diagram2.lanes) {
+        const laid = \u7E26\u5217\u306E\u914D\u7F6E.get(lane.id);
+        if (!laid) continue;
+        const \u72D9\u3044 = \u7E26\u5217\u306E\u72D9\u3044.get(lane.id) ?? { x: laid.x ?? 0, y: laid.y ?? 0 };
+        const \u5DEE2 = \u76F4\u30572.get(`lane:${lane.id}`) ?? { x: 0, y: 0 };
+        lane.posX = \u72D9\u3044.x - \u5DEE2.x;
+        lane.posY = \u72D9\u3044.y - \u5DEE2.y;
+        lane.posW = laid.width;
+        lane.posH = laid.height;
+      }
+    }
+    for (const node of diagram2.nodes) {
+      const \u72D9\u3044 = \u7BB1\u306E\u72D9\u3044.get(node.id);
+      const \u7559\u3081\u308B = \u7559\u3081\u305F\u7BB1.has(node.id) ? \u7559\u3081\u308B\u4F4D\u7F6E.get(node.id) : void 0;
+      if (!\u72D9\u3044 && !\u7559\u3081\u308B) continue;
+      const \u5DEE2 = \u76F4\u30572.get(\u72D9\u3044 ? `node:${node.id}` : `keep:${node.id}`) ?? { x: 0, y: 0 };
+      node.posX = (\u72D9\u3044 ?? \u7559\u3081\u308B).x - \u5DEE2.x;
+      node.posY = (\u72D9\u3044 ?? \u7559\u3081\u308B).y - \u5DEE2.y;
+    }
+  };
+  const \u6E2C\u308B = () => {
+    const \u5F8C = layout(diagram2);
+    const \u5DEE2 = /* @__PURE__ */ new Map();
+    for (const n of \u5F8C.nodes) {
+      const \u72D9\u3044 = \u7BB1\u306E\u72D9\u3044.get(n.id);
+      if (\u72D9\u3044) \u5DEE2.set(`node:${n.id}`, { x: n.cx - \u72D9\u3044.x, y: n.cy - \u72D9\u3044.y });
+      const \u7559\u3081\u308B = \u7559\u3081\u308B\u4F4D\u7F6E.get(n.id);
+      if (\u7559\u3081\u308B) \u5DEE2.set(`keep:${n.id}`, { x: n.cx - \u7559\u3081\u308B.x, y: n.cy - \u7559\u3081\u308B.y });
+    }
+    if (\u7E26\u5217\u3092\u56FA\u5B9A\u3059\u308B) {
+      for (const l of \u5F8C.lanes) {
+        const laid = \u7E26\u5217\u306E\u914D\u7F6E.get(l.id);
+        if (!laid) continue;
+        const \u72D9\u3044 = \u7E26\u5217\u306E\u72D9\u3044.get(l.id) ?? { x: laid.x ?? 0, y: laid.y ?? 0 };
+        \u5DEE2.set(`lane:${l.id}`, { x: (l.x ?? 0) - \u72D9\u3044.x, y: (l.y ?? 0) - \u72D9\u3044.y });
+      }
+    }
+    return \u5DEE2;
+  };
+  const \u305A\u308C\u305F = (\u5DEE2) => \u5DEE2 !== void 0 && (Math.abs(\u5DEE2.x) > PLACEMENT_TOLERANCE || Math.abs(\u5DEE2.y) > PLACEMENT_TOLERANCE);
+  const \u76F4\u3057 = /* @__PURE__ */ new Map();
+  \u66F8\u304F(\u76F4\u3057);
+  let \u5DEE = \u6E2C\u308B();
+  for (let \u56DE = 0; \u56DE < 2 && [...\u5DEE.values()].some(\u305A\u308C\u305F); \u56DE++) {
+    for (const [k, v] of \u5DEE) {
+      if (!\u305A\u308C\u305F(v)) continue;
+      const id = k.slice(k.indexOf(":") + 1);
+      if (k.startsWith("keep:") && !\u7559\u3081\u305F\u7BB1.has(id)) {
+        \u7559\u3081\u305F\u7BB1.add(id);
+        continue;
+      }
+      const \u524D\u306E\u76F4\u3057 = \u76F4\u3057.get(k) ?? { x: 0, y: 0 };
+      \u76F4\u3057.set(k, { x: \u524D\u306E\u76F4\u3057.x + v.x, y: \u524D\u306E\u76F4\u3057.y + v.y });
+    }
+    \u66F8\u304F(\u76F4\u3057);
+    \u5DEE = \u6E2C\u308B();
+  }
+  const \u623B\u3059\u7BB1 = (t) => {
+    for (const b of t.\u7BB1) {
+      const node = diagram2.nodes.find((n) => n.id === b.id);
+      const \u5143 = \u5143\u306E\u7BB1.get(b.id);
+      node.posX = \u5143.posX;
+      node.posY = \u5143.posY;
+    }
+  };
+  const \u77E5\u3089\u305B\u308B = (t) => onNotice?.({
+    kind: "position-offset-ignored",
+    actor: t.\u540D\u524D,
+    line: t.line,
+    message: `"${truncateForMessage(t.\u540D\u524D)}" \u306E\u4F4D\u7F6E\u306E\u305A\u3089\u3057\u306F type: ${doc.type} \u306E\u56F3\u3067\u306F\u66F8\u3044\u305F\u91CF\u3060\u3051\u52D5\u304B\u305B\u307E\u305B\u3093`,
+    hint: "\u305A\u3089\u3057\u3092\u5916\u3059\u304B\u3001\u5EA7\u6A19 (`\u4F4D\u7F6E: 300,200`) \u3067\u7F6E\u304F"
+  });
+  if ([...\u5DEE].some(([k, v]) => (k.startsWith("lane:") || k.startsWith("keep:")) && \u305A\u308C\u305F(v))) {
+    for (const lane of diagram2.lanes) {
+      const \u5143 = \u5143\u306E\u7E26\u5217.get(lane.id);
+      if (!\u5143) continue;
+      lane.posX = \u5143.posX;
+      lane.posY = \u5143.posY;
+      lane.posW = \u5143.posW;
+      lane.posH = \u5143.posH;
+    }
+    for (const node of diagram2.nodes) {
+      if (!\u7559\u3081\u305F\u7BB1.has(node.id)) continue;
+      const \u5143 = \u5143\u306E\u7BB1.get(node.id);
+      node.posX = \u5143.posX;
+      node.posY = \u5143.posY;
+    }
+    for (const t of \u76F8\u624B\u305F\u3061) {
+      \u623B\u3059\u7BB1(t);
+      \u77E5\u3089\u305B\u308B(t);
+    }
+    return;
+  }
+  for (const t of \u76F8\u624B\u305F\u3061) {
+    if (!t.\u7BB1.some((b) => \u305A\u308C\u305F(\u5DEE.get(`node:${b.id}`)))) continue;
+    \u623B\u3059\u7BB1(t);
+    \u77E5\u3089\u305B\u308B(t);
+  }
+}
 function applyNodeTones(diagram2, doc) {
   for (const actor of doc.actors) {
     if (actor.tone === void 0) continue;
@@ -5918,7 +6378,7 @@ function applyNodeTones(diagram2, doc) {
     }
   }
 }
-function applyCanvasPivotPositions(diagram2, doc, onNotice) {
+function applyCanvasPivotPositions(diagram2, doc) {
   for (const actor of doc.actors) {
     if (actor.partId !== void 0) continue;
     const aliasSlug = slugify(actor.name);
@@ -5940,30 +6400,6 @@ function applyCanvasPivotPositions(diagram2, doc, onNotice) {
         }
       }
     }
-    if (actor.nodes) {
-      for (const [subKey, override] of Object.entries(actor.nodes)) {
-        if (override.posX === void 0 || override.posY === void 0) continue;
-        let \u5F53\u305F\u3063\u305F = 0;
-        for (const node of diagram2.nodes) {
-          if (node.id === `${aliasSlug}-${subKey}` || node.id === `${subKey}-${aliasSlug}`) {
-            node.posX = override.posX;
-            node.posY = override.posY;
-            if (override.posW !== void 0) node.posW = override.posW;
-            if (override.posH !== void 0) node.posH = override.posH;
-            \u5F53\u305F\u3063\u305F += 1;
-          }
-        }
-        if (\u5F53\u305F\u3063\u305F === 0) {
-          onNotice?.({
-            kind: "sub-node-not-found",
-            actor: actor.name,
-            line: actor.pos?.line ?? 0,
-            message: `"${truncateForMessage(actor.name)}" \u306E nodes \u306B\u66F8\u3044\u305F "${truncateForMessage(subKey)}" \u306B\u5F53\u305F\u308B\u7BB1\u304C\u56F3\u306B\u3042\u308A\u307E\u305B\u3093`,
-            hint: "1 \u4EBA\u306B\u8907\u6570\u306E\u7BB1\u3092\u4F5C\u308B\u56F3\u7A2E\u3067\u3060\u3051\u52B9\u304D\u307E\u3059\u3002 \u7BB1\u305D\u306E\u3082\u306E\u306E\u4F4D\u7F6E\u306F actor \u5074\u306E \u4F4D\u7F6E: \u306B\u66F8\u3044\u3066\u304F\u3060\u3055\u3044"
-          });
-        }
-      }
-    }
   }
 }
 function lookupPart(partsCatalog, partId) {
@@ -6022,21 +6458,12 @@ function partTargetSize(part, posW, posH, scale) {
   };
 }
 function partScaleBase(part) {
-  const lanes = Array.isArray(part.lanes) ? part.lanes : [];
   const nodes = Array.isArray(part.nodes) ? part.nodes : [];
-  const lefts = [];
-  const rights = [];
-  for (const l of lanes) {
-    const lx = typeof l.x === "number" && Number.isFinite(l.x) ? l.x : 0;
-    const lw = positiveOr(l.width, 400);
-    lefts.push(lx);
-    rights.push(lx + lw);
-  }
   const stacks = nodes.map(
     (n) => typeof n.stack === "number" && Number.isFinite(n.stack) ? n.stack : 0
   );
   return {
-    w: positiveOr(maxOf(rights, 400) - minOf(lefts, 0), 400),
+    w: \u90E8\u54C1\u306E\u7F6E\u304D\u65B9\u3092\u8AAD\u3080(part).\u5E45,
     h: Math.max(1, (maxOf(stacks, 0) - minOf(stacks, 0) + 1) * PART_STACK_PITCH)
   };
 }
@@ -6049,33 +6476,15 @@ function partExtent(part, targetW, targetH) {
   const fallback = { w: 400, h: 200, dx: 0, dy: 0 };
   if (!Array.isArray(part.lanes) || !Array.isArray(part.nodes)) return fallback;
   if (part.nodes.length === 0) return fallback;
-  const lanes = /* @__PURE__ */ new Map();
-  const laneLefts = [];
-  const laneRights = [];
-  for (const l of part.lanes) {
-    const x = typeof l.x === "number" && Number.isFinite(l.x) ? l.x : 0;
-    const w = positiveOr(l.width, 400);
-    lanes.set(l.id, { x, w });
-    laneLefts.push(x);
-    laneRights.push(x + w);
-  }
-  const bboxW = positiveOr(maxOf(laneRights, 400) - minOf(laneLefts, 0), 400);
-  const bboxCenterX = minOf(laneLefts, 0) + bboxW / 2;
+  const \u7F6E\u304D\u65B9 = \u90E8\u54C1\u306E\u7F6E\u304D\u65B9\u3092\u8AAD\u3080(part);
   const { x: scaleX, y: scaleY } = partTargetScale(part, targetW, targetH);
-  const stacks = part.nodes.map(
-    (n) => typeof n.stack === "number" && Number.isFinite(n.stack) ? n.stack : 0
-  );
-  const maxStack = maxOf(stacks, 0);
-  const minStack = minOf(stacks, 0);
-  const centerStack = (minStack + maxStack) / 2;
   const tops = [];
   const bottoms = [];
   const lefts = [];
   const rights = [];
   part.nodes.forEach((n, i) => {
-    const lane = lanes.get(n.lane) ?? { x: 0, w: 320 };
-    const cx = (lane.x + lane.w / 2 - bboxCenterX) * scaleX;
-    const cy = ((stacks[i] ?? 0) - centerStack) * PART_STACK_PITCH * scaleY;
+    const \u9801 = \u7F6E\u304D\u65B9.\u8981\u7D20[i] ?? { x: \u7F6E\u304D\u65B9.\u5DE6\u7AEF + \u7F6E\u304D\u65B9.\u5E45 / 2, y: 0 };
+    const { dx: cx, dy: cy } = \u90E8\u54C1\u306E\u8981\u7D20\u306E\u305A\u308C(n, \u9801, \u7F6E\u304D\u65B9, scaleX, scaleY);
     const halfW = positiveOr(n.w, CDL_DEFAULT_NODE_W) * scaleX / 2;
     const halfH = positiveOr(n.h, CDL_DEFAULT_NODE_H) * scaleY / 2;
     lefts.push(cx - halfW);
@@ -6117,43 +6526,121 @@ function partFrameGeometry(part) {
   if (cached) return cached;
   const fallback = { w: 400, h: 200, left: 0, top: 0, boxW: 400, boxH: 200 };
   let out = fallback;
-  if (countDiagramElements(part) <= MAX_INPUT_ELEMENTS) {
-    try {
-      const own = layout(part);
-      const vb = own.viewBox;
-      const w = positiveOr(vb.w, 400);
-      const h = positiveOr(vb.h, 200);
-      if (own.nodes.length === 0) {
-        out = { w, h, left: 0, top: 0, boxW: w, boxH: h };
-      } else {
-        let x0 = Infinity;
-        let y0 = Infinity;
-        let x1 = -Infinity;
-        let y1 = -Infinity;
-        for (const n of own.nodes) {
-          x0 = Math.min(x0, n.cx - n.w / 2);
-          x1 = Math.max(x1, n.cx + n.w / 2);
-          y0 = Math.min(y0, n.cy - n.h / 2);
-          y1 = Math.max(y1, n.cy + n.h / 2);
-        }
-        const left = x0 - vb.x;
-        const top = y0 - vb.y;
-        out = {
-          w,
-          h,
-          left: Number.isFinite(left) ? left : 0,
-          top: Number.isFinite(top) ? top : 0,
-          boxW: positiveOr(x1 - x0, w),
-          boxH: positiveOr(y1 - y0, h)
-        };
-      }
-    } catch {
-      out = fallback;
+  const own = \u90E8\u54C1\u306E\u9801\u3092\u914D\u7F6E\u3059\u308B(part);
+  if (own !== void 0) {
+    const vb = own.viewBox;
+    const w = positiveOr(vb.w, 400);
+    const h = positiveOr(vb.h, 200);
+    if (own.nodes.length === 0) {
+      out = { w, h, left: 0, top: 0, boxW: w, boxH: h };
+    } else {
+      let x0 = Infinity;
+      let y0 = Infinity;
+      let x1 = -Infinity;
+      let y1 = -Infinity;
+      for (const n of own.nodes) {
+        x0 = Math.min(x0, n.cx - n.w / 2);
+        x1 = Math.max(x1, n.cx + n.w / 2);
+        y0 = Math.min(y0, n.cy - n.h / 2);
+        y1 = Math.max(y1, n.cy + n.h / 2);
+      }
+      const left = x0 - vb.x;
+      const top = y0 - vb.y;
+      out = {
+        w,
+        h,
+        left: Number.isFinite(left) ? left : 0,
+        top: Number.isFinite(top) ? top : 0,
+        boxW: positiveOr(x1 - x0, w),
+        boxH: positiveOr(y1 - y0, h)
+      };
     }
   }
   PART_FRAME_CACHE.set(part, out);
   return out;
 }
+var PART_PAGE_CACHE = /* @__PURE__ */ new WeakMap();
+function \u90E8\u54C1\u306E\u9801\u3092\u914D\u7F6E\u3059\u308B(part) {
+  const cached = PART_PAGE_CACHE.get(part);
+  if (cached !== void 0) return cached ?? void 0;
+  let out = null;
+  if (countDiagramElements(part) <= MAX_INPUT_ELEMENTS) {
+    try {
+      out = layout(part);
+    } catch {
+      out = null;
+    }
+  }
+  PART_PAGE_CACHE.set(part, out);
+  return out ?? void 0;
+}
+var \u90E8\u54C1\u306E\u7F6E\u304D\u65B9\u306E\u63A7\u3048 = /* @__PURE__ */ new WeakMap();
+function \u90E8\u54C1\u306E\u7F6E\u304D\u65B9\u3092\u8AAD\u3080(part) {
+  const \u63A7\u3048 = \u90E8\u54C1\u306E\u7F6E\u304D\u65B9\u306E\u63A7\u3048.get(part);
+  if (\u63A7\u3048) return \u63A7\u3048;
+  const \u7F6E\u304D\u65B9 = \u9801\u306E\u7F6E\u304D\u65B9(part) ?? \u66F8\u3044\u305F\u7F6E\u304D\u65B9(part);
+  \u90E8\u54C1\u306E\u7F6E\u304D\u65B9\u306E\u63A7\u3048.set(part, \u7F6E\u304D\u65B9);
+  return \u7F6E\u304D\u65B9;
+}
+function \u7E26\u5217\u306E\u5916\u63A5(\u7E26\u5217) {
+  const \u5024 = [...\u7E26\u5217.values()];
+  const \u5DE6\u7AEF = minOf(\u5024.map((g) => g.x), 0);
+  const \u53F3\u7AEF = maxOf(\u5024.map((g) => g.x + g.w), 400);
+  return { \u5DE6\u7AEF, \u5E45: positiveOr(\u53F3\u7AEF - \u5DE6\u7AEF, 400) };
+}
+function \u9801\u306E\u7F6E\u304D\u65B9(part) {
+  if (!Array.isArray(part.lanes) || !Array.isArray(part.nodes)) return void 0;
+  const laid = \u90E8\u54C1\u306E\u9801\u3092\u914D\u7F6E\u3059\u308B(part);
+  if (laid === void 0) return void 0;
+  const \u7E26\u5217 = /* @__PURE__ */ new Map();
+  for (const l of laid.lanes) {
+    if (!Number.isFinite(l.x) || !Number.isFinite(l.width) || !(l.width > 0)) return void 0;
+    \u7E26\u5217.set(l.id, { x: l.x, w: l.width });
+  }
+  const \u9801\u306E\u7BB1 = new Map(laid.nodes.map((n) => [n.id, n]));
+  const \u7BB1\u305F\u3061 = [];
+  for (const n of part.nodes) {
+    const \u7BB1 = \u9801\u306E\u7BB1.get(n.id);
+    if (\u7BB1 === void 0 || !Number.isFinite(\u7BB1.cx) || !Number.isFinite(\u7BB1.cy)) return void 0;
+    \u7BB1\u305F\u3061.push(\u7BB1);
+  }
+  const \u7E26\u305F\u3061 = \u7BB1\u305F\u3061.map((b) => b.cy);
+  const \u7E26\u306E\u4E2D\u5FC3 = (minOf(\u7E26\u305F\u3061, 0) + maxOf(\u7E26\u305F\u3061, 0)) / 2;
+  return {
+    \u7E26\u5217,
+    ...\u7E26\u5217\u306E\u5916\u63A5(\u7E26\u5217),
+    \u8981\u7D20: \u7BB1\u305F\u3061.map((b) => ({ x: b.cx, y: b.cy - \u7E26\u306E\u4E2D\u5FC3 }))
+  };
+}
+function \u66F8\u3044\u305F\u7F6E\u304D\u65B9(part) {
+  const lanes = Array.isArray(part.lanes) ? part.lanes : [];
+  const nodes = Array.isArray(part.nodes) ? part.nodes : [];
+  const \u7E26\u5217 = /* @__PURE__ */ new Map();
+  for (const l of lanes) {
+    \u7E26\u5217.set(l.id, {
+      x: typeof l.x === "number" && Number.isFinite(l.x) ? l.x : 0,
+      w: positiveOr(l.width, 400)
+    });
+  }
+  const stacks = nodes.map(
+    (n) => typeof n.stack === "number" && Number.isFinite(n.stack) ? n.stack : 0
+  );
+  const \u4E2D\u592E\u306E\u6BB5 = (minOf(stacks, 0) + maxOf(stacks, 0)) / 2;
+  return {
+    \u7E26\u5217,
+    ...\u7E26\u5217\u306E\u5916\u63A5(\u7E26\u5217),
+    \u8981\u7D20: nodes.map((n, i) => {
+      const l = \u7E26\u5217.get(n.lane) ?? { x: 0, w: 320 };
+      return { x: l.x + l.w / 2, y: ((stacks[i] ?? 0) - \u4E2D\u592E\u306E\u6BB5) * PART_STACK_PITCH };
+    })
+  };
+}
+function \u90E8\u54C1\u306E\u8981\u7D20\u306E\u305A\u308C(node, \u9801, \u7F6E\u304D\u65B9, scaleX, scaleY) {
+  return {
+    dx: ((node.posX ?? \u9801.x) - (\u7F6E\u304D\u65B9.\u5DE6\u7AEF + \u7F6E\u304D\u65B9.\u5E45 / 2)) * scaleX,
+    dy: node.posY ?? \u9801.y * scaleY
+  };
+}
 function partFrameExtent(part, targetW, targetH) {
   const box = partExtent(part, targetW, targetH);
   const geom = partFrameGeometry(part);
@@ -6183,15 +6670,14 @@ function partVisualSize(part, targetW, targetH) {
 }
 var PARTS_PER_ROW = 3;
 var PARTS_GAP = 120;
-var STACK_PITCH = 280;
-function partsBaseRows(nodes) {
-  return nodes.reduce((acc, n) => acc + Math.max(1, Math.ceil(positiveOr(n.h, 0) / STACK_PITCH)), 0);
+function partsBaseBottom(laid) {
+  if (laid.nodes.length === 0) return void 0;
+  return laid.viewBox.y + laid.viewBox.h;
 }
-function partsGridCenters(baseRows, items) {
+function partsGridCenters(baseBottom, items) {
   const out = /* @__PURE__ */ new Map();
   if (items.length === 0) return out;
-  const safeCount = Number.isSafeInteger(baseRows) && baseRows >= 0 ? baseRows : 0;
-  const top = safeCount * STACK_PITCH + PARTS_GAP * 2;
+  const top = baseBottom === void 0 || !Number.isFinite(baseBottom) ? PARTS_GAP * 2 : baseBottom + PARTS_GAP;
   const seen = /* @__PURE__ */ new Set();
   const unique = items.filter((i) => {
     if (seen.has(i.id)) return false;
@@ -6237,10 +6723,23 @@ function partsBudget(target, partsActors, partsCatalog) {
   });
   return accepted;
 }
+function baseDiagramBottom(target, baseNodes, partsLaneIds) {
+  if (baseNodes.length === 0) return void 0;
+  const baseIds = new Set(baseNodes.map((n) => n.id));
+  return partsBaseBottom(
+    layout({
+      ...target,
+      lanes: target.lanes.filter((l) => !partsLaneIds.has(l.id)),
+      nodes: [...baseNodes],
+      edges: target.edges.filter((e) => baseIds.has(e.from) && baseIds.has(e.to))
+    })
+  );
+}
 function partGridCenters(target, doc, partsCatalog, accepted, acceptedFrom) {
   const partsActors = doc.actors.filter((a) => a.partId !== void 0);
+  const \u7E26\u5217\u306E\u90E8\u54C1 = \u7E26\u5217\u306B\u7F6E\u304F\u90E8\u54C1(target, doc).\u7E26\u5217;
   const autoActors = partsActors.filter(
-    (a) => a.posX === void 0 && a.posY === void 0 && a.posRel === void 0
+    (a) => a.posX === void 0 && a.posY === void 0 && a.posRel === void 0 && !\u7E26\u5217\u306E\u90E8\u54C1.has(a.name)
   );
   if (autoActors.length === 0) return /* @__PURE__ */ new Map();
   const otherActorNames = new Set(
@@ -6273,7 +6772,7 @@ function partGridCenters(target, doc, partsCatalog, accepted, acceptedFrom) {
     extents.set(a.name, partFrameExtent(part, t.w, t.h));
   }
   const centers = partsGridCenters(
-    partsBaseRows(baseNodes),
+    baseDiagramBottom(target, baseNodes, partsLaneIds),
     placedActors.map((a) => ({ id: a.name, ...extents.get(a.name) }))
   );
   const out = /* @__PURE__ */ new Map();
@@ -6310,7 +6809,126 @@ function partBoxes(target, doc, partsCatalog) {
   }
   return out;
 }
-function cleanupPlaceholderActor(target, doc, a) {
+function \u90E8\u54C1\u306E\u8981\u7D20\u3078\u7E4B\u3050(\u90E8\u54C1\u306E\u540D\u524D, partId, part, edgeSteps, onNotice) {
+  const \u8981\u7D20 = (part?.nodes ?? []).map((n) => n.id);
+  const \u898B\u305B\u308B\u6570 = 8;
+  const \u8981\u7D20\u306E\u4E00\u89A7 = `${\u8981\u7D20.slice(0, \u898B\u305B\u308B\u6570).map(truncateForMessage).join(", ")}${\u8981\u7D20.length > \u898B\u305B\u308B\u6570 ? ` \u307B\u304B ${\u8981\u7D20.length - \u898B\u305B\u308B\u6570} \u4EF6` : ""}`;
+  return (edge, \u7AEF) => {
+    const s = edgeSteps?.get(edge.id);
+    const \u7E4B\u3044\u3060 = { ...edge };
+    for (const \u5074 of ["from", "to"]) {
+      if (!\u7AEF[\u5074]) continue;
+      if (s === void 0 || s[\u5074] !== \u90E8\u54C1\u306E\u540D\u524D) return void 0;
+      const \u6B04 = \u5074 === "from" ? "fromPartNode" : "toPartNode";
+      const \u540D\u6307\u3057 = s[\u6B04];
+      let \u7406\u7531;
+      if (part === void 0) {
+        \u7406\u7531 = {
+          message: "\u3092\u56F3\u306B\u53D6\u308A\u8FBC\u307E\u306A\u304B\u3063\u305F",
+          hint: "\u90E8\u54C1\u304C\u56F3\u306B\u5165\u3089\u306A\u3044\u305F\u3081\u3001\u77E2\u5370\u306E\u7AEF\u306B\u3067\u304D\u307E\u305B\u3093"
+        };
+      } else if (\u540D\u6307\u3057 !== void 0) {
+        if (\u8981\u7D20.includes(\u540D\u6307\u3057)) \u7E4B\u3044\u3060[\u5074] = `${\u90E8\u54C1\u306E\u540D\u524D}__${\u540D\u6307\u3057}`;
+        else
+          \u7406\u7531 = {
+            message: `\u306E\u4E2D\u306B ${\u6B04} \u306B\u66F8\u3044\u305F "${truncateForMessage(\u540D\u6307\u3057)}" \u3068\u3044\u3046\u8981\u7D20\u304C\u7121\u3044`,
+            hint: `\u3053\u306E\u90E8\u54C1\u306E\u8981\u7D20 = ${\u8981\u7D20\u306E\u4E00\u89A7}`
+          };
+      } else if (\u8981\u7D20.length === 1) {
+        \u7E4B\u3044\u3060[\u5074] = `${\u90E8\u54C1\u306E\u540D\u524D}__${\u8981\u7D20[0]}`;
+      } else {
+        \u7406\u7531 = \u8981\u7D20.length === 0 ? { message: "\u306E\u4E2D\u306B\u7E4B\u3052\u308B\u8981\u7D20\u304C\u7121\u3044", hint: "\u3053\u306E\u90E8\u54C1\u306F\u8981\u7D20\u3092\u6301\u305F\u306A\u3044\u305F\u3081\u3001\u77E2\u5370\u306E\u7AEF\u306B\u3067\u304D\u307E\u305B\u3093" } : {
+          message: "\u306E\u4E2D\u306E\u3069\u306E\u8981\u7D20\u306B\u7E4B\u3050\u304B\u304C\u6C7A\u307E\u3089\u306A\u3044",
+          hint: `\u8981\u7D20\u304C 2 \u3064\u4EE5\u4E0A\u3042\u308B\u90E8\u54C1\u306F\u3001\u77E2\u5370\u306B ${\u6B04}: <\u8981\u7D20\u306E id> \u3092\u66F8\u3044\u3066\u7E4B\u3050\u8981\u7D20\u3092\u9078\u3076 (\u8981\u7D20 = ${\u8981\u7D20\u306E\u4E00\u89A7})`
+        };
+      }
+      if (\u7406\u7531 === void 0) continue;
+      const \u77E2\u5370 = `"${truncateForMessage(s.from)}" \u304B\u3089 "${truncateForMessage(s.to)}" \u3078\u306E\u77E2\u5370`;
+      onNotice?.({
+        kind: "part-edge-dropped",
+        actor: \u90E8\u54C1\u306E\u540D\u524D,
+        line: s.pos.line,
+        message: `${\u77E2\u5370}\u306F\u3001"${truncateForMessage(\u90E8\u54C1\u306E\u540D\u524D)}" (${truncateForMessage(partId)}) ${\u7406\u7531.message}\u305F\u3081\u5916\u3057\u307E\u3057\u305F`,
+        hint: \u7406\u7531.hint
+      });
+      return void 0;
+    }
+    return \u7E4B\u3044\u3060;
+  };
+}
+function reportPartNodeNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  const \u9806\u5E8F\u56F3 = doc.type === "sequence" || doc.type === "solidity";
+  const \u90E8\u54C1 = new Set(doc.actors.filter((a) => a.partId !== void 0).map((a) => a.name));
+  const \u5C45\u308B = new Set(doc.actors.map((a) => a.name));
+  for (const s of doc.flow) {
+    for (const [\u5074, \u6B04] of [
+      ["from", "fromPartNode"],
+      ["to", "toPartNode"]
+    ]) {
+      const \u5024 = s[\u6B04];
+      if (\u5024 === void 0) continue;
+      const \u540D = s[\u5074];
+      if (!\u5C45\u308B.has(\u540D)) continue;
+      if (!\u9806\u5E8F\u56F3 && \u90E8\u54C1.has(\u540D)) continue;
+      onNotice({
+        kind: "part-node-ignored",
+        actor: \u540D,
+        line: s.pos.line,
+        message: \u9806\u5E8F\u56F3 ? `\u9806\u5E8F\u56F3\u306E\u8A00\u3065\u3066\u306F "${truncateForMessage(\u540D)}" \u306E\u7E26\u306E\u7DDA\u306B\u5C4A\u304F\u305F\u3081\u3001${\u6B04} \u306B\u66F8\u3044\u305F "${truncateForMessage(\u5024)}" \u306F\u52B9\u304D\u307E\u305B\u3093` : `"${truncateForMessage(\u540D)}" \u306F\u90E8\u54C1\u3067\u306F\u306A\u3044\u305F\u3081\u3001${\u6B04} \u306B\u66F8\u3044\u305F "${truncateForMessage(\u5024)}" \u306F\u52B9\u304D\u307E\u305B\u3093`,
+        hint: \u9806\u5E8F\u56F3 ? "\u90E8\u54C1\u306E\u4E2D\u306E\u8981\u7D20\u3078\u77E2\u5370\u3092\u7E4B\u3050\u306E\u306F\u3001\u77E2\u5370\u3092\u7BB1\u306E\u9593\u306B\u5F15\u304F\u56F3\u7A2E (flow / swimlane \u306A\u3069)" : "\u90E8\u54C1\u306E\u4E2D\u306E\u8981\u7D20\u306E\u540D\u6307\u3057\u306F\u3001kind \u306B\u90E8\u54C1\u306E\u540D\u524D\u3092\u66F8\u3044\u305F\u7BB1\u306E\u7AEF\u306B\u3060\u3051\u52B9\u304F"
+      });
+    }
+  }
+}
+function \u4EEE\u306E\u7BB1\u306Eid\u304B(doc, name) {
+  const aliasSlug = slugify(name);
+  const \u7D20\u306E\u7BB1\u306Eid = new Set(
+    doc.actors.filter((x) => x.partId === void 0).map((x) => slugify(x.name))
+  );
+  const \u982D\u304C\u91CD\u306A\u308Bid = [
+    ...new Set(
+      doc.actors.filter((x) => x.name !== name).map((x) => slugify(x.name)).filter((s) => s.startsWith(`${aliasSlug}-`) || s.endsWith(`-${aliasSlug}`))
+    )
+  ];
+  const \u81EA\u5206\u306E\u5F62\u304B = (id, slug) => id === slug || id.startsWith(`${slug}-`) || /^s\d+-/.test(id) && id.endsWith(`-${slug}`);
+  return (id) => {
+    if (\u7D20\u306E\u7BB1\u306Eid.has(id)) return false;
+    if (\u982D\u304C\u91CD\u306A\u308Bid.some((s) => \u81EA\u5206\u306E\u5F62\u304B(id, s))) return false;
+    return \u81EA\u5206\u306E\u5F62\u304B(id, aliasSlug);
+  };
+}
+function \u7E26\u5217\u306B\u7F6E\u304F\u90E8\u54C1(target, doc) {
+  const \u7E26\u5217 = /* @__PURE__ */ new Map();
+  const \u57FA\u6E96\u306E\u305F\u3081\u5916\u3057\u305F = /* @__PURE__ */ new Map();
+  if (doc.type === "sequence" || doc.type === "solidity") return { \u7E26\u5217, \u57FA\u6E96\u306E\u305F\u3081\u5916\u3057\u305F };
+  const \u57FA\u6E96\u306E\u540D\u524D = new Set(
+    doc.actors.map((a) => a.posRel?.anchor).filter((n) => n !== void 0)
+  );
+  const \u7E26\u5217\u306Eid = new Set(target.lanes.map((l) => l.id));
+  for (const a of doc.actors) {
+    if (a.partId === void 0) continue;
+    if (\u7E26\u5217.has(a.name) || \u57FA\u6E96\u306E\u305F\u3081\u5916\u3057\u305F.has(a.name)) continue;
+    if (a.posX !== void 0 || a.posY !== void 0 || a.posRel !== void 0) continue;
+    const \u7F6E\u304F\u7E26\u5217 = \u90E8\u54C1\u306E\u7E26\u5217(target, doc, a, \u7E26\u5217\u306Eid);
+    if (\u7F6E\u304F\u7E26\u5217 === void 0) continue;
+    if (\u57FA\u6E96\u306E\u540D\u524D.has(a.name)) \u57FA\u6E96\u306E\u305F\u3081\u5916\u3057\u305F.set(a.name, \u7F6E\u304F\u7E26\u5217);
+    else \u7E26\u5217.set(a.name, \u7F6E\u304F\u7E26\u5217);
+  }
+  return { \u7E26\u5217, \u57FA\u6E96\u306E\u305F\u3081\u5916\u3057\u305F };
+}
+function \u90E8\u54C1\u306E\u7E26\u5217(target, doc, a, \u7E26\u5217\u306Eid) {
+  if (a.lane !== void 0) return \u7E26\u5217\u306Eid.has(a.lane) ? a.lane : void 0;
+  if (target.lanes.length < 2) return void 0;
+  const \u4EEE\u306E\u7BB1\u304B = \u4EEE\u306E\u7BB1\u306Eid\u304B(doc, a.name);
+  const \u4EEE\u306E\u7BB1\u306E\u7E26\u5217 = new Set(target.nodes.filter((n) => \u4EEE\u306E\u7BB1\u304B(n.id)).map((n) => n.lane));
+  if (\u4EEE\u306E\u7BB1\u306E\u7E26\u5217.size > 1) return void 0;
+  const [\u5165\u3063\u3066\u3044\u305F] = [...\u4EEE\u306E\u7BB1\u306E\u7E26\u5217];
+  const \u5019\u88DC = \u5165\u3063\u3066\u3044\u305F ?? target.lanes.find((l) => l.label === a.name && !target.nodes.some((n) => n.lane === l.id))?.id;
+  if (\u5019\u88DC === void 0) return void 0;
+  return target.nodes.some((n) => n.lane === \u5019\u88DC && !\u4EEE\u306E\u7BB1\u304B(n.id)) ? void 0 : \u5019\u88DC;
+}
+function cleanupPlaceholderActor(target, doc, a, \u7E4B\u304E\u76F4\u3059) {
   const aliasSlug = slugify(a.name);
   const ownedLaneIds = /* @__PURE__ */ new Set();
   if (doc.type === "sequence" || doc.type === "solidity") {
@@ -6323,37 +6941,37 @@ function cleanupPlaceholderActor(target, doc, a) {
   for (const n of target.nodes) {
     if (ownedLaneIds.has(n.lane)) ownedNodeIds.add(n.id);
   }
-  const \u7D20\u306E\u7BB1\u306Eid = new Set(
-    doc.actors.filter((x) => x.partId === void 0).map((x) => slugify(x.name))
-  );
-  const matchesAliasSlug = (id) => {
-    if (\u7D20\u306E\u7BB1\u306Eid.has(id)) return false;
-    if (id === aliasSlug) return true;
-    if (id.startsWith(`${aliasSlug}-`)) return true;
-    if (/^s\d+-/.test(id) && id.endsWith(`-${aliasSlug}`)) return true;
-    return false;
-  };
+  const matchesAliasSlug = \u4EEE\u306E\u7BB1\u306Eid\u304B(doc, a.name);
   const relatedToActor = (id) => ownedLaneIds.size > 0 ? ownedNodeIds.has(id) : matchesAliasSlug(id);
+  const \u4EEE\u306E\u7BB1\u306E\u7E26\u5217 = new Set(target.nodes.filter((n) => relatedToActor(n.id)).map((n) => n.lane));
   target.nodes = target.nodes.filter((n) => !relatedToActor(n.id));
   const removedEdgeIds = /* @__PURE__ */ new Set();
-  target.edges = target.edges.filter((e) => {
-    const drop = relatedToActor(e.from) || relatedToActor(e.to);
-    if (drop) removedEdgeIds.add(e.id);
-    return !drop;
-  });
+  const \u6B8B\u3059\u77E2\u5370 = [];
+  for (const e of target.edges) {
+    const \u7AEF = { from: relatedToActor(e.from), to: relatedToActor(e.to) };
+    if (!\u7AEF.from && !\u7AEF.to) {
+      \u6B8B\u3059\u77E2\u5370.push(e);
+      continue;
+    }
+    const \u7E4B\u3044\u3060 = \u7E4B\u304E\u76F4\u3059?.(e, \u7AEF);
+    if (\u7E4B\u3044\u3060) \u6B8B\u3059\u77E2\u5370.push(\u7E4B\u3044\u3060);
+    else removedEdgeIds.add(e.id);
+  }
+  target.edges = \u6B8B\u3059\u77E2\u5370;
   const \u6B8B\u308B\u7BB1\u3092\u6301\u3064 = new Set(target.nodes.map((n) => n.lane));
   target.lanes = target.lanes.filter((l) => {
     if (a.lane !== void 0 && l.id === a.lane) return true;
     if (\u6B8B\u308B\u7BB1\u3092\u6301\u3064.has(l.id)) return true;
     if (l.label === a.name) return false;
     if (l.id === aliasSlug) return false;
+    if (\u4EEE\u306E\u7BB1\u306E\u7E26\u5217.has(l.id) && !Object.hasOwn(doc.lanes ?? {}, l.id)) return false;
     return true;
   });
   for (const phase of target.phases) {
     phase.activate = phase.activate.filter((id) => !relatedToActor(id) && !removedEdgeIds.has(id));
   }
 }
-function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSourceLines) {
+function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSourceLines, edgeSteps) {
   const partsActors = doc.actors.filter((a) => a.partId !== void 0);
   if (partsActors.length === 0) return target;
   const \u5024\u306E\u524D\u7F6E\u304D = \u5024\u306E\u524D\u7F6E\u304D\u3092\u4F5C\u308B(partsActors.map((a) => a.name));
@@ -6366,6 +6984,9 @@ function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSource
   }
   const budget = partsBudget(target, partsActors, partsCatalog);
   const gridCenters = partGridCenters(target, doc, partsCatalog, budget, partsActors);
+  const { \u7E26\u5217: \u7E26\u5217\u306E\u90E8\u54C1, \u57FA\u6E96\u306E\u305F\u3081\u5916\u3057\u305F } = \u7E26\u5217\u306B\u7F6E\u304F\u90E8\u54C1(target, doc);
+  const \u7E26\u5217\u306B\u7F6E\u3044\u305F = [];
+  const \u81EA\u5206\u306E\u7E26\u5217\u306B\u7F6E\u3044\u305F = [];
   for (const [actorIndex, actor] of partsActors.entries()) {
     const partId = actor.partId;
     if (typeof partId !== "string" || partId.length === 0) continue;
@@ -6379,7 +7000,12 @@ function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSource
         message: `"${actor.name}" (${partId}) \u306F\u5927\u304D\u3059\u304E\u308B\u305F\u3081\u53D6\u308A\u8FBC\u307F\u307E\u305B\u3093\u3002`,
         hint: overOne ? `\u8981\u7D20\u6570\u304C\u4E0A\u9650 (${MAX_INPUT_ELEMENTS}) \u3092\u8D85\u3048\u3066\u3044\u307E\u3059` : `\u56F3\u5168\u4F53\u306E\u8981\u7D20\u6570\u304C\u4E0A\u9650 (${MAX_INPUT_ELEMENTS}) \u3092\u8D85\u3048\u307E\u3059`
       });
-      cleanupPlaceholderActor(target, doc, actor);
+      cleanupPlaceholderActor(
+        target,
+        doc,
+        actor,
+        \u90E8\u54C1\u306E\u8981\u7D20\u3078\u7E4B\u3050(actor.name, partId, void 0, edgeSteps, onNotice)
+      );
       continue;
     }
     const part = found;
@@ -6389,13 +7015,81 @@ function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSource
           `[dragon] parts kind "${partId}" not found in partsCatalog (actor: ${actor.name})`
         );
       }
+      for (const s of doc.flow) {
+        for (const [\u5074, \u6B04] of [
+          ["from", "fromPartNode"],
+          ["to", "toPartNode"]
+        ]) {
+          const \u5024 = s[\u6B04];
+          if (\u5024 === void 0 || s[\u5074] !== actor.name) continue;
+          if (doc.type === "sequence" || doc.type === "solidity") continue;
+          onNotice?.({
+            kind: "part-node-ignored",
+            actor: actor.name,
+            line: s.pos.line,
+            message: `"${truncateForMessage(actor.name)}" (${truncateForMessage(partId)}) \u306F\u90E8\u54C1\u306E\u4E00\u89A7\u306B\u7121\u3044\u305F\u3081\u3001${\u6B04} \u306B\u66F8\u3044\u305F "${truncateForMessage(\u5024)}" \u306F\u52B9\u304D\u307E\u305B\u3093`,
+            hint: "kind \u306B\u90E8\u54C1\u306E\u540D\u524D\u3092\u66F8\u304F (\u7DB4\u308A\u3092\u78BA\u304B\u3081\u308B)"
+          });
+        }
+      }
       continue;
     }
-    cleanupPlaceholderActor(target, doc, actor);
+    const \u7F6E\u304F\u7E26\u5217 = \u7E26\u5217\u306E\u90E8\u54C1.get(actor.name);
+    cleanupPlaceholderActor(
+      target,
+      doc,
+      \u7F6E\u304F\u7E26\u5217 !== void 0 ? { name: actor.name, lane: \u7F6E\u304F\u7E26\u5217 } : actor,
+      \u90E8\u54C1\u306E\u8981\u7D20\u3078\u7E4B\u3050(actor.name, partId, part, edgeSteps, onNotice)
+    );
+    const \u5916\u3057\u305F\u7E26\u5217 = \u57FA\u6E96\u306E\u305F\u3081\u5916\u3057\u305F.get(actor.name);
+    if (\u5916\u3057\u305F\u7E26\u5217 !== void 0) {
+      onNotice?.({
+        kind: "part-lane-ignored",
+        actor: actor.name,
+        line: actor.pos?.line ?? 0,
+        message: `"${actor.name}" \u306F\u4ED6\u306E\u7BB1\u306E\u4F4D\u7F6E\u306E\u57FA\u6E96\u306B\u306A\u3063\u3066\u3044\u308B\u305F\u3081\u3001\u7E26\u5217 "${target.lanes.find((l) => l.id === \u5916\u3057\u305F\u7E26\u5217)?.label ?? \u5916\u3057\u305F\u7E26\u5217}" \u306B\u306F\u7F6E\u304B\u305A\u56F3\u306E\u4E0B\u306B\u4E26\u3079\u307E\u3057\u305F`,
+        hint: `\u7E26\u5217\u306B\u7F6E\u304D\u305F\u3044\u6642\u306F\u3001"${actor.name}" \u3092\u57FA\u6E96\u306B\u3057\u305F\u4F4D\u7F6E (\u4F4D\u7F6E: ${actor.name} \u306E\u53F3 200 \u306A\u3069) \u3092\u5EA7\u6A19\u3067\u66F8\u304F`
+      });
+    }
     const merged = applyColorHex(part, actor.colorHex, actor.stateOverride ?? {});
+    if (actor.colorHex && !(part.states ?? []).some((st) => isColorValue(st.initial))) {
+      onNotice?.({
+        kind: "part-color-ignored",
+        actor: actor.name,
+        line: actor.pos?.line ?? 0,
+        message: `"${actor.name}" (${partId}) \u306F\u8272\u3092\u5909\u3048\u3089\u308C\u308B\u72B6\u614B\u3092\u6301\u305F\u306A\u3044\u305F\u3081\u3001\u8272\u756A\u53F7 ${actor.colorHex} \u306F\u52B9\u304D\u307E\u305B\u3093`,
+        hint: "\u8272\u3092\u5909\u3048\u3089\u308C\u308B\u90E8\u54C1\u306F\u3001\u521D\u671F\u5024\u304C\u8272\u756A\u53F7\u306E\u72B6\u614B\u3092\u6301\u3064\u3082\u306E (\u4F8B = state-indicator)"
+      });
+    }
+    if (actor.partColorName) {
+      onNotice?.({
+        kind: "part-color-ignored",
+        actor: actor.name,
+        line: actor.pos?.line ?? 0,
+        // 残っている名前は読み替えた後の正規の名前 (`成功` なら `success`) なので文には出さない
+        message: `"${actor.name}" (${partId}) \u306E\u8272\u306F\u8272\u306E\u540D\u524D\u3067\u306F\u5909\u308F\u308A\u307E\u305B\u3093`,
+        hint: '\u90E8\u54C1\u306E\u8272\u306F\u8272\u756A\u53F7\u3067\u66F8\u304F (\u4F8B = color: "#d9534f")'
+      });
+    }
+    const \u90E8\u54C1\u306E\u72B6\u614B = new Set((part.states ?? []).map((st) => st.id));
+    const \u7121\u3044\u72B6\u614B = Object.keys(actor.stateOverride ?? {}).filter(
+      (k) => k !== "phase" && !\u90E8\u54C1\u306E\u72B6\u614B.has(k)
+    );
+    if (\u7121\u3044\u72B6\u614B.length > 0) {
+      onNotice?.({
+        kind: "part-state-missing",
+        actor: actor.name,
+        line: actor.pos?.line ?? 0,
+        message: `"${actor.name}" (${partId}) \u306F ${\u7121\u3044\u72B6\u614B.map((k) => `"${truncateForMessage(k)}"`).join(" / ")} \u3068\u3044\u3046\u72B6\u614B\u3092\u6301\u305F\u306A\u3044\u305F\u3081\u3001\u66F8\u3044\u305F\u5024\u306F\u52B9\u304D\u307E\u305B\u3093`,
+        hint: \u90E8\u54C1\u306E\u72B6\u614B.size > 0 ? `\u3053\u306E\u90E8\u54C1\u306E\u72B6\u614B = ${[...\u90E8\u54C1\u306E\u72B6\u614B].join(", ")}` : "\u3053\u306E\u90E8\u54C1\u306F\u72B6\u614B\u3092\u6301\u305F\u306A\u3044\u305F\u3081\u3001\u5024\u3092\u66F8\u3044\u3066\u3082\u5909\u308F\u308A\u307E\u305B\u3093"
+      });
+    }
     let placeX = actor.posX;
     let placeY = actor.posY;
-    if (placeX === void 0 && placeY === void 0) {
+    if (\u7F6E\u304F\u7E26\u5217 !== void 0) {
+      placeX = 0;
+      placeY = 0;
+    } else if (placeX === void 0 && placeY === void 0) {
       const center = gridCenters.get(actor.name);
       placeX = center?.cx;
       placeY = center?.cy;
@@ -6414,12 +7108,13 @@ function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSource
       }
     }
     const t = partTargetSize(part, actor.posW, actor.posH, actor.scale);
-    mergePartIntoDiagram(
+    const \u7D44\u307F\u8FBC\u3080\u524D\u306E\u7BB1\u306E\u6570 = target.nodes.length;
+    const \u4F5C\u3063\u305F\u7E26\u5217 = mergePartIntoDiagram(
       target,
       part,
       actor.name,
       merged,
-      actor.lane,
+      \u7F6E\u304F\u7E26\u5217 ?? actor.lane,
       placeX,
       placeY,
       t.w,
@@ -6429,9 +7124,122 @@ function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSource
       derivedSourceLines,
       \u5024\u306E\u524D\u7F6E\u304D.get(actor.name)
     );
+    const \u8981\u7D20 = new Set(target.nodes.slice(\u7D44\u307F\u8FBC\u3080\u524D\u306E\u7BB1\u306E\u6570).map((n) => n.id));
+    if (\u7F6E\u304F\u7E26\u5217 !== void 0) {
+      \u7E26\u5217\u306B\u7F6E\u3044\u305F.push({ \u7E26\u5217: \u7F6E\u304F\u7E26\u5217, \u8981\u7D20 });
+    } else if (\u4F5C\u3063\u305F\u7E26\u5217.length > 0) {
+      \u81EA\u5206\u306E\u7E26\u5217\u306B\u7F6E\u3044\u305F.push({ \u540D\u524D: actor.name, \u7E26\u5217: \u4F5C\u3063\u305F\u7E26\u5217, \u8981\u7D20 });
+    }
   }
+  \u90E8\u54C1\u306E\u7E26\u5217\u3092\u90E8\u54C1\u306B\u56FA\u5B9A\u3059\u308B(target, \u81EA\u5206\u306E\u7E26\u5217\u306B\u7F6E\u3044\u305F);
+  \u7E26\u5217\u306B\u7F6E\u3044\u305F\u90E8\u54C1\u3092\u63C3\u3048\u308B(target, \u7E26\u5217\u306B\u7F6E\u3044\u305F);
   return target;
 }
+var \u90E8\u54C1\u306E\u7E26\u5217\u306E\u540D\u672D\u306E\u9AD8\u3055 = 60;
+function \u90E8\u54C1\u306E\u7E26\u5217\u3092\u90E8\u54C1\u306B\u56FA\u5B9A\u3059\u308B(target, \u90E8\u54C1\u305F\u3061) {
+  const \u5EA7\u6A19\u3067\u7F6E\u3044\u305F = (id) => {
+    const n = target.nodes.find((x) => x.id === id);
+    return n !== void 0 && n.posX !== void 0 && n.posY !== void 0;
+  };
+  const \u5BFE\u8C61 = \u90E8\u54C1\u305F\u3061.filter((p) => [...p.\u8981\u7D20].every(\u5EA7\u6A19\u3067\u7F6E\u3044\u305F));
+  if (\u5BFE\u8C61.length === 0) return;
+  let laid;
+  try {
+    laid = layout(target);
+  } catch {
+    return;
+  }
+  for (const p of \u5BFE\u8C61) {
+    const \u7BB1 = laid.nodes.filter((n) => p.\u8981\u7D20.has(n.id));
+    if (\u7BB1.length === 0) continue;
+    const \u4E0A\u7AEF = Math.min(...\u7BB1.map((n) => n.cy - n.h / 2));
+    const \u4E0B\u7AEF = Math.max(...\u7BB1.map((n) => n.cy + n.h / 2));
+    const \u7E26\u5217\u305F\u3061 = p.\u7E26\u5217.flatMap((l) => {
+      const \u7E26\u5217 = target.lanes.find((x) => x.id === l.id);
+      return \u7E26\u5217 ? [{ ...l, \u7E26\u5217 }] : [];
+    });
+    let \u540D\u672D\u306E\u7E26\u5217;
+    for (const l of \u7E26\u5217\u305F\u3061) {
+      if (\u540D\u672D\u306E\u7E26\u5217 === void 0 || (l.\u7E26\u5217.x ?? 0) < (\u540D\u672D\u306E\u7E26\u5217.\u7E26\u5217.x ?? 0)) \u540D\u672D\u306E\u7E26\u5217 = l;
+    }
+    for (const l of \u7E26\u5217\u305F\u3061) {
+      l.\u7E26\u5217.posX = l.\u7E26\u5217.x ?? 0;
+      l.\u7E26\u5217.posY = \u4E0A\u7AEF - \u90E8\u54C1\u306E\u7E26\u5217\u306E\u540D\u672D\u306E\u9AD8\u3055;
+      l.\u7E26\u5217.posH = \u4E0B\u7AEF - \u4E0A\u7AEF + \u90E8\u54C1\u306E\u7E26\u5217\u306E\u540D\u672D\u306E\u9AD8\u3055;
+      const \u540D\u672D = l === \u540D\u672D\u306E\u7E26\u5217 ? l.\u90E8\u54C1\u306E\u540D\u672D ?? p.\u540D\u524D : l.\u90E8\u54C1\u306E\u540D\u672D;
+      if (\u540D\u672D === void 0) delete l.\u7E26\u5217.label;
+      else l.\u7E26\u5217.label = \u540D\u672D;
+    }
+  }
+}
+var \u90E8\u54C1\u306E\u7E26\u5217\u306E\u4F59\u767D = 25;
+function \u7E26\u5217\u306B\u7F6E\u3044\u305F\u90E8\u54C1\u3092\u63C3\u3048\u308B(target, \u7F6E\u3044\u305F) {
+  if (\u7F6E\u3044\u305F.length === 0) return;
+  const \u914D\u7F6E\u3059\u308B = () => {
+    try {
+      return layout(target);
+    } catch {
+      return void 0;
+    }
+  };
+  let laid = \u914D\u7F6E\u3059\u308B();
+  if (!laid) return;
+  const \u7BC4\u56F2 = (d, \u8981\u7D20) => {
+    const \u7BB1 = d.nodes.filter((n) => \u8981\u7D20.has(n.id));
+    if (\u7BB1.length === 0) return void 0;
+    return {
+      x0: Math.min(...\u7BB1.map((n) => n.cx - n.w / 2)),
+      x1: Math.max(...\u7BB1.map((n) => n.cx + n.w / 2)),
+      y0: Math.min(...\u7BB1.map((n) => n.cy - n.h / 2)),
+      y1: Math.max(...\u7BB1.map((n) => n.cy + n.h / 2))
+    };
+  };
+  let \u5E83\u3052\u305F = false;
+  for (const p of \u7F6E\u3044\u305F) {
+    const r = \u7BC4\u56F2(laid, p.\u8981\u7D20);
+    const \u7E26\u5217 = target.lanes.find((l) => l.id === p.\u7E26\u5217);
+    const \u63CF\u3044\u305F\u7E26\u5217 = laid.lanes.find((l) => l.id === p.\u7E26\u5217);
+    if (!r || !\u7E26\u5217 || !\u63CF\u3044\u305F\u7E26\u5217) continue;
+    const \u8981\u308B\u5E45 = r.x1 - r.x0 + \u90E8\u54C1\u306E\u7E26\u5217\u306E\u4F59\u767D * 2;
+    if (\u8981\u308B\u5E45 > \u63CF\u3044\u305F\u7E26\u5217.width && \u8981\u308B\u5E45 > \u7E26\u5217.width) {
+      \u7E26\u5217.width = \u8981\u308B\u5E45;
+      \u5E83\u3052\u305F = true;
+    }
+  }
+  if (\u5E83\u3052\u305F) {
+    laid = \u914D\u7F6E\u3059\u308B();
+    if (!laid) return;
+  }
+  const \u90E8\u54C1\u306E\u8981\u7D20 = new Set(\u7F6E\u3044\u305F.flatMap((p) => [...p.\u8981\u7D20]));
+  for (let \u56DE = 0; \u56DE < \u90E8\u54C1\u3092\u63C3\u3048\u76F4\u3059\u4E0A\u9650; \u56DE += 1) {
+    const \u4ED6\u306E\u7BB1\u306E\u4E0B\u7AEF = Math.max(
+      ...laid.nodes.filter((n) => !\u90E8\u54C1\u306E\u8981\u7D20.has(n.id)).map((n) => n.cy + n.h / 2),
+      ...laid.lanes.filter((l) => !l.contain).map((l) => l.y + l.height)
+    );
+    const \u6B21\u306E\u4E0A\u7AEF = /* @__PURE__ */ new Map();
+    let \u52D5\u304B\u3057\u305F = false;
+    for (const p of \u7F6E\u3044\u305F) {
+      const r = \u7BC4\u56F2(laid, p.\u8981\u7D20);
+      const \u7E26\u5217 = laid.lanes.find((l) => l.id === p.\u7E26\u5217);
+      if (!r || !\u7E26\u5217) continue;
+      const \u4E0A\u7AEF = \u6B21\u306E\u4E0A\u7AEF.get(p.\u7E26\u5217) ?? \u4ED6\u306E\u7BB1\u306E\u4E0B\u7AEF + PARTS_GAP;
+      const dx = \u7E26\u5217.x + \u7E26\u5217.width / 2 - (r.x0 + r.x1) / 2;
+      const dy = \u4E0A\u7AEF - r.y0;
+      \u6B21\u306E\u4E0A\u7AEF.set(p.\u7E26\u5217, \u4E0A\u7AEF + (r.y1 - r.y0) + PARTS_GAP);
+      if (Math.abs(dx) <= PLACEMENT_TOLERANCE && Math.abs(dy) <= PLACEMENT_TOLERANCE) continue;
+      for (const n of target.nodes) {
+        if (!p.\u8981\u7D20.has(n.id) || n.posX === void 0 || n.posY === void 0) continue;
+        n.posX += dx;
+        n.posY += dy;
+      }
+      \u52D5\u304B\u3057\u305F = true;
+    }
+    if (!\u52D5\u304B\u3057\u305F) return;
+    laid = \u914D\u7F6E\u3059\u308B();
+    if (!laid) return;
+  }
+}
+var \u90E8\u54C1\u3092\u63C3\u3048\u76F4\u3059\u4E0A\u9650 = 3;
 function resolveStateOverride(original, override) {
   if (override === void 0) return { initial: original, rejected: false };
   if (isColorValue(original) && !isColorValue(override))
@@ -6448,6 +7256,19 @@ function applyColorHex(part, colorHex, stateOverride) {
   }
   return out;
 }
+function \u90E8\u54C1\u306B\u4E0A\u66F8\u304D\u3092\u5F53\u3066\u308B(part, actor) {
+  const \u4E0A\u66F8\u304D = applyColorHex(part, actor.colorHex, actor.stateOverride ?? {});
+  const \u6BB5\u3092\u5916\u3059 = \u4E0A\u66F8\u304D["phase"] === false;
+  if (Object.keys(\u4E0A\u66F8\u304D).length === 0) return part;
+  return {
+    ...part,
+    states: part.states.map((st) => ({
+      ...st,
+      initial: resolveStateOverride(st.initial, \u4E0A\u66F8\u304D[st.id]).initial
+    })),
+    phases: \u6BB5\u3092\u5916\u3059 ? part.phases.map((ph) => ({ ...ph, activate: [], tweens: [], sets: [] })) : part.phases
+  };
+}
 function \u5024\u306E\u524D\u7F6E\u304D\u3092\u4F5C\u308B(\u540D\u524D\u305F\u3061) {
   const \u51FA\u529B = /* @__PURE__ */ new Map();
   const \u4F7F\u7528\u4E2D = /* @__PURE__ */ new Set();
@@ -6491,25 +7312,15 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
   };
   const targetLaneId = laneMapping;
   const laneIdMap = /* @__PURE__ */ new Map();
+  const \u4F5C\u3063\u305F\u7E26\u5217 = [];
   const PARTS_LANE_GAP = 300;
   const existingLaneMaxX = target.lanes.length > 0 ? Math.max(...target.lanes.map((l) => (l.x ?? 0) + l.width)) : 0;
-  const partLaneGeom = /* @__PURE__ */ new Map();
-  for (const l of part.lanes) {
-    partLaneGeom.set(l.id, {
-      x: typeof l.x === "number" && Number.isFinite(l.x) ? l.x : 0,
-      w: positiveOr(l.width, 400)
-    });
-  }
-  const laneXs = [...partLaneGeom.values()].map((g) => g.x);
-  const laneRights = [...partLaneGeom.values()].map((g) => g.x + g.w);
-  const partMinLaneX = minOf(laneXs, 0);
-  const partMaxLaneRight = maxOf(laneRights, 400);
-  const rawBboxW = partMaxLaneRight - partMinLaneX;
-  const partsBboxW = rawBboxW > 0 ? rawBboxW : 1;
-  const rawLaneScaleX = targetW !== void 0 && targetW > 0 ? targetW / partsBboxW : 1;
+  const \u7F6E\u304D\u65B9 = \u90E8\u54C1\u306E\u7F6E\u304D\u65B9\u3092\u8AAD\u3080(part);
+  const \u4F38\u7E2E\u306E\u57FA\u6E96 = partScaleBase(part);
+  const rawLaneScaleX = targetW !== void 0 && targetW > 0 ? targetW / \u4F38\u7E2E\u306E\u57FA\u6E96.w : 1;
   const laneScaleX = Number.isFinite(rawLaneScaleX) && rawLaneScaleX > 0 ? rawLaneScaleX : 1;
-  const partOrigBboxCenterX = partMinLaneX + partsBboxW / 2;
-  const dropCenterX = offsetX !== void 0 ? offsetX : existingLaneMaxX + PARTS_LANE_GAP + partsBboxW * laneScaleX / 2;
+  const partOrigBboxCenterX = \u7F6E\u304D\u65B9.\u5DE6\u7AEF + \u7F6E\u304D\u65B9.\u5E45 / 2;
+  const dropCenterX = offsetX !== void 0 ? offsetX : existingLaneMaxX + PARTS_LANE_GAP + \u7F6E\u304D\u65B9.\u5E45 * laneScaleX / 2;
   const mapLaneX = (x) => (x - partOrigBboxCenterX) * laneScaleX + dropCenterX;
   for (const laneOrig of part.lanes) {
     if (targetLaneId) {
@@ -6517,7 +7328,7 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
     } else {
       const newLaneId = prefix(laneOrig.id);
       laneIdMap.set(laneOrig.id, newLaneId);
-      const geom = partLaneGeom.get(laneOrig.id) ?? { x: 0, w: 400 };
+      const geom = \u7F6E\u304D\u65B9.\u7E26\u5217.get(laneOrig.id) ?? { x: 0, w: 400 };
       target.lanes.push({
         ...laneOrig,
         id: newLaneId,
@@ -6525,24 +7336,18 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
         x: mapLaneX(geom.x),
         width: geom.w * laneScaleX
       });
+      \u4F5C\u3063\u305F\u7E26\u5217.push({ id: newLaneId, \u90E8\u54C1\u306E\u540D\u672D: laneOrig.label });
     }
   }
   const STACK_ISOLATION_OFFSET = 1e3;
   const shouldForcePos = offsetX !== void 0 || offsetY !== void 0;
   const targetMaxStack = shouldForcePos && target.nodes.length > 0 ? Math.max(...target.nodes.map((n) => n.stack ?? 0)) : 0;
   const stackShiftBase = shouldForcePos ? targetMaxStack + STACK_ISOLATION_OFFSET : 0;
-  const STACK_PITCH_APPROX = 220;
-  const partStacks = part.nodes.map(
-    (n) => typeof n.stack === "number" && Number.isFinite(n.stack) ? n.stack : 0
-  );
-  const minStack = partStacks.length > 0 ? Math.min(...partStacks) : 0;
-  const maxStack = partStacks.length > 0 ? Math.max(...partStacks) : 0;
-  const partCenterStack = (minStack + maxStack) / 2;
-  const partOrigH = Math.max(1, (maxStack - minStack + 1) * STACK_PITCH_APPROX);
   const scaleX = laneScaleX;
-  const rawScaleY = targetH !== void 0 && targetH > 0 ? targetH / partOrigH : 1;
+  const rawScaleY = targetH !== void 0 && targetH > 0 ? targetH / \u4F38\u7E2E\u306E\u57FA\u6E96.h : 1;
   const scaleY = Number.isFinite(rawScaleY) && rawScaleY > 0 ? rawScaleY : 1;
-  for (const nodeOrig of part.nodes) {
+  const \u6BB5\u3092\u632F\u308A\u76F4\u3059 = targetLaneId !== void 0 && shouldForcePos && part.lanes.length > 1;
+  for (const [nodeIndex, nodeOrig] of part.nodes.entries()) {
     const mappedLane = laneIdMap.get(nodeOrig.lane) ?? nodeOrig.lane;
     let newShape = nodeOrig.shape ? deepRewriteStrings(nodeOrig.shape, rewriteTemplate) : void 0;
     if (newShape && (scaleX !== 1 || scaleY !== 1)) {
@@ -6565,16 +7370,10 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
       };
       newShape = scaleGeom(newShape);
     }
-    let nodePosX = nodeOrig.posX !== void 0 ? mapLaneX(nodeOrig.posX) : void 0;
-    let nodePosY = nodeOrig.posY !== void 0 ? nodeOrig.posY + (offsetY ?? 0) : void 0;
-    if (shouldForcePos && nodePosX === void 0) {
-      const geom = partLaneGeom.get(nodeOrig.lane) ?? { x: 0, w: 320 };
-      nodePosX = mapLaneX(geom.x + geom.w / 2);
-    }
-    if (shouldForcePos && nodePosY === void 0) {
-      const stack = nodeOrig.stack ?? 0;
-      nodePosY = (stack - partCenterStack) * STACK_PITCH_APPROX * scaleY + (offsetY ?? 0);
-    }
+    const \u9801 = \u7F6E\u304D\u65B9.\u8981\u7D20[nodeIndex] ?? { x: partOrigBboxCenterX, y: 0 };
+    const \u305A\u308C = \u90E8\u54C1\u306E\u8981\u7D20\u306E\u305A\u308C(nodeOrig, \u9801, \u7F6E\u304D\u65B9, scaleX, scaleY);
+    const nodePosX = shouldForcePos || nodeOrig.posX !== void 0 ? dropCenterX + \u305A\u308C.dx : void 0;
+    const nodePosY = shouldForcePos ? (offsetY ?? 0) + \u305A\u308C.dy : void 0;
     const rawNodeW = nodeOrig.w !== void 0 ? positiveOr(nodeOrig.w, 200) : void 0;
     const rawNodeH = nodeOrig.h !== void 0 ? positiveOr(nodeOrig.h, 200) : void 0;
     const nodeW = rawNodeW !== void 0 && (scaleX !== 1 || scaleY !== 1) ? rawNodeW * scaleX : rawNodeW;
@@ -6587,7 +7386,7 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
       subtitle: rewriteTemplate(nodeOrig.subtitle),
       value: rewriteTemplate(nodeOrig.value),
       // parts stack を target 側と分離 (D2 fix、 posX/posY 明示との 2 段防御)
-      stack: (nodeOrig.stack ?? 0) + stackShiftBase,
+      stack: (\u6BB5\u3092\u632F\u308A\u76F4\u3059 ? nodeIndex : nodeOrig.stack ?? 0) + stackShiftBase,
       ...newShape ? { shape: newShape } : {},
       ...nodePosX !== void 0 ? { posX: nodePosX } : {},
       ...nodePosY !== void 0 ? { posY: nodePosY } : {},
@@ -6643,7 +7442,7 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
   }
   const phaseOptOut = stateOverride["phase"] === false;
   if (phaseOptOut) {
-    return;
+    return \u4F5C\u3063\u305F\u7E26\u5217;
   }
   if (target.phases.length === 0) {
     for (const phaseOrig of part.phases) {
@@ -6684,6 +7483,7 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
       });
     }
   }
+  return \u4F5C\u3063\u305F\u7E26\u5217;
 }
 function deepRewriteStrings(value, rewrite, seen = /* @__PURE__ */ new WeakSet()) {
   if (typeof value === "string") return rewrite(value) ?? value;
@@ -6699,12 +7499,14 @@ function deepRewriteStrings(value, rewrite, seen = /* @__PURE__ */ new WeakSet()
   }
   return out;
 }
-function applyEdgeInlineOptions(diagram2, doc, sourceLines) {
+function applyEdgeInlineOptions(diagram2, doc, sourceLines, edgeSteps, partsCatalog) {
   if (\u9396\u3067\u3064\u306A\u3050\u5F62\u304B(doc)) {
+    const \u4E26\u3073 = \u9396\u306B\u4E26\u3079\u308B\u767B\u5834\u4EBA\u7269(doc, partsCatalog);
     diagram2.edges.forEach((e, idx) => {
-      const s = \u9396\u306E\u3069\u306E\u884C\u304B\u3089\u6765\u305F\u304B(doc, idx);
+      const s = \u9396\u306E\u3069\u306E\u884C\u304B\u3089\u6765\u305F\u304B(doc, \u4E26\u3073, idx);
       if (s === void 0) return;
       sourceLines?.set(e.id, s.pos.line);
+      edgeSteps?.set(e.id, s);
       \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(e, s, doc);
     });
     return;
@@ -6720,6 +7522,7 @@ function applyEdgeInlineOptions(diagram2, doc, sourceLines) {
     if (!target) return;
     used.add(target.id);
     sourceLines?.set(target.id, s.pos.line);
+    edgeSteps?.set(target.id, s);
     \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(target, s, doc);
   });
 }
@@ -6753,7 +7556,7 @@ function \u51FA\u6765\u4E8B\u306E\u76F8\u624B\u3092\u89E3\u304F(diagram2, doc, e
   return \u5217 ? { kind: "lane", id: \u5217.id } : void 0;
 }
 function \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(target, s, doc) {
-  if (s.sub !== void 0) target.sub = s.sub;
+  if (s.sub !== void 0 && doc.type !== "class") target.sub = s.sub;
   if (s.guard !== void 0) {
     target.guard = s.guard;
     if (doc.type === "state" && target.sub === void 0) target.sub = s.guard;
@@ -6773,6 +7576,10 @@ function \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(target, s, doc) {
   if (s.labelPlate !== void 0) target.labelPlate = s.labelPlate;
   if (s.labelOffsetX !== void 0) target.labelOffsetX = s.labelOffsetX;
   if (s.labelOffsetY !== void 0) target.labelOffsetY = s.labelOffsetY;
+  if (s.layoutPos !== void 0) {
+    target.labelOffsetX = (s.labelOffsetX ?? 0) + s.layoutPos.x;
+    target.labelOffsetY = (s.labelOffsetY ?? 0) + s.layoutPos.y;
+  }
   if (s.overlay !== void 0) target.overlay = s.overlay;
   if (s.widthBind !== void 0) target.widthBind = s.widthBind;
   if (s.strokeBind !== void 0) target.strokeBind = s.strokeBind;
@@ -6781,10 +7588,18 @@ function \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(target, s, doc) {
 function \u9396\u3067\u3064\u306A\u3050\u5F62\u304B(doc) {
   if (doc.type !== "flow") return false;
   if (doc.animate && doc.animate.phases.length > 0) return false;
+  if (doc.direction !== void 0) return false;
   return !\u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("flow", doc);
 }
-function \u9396\u306E\u3069\u306E\u884C\u304B\u3089\u6765\u305F\u304B(doc, edgeIndex) {
-  const to = doc.actors[edgeIndex + 1];
+function \u9396\u306B\u4E26\u3079\u308B\u767B\u5834\u4EBA\u7269(doc, partsCatalog) {
+  if (!partsCatalog) return doc.actors;
+  const \u884C\u306B\u66F8\u304B\u308C\u305F = new Set(doc.flow.flatMap((s) => [s.from, s.to]));
+  return doc.actors.filter(
+    (a) => \u884C\u306B\u66F8\u304B\u308C\u305F.has(a.name) || lookupPartRaw(partsCatalog, a.partId) === void 0
+  );
+}
+function \u9396\u306E\u3069\u306E\u884C\u304B\u3089\u6765\u305F\u304B(doc, \u4E26\u3073, edgeIndex) {
+  const to = \u4E26\u3073[edgeIndex + 1];
   if (to === void 0) return void 0;
   return doc.flow.find((s) => s.to === to.name);
 }
@@ -7115,13 +7930,22 @@ var SINGLE_BOX_KINDS = /* @__PURE__ */ new Set([
   "tree-hierarchy",
   "journey-map",
   // 2 時点を直線でつなぐ図も 1 箱で全体を描く (#1647)
-  "chart-slope"
+  "chart-slope",
+  // 弧と帯で量を表す 3 種も 1 箱で全体を描く (#1668)
+  "chart-gauge",
+  "chart-radial",
+  "chart-stacked-bar",
+  // 値 1 つを大きく示す図と、1 個 = 1% の印を埋める図も同じ (#1668)。
+  // 段の `draw:` は受けない (描画側が起点から描く動きを持たない) が、性質は同じなので載せる
+  "chart-stat",
+  "chart-waffle"
 ]);
 function applyGroupContainers(diagram2, doc) {
-  if (!doc.groups || Object.keys(doc.groups).length === 0) return;
+  const \u4F5C\u3063\u305F = /* @__PURE__ */ new Set();
+  if (!doc.groups || Object.keys(doc.groups).length === 0) return \u4F5C\u3063\u305F;
   for (const [id, g] of Object.entries(doc.groups)) {
     const containerId = `group-${id}`;
-    if (diagram2.lanes.some((l) => l.id === containerId)) continue;
+    if (diagram2.lanes.some((l) => l.id === containerId) || doc.lanes?.[containerId]) continue;
     diagram2.lanes.push({
       id: containerId,
       width: 800,
@@ -7129,8 +7953,84 @@ function applyGroupContainers(diagram2, doc) {
       contain: true,
       // 束ねる lane 群に重ねて描く枠。 横に並べる lane ではないので、 engine の間隔調整
       // (lane を詰めた分を幅で埋め合わせる処理) の対象から外す。
-      role: "overlay"
+      role: "overlay",
+      // 置き直すまでは座標を固定しておく。 固定しない枠は縦列の並びに加わり、 他の縦列の間隔を
+      // 広げる (実測 = 3 本の縦列の 2 本目が 666 から 710 へ動いた)。 並びから外した配置で測らないと、
+      // 枠を置いた後に縦列が詰め直されて枠から外れる
+      posX: 0,
+      posY: 0,
+      posW: 1,
+      posH: 1
     });
+    \u4F5C\u3063\u305F.add(containerId);
+  }
+  return \u4F5C\u3063\u305F;
+}
+var \u7D44\u306E\u67A0\u306E\u4F59\u767D = { \u4E0A: 40, \u4E0B: 20, \u56F2\u3044\u306E\u6A2A: 20, \u56F2\u3044\u306E\u7121\u3044\u6A2A: 0 };
+function applyGroupFrames(diagram2, doc, \u4F5C\u3063\u305F\u67A0, onNotice) {
+  if (\u4F5C\u3063\u305F\u67A0.size === 0) return;
+  const \u7F6E\u304F = [];
+  for (const [id, g] of Object.entries(doc.groups ?? {})) {
+    const \u67A0 = diagram2.lanes.find((l) => l.id === `group-${id}`);
+    if (!\u67A0 || !\u4F5C\u3063\u305F\u67A0.has(\u67A0.id)) continue;
+    const \u66F8\u3044\u305F = Array.isArray(g.lanes) ? g.lanes : [];
+    const \u5728\u308B = \u66F8\u3044\u305F.filter((x) => diagram2.lanes.some((l) => l.id === x && !\u4F5C\u3063\u305F\u67A0.has(l.id)));
+    const \u7121\u3044 = \u66F8\u3044\u305F.filter((x) => !\u5728\u308B.includes(x));
+    if (\u5728\u308B.length === 0) {
+      diagram2.lanes = diagram2.lanes.filter((l) => l !== \u67A0);
+      onNotice?.({
+        kind: "group-lane-missing",
+        actor: id,
+        line: g.pos?.line ?? 0,
+        message: \u66F8\u3044\u305F.length === 0 ? `\u7D44 "${truncateForMessage(id)}" \u306F\u675F\u306D\u308B\u7E26\u5217\u3092\u66F8\u3044\u3066\u3044\u306A\u3044\u306E\u3067\u3001\u67A0\u3092\u63CF\u304D\u307E\u305B\u3093` : `\u7D44 "${truncateForMessage(id)}" \u304C\u675F\u306D\u308B\u7E26\u5217 ${\u7121\u3044.map((x) => `"${truncateForMessage(x)}"`).join(", ")} \u304C\u56F3\u306B\u7121\u3044\u306E\u3067\u3001\u67A0\u3092\u63CF\u304D\u307E\u305B\u3093`,
+        hint: "`lanes: [\u7E26\u5217\u306E\u540D\u524D, ...]` \u306B `lanes:` \u3067\u66F8\u3044\u305F\u7E26\u5217\u306E\u540D\u524D\u3092\u4E26\u3079\u308B"
+      });
+      continue;
+    }
+    if (\u7121\u3044.length > 0) {
+      onNotice?.({
+        kind: "group-lane-missing",
+        actor: id,
+        line: g.pos?.line ?? 0,
+        message: `\u7D44 "${truncateForMessage(id)}" \u304C\u675F\u306D\u308B\u7E26\u5217 ${\u7121\u3044.map((x) => `"${truncateForMessage(x)}"`).join(", ")} \u304C\u56F3\u306B\u7121\u3044\u306E\u3067\u3001\u6B8B\u308A\u306E\u7E26\u5217\u3060\u3051\u3092\u56F2\u307F\u307E\u3059`,
+        hint: "`lanes:` \u3067\u66F8\u3044\u305F\u7E26\u5217\u306E\u540D\u524D\u304B\u78BA\u304B\u3081\u308B"
+      });
+    }
+    \u7F6E\u304F.push({ \u67A0, \u540D\u524D: id, line: g.pos?.line ?? 0, \u7E26\u5217: \u5728\u308B });
+  }
+  if (\u7F6E\u304F.length === 0) return;
+  const \u914D\u7F6E = layout(diagram2);
+  const \u4E26\u3073\u306E\u7E26\u5217 = \u914D\u7F6E.lanes.filter((l) => !\u4F5C\u3063\u305F\u67A0.has(l.id));
+  for (const { \u67A0, \u540D\u524D, line, \u7E26\u5217 } of \u7F6E\u304F) {
+    const \u675F = \u4E26\u3073\u306E\u7E26\u5217.filter((l) => \u7E26\u5217.includes(l.id));
+    const \u5DE6 = Math.min(...\u675F.map((l) => l.x ?? 0));
+    const \u53F3 = Math.max(...\u675F.map((l) => (l.x ?? 0) + l.width));
+    const \u631F\u3093\u3060 = \u4E26\u3073\u306E\u7E26\u5217.filter(
+      (l) => !\u7E26\u5217.includes(l.id) && (l.x ?? 0) < \u53F3 && (l.x ?? 0) + l.width > \u5DE6
+    );
+    if (\u631F\u3093\u3060.length > 0) {
+      onNotice?.({
+        kind: "group-lanes-apart",
+        actor: \u540D\u524D,
+        line,
+        message: `\u7D44 "${truncateForMessage(\u540D\u524D)}" \u304C\u675F\u306D\u308B\u7E26\u5217\u306E\u9593\u306B ${\u631F\u3093\u3060.map((l) => `"${truncateForMessage(l.id)}"`).join(", ")} \u304C\u3042\u308B\u306E\u3067\u3001\u305D\u306E\u7E26\u5217\u3082\u67A0\u306B\u5165\u308A\u307E\u3059`,
+        hint: "\u675F\u306D\u308B\u7E26\u5217\u3092 `lanes:` \u3067\u96A3\u308A\u5408\u3046\u9806\u306B\u4E26\u3079\u308B"
+      });
+    }
+    const \u56F2\u3080\u7E26\u5217 = new Set([...\u675F, ...\u631F\u3093\u3060].map((l) => l.id));
+    const \u56F2\u3080 = [...\u675F, ...\u631F\u3093\u3060];
+    const \u7BB1 = \u914D\u7F6E.nodes.filter((n) => \u56F2\u3080\u7E26\u5217.has(n.lane));
+    const \u4E0A = Math.min(...\u56F2\u3080.map((l) => l.y ?? 0));
+    const \u4E0B = Math.max(
+      ...\u56F2\u3080.map((l) => (l.y ?? 0) + (l.height ?? 0)),
+      ...\u7BB1.map((n) => n.cy + n.h / 2)
+    );
+    const \u56F2\u3044\u3092\u6301\u3064 = diagram2.lanes.some((l) => \u56F2\u3080\u7E26\u5217.has(l.id) && l.contain === true);
+    const \u6A2A = \u56F2\u3044\u3092\u6301\u3064 ? \u7D44\u306E\u67A0\u306E\u4F59\u767D.\u56F2\u3044\u306E\u6A2A : \u7D44\u306E\u67A0\u306E\u4F59\u767D.\u56F2\u3044\u306E\u7121\u3044\u6A2A;
+    \u67A0.posX = \u5DE6 - \u6A2A;
+    \u67A0.posY = \u4E0A - \u7D44\u306E\u67A0\u306E\u4F59\u767D.\u4E0A;
+    \u67A0.posW = \u53F3 - \u5DE6 + \u6A2A * 2;
+    \u67A0.posH = \u4E0B - \u4E0A + \u7D44\u306E\u67A0\u306E\u4F59\u767D.\u4E0A + \u7D44\u306E\u67A0\u306E\u4F59\u767D.\u4E0B;
   }
 }
 function compileSolidity(doc) {
@@ -7315,6 +8215,8 @@ function compileClass(doc) {
       type: s2.relation ?? "uses",
       ...s2.label ? { label: s2.label } : {},
       ...s2.sub ? { cardinality: s2.sub } : {},
+      // 出どころ側の多重度 (#1771)。 engine が出どころの端に添える (cdl#825)
+      ...s2.tailSub ? { tailCardinality: s2.tailSub } : {},
       ...s2.tone ? { tone: s2.tone } : {},
       ...s2.style ? { style: s2.style } : {},
       ...s2.head ? { head: s2.head } : {},
@@ -7866,7 +8768,7 @@ function compileC4(doc) {
   const b = diagram(slugify(doc.title), { topic: doc.title, type: "infrastructure" });
   const LANE_W = 400;
   const LANE_GAP = 80;
-  const \u6BB5\u306E\u540D\u524D = { 1: "System Context", 2: "Container", 3: "Component" };
+  const \u6BB5\u306E\u540D\u524D = { 1: "\u5168\u4F53\u306E\u898B\u53D6\u308A\u56F3", 2: "\u52D5\u304B\u3059\u5358\u4F4D", 3: "\u90E8\u54C1" };
   const \u5272\u5F53 = doc.actors.map((a, idx) => {
     const { \u6BB5, \u8AAC\u660E } = \u6BB5\u3092\u8AAD\u307F\u53D6\u308B(a.subtitle);
     return { \u6BB5, \u8AAC\u660E, id: slugify(a.name), actor: a };
@@ -7966,6 +8868,7 @@ var \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u306E\u540D\u524D = {
   final: "\u59CB\u307E\u308A / \u7D42\u308F\u308A \u306E\u5370",
   previous: "\u524D\u306E\u6642\u70B9\u306E\u5024",
   colorHex: "\u8272\u756A\u53F7",
+  partColorName: "\u8272\u306E\u540D\u524D",
   stateOverride: "\u72B6\u614B\u306E\u4E0A\u66F8\u304D",
   // 位置は「登場人物ごとの箱をどこに置くか」 の指定で、 箱が 1 つの図では置く先が無い
   posX: "\u4F4D\u7F6E (\u5EA7\u6A19)",
@@ -7975,7 +8878,6 @@ var \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u306E\u540D\u524D = {
   scale: "\u500D\u7387",
   scaleKeys: "\u500D\u7387",
   posRel: "\u4F4D\u7F6E (\u76F8\u5BFE)",
-  nodes: "\u4E2D\u306E\u7BB1\u3054\u3068\u306E\u6307\u5B9A",
   layoutPos: "\u914D\u7F6E\u306E\u305A\u3089\u3057",
   shape: "\u7BB1\u306E\u4E2D\u306E\u56F3\u5F62",
   visibleIf: "\u51FA\u3059\u6761\u4EF6",
@@ -7996,7 +8898,7 @@ function \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(a) {
   return { title: \u7BB1\u306E\u984C(a), ...\u7D9A\u304D.length > 0 ? { subtitle: \u7D9A\u304D.join(" ") } : {} };
 }
 function compileMind(doc, onNotice) {
-  const b = diagram(slugify(doc.title), { topic: doc.title, type: "mindmap" });
+  const b = diagram(slugify(doc.title), { topic: doc.title, type: "mind" });
   const { w: W, h: H } = \u56F3\u8868\u306E\u5927\u304D\u3055.mind;
   const \u4F1D\u3048\u308B = (kind, \u540D, message, line = 0) => {
     onNotice?.({ kind, actor: \u540D, line, message });
@@ -8367,19 +9269,20 @@ function slugLookup(byName, wanted) {
   }
   return hit;
 }
-function compileFlow(doc) {
-  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("flow", doc) || doc.direction !== void 0) {
+function compileFlow(doc, partsCatalog) {
+  if (!\u9396\u3067\u3064\u306A\u3050\u5F62\u304B(doc)) {
     return compileGenericWithAnimate(doc, { kind: "flow", laneId: "main", laneWidth: 400 });
   }
-  if (doc.actors.length === 0) {
+  const \u4E26\u3073 = \u9396\u306B\u4E26\u3079\u308B\u767B\u5834\u4EBA\u7269(doc, partsCatalog);
+  if (\u4E26\u3073.length === 0) {
     return diagram(slugify(doc.title), { topic: doc.title, type: "flow" }).build();
   }
   const flowBuilder = flow({
     id: slugify(doc.title),
     topic: doc.title
   });
-  for (let i = 0; i < doc.actors.length; i++) {
-    const a = doc.actors[i];
+  for (const a of \u4E26\u3073) {
+    doc.actors.indexOf(a);
     const incomingEdge = doc.flow.find((s) => s.to === a.name);
     const edgeLabel = incomingEdge?.label;
     flowBuilder.step(
@@ -8813,10 +9716,13 @@ function stripCardinality(label) {
 
 // src/notation-lint.ts
 var REDUNDANT_TOPIC_PATTERNS = [
-  { pattern: /\bpreset\s*\(/i, hint: "\u300C\u301C preset (\u8A73\u7D30)\u300D \u306F\u5B9F\u88C5\u8868\u73FE\u3001 \u300C\u301C \u3092\u793A\u3059\u56F3\u300D \u306E\u3088\u3046\u306B\u8AAD\u8005\u5411\u3051\u8AAC\u660E\u306B" },
-  { pattern: /render\s*未実装/, hint: "\u300Crender \u672A\u5B9F\u88C5\u300D \u306F\u958B\u767A\u8005\u5411\u3051\u5185\u90E8\u30E1\u30E2\u3001 catalog \u8868\u793A\u3067\u306F\u7701\u304F" },
-  { pattern: /SVG\s+(polyline|arc|rect|path)/i, hint: "\u300CSVG polyline / arc / rect / path\u300D \u306F\u5B9F\u88C5\u8A73\u7D30\u3001 \u300C\u301C \u3092\u793A\u3059\u56F3\u300D \u306B\u7F6E\u63DB" },
-  { pattern: /\bpolygon\b/i, hint: "\u300Cpolygon\u300D \u306F\u5B9F\u88C5\u7528\u8A9E\u3001 \u56F3\u306E\u610F\u5473\u3092\u8AAC\u660E\u3059\u308B\u81EA\u7136\u6587\u306B\u7F6E\u63DB" }
+  { pattern: /\bpreset\s*\(/i, hint: "`preset (\u2026)` \u306F\u4F5C\u308A\u624B\u306E\u66F8\u304D\u65B9\u3067\u3001 \u8AAD\u3080\u4EBA\u306B\u306F\u4F55\u3092\u793A\u3059\u56F3\u304B\u304C\u4F1D\u308F\u3089\u306A\u3044" },
+  { pattern: /render\s*未実装/, hint: "`render \u672A\u5B9F\u88C5` \u306F\u4F5C\u308A\u624B\u5411\u3051\u306E\u63A7\u3048\u3067\u3001 \u30AB\u30BF\u30ED\u30B0\u306B\u51FA\u3059\u8AAC\u660E\u306B\u306F\u8981\u3089\u306A\u3044" },
+  {
+    pattern: /SVG\s+(polyline|arc|rect|path)/i,
+    hint: "`SVG` \u306E\u63CF\u304D\u65B9\u306E\u540D\u524D (`polyline` / `arc` / `rect` / `path`) \u306F\u5B9F\u88C5\u306E\u8A73\u7D30\u3067\u3001 \u4F55\u3092\u793A\u3059\u56F3\u304B\u304C\u4F1D\u308F\u3089\u306A\u3044"
+  },
+  { pattern: /\bpolygon\b/i, hint: "`polygon` \u306F\u5B9F\u88C5\u306E\u8A00\u8449\u3067\u3001 \u4F55\u3092\u793A\u3059\u56F3\u304B\u304C\u4F1D\u308F\u3089\u306A\u3044" }
 ];
 function lintDiagram(d) {
   const issues = [];
@@ -8842,27 +9748,27 @@ function autoFix(d) {
   return patched;
 }
 var KIND_TO_JA = {
-  chart: "\u7D71\u8A08\u30C1\u30E3\u30FC\u30C8",
-  "line chart": "\u6298\u308C\u7DDA\u30B0\u30E9\u30D5",
-  "pie chart": "\u5186\u30B0\u30E9\u30D5",
-  "bar chart": "\u68D2\u30B0\u30E9\u30D5",
-  flow: "\u51E6\u7406\u306E\u6D41\u308C",
-  swimlane: "\u30B9\u30A4\u30E0\u30EC\u30FC\u30F3 (\u5F79\u5272\u5225\u30EC\u30FC\u30F3)",
-  sequence: "\u6642\u7CFB\u5217\u306E\u3084\u308A\u53D6\u308A",
-  topology: "\u30B7\u30B9\u30C6\u30E0\u69CB\u6210",
-  er: "\u30C6\u30FC\u30D6\u30EB\u95A2\u4FC2 (ER \u56F3)",
-  stateMachine: "\u72B6\u614B\u9077\u79FB (\u30B9\u30C6\u30FC\u30C8\u56F3)",
-  stateMachine2: "\u62E1\u5F35\u30B9\u30C6\u30FC\u30C8\u56F3 (\u968E\u5C64\u72B6\u614B)",
-  infrastructure: "\u30AF\u30E9\u30A6\u30C9\u69CB\u6210",
-  classDiagram: "UML \u30AF\u30E9\u30B9\u56F3",
-  tree: "\u968E\u5C64\u30C4\u30EA\u30FC",
-  userJourney: "\u30E6\u30FC\u30B6\u30FC\u30B8\u30E3\u30FC\u30CB\u30FC",
-  mindMap: "\u30DE\u30A4\u30F3\u30C9\u30DE\u30C3\u30D7",
-  funnel: "\u30D5\u30A1\u30CD\u30EB (\u6BB5\u968E\u5225\u96E2\u8131)",
-  quadrant: "\u56DB\u8C61\u9650\u30DE\u30C8\u30EA\u30AF\u30B9",
-  gantt: "\u30AC\u30F3\u30C8\u30C1\u30E3\u30FC\u30C8",
-  flowchart: "\u5206\u5C90\u30D5\u30ED\u30FC\u30C1\u30E3\u30FC\u30C8",
-  network: "\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u69CB\u6210"
+  chart: { shows: "\u9805\u76EE\u3054\u3068\u306E\u6570\u5024", name: "\u30B0\u30E9\u30D5" },
+  "line chart": { shows: "\u5024\u306E\u79FB\u308A\u5909\u308F\u308A", name: "\u6298\u308C\u7DDA\u30B0\u30E9\u30D5" },
+  "pie chart": { shows: "\u5168\u4F53\u306B\u5BFE\u3059\u308B\u5185\u8A33\u306E\u5272\u5408", name: "\u5186\u30B0\u30E9\u30D5" },
+  "bar chart": { shows: "\u9805\u76EE\u3054\u3068\u306E\u5024\u306E\u5927\u304D\u3055", name: "\u68D2\u30B0\u30E9\u30D5" },
+  flow: { shows: "\u51E6\u7406\u306E\u9806\u756A", name: "\u30D5\u30ED\u30FC" },
+  swimlane: { shows: "\u5F79\u5272\u3054\u3068\u306E\u7E26\u5217\u306B\u5206\u3051\u305F\u51E6\u7406\u306E\u6D41\u308C", name: "\u30B9\u30A4\u30E0\u30EC\u30FC\u30F3" },
+  sequence: { shows: "\u8981\u7D20\u3069\u3046\u3057\u306E\u3084\u308A\u53D6\u308A\u306E\u9806\u756A", name: "\u30B7\u30FC\u30B1\u30F3\u30B9\u56F3" },
+  topology: { shows: "\u30B7\u30B9\u30C6\u30E0\u306E\u69CB\u6210\u8981\u7D20\u3068\u63A5\u7D9A", name: "\u30C8\u30DD\u30ED\u30B8\u30FC\u56F3" },
+  er: { shows: "\u8868\u3069\u3046\u3057\u306E\u95A2\u4FC2", name: "ER\u56F3" },
+  stateMachine: { shows: "\u72B6\u614B\u3068\u9077\u79FB\u306E\u6761\u4EF6", name: "\u72B6\u614B\u9077\u79FB\u56F3" },
+  stateMachine2: { shows: "\u89AA\u306E\u72B6\u614B\u306E\u4E2D\u306B\u7F6E\u3044\u305F\u5B50\u306E\u72B6\u614B\u3068\u9077\u79FB\u306E\u6761\u4EF6", name: "\u5165\u308C\u5B50\u306E\u72B6\u614B\u9077\u79FB\u56F3" },
+  infrastructure: { shows: "\u30AF\u30E9\u30A6\u30C9\u3068\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u69CB\u6210", name: "\u968E\u5C64\u69CB\u6210\u56F3" },
+  classDiagram: { shows: "\u30AF\u30E9\u30B9\u3069\u3046\u3057\u306E\u95A2\u4FC2", name: "\u30AF\u30E9\u30B9\u56F3" },
+  tree: { shows: "\u7D44\u7E54\u3084\u5206\u985E\u306E\u89AA\u5B50\u306E\u95A2\u4FC2", name: "\u968E\u5C64\u56F3" },
+  userJourney: { shows: "\u5229\u7528\u8005\u306E\u6C17\u6301\u3061\u306E\u79FB\u308A\u5909\u308F\u308A", name: "\u4F53\u9A13\u306E\u9053\u7B4B" },
+  mindMap: { shows: "\u4E2D\u5FC3\u306E\u4E3B\u984C\u304B\u3089\u5E83\u304C\u308B\u767A\u60F3", name: "\u679D\u5206\u304B\u308C\u56F3" },
+  funnel: { shows: "\u6BB5\u968E\u3054\u3068\u306B\u6B8B\u308B\u6570\u3068\u96E2\u308C\u308B\u6570", name: "\u7D5E\u308A\u8FBC\u307F\u56F3" },
+  quadrant: { shows: "2 \u3064\u306E\u8EF8\u3067\u5206\u3051\u305F\u9805\u76EE\u306E\u4F4D\u7F6E", name: "\u56DB\u8C61\u9650\u56F3" },
+  gantt: { shows: "\u4F5C\u696D\u306E\u671F\u9593\u3068\u524D\u5F8C\u306E\u95A2\u4FC2", name: "\u5DE5\u7A0B\u8868" },
+  flowchart: { shows: "\u5206\u5C90\u3084\u5224\u5B9A\u3092\u542B\u3080\u51E6\u7406\u306E\u9806\u756A", name: "\u6D41\u308C\u56F3" },
+  network: { shows: "\u6A5F\u5668\u3068\u533A\u753B\u306E\u3064\u306A\u304C\u308A", name: "\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u56F3" }
 };
 function applyTopicAutoFix(topic) {
   const kindMatch = topic.match(
@@ -8872,7 +9778,8 @@ function applyTopicAutoFix(topic) {
     const kind = kindMatch[1].toLowerCase();
     const canonical = Object.keys(KIND_TO_JA).find((k) => k.toLowerCase() === kind);
     if (canonical) {
-      return `${KIND_TO_JA[canonical]} \u3092\u793A\u3059\u56F3`;
+      const { shows, name } = KIND_TO_JA[canonical];
+      return `${shows}\u3092\u793A\u3059${name}`;
     }
   }
   let out = topic;
@@ -8883,20 +9790,20 @@ function applyTopicAutoFix(topic) {
   return out;
 }
 function ruleTopicRedundancy(d) {
-  const out = [];
-  for (const { pattern, hint } of REDUNDANT_TOPIC_PATTERNS) {
-    if (pattern.test(d.topic)) {
-      out.push({
-        rule: "topic-redundant-implementation-detail",
-        severity: "warn",
-        target: d.id,
-        message: `topic \u306B\u5B9F\u88C5\u8A73\u7D30\u304C\u542B\u307E\u308C\u308B: "${d.topic}"`,
-        suggestion: hint,
-        autoFixable: true
-      });
-    }
-  }
-  return out;
+  const \u5F53\u305F\u308B = REDUNDANT_TOPIC_PATTERNS.filter(({ pattern }) => pattern.test(d.topic));
+  if (\u5F53\u305F\u308B.length === 0) return [];
+  const \u76F4\u3057\u305F\u5F8C = applyTopicAutoFix(d.topic);
+  const \u76F4\u305B\u308B = !REDUNDANT_TOPIC_PATTERNS.some(({ pattern }) => pattern.test(\u76F4\u3057\u305F\u5F8C));
+  const \u4F8B = KIND_TO_JA.gantt;
+  const \u624B\u3067\u76F4\u3059 = `\u4F55\u3092\u793A\u3059\u56F3\u304B\u3092\u6587\u3067\u66F8\u304D\u76F4\u3059 (\u300C${\u4F8B.shows}\u3092\u793A\u3059${\u4F8B.name}\u300D \u306E\u3088\u3046\u306B)`;
+  return \u5F53\u305F\u308B.map(({ hint }) => ({
+    rule: "topic-redundant-implementation-detail",
+    severity: "warn",
+    target: d.id,
+    message: `\u56F3\u306E\u8AAC\u660E \`${d.topic}\` \u306B\u5B9F\u88C5\u306E\u66F8\u304D\u65B9\u304C\u5165\u3063\u3066\u3044\u308B\u3002 ${hint}`,
+    suggestion: \u76F4\u305B\u308B ? \u76F4\u3057\u305F\u5F8C : \u624B\u3067\u76F4\u3059,
+    autoFixable: \u76F4\u305B\u308B
+  }));
 }
 function ruleEmptyChartData(d) {
   const out = [];
@@ -8908,8 +9815,8 @@ function ruleEmptyChartData(d) {
           rule: "chart-empty-datum",
           severity: "warn",
           target: n.id,
-          message: `chart node "${n.id}" \u304C datum 0 \u4EF6\u3001 chart \u306F\u975E\u8868\u793A\u306B\u306A\u308B`,
-          suggestion: `.datum({ id: ..., label: ..., value: ... }) \u3092 1 \u4EF6\u4EE5\u4E0A\u8FFD\u52A0`,
+          message: `\u56F3\u8868 \`${n.id}\` \u306B\u5024 (\`datum\`) \u304C 1 \u4EF6\u3082\u7121\u304F\u3001 \u56F3\u8868\u304C\u63CF\u304B\u308C\u306A\u3044`,
+          suggestion: `\`.datum({ id, label, value })\` \u3067\u5024\u3092 1 \u4EF6\u4EE5\u4E0A\u8DB3\u3059`,
           autoFixable: false
         });
       }
@@ -8918,8 +9825,8 @@ function ruleEmptyChartData(d) {
           rule: "chart-single-datum",
           severity: "info",
           target: n.id,
-          message: `chart node "${n.id}" \u304C datum 1 \u4EF6\u3001 \u6BD4\u8F03 / \u63A8\u79FB\u3068\u3057\u3066\u610F\u5473\u304C\u8584\u3044`,
-          suggestion: `2 \u4EF6\u4EE5\u4E0A\u306E datum \u3092\u63A8\u5968 (line \u7CFB\u306F 3 \u4EF6\u4EE5\u4E0A\u3067 trend \u304C\u898B\u3048\u308B)`,
+          message: `\u56F3\u8868 \`${n.id}\` \u306E\u5024 (\`datum\`) \u304C 1 \u4EF6\u3060\u3051\u3067\u3001 \u6BD4\u3079\u308B\u3053\u3068\u3082\u79FB\u308A\u5909\u308F\u308A\u3092\u8FFD\u3046\u3053\u3068\u3082\u3067\u304D\u306A\u3044`,
+          suggestion: `\u5024\u3092 2 \u4EF6\u4EE5\u4E0A\u306B\u3059\u308B (\u6298\u308C\u7DDA\u30B0\u30E9\u30D5\u306F 3 \u4EF6\u4EE5\u4E0A\u3067\u50BE\u304D\u304C\u8AAD\u3081\u308B)`,
           autoFixable: false
         });
       }
@@ -8939,8 +9846,8 @@ function ruleGanttUnknownDependsOn(d) {
             rule: "gantt-unknown-depends-on",
             severity: "warn",
             target: t.id,
-            message: `task "${t.id}" \u304C\u672A\u5B9A\u7FA9 task "${t.dependsOn}" \u306B dependsOn \u53C2\u7167`,
-            suggestion: `\u53C2\u7167\u5148 id \u3092\u4FEE\u6B63 or dependsOn \u3092\u9664\u53BB`,
+            message: `\u4F5C\u696D \`${t.id}\` \u306E \`dependsOn\` \u304C\u3001 \u7121\u3044\u4F5C\u696D \`${t.dependsOn}\` \u3092\u6307\u3057\u3066\u3044\u308B`,
+            suggestion: `\`dependsOn\` \u3092\u65E2\u306B\u3042\u308B\u4F5C\u696D\u306E \`id\` \u306B\u76F4\u3059\u304B\u3001 \`dependsOn\` \u3092\u5916\u3059`,
             autoFixable: false
           });
         }
@@ -8961,8 +9868,8 @@ function ruleMindMapParentReference(d) {
             rule: "mindmap-unknown-parent",
             severity: "warn",
             target: b.id,
-            message: `branch "${b.id}" \u304C\u672A\u5B9A\u7FA9 parent "${b.parent}" \u3092\u53C2\u7167`,
-            suggestion: `parent \u3092 rootId ("${n.mindData.rootId}") \u307E\u305F\u306F\u65E2\u5B58 branch id \u306B\u4FEE\u6B63`,
+            message: `\u679D \`${b.id}\` \u306E \`parent\` \u304C\u3001 \u7121\u3044\u679D \`${b.parent}\` \u3092\u6307\u3057\u3066\u3044\u308B`,
+            suggestion: `\`parent\` \u3092\u4E2D\u5FC3 (\`${n.mindData.rootId}\`) \u304B\u3001 \u65E2\u306B\u3042\u308B\u679D\u306E \`id\` \u306B\u76F4\u3059`,
             autoFixable: false
           });
         }
@@ -8982,8 +9889,8 @@ function ruleTreeParentReference(d) {
             rule: "tree-unknown-parent",
             severity: "warn",
             target: t.id,
-            message: `tree node "${t.id}" \u304C\u672A\u5B9A\u7FA9 parent "${t.parent}" \u3092\u53C2\u7167`,
-            suggestion: `parent id \u3092\u65E2\u5B58 tree node \u306B\u4FEE\u6B63 or parent \u9664\u53BB (root \u306B\u3059\u308B)`,
+            message: `\u968E\u5C64\u56F3\u306E\u9805\u76EE \`${t.id}\` \u306E \`parent\` \u304C\u3001 \u7121\u3044\u9805\u76EE \`${t.parent}\` \u3092\u6307\u3057\u3066\u3044\u308B`,
+            suggestion: `\`parent\` \u3092\u65E2\u306B\u3042\u308B\u9805\u76EE\u306E \`id\` \u306B\u76F4\u3059\u304B\u3001 \`parent\` \u3092\u5916\u3057\u3066\u4E00\u756A\u4E0A\u306E\u9805\u76EE\u306B\u3059\u308B`,
             autoFixable: false
           });
         }
@@ -9002,8 +9909,8 @@ function ruleQuadrantMissingItems(d) {
           rule: "quadrant-empty",
           severity: "warn",
           target: n.id,
-          message: `quadrant "${n.id}" \u304C item 0 \u4EF6\u3001 \u8EF8\u306E\u307F\u8868\u793A\u3055\u308C\u308B`,
-          suggestion: `.item({ id: ..., title: ..., quadrant: "topLeft" | ... }) \u3092 1 \u4EF6\u4EE5\u4E0A\u8FFD\u52A0`,
+          message: `\u56DB\u8C61\u9650\u56F3 \`${n.id}\` \u306B\u9805\u76EE (\`item\`) \u304C 1 \u4EF6\u3082\u7121\u304F\u3001 \u8EF8\u3060\u3051\u304C\u63CF\u304B\u308C\u308B`,
+          suggestion: `\`.item({ id, title, quadrant })\` \u3067\u9805\u76EE\u3092 1 \u4EF6\u4EE5\u4E0A\u8DB3\u3059 (\`quadrant\` \u306F \`topLeft\` \u306A\u3069\u306E 4 \u533A\u753B\u304B\u3089\u9078\u3076)`,
           autoFixable: false
         });
       }
@@ -9013,8 +9920,8 @@ function ruleQuadrantMissingItems(d) {
           rule: "quadrant-single-quadrant",
           severity: "info",
           target: n.id,
-          message: `quadrant "${n.id}" \u306E item \u304C 1 \u8C61\u9650\u306B\u96C6\u4E2D\u3001 \u30DE\u30C8\u30EA\u30AF\u30B9\u306E\u610F\u5473\u304C\u8584\u3044`,
-          suggestion: `2 \u8C61\u9650\u4EE5\u4E0A\u306B item \u3092\u5206\u6563 (SWOT / Priority matrix \u7B49\u306F 4 \u8C61\u9650 balanced \u3092\u63A8\u5968)`,
+          message: `\u56DB\u8C61\u9650\u56F3 \`${n.id}\` \u306E\u9805\u76EE\u304C\u3059\u3079\u3066 1 \u3064\u306E\u533A\u753B\u306B\u96C6\u307E\u308A\u3001 4 \u3064\u306B\u5206\u3051\u305F\u610F\u5473\u304C\u8584\u3044`,
+          suggestion: `\u9805\u76EE\u3092 2 \u3064\u4EE5\u4E0A\u306E\u533A\u753B\u306B\u5206\u3051\u308B\u3002 \u5F37\u307F\u3068\u5F31\u307F\u3092\u4E26\u3079\u308B\u5206\u6790 (\`SWOT\`) \u3084\u512A\u5148\u5EA6\u3092\u6C7A\u3081\u308B\u56F3\u306F\u3001 4 \u3064\u306E\u533A\u753B\u306B\u6563\u3089\u3057\u3066\u4F7F\u3046`,
           autoFixable: false
         });
       }
@@ -9036,8 +9943,8 @@ function ruleFunnelMonotonicCount(d) {
             rule: "funnel-increasing-count",
             severity: "warn",
             target: stages[i].id,
-            message: `stage "${stages[i].id}" (${stages[i].count}) \u304C\u524D\u6BB5 (${stages[i - 1].count}) \u3088\u308A\u5897\u52A0\u3001 funnel \u306F\u5358\u8ABF\u6E1B\u5C11\u304C\u671F\u5F85\u3055\u308C\u308B`,
-            suggestion: `stage \u9806\u3092\u518D\u78BA\u8A8D\u3001 \u5897\u52A0 pattern \u306A\u3089\u5225 preset (chart-line \u7B49) \u3092\u691C\u8A0E`,
+            message: `\u6BB5\u968E \`${stages[i].id}\` \u306E\u6570 (${\u4ECA}) \u304C\u524D\u306E\u6BB5\u968E (${\u524D}) \u3088\u308A\u591A\u3044\u3002 \u7D5E\u308A\u8FBC\u307F\u56F3\u306F\u6BB5\u968E\u304C\u9032\u3080\u307B\u3069\u6570\u304C\u6E1B\u308B`,
+            suggestion: `\u6BB5\u968E\u306E\u9806\u756A\u3092\u78BA\u304B\u3081\u308B\u3002 \u6570\u304C\u5897\u3048\u308B\u6D41\u308C\u3092\u793A\u3059\u306A\u3089\u3001 \u6298\u308C\u7DDA\u30B0\u30E9\u30D5 (\`chart-line\`) \u306A\u3069\u306E\u5225\u306E\u56F3\u306B\u3059\u308B`,
             autoFixable: false
           });
         }
@@ -9410,6 +10317,8 @@ var ACCEPTED_KEYS = {
     "bands",
     // 矢印をいつ出すか (#1470)
     "reveal",
+    // 箱に触れると関係する線だけを光らせるか (#1757)
+    "relations",
     // 図の並ぶ向き (#1494)
     "direction",
     // 図の配色 (#1553)
@@ -9438,7 +10347,6 @@ var ACCEPTED_KEYS = {
     "posY",
     "posW",
     "posH",
-    "nodes",
     "scale",
     "state",
     "pos",
@@ -9470,6 +10378,8 @@ var ACCEPTED_KEYS = {
     "tailHead",
     "headFill",
     "tailHeadFill",
+    // クラス図の出どころ側の多重度 (#1771)
+    "tailSub",
     "relation",
     // 辺の役目と名前の下地 (cdl#618)
     "role",
@@ -9486,13 +10396,15 @@ var ACCEPTED_KEYS = {
     "labelOffsetX",
     "labelOffsetY",
     "overlay",
-    "pos"
+    "pos",
+    // 部品の端で繋ぐ要素の id (#1979)
+    "fromPartNode",
+    "toPartNode"
   ],
   phase: ["step", "duration", "focus", "body", "badge", "tween", "set", "draw", "drawRatio"],
   viewport: ["width", "height", "scale", "laneWidth", "gap", "laneGap", "nodeGap", "labelMargin"],
   lane: ["x", "width", "label", "contain", "lifeline", "pos"],
   group: ["label", "lanes"],
-  actorNode: ["posX", "posY", "posW", "posH"],
   axes: ["x", "y"],
   axesX: ["left", "right"],
   axesY: ["bottom", "top"],
@@ -9525,6 +10437,8 @@ var \u6B04\u306E\u578B\u8868 = {
     bands: "\u4E26\u3073",
     // 矢印をいつ出すか (#1470)
     reveal: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
+    // 箱に触れると関係する線だけを光らせるか (#1757)
+    relations: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
     // 図の並ぶ向き (#1494)
     direction: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
     // 図の配色 (#1553)
@@ -9552,7 +10466,6 @@ var \u6B04\u306E\u578B\u8868 = {
     posY: "\u6570",
     posW: "\u6570",
     posH: "\u6570",
-    nodes: "object",
     scale: "\u6570",
     state: "object",
     pos: "object",
@@ -9583,6 +10496,8 @@ var \u6B04\u306E\u578B\u8868 = {
     tailHead: "\u7AEF\u306E\u5F62",
     headFill: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
     tailHeadFill: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
+    // クラス図の出どころ側の多重度 (#1771)
+    tailSub: "\u6587\u5B57\u5217",
     relation: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
     // 辺の役目と名前の下地 (cdl#618)
     role: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
@@ -9599,7 +10514,10 @@ var \u6B04\u306E\u578B\u8868 = {
     labelOffsetX: "\u6570",
     labelOffsetY: "\u6570",
     overlay: "\u771F\u507D",
-    pos: "object"
+    pos: "object",
+    // 部品の端で繋ぐ要素の id (#1979)。 空の id は要素を指せないので受けない
+    fromPartNode: "\u975E\u7A7A\u306E\u6587\u5B57\u5217",
+    toPartNode: "\u975E\u7A7A\u306E\u6587\u5B57\u5217"
   },
   phase: {
     step: "\u5FC5\u9808\u306E\u975E\u7A7A\u6587\u5B57\u5217",
@@ -9631,7 +10549,6 @@ var \u6B04\u306E\u578B\u8868 = {
     pos: "object"
   },
   group: { label: "\u6587\u5B57\u5217", lanes: "\u6587\u5B57\u5217\u306E\u4E26\u3073" },
-  actorNode: { posX: "\u6570", posY: "\u6570", posW: "\u6570", posH: "\u6570" },
   axes: { x: "object", y: "object" },
   axesX: { left: "\u6587\u5B57\u5217", right: "\u6587\u5B57\u5217" },
   axesY: { bottom: "\u6587\u5B57\u5217", top: "\u6587\u5B57\u5217" },
@@ -9887,26 +10804,6 @@ function \u898B\u672C\u306E\u540D\u524D\u304B(kind) {
   if (typeof kind !== "string" || kind.length === 0) return false;
   return kind !== "actor" && !VALID_KIND_SET.has(kind);
 }
-function validateActorNodes(v, path, errors) {
-  if (v === void 0) return;
-  if (!v || typeof v !== "object" || Array.isArray(v)) {
-    errors.push({
-      path,
-      message: "actor.nodes must be a plain object of name -> { posX, posY, posW, posH }"
-    });
-    return;
-  }
-  for (const [name, o] of Object.entries(v)) {
-    const nodePath = `${path}.${name}`;
-    if (!o || typeof o !== "object" || Array.isArray(o)) {
-      errors.push({ path: nodePath, message: "actor.nodes entry must be a plain object" });
-      continue;
-    }
-    const n = o;
-    checkUnknownKeys(n, "actorNode", nodePath, errors);
-    \u8868\u3067\u691C\u67FB(n, "actorNode", nodePath, `nodes.${name}`, errors);
-  }
-}
 function validateViewport(v, errors) {
   if (v === void 0) return;
   if (!v || typeof v !== "object" || Array.isArray(v)) {
@@ -9916,6 +10813,47 @@ function validateViewport(v, errors) {
   checkUnknownKeys(v, "viewport", "$.viewport", errors);
   \u8868\u3067\u691C\u67FB(v, "viewport", "$.viewport", "viewport", errors);
 }
+function \u9078\u629E\u80A2\u306E\u4E26\u3073\u3092\u691C\u67FB\u3059\u308B(\u5024, path, errors) {
+  if (!Array.isArray(\u5024)) {
+    errors.push({
+      path,
+      message: "options must be \u9078\u629E\u80A2\u306E\u4E26\u3073",
+      hint: `got ${\u5024 === null ? "null" : typeof \u5024}`
+    });
+    return;
+  }
+  \u5024.forEach((x, i) => {
+    const here = `${path}[${i}]`;
+    if (typeof x === "string") return;
+    if (typeof x !== "object" || x === null || Array.isArray(x)) {
+      errors.push({
+        path: here,
+        message: "option must be a string or { value, label }",
+        hint: `got ${Array.isArray(x) ? "array" : x === null ? "null" : typeof x}`
+      });
+      return;
+    }
+    const \u7D44 = x;
+    for (const k of Object.keys(\u7D44)) {
+      if (k === "value" || k === "label") continue;
+      errors.push({ path: `${here}.${k}`, message: `unknown key "${k}"`, hint: "\u4F7F\u3048\u308B\u9805\u76EE = value, label" });
+    }
+    for (const k of ["value", "label"]) {
+      const v = \u7D44[k];
+      if (v === void 0) {
+        errors.push({ path: `${here}.${k}`, message: `${k} is required`, hint: "\u5FC5\u9808\u306E\u9805\u76EE = value, label" });
+      } else if (typeof v !== "string") {
+        errors.push({ path: `${here}.${k}`, message: `${k} must be \u6587\u5B57\u5217`, hint: `got ${v === null ? "null" : typeof v}` });
+      } else if (v === "") {
+        errors.push({
+          path: `${here}.${k}`,
+          message: `${k} must not be empty`,
+          hint: k === "label" ? "\u540D\u524D\u3092\u66F8\u304B\u306A\u3044\u306A\u3089\u6587\u5B57\u5217\u3060\u3051\u3092\u4E26\u3079\u308B" : "\u5024\u3092 1 \u6587\u5B57\u4EE5\u4E0A\u66F8\u304F"
+        });
+      }
+    }
+  });
+}
 function \u8868\u3067\u4E2D\u8EAB\u3092\u691C\u67FB\u3059\u308B(o, \u8868, path, \u4F55, errors) {
   const kind = typeof o.kind === "string" ? o.kind : "";
   const \u5B9A\u7FA9 = Object.hasOwn(\u8868, kind) ? \u8868[kind] : void 0;
@@ -9940,6 +10878,10 @@ function \u8868\u3067\u4E2D\u8EAB\u3092\u691C\u67FB\u3059\u308B(o, \u8868, path,
       });
       continue;
     }
+    if (\u5F62 === "\u9078\u629E\u80A2\u306E\u4E26\u3073") {
+      \u9078\u629E\u80A2\u306E\u4E26\u3073\u3092\u691C\u67FB\u3059\u308B(\u5024, `${path}.${\u6B04}`, errors);
+      continue;
+    }
     const \u578B\u304C\u5408\u3046 = \u5F62 === "\u6570" ? typeof \u5024 === "number" && Number.isFinite(\u5024) : \u5F62 === "\u6570\u304B\u6587\u5B57\u5217" ? typeof \u5024 === "number" && Number.isFinite(\u5024) || typeof \u5024 === "string" : \u5F62 === "\u6587\u5B57\u5217\u306E\u4E26\u3073" ? Array.isArray(\u5024) && \u5024.every((x) => typeof x === "string") : \u5F62 === "\u6570\u306E\u4E26\u3073" ? Array.isArray(\u5024) && \u5024.every((x) => typeof x === "number" && Number.isFinite(x)) : \u5F62 === "\u771F\u507D" ? typeof \u5024 === "boolean" : \u5F62 === "\u7D44\u306E\u4E26\u3073" ? Array.isArray(\u5024) && \u5024.length > 0 && \u5024.every(
       (x) => typeof x === "object" && x !== null && !Array.isArray(x) && Object.keys(x).length > 0 && Object.values(x).every(
         (y) => typeof y === "string" || typeof y === "number" && Number.isFinite(y)
@@ -10093,12 +11035,15 @@ function validateFormulas(v, inputs, errors) {
     }
   }
   const \u5148\u306B\u66F8\u304B\u308C\u305F\u5F0F = /* @__PURE__ */ new Set();
-  for (const [\u540D\u524D, \u5F0F] of Object.entries(v)) {
+  for (const [\u540D\u524D, \u5024] of Object.entries(v)) {
     const path = `$.formulas.${\u540D\u524D}`;
     if (!isValueName(\u540D\u524D)) {
       errors.push({ path, ...valueNameIssue(\u540D\u524D) });
       continue;
     }
+    const \u691C\u67FB\u7D50\u679C = \u5F0F\u306E\u7D44\u3092\u691C\u67FB\u3059\u308B(\u5024, path, errors);
+    if (!\u691C\u67FB\u7D50\u679C.\u8AAD\u3081\u305F) continue;
+    const \u5F0F = \u691C\u67FB\u7D50\u679C.\u5024;
     if (typeof \u5F0F !== "string" || \u5F0F.trim() === "") {
       errors.push({
         path,
@@ -10139,6 +11084,37 @@ function validateFormulas(v, inputs, errors) {
     }
   }
 }
+function \u5F0F\u306E\u7D44\u3092\u691C\u67FB\u3059\u308B(\u5024, path, errors) {
+  if (!\u5024 || typeof \u5024 !== "object" || Array.isArray(\u5024)) return { \u8AAD\u3081\u305F: true, \u5024 };
+  const \u7D44 = \u5024;
+  let \u8AAD\u3081\u305F = true;
+  for (const \u9375 of Object.keys(\u7D44)) {
+    if (\u9375 === "expression" || \u9375 === "label") continue;
+    \u8AAD\u3081\u305F = false;
+    errors.push({
+      path: `${path}.${\u9375}`,
+      message: `unknown formula field: ${\u9375}`,
+      hint: "\u4F7F\u3048\u308B\u9805\u76EE = expression, label"
+    });
+  }
+  if (typeof \u7D44.expression !== "string" || \u7D44.expression.trim() === "") {
+    \u8AAD\u3081\u305F = false;
+    errors.push({
+      path: `${path}.expression`,
+      message: "expression must be a non-empty expression string",
+      hint: `got ${\u7D44.expression === void 0 ? "nothing" : JSON.stringify(\u7D44.expression)}`
+    });
+  }
+  if (\u7D44.label !== void 0 && (typeof \u7D44.label !== "string" || \u7D44.label.trim() === "")) {
+    \u8AAD\u3081\u305F = false;
+    errors.push({
+      path: `${path}.label`,
+      message: "label must be a non-empty string",
+      hint: "\u540D\u672D\u3092\u4ED8\u3051\u306A\u3044\u306A\u3089 label \u3092\u66F8\u304B\u306A\u3044"
+    });
+  }
+  return \u8AAD\u3081\u305F ? { \u8AAD\u3081\u305F: true, \u5024: \u7D44.expression } : { \u8AAD\u3081\u305F: false };
+}
 function validateEvents(v, errors) {
   if (v === void 0) return;
   if (!Array.isArray(v)) {
@@ -10498,7 +11474,6 @@ function validateJson(json) {
           });
         }
       }
-      validateActorNodes(ao.nodes, `$.actors[${i}].nodes`, errors);
       if (ao.state !== void 0) {
         if (!ao.state || typeof ao.state !== "object" || Array.isArray(ao.state)) {
           errors.push({
@@ -10715,18 +11690,13 @@ function jsonToDoc(json) {
         opportunity: a.opportunity
       },
       colorHex: \u8272.hex,
+      // 部品に書いた色の名前は効かない。 記法と同じく書いた名前として残し、組み立て側が知らせる (#1973)
+      partColorName: isPart ? \u8272.tone : void 0,
       // 絶対座標と大きさ (#1294)。 `pos` (ずらし幅) とは別経路
       posX: a.posX,
       posY: a.posY,
       posW: a.posW,
       posH: a.posH,
-      // 箱の中の要素ごとの固定 (#1294)。 写しを作って外から書き換えられないようにする
-      nodes: a.nodes ? Object.fromEntries(
-        Object.entries(a.nodes).map(([id, o]) => [
-          id,
-          { posX: o.posX, posY: o.posY, posW: o.posW, posH: o.posH }
-        ])
-      ) : void 0,
       // 倍率は見本にしか効かない (検査が見本でない箱を弾く)。 書かれた名前は JSON では
       // 常に `scale` で、記法の別名 (`倍率`) は JSON に持ち込まない
       scale: isPart ? a.scale : void 0,
@@ -10752,6 +11722,8 @@ function jsonToDoc(json) {
     tailHead: s.tailHead,
     headFill: s.headFill,
     tailHeadFill: s.tailHeadFill,
+    // クラス図の出どころ側の多重度 (#1771)
+    tailSub: s.tailSub,
     relation: s.relation,
     // 辺の役目と名前の下地 (cdl#618)
     role: s.role,
@@ -10770,6 +11742,9 @@ function jsonToDoc(json) {
     labelOffsetX: s.labelOffsetX,
     labelOffsetY: s.labelOffsetY,
     overlay: s.overlay,
+    // 部品の端で繋ぐ要素の id (#1979)。 書かない矢印には欄を足さない = 記法と同じ形になる
+    ...s.fromPartNode !== void 0 ? { fromPartNode: s.fromPartNode } : {},
+    ...s.toPartNode !== void 0 ? { toPartNode: s.toPartNode } : {},
     // CAR-1693 Phase 1: DSL 表面 pos → 内部 AST layoutPos
     layoutPos: s.pos,
     pos: p0
@@ -10787,7 +11762,14 @@ function jsonToDoc(json) {
     pos: p0
   }));
   const scrolls = json.scrolls ? Object.entries(json.scrolls).map(([id, spec]) => ({ id, ...spec })) : void 0;
-  const formulas = json.formulas ? Object.entries(json.formulas).map(([id, expression]) => ({ id, expression, pos: p0 })) : void 0;
+  const formulas = json.formulas ? Object.entries(json.formulas).map(
+    ([id, \u5024]) => typeof \u5024 === "string" ? { id, expression: \u5024, pos: p0 } : {
+      id,
+      expression: \u5024.expression,
+      ...\u5024.label !== void 0 ? { label: \u5024.label } : {},
+      pos: p0
+    }
+  ) : void 0;
   const states = Object.entries(json.states ?? {}).map(([name, initial]) => ({
     name,
     initial,
@@ -10856,6 +11838,8 @@ function jsonToDoc(json) {
     bands: json.bands,
     // 矢印をいつ出すか (#1470)
     reveal: json.reveal,
+    // 箱に触れると関係する線だけを光らせるか (#1757)
+    relations: json.relations,
     // 図の並ぶ向き (#1494)。 JSON は英語で書くので、記法と同じ語に直してから渡す
     ...json.direction !== void 0 ? { direction: json.direction === "horizontal" ? "\u6A2A" : "\u7E26" } : {},
     // 図の配色 (#1553)。 記法と同じ解決を通す = 別名 (`生成り` / `青磁`) の受け方がずれない。
@@ -11122,28 +12106,6 @@ var diagram_default = {
                 type: "number",
                 description: "\u7BB1\u306E\u9AD8\u3055\u3002"
               },
-              nodes: {
-                type: "object",
-                description: "\u7BB1\u306E\u4E2D\u306E\u8981\u7D20\u3054\u3068\u306E\u4F4D\u7F6E\u3068\u5927\u304D\u3055\u3002 key \u306F header / footer / s0 \u7B49\u306E\u8981\u7D20\u540D\u3002",
-                additionalProperties: {
-                  type: "object",
-                  additionalProperties: false,
-                  properties: {
-                    posX: {
-                      type: "number"
-                    },
-                    posY: {
-                      type: "number"
-                    },
-                    posW: {
-                      type: "number"
-                    },
-                    posH: {
-                      type: "number"
-                    }
-                  }
-                }
-              },
               scale: {
                 type: "number",
                 description: "parts \u306E\u63CF\u753B\u500D\u7387\u3002 kind \u306B parts identifier \u3092\u6307\u5B9A\u3057\u305F\u6642\u3060\u3051\u4F7F\u3048\u308B\u3002"
@@ -11404,6 +12366,10 @@ var diagram_default = {
             type: "string",
             description: "\u30E9\u30D9\u30EB\u4E0B\u306E\u88DC\u8DB3"
           },
+          tailSub: {
+            type: "string",
+            description: '\u30AF\u30E9\u30B9\u56F3\u306E\u51FA\u3069\u3053\u308D\u5074\u306E\u591A\u91CD\u5EA6 (\u4F8B "1")\u3002 sub \u304C\u884C\u304D\u5148\u306E\u7AEF\u306E\u591A\u91CD\u5EA6\u3002 \u30AF\u30E9\u30B9\u56F3\u3067\u3060\u3051\u52B9\u304F'
+          },
           tone: {
             type: "string",
             enum: [
@@ -11462,7 +12428,7 @@ var diagram_default = {
               "many",
               "zero-many"
             ],
-            description: "\u7740\u304D\u5148\u5074\u306E\u7AEF\u306E\u5F62\u3002 \u7AEF\u306E\u5F62\u3067\u95A2\u4FC2\u306E\u7A2E\u985E\u3092\u793A\u3059 = triangle (\u7D99\u3050) / diamond (\u6301\u3064) / open (\u4F7F\u3046) / crow (\u591A) / one / zero-one / many / zero-many (\u500B\u6570)\u3002 \u66F8\u304B\u306A\u3051\u308C\u3070\u5857\u3063\u305F\u4E09\u89D2\u306B\u306A\u308B\u3002"
+            description: "\u7740\u304D\u5148\u5074\u306E\u7AEF\u306E\u5F62\u3002 \u7AEF\u306E\u5F62\u3067\u95A2\u4FC2\u306E\u7A2E\u985E\u3092\u793A\u3059 = triangle (\u7D99\u627F\u30FB\u5B9F\u88C5) / diamond (\u96C6\u7D04\u30FB\u30B3\u30F3\u30DD\u30B8\u30B7\u30E7\u30F3) / open (\u95A2\u9023\u30FB\u4F9D\u5B58) / crow (\u591A) / one / zero-one / many / zero-many (\u500B\u6570)\u3002 \u66F8\u304B\u306A\u3051\u308C\u3070\u5857\u3063\u305F\u4E09\u89D2\u306B\u306A\u308B\u3002"
           },
           tailHead: {
             type: "string",
@@ -11539,6 +12505,18 @@ var diagram_default = {
             type: "boolean",
             description: "true \u3067\u8AAC\u660E\u6587\u3092\u77E2\u5370\u306E\u7DDA\u306E\u4E0A\u306B\u91CD\u306D\u308B (\u5206\u5C90\u56F3\u306E\u6761\u4EF6\u30E9\u30D9\u30EB\u7528)"
           },
+          fromPartNode: {
+            type: "string",
+            minLength: 1,
+            pattern: "\\S",
+            description: "from \u304C\u90E8\u54C1\u306E\u6642\u3001\u77E2\u5370\u3092\u7E4B\u3050\u90E8\u54C1\u306E\u4E2D\u306E\u8981\u7D20\u306E id\u3002 \u8981\u7D20\u3092 1 \u3064\u3060\u3051\u6301\u3064\u90E8\u54C1\u306F\u66F8\u304B\u306A\u304F\u3066\u3082\u305D\u306E\u8981\u7D20\u306B\u7E4B\u3050\u3002 \u8981\u7D20\u3092 2 \u3064\u4EE5\u4E0A\u6301\u3064\u90E8\u54C1\u306F\u66F8\u304B\u306A\u3044\u3068\u77E2\u5370\u3092\u5916\u3057\u3066\u77E5\u3089\u305B\u308B"
+          },
+          toPartNode: {
+            type: "string",
+            minLength: 1,
+            pattern: "\\S",
+            description: "to \u304C\u90E8\u54C1\u306E\u6642\u3001\u77E2\u5370\u3092\u7E4B\u3050\u90E8\u54C1\u306E\u4E2D\u306E\u8981\u7D20\u306E id\u3002 \u8981\u7D20\u3092 1 \u3064\u3060\u3051\u6301\u3064\u90E8\u54C1\u306F\u66F8\u304B\u306A\u304F\u3066\u3082\u305D\u306E\u8981\u7D20\u306B\u7E4B\u3050\u3002 \u8981\u7D20\u3092 2 \u3064\u4EE5\u4E0A\u6301\u3064\u90E8\u54C1\u306F\u66F8\u304B\u306A\u3044\u3068\u77E2\u5370\u3092\u5916\u3057\u3066\u77E5\u3089\u305B\u308B"
+          },
           pos: {
             type: "object",
             additionalProperties: false,
@@ -11661,9 +12639,13 @@ var diagram_default = {
               "tree",
               "gantt",
               "funnel",
-              "slope"
+              "slope",
+              "gauge",
+              "radial",
+              "stacked",
+              "waffle"
             ],
-            description: "\u3053\u306E phase \u3067\u8D77\u70B9\u304B\u3089\u63CF\u304F\u3082\u306E\u3002 \u8A9E\u306F\u56F3\u7A2E\u3068\u63C3\u3048\u308B\u3002 line / journey = \u7DDA\u304C\u5DE6\u7AEF\u304B\u3089\u53F3\u3078\u4F38\u3073\u308B / bar = \u68D2\u304C\u6A2A\u8EF8\u304B\u3089\u4E0A\u3078\u4F38\u3073\u308B / pie = \u6247\u304C 12 \u6642\u304B\u3089\u6642\u8A08\u56DE\u308A\u306B\u958B\u304F / mind = \u679D\u304C\u4E2D\u5FC3\u304B\u3089\u5916\u3078\u4F38\u3073\u308B / tree = \u679D\u304C\u6839\u304B\u3089\u4E0B\u3078\u4F38\u3073\u308B / gantt = \u5E2F\u304C\u5404\u59CB\u7AEF\u304B\u3089\u53F3\u3078\u4F38\u3073\u308B / funnel = \u6BB5\u304C\u4E0A\u7AEF\u304B\u3089\u9806\u306B\u7A4D\u307E\u308C\u308B / slope = \u7DDA\u304C\u5DE6\u306E\u8EF8\u304B\u3089\u53F3\u306E\u8EF8\u3078\u4F38\u3073\u308B"
+            description: "\u3053\u306E phase \u3067\u8D77\u70B9\u304B\u3089\u63CF\u304F\u3082\u306E\u3002 \u8A9E\u306F\u56F3\u7A2E\u3068\u63C3\u3048\u308B\u3002 line / journey = \u7DDA\u304C\u5DE6\u7AEF\u304B\u3089\u53F3\u3078\u4F38\u3073\u308B / bar = \u68D2\u304C\u6A2A\u8EF8\u304B\u3089\u4E0A\u3078\u4F38\u3073\u308B / pie = \u6247\u304C 12 \u6642\u304B\u3089\u6642\u8A08\u56DE\u308A\u306B\u958B\u304F / mind = \u679D\u304C\u4E2D\u5FC3\u304B\u3089\u5916\u3078\u4F38\u3073\u308B / tree = \u679D\u304C\u6839\u304B\u3089\u4E0B\u3078\u4F38\u3073\u308B / gantt = \u5E2F\u304C\u5404\u59CB\u7AEF\u304B\u3089\u53F3\u3078\u4F38\u3073\u308B / funnel = \u6BB5\u304C\u4E0A\u7AEF\u304B\u3089\u9806\u306B\u7A4D\u307E\u308C\u308B / slope = \u7DDA\u304C\u5DE6\u306E\u8EF8\u304B\u3089\u53F3\u306E\u8EF8\u3078\u4F38\u3073\u308B / gauge = \u5F27\u304C 9 \u6642\u304B\u3089\u4E0A\u3092\u901A\u3063\u3066 3 \u6642\u3078\u4F38\u3073\u308B / radial = \u5404\u8F2A\u304C 12 \u6642\u304B\u3089\u6642\u8A08\u56DE\u308A\u306B\u958B\u304F / stacked = \u5E2F\u304C\u5DE6\u7AEF\u304B\u3089\u53F3\u3078\u4F38\u3073\u308B / waffle = \u5370\u304C\u5DE6\u4E0A\u304B\u3089\u8AAD\u3080\u5411\u304D\u306B 1 \u500B\u305A\u3064\u57CB\u307E\u308B"
           },
           drawRatio: {
             type: "number",
@@ -12898,10 +13880,43 @@ var diagram_default = {
           min: {
             type: "number"
           },
+          offLabel: {
+            type: "string",
+            minLength: 1,
+            description: "\u5207\u308A\u66FF\u3048 (toggle) \u304C\u5207\u306E\u6642\u306B\u3001\u7BB1\u306E\u5B57\u306E\u5DEE\u3057\u8FBC\u307F\u3078\u63CF\u304F\u540D\u524D\u3002 \u7701\u7565\u3059\u308B\u3068 false \u3092\u63CF\u304F\u3002"
+          },
+          onLabel: {
+            type: "string",
+            minLength: 1,
+            description: "\u5207\u308A\u66FF\u3048 (toggle) \u304C\u5165\u306E\u6642\u306B\u3001\u7BB1\u306E\u5B57\u306E\u5DEE\u3057\u8FBC\u307F\u3078\u63CF\u304F\u540D\u524D\u3002 \u7701\u7565\u3059\u308B\u3068 true \u3092\u63CF\u304F\u3002"
+          },
           options: {
             type: "array",
+            description: "\u9078\u629E\u80A2\u3002 \u6587\u5B57\u5217\u306F\u5024\u3068\u540D\u524D\u3092\u517C\u306D\u3001{ value, label } \u306E\u7D44\u306F value \u3092\u5024\u306B\u3057\u3066 label \u3092\u64CD\u4F5C\u90E8\u306E\u9078\u629E\u80A2\u3068\u7BB1\u306E\u5B57\u306E\u5DEE\u3057\u8FBC\u307F\u306B\u63CF\u304F\u3002 2 \u3064\u3092\u6DF7\u305C\u3066\u66F8\u3051\u308B\u3002",
             items: {
-              type: "string"
+              oneOf: [
+                {
+                  type: "string"
+                },
+                {
+                  type: "object",
+                  additionalProperties: false,
+                  required: [
+                    "value",
+                    "label"
+                  ],
+                  properties: {
+                    value: {
+                      type: "string",
+                      minLength: 1
+                    },
+                    label: {
+                      type: "string",
+                      minLength: 1
+                    }
+                  }
+                }
+              ]
             }
           },
           placeholder: {
@@ -13075,11 +14090,34 @@ var diagram_default = {
     },
     formulas: {
       type: "object",
-      description: '\u3064\u307E\u307F\u306E\u5024\u304B\u3089\u6C7A\u307E\u308B\u5024\u3002 \u540D\u524D\u3092\u9375\u3001\u5F0F\u3092\u5024\u306B\u66F8\u304F\u3002 `values` \u3068\u306F\u7D4C\u8DEF\u304C\u5225\u3067\u3001\u5F0F\u306F\u540D\u524D\u3092\u4E2D\u62EC\u5F27\u3067\u56F2\u308F\u306A\u3044 (\u4F8B "input * 2")\u3002',
+      description: '\u3064\u307E\u307F\u306E\u5024\u304B\u3089\u6C7A\u307E\u308B\u5024\u3002 \u540D\u524D\u3092\u9375\u3001\u5F0F\u3092\u5024\u306B\u66F8\u304F\u3002 `values` \u3068\u306F\u7D4C\u8DEF\u304C\u5225\u3067\u3001\u5F0F\u306F\u540D\u524D\u3092\u4E2D\u62EC\u5F27\u3067\u56F2\u308F\u306A\u3044 (\u4F8B "input * 2")\u3002 \u64CD\u4F5C\u90E8\u306B\u51FA\u3059\u540D\u672D\u3092\u4ED8\u3051\u308B\u6642\u306F { "expression": "input * 2", "label": "2 \u500D" } \u306E\u7D44\u3067\u66F8\u304F\u3002',
       additionalProperties: {
-        type: "string",
-        minLength: 1,
-        pattern: "\\S"
+        oneOf: [
+          {
+            type: "string",
+            minLength: 1,
+            pattern: "\\S"
+          },
+          {
+            type: "object",
+            additionalProperties: false,
+            required: ["expression"],
+            properties: {
+              expression: {
+                type: "string",
+                minLength: 1,
+                pattern: "\\S",
+                description: '\u5F0F (\u4F8B "input * 2")'
+              },
+              label: {
+                type: "string",
+                minLength: 1,
+                pattern: "\\S",
+                description: "\u64CD\u4F5C\u90E8\u306B\u5F0F\u306E\u540D\u524D\u3068\u3057\u3066\u51FA\u3059\u540D\u672D\u3002 \u66F8\u304B\u306A\u3051\u308C\u3070\u540D\u524D\u3092\u305D\u306E\u307E\u307E\u51FA\u3059"
+              }
+            }
+          }
+        ]
       },
       propertyNames: {
         pattern: "^[A-Za-z_][A-Za-z0-9_]*$"
@@ -13109,6 +14147,14 @@ var diagram_default = {
       ],
       description: "\u77E2\u5370\u3092\u3044\u3064\u51FA\u3059\u304B\u3002 phase (\u65E2\u5B9A) = \u6BB5\u304C\u540D\u6307\u3057\u3059\u308B\u77E2\u5370\u306F\u305D\u306E\u6BB5\u304C\u6765\u308B\u307E\u3067\u63CF\u304B\u306A\u3044\u3002 all = \u6BB5\u306B\u95A2\u308F\u3089\u305A\u6700\u521D\u304B\u3089\u5168\u90E8\u63CF\u304F\u3002"
     },
+    relations: {
+      type: "string",
+      enum: [
+        "off",
+        "hover"
+      ],
+      description: "\u7BB1\u306B\u89E6\u308C\u308B\u3068\u95A2\u4FC2\u3059\u308B\u7DDA\u3060\u3051\u3092\u5149\u3089\u305B\u308B\u304B\u3002 off (\u65E2\u5B9A) = \u4F55\u3082\u3057\u306A\u3044\u3002 hover = \u7BB1\u306B\u89E6\u308C\u305F\u6642\u306B\u305D\u306E\u7BB1\u3068\u7E4B\u304C\u308B\u7DDA\u3068\u76F8\u624B\u306E\u7BB1\u3060\u3051\u304C\u5149\u308A\u3001\u4ED6\u304C\u6C88\u3080\u3002 \u9806\u756A\u3092\u6301\u305F\u306A\u3044\u30AF\u30E9\u30B9\u56F3\u3068 ER \u56F3\u3067\u4F7F\u3046\u3002"
+    },
     bands: {
       type: "array",
       description: "\u9806\u5E8F\u56F3\u3067\u9762\u304C\u52D5\u3044\u3066\u3044\u308B\u9593\u306E\u5E2F\u3002 \u66F8\u304B\u306A\u3051\u308C\u3070\u9762\u3054\u3068\u306B\u300C\u6700\u521D\u306B\u95A2\u308F\u3063\u305F\u6BB5\u304B\u3089\u6700\u5F8C\u307E\u3067\u300D \u306E 1 \u672C\u306B\u306A\u308B\u3002",
@@ -13324,6 +14370,6 @@ function isV05Source(src) {
   return true;
 }
 
-export { DIAGRAM_BOUNDARY_PADDING, DRAW_TARGETS, DRAW_WORDS, JSONを分解する, MAX_INPUT_BYTES, MAX_INPUT_ELEMENTS, MAX_PART_SCALE, NODE_KIND_ALIAS, NODE_KIND_VALID, PHASE_ITEM_WORDS, PRESET_TYPES, RELATIVE_GAP_DEFAULT, TONE_ALIAS, TOP_LEVEL_KEYS, autoFix, compileToCdl, computeDiagramBoundingBox, countBytes, countDiagramElements, countDocElements, describeOversize, describeOversizeSource, diagramJsonSchema, isColorValue, jsonToDiagram, lintDiagram, measureActorBoxes, normalizePartScale, orderByDependency, parseFocusEntry, parseRelativePos, parseTextDsl, parseTextDslV05, partBoxInFrame, partDrawsInDiagram, partIsMeasurable, partRenderSize, partScaleFactor, partTargetScale, partTargetSize, partVisualSize, partsBaseRows, partsGridCenters, pointsOutside, rectsOverlap, resolveRelativePos, stripExternalPaint, stripQuotes, textDslToDiagram, validateDragonJson, writeActorPosition, 区間に広げる, 記法を分解する };
+export { DIAGRAM_BOUNDARY_PADDING, DIRECTION_ALIAS, DRAW_TARGETS, DRAW_WORDS, JSONを分解する, MAX_INPUT_BYTES, MAX_INPUT_ELEMENTS, MAX_PART_SCALE, NODE_KIND_ALIAS, NODE_KIND_VALID, PHASE_ITEM_WORDS, PRESET_TYPES, RELATIVE_GAP_DEFAULT, TONE_ALIAS, TOP_LEVEL_KEYS, autoFix, compileToCdl, computeDiagramBoundingBox, countBytes, countDiagramElements, countDocElements, describeOversize, describeOversizeSource, diagramJsonSchema, isColorValue, jsonToDiagram, lintDiagram, measureActorBoxes, normalizePartScale, orderByDependency, parseFocusEntry, parseRelativePos, parseTextDsl, parseTextDslV05, partBoxInFrame, partDrawsInDiagram, partIsMeasurable, partRenderSize, partScaleFactor, partTargetScale, partTargetSize, partVisualSize, partsBaseBottom, partsGridCenters, pointsOutside, rectsOverlap, resolveRelativePos, stripExternalPaint, stripQuotes, textDslToDiagram, validateDragonJson, writeActorPosition, 区間に広げる, 記法を分解する, 部品に上書きを当てる };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map