@cardenelabs/dragon 0.7.0 → 0.8.0

package/dist/index.cjs

@@ -610,7 +610,7 @@ function countDocElements(doc) {
     (acc, p) => acc + (p.highlight?.length ?? 0) + (p.tweens?.length ?? 0) + (p.sets?.length ?? 0),
     0
   );
-  return doc.actors.length + doc.flow.length + phases.length + phaseChildren + (doc.animate?.states.length ?? 0) + (doc.groups ? Object.keys(doc.groups).length : 0) + (doc.lanes ? Object.keys(doc.lanes).length : 0);
+  return doc.actors.length + doc.flow.length + phases.length + phaseChildren + (doc.animate?.states.length ?? 0) + (doc.values?.length ?? 0) + (doc.groups ? Object.keys(doc.groups).length : 0) + (doc.lanes ? Object.keys(doc.lanes).length : 0);
 }
 function countDiagramElements(diagram2) {
   const phases = Array.isArray(diagram2.phases) ? diagram2.phases : [];
@@ -619,7 +619,8 @@ function countDiagramElements(diagram2) {
     return acc + (Array.isArray(ph?.activate) ? ph.activate.length : 0) + (Array.isArray(ph?.highlight) ? ph.highlight.length : 0) + (Array.isArray(ph?.tweens) ? ph.tweens.length : 0) + (Array.isArray(ph?.sets) ? ph.sets.length : 0);
   }, 0);
   return (diagram2.nodes?.length ?? 0) + (diagram2.edges?.length ?? 0) + (diagram2.lanes?.length ?? 0) + (diagram2.states?.length ?? 0) + phases.length + phaseChildren + // 図が持てる並びは全部数える。 1 つでも外すと、そこに寄せた図が素通りする
-  (diagram2.readouts?.length ?? 0) + (diagram2.inputs?.length ?? 0) + (diagram2.formulas?.length ?? 0) + (diagram2.scrollTriggers?.length ?? 0) + (diagram2.eventBindings?.length ?? 0);
+  (diagram2.readouts?.length ?? 0) + (diagram2.inputs?.length ?? 0) + (diagram2.formulas?.length ?? 0) + (diagram2.scrollTriggers?.length ?? 0) + (diagram2.eventBindings?.length ?? 0) + // 他の値から決まる値 (#1162)。 記法側 (`countDocElements`) が数えるので、こちらも揃える
+  (diagram2.derived?.length ?? 0);
 }
 function countBytes(src) {
   return new TextEncoder().encode(src).length;
@@ -725,6 +726,12 @@ function orderByDependency(items) {
 function compileToCdl(doc, opts) {
   const oversize = describeOversize({ elements: countDocElements(doc), bytes: 0 });
   if (oversize) throw new Error(oversize);
+  doc = canonicalizeFlowActors(doc);
+  const \u66F8\u3044\u305F\u307E\u307E = doc;
+  doc = dropUnresolvedFlow(doc);
+  doc = dropSelfLoopFlow(doc);
+  const \u5206\u3051\u305F = disambiguateActorIds(doc, opts?.onNotice);
+  doc = \u5206\u3051\u305F.doc;
   let diagram2;
   switch (doc.type) {
     case "sequence":
@@ -755,27 +762,64 @@ function compileToCdl(doc, opts) {
       diagram2 = compileClass(doc);
       break;
     case "pie":
-      diagram2 = compilePie(doc);
+      diagram2 = compileValueChart(doc, "pie", "chart-pie", opts?.onNotice);
+      break;
+    case "bar":
+      diagram2 = compileValueChart(doc, "bar", "chart-bar", opts?.onNotice);
+      break;
+    case "line":
+      diagram2 = compileValueChart(doc, "line", "chart-line", opts?.onNotice);
+      break;
+    case "funnel":
+      diagram2 = compileFunnel(doc, opts?.onNotice);
+      break;
+    case "tree":
+      diagram2 = compileTree(doc, opts?.onNotice);
+      break;
+    case "journey":
+      diagram2 = compileJourney(doc, opts?.onNotice);
+      break;
+    case "quadrant":
+      diagram2 = compileQuadrant(doc, opts?.onNotice);
       break;
     case "c4":
       diagram2 = compileC4(doc);
       break;
     case "mind":
-      diagram2 = compileMind(doc);
+      diagram2 = compileMind(doc, opts?.onNotice);
       break;
     default:
       throw new Error(`unknown type: ${String(doc.type)}`);
   }
+  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);
-  if (edgeSourceLines) fillFlowEdgeSources(diagram2, doc, edgeSourceLines);
   applyGroupContainers(diagram2, doc);
   applyNodeTones(diagram2, doc);
-  reportMissingFocusTargets(doc, opts?.onNotice);
+  reportMissingFocusTargets(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportMissingFlowActors(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportSelfLoopFlow(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportFlowEndpointNotHonored(doc, \u5206\u3051\u305F.\u5143\u306E\u540D\u524D, opts?.onNotice);
+  reportLaneNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportDocEyebrowNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportChartFieldsNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
+  reportAxesNotHonored(\u66F8\u3044\u305F\u307E\u307E, opts?.onNotice);
   const placed = resolveRelativeDoc(diagram2, doc, opts?.onNotice, opts?.partsCatalog);
   applyCanvasPivotPositions(diagram2, placed);
-  const extended = applyV05Extensions(diagram2, placed);
-  const merged = mergePartsFromActors(extended, placed, opts?.partsCatalog, opts?.onNotice);
+  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;
+  for (const value of extended.derived ?? []) {
+    recordDerivedSourceLine(inheritedDerivedSourceLines, value.id, 0);
+  }
+  const merged = mergePartsFromActors(
+    extended,
+    placed,
+    opts?.partsCatalog,
+    opts?.onNotice,
+    inheritedDerivedSourceLines
+  );
+  reportEmptyDeclaredLanes(merged, \u8FFD\u52A0\u3057\u305F\u7E26\u5217, opts?.onNotice);
   if (edgeSourceLines && opts?.onEdgeSource) {
     const alive = new Set(merged.edges.map((e) => e.id));
     for (const [id, line] of edgeSourceLines) {
@@ -783,6 +827,10 @@ function compileToCdl(doc, opts) {
     }
   }
   injectStaticPhase(merged);
+  materializeStates(merged, doc);
+  \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);
   for (const dropped of stripExternalPaint(merged)) {
     opts?.onNotice?.({
       kind: "external-paint-dropped",
@@ -792,8 +840,17 @@ function compileToCdl(doc, opts) {
       hint: "\u8272\u306F `#ff0000` \u306E\u3088\u3046\u306A\u8272\u756A\u53F7\u304B\u3001 `red` \u306E\u3088\u3046\u306A\u8272\u540D\u3067\u66F8\u304F"
     });
   }
+  restoreActorNames(merged, \u5206\u3051\u305F.\u5143\u306E\u540D\u524D, \u4F5C\u308A\u66FF\u3048\u305F\u5BFE\u8C61);
   return merged;
 }
+function materializeStates(diagram2, doc) {
+  const \u8F09\u3063\u3066\u3044\u308B = new Set(diagram2.states.map((s) => s.id));
+  for (const st of doc.animate?.states ?? []) {
+    if (\u8F09\u3063\u3066\u3044\u308B.has(st.name)) continue;
+    diagram2.states.push({ id: st.name, initial: st.initial });
+    \u8F09\u3063\u3066\u3044\u308B.add(st.name);
+  }
+}
 function injectStaticPhase(diagram2) {
   if (diagram2.phases.length > 0) return;
   const activate = [...diagram2.nodes.map((n) => n.id), ...diagram2.edges.map((e) => e.id)];
@@ -811,6 +868,314 @@ function truncateForMessage(v) {
   const s = v.trim();
   return s.length <= 40 ? s : `${s.slice(0, 37)}...`;
 }
+function actorRefTable(doc) {
+  const \u8868 = /* @__PURE__ */ new Map();
+  const slug\u6570 = /* @__PURE__ */ new Map();
+  for (const a of doc.actors) {
+    const sl = slugify(a.name);
+    slug\u6570.set(sl, (slug\u6570.get(sl) ?? 0) + 1);
+  }
+  for (const a of doc.actors) {
+    \u8868.set(a.name, a.name);
+    const sl = slugify(a.name);
+    if ((slug\u6570.get(sl) ?? 0) === 1) \u8868.set(sl, a.name);
+  }
+  return \u8868;
+}
+function canonicalizeFlowActors(doc) {
+  const \u8868 = actorRefTable(doc);
+  let \u5909\u3048\u305F = false;
+  const flow2 = doc.flow.map((s) => {
+    const from = \u8868.get(s.from) ?? s.from;
+    const to = \u8868.get(s.to) ?? s.to;
+    if (from === s.from && to === s.to) return s;
+    \u5909\u3048\u305F = true;
+    return { ...s, from, to };
+  });
+  return \u5909\u3048\u305F ? { ...doc, flow: flow2 } : doc;
+}
+var \u56F3\u7A2E\u306E\u4F5C\u308A = {
+  // 矢印の端と登場人物の名前が、 そのまま箱や枠の id になる
+  sequence: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  flow: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  swimlane: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  er: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  state: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  topology: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  solidity: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  class: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  c4: "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1",
+  // 中身は payload が持ち、 図そのものは 1 箱。 矢印は描かず本数を数えて知らせる
+  gantt: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  pie: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  bar: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  line: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  funnel: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  tree: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  journey: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  quadrant: "\u56F3\u5168\u4F53\u3092 1 \u7BB1",
+  mind: "\u56F3\u5168\u4F53\u3092 1 \u7BB1"
+};
+function dropUnresolvedFlow(doc) {
+  if (\u56F3\u7A2E\u306E\u4F5C\u308A[doc.type] === "\u56F3\u5168\u4F53\u3092 1 \u7BB1") return doc;
+  const \u8868 = actorRefTable(doc);
+  const flow2 = doc.flow.filter((s) => \u8868.has(s.from) && \u8868.has(s.to));
+  return flow2.length === doc.flow.length ? doc : { ...doc, flow: flow2 };
+}
+function dropSelfLoopFlow(doc) {
+  if (\u56F3\u7A2E\u306E\u4F5C\u308A[doc.type] === "\u56F3\u5168\u4F53\u3092 1 \u7BB1") return doc;
+  const flow2 = doc.flow.filter((s) => s.from !== s.to);
+  return flow2.length === doc.flow.length ? doc : { ...doc, flow: flow2 };
+}
+function reportSelfLoopFlow(doc, onNotice) {
+  if (!onNotice) return;
+  if (\u56F3\u7A2E\u306E\u4F5C\u308A[doc.type] === "\u56F3\u5168\u4F53\u3092 1 \u7BB1") return;
+  const \u77E5\u3089\u305B\u305F = /* @__PURE__ */ new Set();
+  for (const s of doc.flow) {
+    if (s.from !== s.to || \u77E5\u3089\u305B\u305F.has(s.from)) continue;
+    \u77E5\u3089\u305B\u305F.add(s.from);
+    onNotice({
+      kind: "flow-self-loop",
+      actor: s.from,
+      line: s.pos.line,
+      message: `"${truncateForMessage(s.from)}" \u304B\u3089\u81EA\u5206\u3078\u623B\u308B\u77E2\u5370\u306F\u63CF\u3051\u307E\u305B\u3093 (\u7D44\u307F\u7ACB\u3066\u304B\u3089\u5916\u3057\u307E\u3057\u305F)`,
+      hint: "\u9014\u4E2D\u306E\u7BB1\u3092 1 \u3064\u8DB3\u3057\u3066 2 \u672C\u306B\u5206\u3051\u308B\u304B\u3001 \u6BB5 (animation) \u3067\u72B6\u614B\u304C\u5909\u308F\u308B\u69D8\u5B50\u3068\u3057\u3066\u898B\u305B\u308B"
+    });
+  }
+}
+function \u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc) {
+  return doc.eyebrow === void 0 ? {} : { eyebrow: doc.eyebrow };
+}
+function reportDocEyebrowNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.eyebrow === void 0) return;
+  if (\u56F3\u7A2E\u306E\u4F5C\u308A[doc.type] === "\u56F3\u5168\u4F53\u3092 1 \u7BB1") return;
+  onNotice({
+    kind: "eyebrow-not-honored",
+    actor: doc.title,
+    // 図の `pos` は常に 1 行目を指す。 書いた行に辿り着けるよう `eyebrowPos` を優先する
+    line: doc.eyebrowPos?.line ?? doc.pos?.line ?? 0,
+    message: `\u6700\u4E0A\u4F4D\u306B\u66F8\u3044\u305F eyebrow \u306F\u52B9\u304D\u307E\u305B\u3093 (type: ${doc.type} \u306F\u7BB1\u3054\u3068\u306B\u5206\u304B\u308C\u308B\u305F\u3081\u76F8\u624B\u304C\u6C7A\u307E\u308A\u307E\u305B\u3093)`,
+    hint: '\u7BB1\u3054\u3068\u306B\u66F8\u3044\u3066\u304F\u3060\u3055\u3044 (`- A: { eyebrow: "..." }`)'
+  });
+}
+function reportLaneMixed(doc, onNotice) {
+  const \u5BFE\u8C61 = doc.actors.filter((a) => a.partId === void 0);
+  const \u66F8\u3044\u305F = \u5BFE\u8C61.filter((a) => a.lane !== void 0);
+  if (\u66F8\u3044\u305F.length === 0 || \u66F8\u3044\u305F.length === \u5BFE\u8C61.length) return;
+  const \u66F8\u3044\u3066\u3044\u306A\u3044 = \u5BFE\u8C61.filter((a) => a.lane === void 0);
+  onNotice({
+    kind: "lane-not-honored",
+    actor: \u66F8\u3044\u3066\u3044\u306A\u3044[0]?.name ?? "",
+    line: \u66F8\u3044\u3066\u3044\u306A\u3044[0]?.pos?.line ?? 0,
+    message: `type: ${doc.type} \u3067\u306F\u7E26\u5217\u3092\u66F8\u304F\u306A\u3089\u5168\u3066\u306E\u7BB1\u306B\u66F8\u304D\u307E\u3059 (\u66F8\u3044\u3066\u3044\u306A\u3044\u7BB1: ${\u66F8\u3044\u3066\u3044\u306A\u3044.map((a) => truncateForMessage(a.name)).join(" / ")})`,
+    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) {
+  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];
+    if (\u6B21 === void 0) return;
+    \u9396\u306E\u7D44.add(`${a.name}\0${\u6B21.name}`);
+  });
+  for (const s of doc.flow) {
+    if (\u9396\u306E\u7D44.has(`${s.from}\0${s.to}`)) continue;
+    onNotice({
+      kind: "flow-endpoint-not-honored",
+      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)"
+    });
+  }
+}
+function reportLaneNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.type === "mind") return;
+  const \u52B9\u304F\u56F3\u7A2E = \u7E26\u5217\u3092\u9078\u3079\u308B\u56F3\u7A2E.has(doc.type);
+  if (\u52B9\u304F\u56F3\u7A2E && \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F(doc.type, doc)) return;
+  if (\u52B9\u304F\u56F3\u7A2E) {
+    reportLaneMixed(doc, onNotice);
+    return;
+  }
+  for (const a of doc.actors) {
+    if (a.partId !== void 0) continue;
+    if (a.lane === void 0) continue;
+    onNotice({
+      kind: "lane-not-honored",
+      actor: a.name,
+      line: a.pos?.line ?? 0,
+      message: `"${truncateForMessage(a.name)}" \u306B\u66F8\u3044\u305F lane \u306F\u52B9\u304D\u307E\u305B\u3093 (\u7E26\u5217\u306F type: ${doc.type} \u304C\u6C7A\u3081\u307E\u3059)`,
+      hint: "\u7E26\u5217\u306F\u56F3\u7A2E\u304C\u6C7A\u3081\u308B\u305F\u3081\u7BB1\u304B\u3089\u306F\u9078\u3079\u307E\u305B\u3093\u3002 lane \u3092\u6D88\u3057\u3066\u304F\u3060\u3055\u3044 (\u898B\u672C\u3067\u306F\u5F35\u66FF\u3048\u5148\u3068\u3057\u3066\u4F7F\u3048\u307E\u3059)"
+    });
+  }
+}
+function \u540D\u524D\u306E\u5C3E(name) {
+  let h = 2166136261;
+  for (const c of name) {
+    h ^= c.codePointAt(0) ?? 0;
+    h = Math.imul(h, 16777619) >>> 0;
+  }
+  return h.toString(16).padStart(8, "0").slice(0, 6);
+}
+function cdl\u5074\u306Eslug(s) {
+  return s.toLowerCase().replace(/[^a-z0-9぀-ゟ゠-ヿ一-龯]+/g, "-").replace(/^-|-$/g, "");
+}
+var \u7A7A\u306E\u5F62\u306E\u9003\u3052\u5148 = {
+  sequence: ["actor-"],
+  solidity: ["actor-"],
+  swimlane: ["lane-"],
+  flow: [],
+  er: [],
+  state: [],
+  topology: [],
+  class: [],
+  c4: [],
+  // 図全体を 1 箱で描く群 (作り替えないのでここは使わない)
+  gantt: [],
+  pie: [],
+  bar: [],
+  line: [],
+  funnel: [],
+  tree: [],
+  journey: [],
+  quadrant: [],
+  mind: []
+};
+function id\u306B\u306A\u308B\u5F62(name, \u4F4D\u7F6E, \u9003\u3052\u5148\u306E\u982D = []) {
+  const cdl = cdl\u5074\u306Eslug(name);
+  const out = [slugify(name), cdl];
+  if (cdl === "" && \u4F4D\u7F6E !== void 0) {
+    for (const \u982D of \u9003\u3052\u5148\u306E\u982D) out.push(`${\u982D}${\u4F4D\u7F6E}`);
+  }
+  return out;
+}
+function disambiguateActorIds(doc, onNotice) {
+  const \u5143\u306E\u540D\u524D = /* @__PURE__ */ new Map();
+  if (\u56F3\u7A2E\u306E\u4F5C\u308A[doc.type] !== "\u767B\u5834\u4EBA\u7269\u3054\u3068\u306B\u7BB1") return { doc, \u5143\u306E\u540D\u524D };
+  const \u898B\u305F = /* @__PURE__ */ new Set();
+  const \u6B8B\u3059 = [];
+  for (const a of doc.actors) {
+    if (\u898B\u305F.has(a.name)) {
+      onNotice?.({
+        kind: "chart-value-unreadable",
+        actor: a.name,
+        line: a.pos?.line ?? 0,
+        message: `"${truncateForMessage(a.name)}" \u3092 2 \u5EA6\u66F8\u3044\u3066\u3044\u307E\u3059 (\u5148\u306B\u66F8\u3044\u305F\u65B9\u3060\u3051\u63CF\u304D\u307E\u3059)`,
+        hint: "\u9055\u3046\u540D\u524D\u306B\u3059\u308B\u304B\u3001 1 \u3064\u306B\u307E\u3068\u3081\u308B"
+      });
+      continue;
+    }
+    \u898B\u305F.add(a.name);
+    \u6B8B\u3059.push(a);
+  }
+  const \u5F62\u3054\u3068\u306E\u540D\u524D = /* @__PURE__ */ new Map();
+  const \u4F4D\u7F6E = /* @__PURE__ */ new Map();
+  \u6B8B\u3059.forEach((a, i) => \u4F4D\u7F6E.set(a.name, i));
+  const \u52D5\u304D\u3092\u66F8\u3044\u305F = (doc.animate?.phases.length ?? 0) > 0;
+  const \u9003\u3052\u5148\u306E\u982D = \u52D5\u304D\u3092\u66F8\u3044\u305F ? [] : \u7A7A\u306E\u5F62\u306E\u9003\u3052\u5148[doc.type];
+  for (const a of \u6B8B\u3059) {
+    for (const \u5F62 of id\u306B\u306A\u308B\u5F62(a.name, \u4F4D\u7F6E.get(a.name), \u9003\u3052\u5148\u306E\u982D)) {
+      const \u7FA4 = \u5F62\u3054\u3068\u306E\u540D\u524D.get(\u5F62) ?? /* @__PURE__ */ new Set();
+      \u7FA4.add(a.name);
+      \u5F62\u3054\u3068\u306E\u540D\u524D.set(\u5F62, \u7FA4);
+    }
+  }
+  const \u91CD\u306A\u308B = (name) => id\u306B\u306A\u308B\u5F62(name, \u4F4D\u7F6E.get(name), \u9003\u3052\u5148\u306E\u982D).some(
+    (\u5F62) => (\u5F62\u3054\u3068\u306E\u540D\u524D.get(\u5F62)?.size ?? 0) > 1
+  );
+  const \u4F5C\u308A\u66FF\u3048\u308B = \u6B8B\u3059.filter((a) => a.partId === void 0 && \u91CD\u306A\u308B(a.name));
+  const \u4F7F\u3046\u5F62 = /* @__PURE__ */ new Set();
+  for (const a of \u6B8B\u3059) {
+    if (\u4F5C\u308A\u66FF\u3048\u308B.some((b) => b.name === a.name)) continue;
+    for (const \u5F62 of id\u306B\u306A\u308B\u5F62(a.name)) \u4F7F\u3046\u5F62.add(\u5F62);
+  }
+  const \u65B0\u3057\u3044\u540D\u524D = /* @__PURE__ */ new Map();
+  for (const a of [...\u4F5C\u308A\u66FF\u3048\u308B].sort((x, y) => x.name < y.name ? -1 : x.name > y.name ? 1 : 0)) {
+    const \u5C3E = \u540D\u524D\u306E\u5C3E(a.name);
+    const \u4F59\u5730 = ID_MAX - (\u5C3E.length + 1);
+    const \u57FA\u5E95 = a.name.slice(0, \u4F59\u5730);
+    let \u5019\u88DC = `${\u57FA\u5E95} ${\u5C3E}`;
+    let n = 0;
+    while (id\u306B\u306A\u308B\u5F62(\u5019\u88DC).some((\u5F62) => \u4F7F\u3046\u5F62.has(\u5F62))) {
+      n += 1;
+      \u5019\u88DC = `${\u57FA\u5E95.slice(0, \u4F59\u5730 - String(n).length)} ${\u5C3E}${n}`;
+    }
+    for (const \u5F62 of id\u306B\u306A\u308B\u5F62(\u5019\u88DC)) \u4F7F\u3046\u5F62.add(\u5F62);
+    \u65B0\u3057\u3044\u540D\u524D.set(a.name, \u5019\u88DC);
+    \u5143\u306E\u540D\u524D.set(\u5019\u88DC, a.name);
+  }
+  if (\u65B0\u3057\u3044\u540D\u524D.size === 0 && \u6B8B\u3059.length === doc.actors.length) return { doc, \u5143\u306E\u540D\u524D };
+  const \u76F4\u3059 = (\u540D) => \u65B0\u3057\u3044\u540D\u524D.get(\u540D) ?? \u540D;
+  const \u6B21 = {
+    ...doc,
+    actors: \u6B8B\u3059.map((a) => \u65B0\u3057\u3044\u540D\u524D.has(a.name) ? { ...a, name: \u76F4\u3059(a.name) } : a),
+    flow: doc.flow.map((s) => {
+      const from = \u76F4\u3059(s.from);
+      const to = \u76F4\u3059(s.to);
+      return from === s.from && to === s.to ? s : { ...s, from, to };
+    })
+  };
+  if (\u6B21.animate) {
+    \u6B21.animate = {
+      ...\u6B21.animate,
+      phases: \u6B21.animate.phases.map(
+        (ph) => ph.highlight ? { ...ph, highlight: ph.highlight.map((h) => \u76F4\u3059(h)) } : ph
+      )
+    };
+  }
+  \u6B21.actors = \u6B21.actors.map(
+    (a) => a.posRel ? { ...a, posRel: { ...a.posRel, anchor: \u76F4\u3059(a.posRel.anchor) } } : a
+  );
+  return { doc: \u6B21, \u5143\u306E\u540D\u524D };
+}
+function collectRenamedTargets(diagram2, \u5143\u306E\u540D\u524D) {
+  const \u7BB1 = /* @__PURE__ */ new Set();
+  const \u67A0 = /* @__PURE__ */ new Set();
+  if (\u5143\u306E\u540D\u524D.size === 0) return { \u7BB1, \u67A0 };
+  for (const n of diagram2.nodes) if (\u5143\u306E\u540D\u524D.has(n.title)) \u7BB1.add(n.id);
+  for (const l of diagram2.lanes) if (l.label !== void 0 && \u5143\u306E\u540D\u524D.has(l.label)) \u67A0.add(l.id);
+  return { \u7BB1, \u67A0 };
+}
+function restoreActorNames(diagram2, \u5143\u306E\u540D\u524D, \u5BFE\u8C61) {
+  if (\u5143\u306E\u540D\u524D.size === 0) return;
+  for (const n of diagram2.nodes) {
+    if (!\u5BFE\u8C61.\u7BB1.has(n.id)) continue;
+    const \u5143 = \u5143\u306E\u540D\u524D.get(n.title);
+    if (\u5143 !== void 0) n.title = \u5143;
+  }
+  for (const l of diagram2.lanes) {
+    if (!\u5BFE\u8C61.\u67A0.has(l.id) || l.label === void 0) continue;
+    const \u5143 = \u5143\u306E\u540D\u524D.get(l.label);
+    if (\u5143 !== void 0) l.label = \u5143;
+  }
+}
+function reportMissingFlowActors(doc, onNotice) {
+  if (!onNotice) return;
+  const \u8868 = actorRefTable(doc);
+  const \u898B\u305B\u308B\u6570 = 8;
+  const \u540D\u524D\u4E00\u89A7 = doc.actors.slice(0, \u898B\u305B\u308B\u6570).map((a) => truncateForMessage(a.name)).join(" / ");
+  const \u6B8B\u308A = doc.actors.length - \u898B\u305B\u308B\u6570;
+  const hint = doc.actors.length > 0 ? `actors \u306B\u66F8\u3044\u305F\u540D\u524D\u3067\u6307\u3059 (${\u540D\u524D\u4E00\u89A7}${\u6B8B\u308A > 0 ? ` \u307B\u304B ${\u6B8B\u308A} \u4EF6` : ""})` : "actors \u306B\u767B\u5834\u4EBA\u7269\u3092\u66F8\u304F";
+  const \u77E5\u3089\u305B\u305F = /* @__PURE__ */ new Set();
+  for (const s of doc.flow) {
+    for (const ref of [s.from, s.to]) {
+      if (\u8868.has(ref) || \u77E5\u3089\u305B\u305F.has(ref)) continue;
+      \u77E5\u3089\u305B\u305F.add(ref);
+      onNotice({
+        kind: "flow-actor-missing",
+        actor: ref,
+        line: s.pos.line,
+        message: `\u77E2\u5370\u304C "${truncateForMessage(ref)}" \u3092\u6307\u3057\u3066\u3044\u307E\u3059\u304C\u3001 actors \u306B\u66F8\u304B\u308C\u3066\u3044\u307E\u305B\u3093`,
+        hint
+      });
+    }
+  }
+}
 function reportMissingFocusTargets(doc, onNotice) {
   if (!onNotice || !doc.animate) return;
   const names = new Set(doc.actors.map((a) => a.name));
@@ -827,10 +1192,12 @@ function reportMissingFocusTargets(doc, onNotice) {
     tos.add(st.to);
     steps.set(st.from, tos);
   }
+  const \u540D\u524D\u3078 = actorRefTable(doc);
+  const \u63C3\u3048\u308B = (ref) => \u540D\u524D\u3078.get(ref) ?? ref;
   for (const phase of doc.animate.phases) {
     for (const raw of phase.highlight ?? []) {
       const entry = parseFocusEntry(raw, names);
-      const found = entry.kind === "edge" ? steps.get(entry.from)?.has(entry.to) ?? false : accepted.has(entry.name);
+      const found = entry.kind === "edge" ? steps.get(\u63C3\u3048\u308B(entry.from))?.has(\u63C3\u3048\u308B(entry.to)) ?? false : accepted.has(entry.name);
       if (found) continue;
       onNotice({
         kind: "focus-target-missing",
@@ -1418,9 +1785,10 @@ function cleanupPlaceholderActor(target, doc, a) {
     phase.activate = phase.activate.filter((id) => !relatedToActor(id) && !removedEdgeIds.has(id));
   }
 }
-function mergePartsFromActors(target, doc, partsCatalog, onNotice) {
+function mergePartsFromActors(target, doc, partsCatalog, onNotice, derivedSourceLines) {
   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));
   if (!partsCatalog) {
     if (typeof console !== "undefined" && console.warn) {
       const names = partsActors.map((a) => `${a.name} (kind: ${a.partId ?? "?"})`).join(", ");
@@ -1476,7 +1844,21 @@ function mergePartsFromActors(target, doc, partsCatalog, onNotice) {
       }
     }
     const t = partTargetSize(part, actor.posW, actor.posH, actor.scale);
-    mergePartIntoDiagram(target, part, actor.name, merged, actor.lane, placeX, placeY, t.w, t.h, onNotice, actor.pos?.line ?? 0);
+    mergePartIntoDiagram(
+      target,
+      part,
+      actor.name,
+      merged,
+      actor.lane,
+      placeX,
+      placeY,
+      t.w,
+      t.h,
+      onNotice,
+      actor.pos?.line ?? 0,
+      derivedSourceLines,
+      \u5024\u306E\u524D\u7F6E\u304D.get(actor.name)
+    );
   }
   return target;
 }
@@ -1495,15 +1877,47 @@ function applyColorHex(part, colorHex, stateOverride) {
   }
   return out;
 }
-function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, offsetX, offsetY, targetW, targetH, onNotice, noticeLine = 0) {
+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();
+  const \u6B21\u306E\u756A\u53F7 = /* @__PURE__ */ new Map();
+  for (const \u540D\u524D of \u540D\u524D\u305F\u3061) {
+    if (\u51FA\u529B.has(\u540D\u524D)) continue;
+    let \u7D20 = \u540D\u524D.normalize("NFKC").replace(/[^A-Za-z0-9_]+/g, "_").replace(/^_+|_+$/g, "");
+    if (\u7D20 === "" || /^[0-9]/.test(\u7D20)) \u7D20 = `p${\u7D20}`;
+    let \u5019\u88DC = \u7D20;
+    let \u756A\u53F7 = \u6B21\u306E\u756A\u53F7.get(\u7D20) ?? 2;
+    while (\u4F7F\u7528\u4E2D.has(\u5019\u88DC)) {
+      \u5019\u88DC = `${\u7D20}_${\u756A\u53F7}`;
+      \u756A\u53F7 += 1;
+    }
+    \u6B21\u306E\u756A\u53F7.set(\u7D20, \u756A\u53F7);
+    \u4F7F\u7528\u4E2D.add(\u5019\u88DC);
+    \u51FA\u529B.set(\u540D\u524D, \u5019\u88DC);
+  }
+  return \u51FA\u529B;
+}
+function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, offsetX, offsetY, targetW, targetH, onNotice, noticeLine = 0, derivedSourceLines, valueAlias) {
   const prefix = (id) => `${alias}__${id}`;
-  const stateIdSet = new Set(part.states.map((s) => s.id));
+  const \u5024\u524D\u7F6E\u304D = valueAlias ?? alias;
+  const valuePrefix = (id) => `${\u5024\u524D\u7F6E\u304D}__${id}`;
+  const ownIdSet = /* @__PURE__ */ new Set([
+    ...part.states.map((s) => s.id),
+    ...(part.derived ?? []).map((d) => d.id)
+  ]);
   const rewriteTemplate = (s) => {
     if (!s) return s;
-    return s.replace(/\{([a-zA-Z_][a-zA-Z0-9_]*)\}/g, (m, name) => {
-      return stateIdSet.has(name) ? `{${prefix(name)}}` : m;
+    return s.replace(/\{(\w+)\}/g, (m, name) => {
+      return ownIdSet.has(name) ? `{${valuePrefix(name)}}` : m;
     });
   };
+  const rewriteDerivedExpression = (expression) => {
+    try {
+      return writeFormula(renameFormulaIdentifiers(cdl.parseFormula(expression), valuePrefix));
+    } catch {
+      return expression;
+    }
+  };
   const targetLaneId = laneMapping;
   const laneIdMap = /* @__PURE__ */ new Map();
   const PARTS_LANE_GAP = 300;
@@ -1621,7 +2035,16 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
         hint: "\u8272\u306F `#ff0000` \u306E\u3088\u3046\u306A\u8272\u756A\u53F7\u304B\u3001 `red` \u306E\u3088\u3046\u306A\u8272\u540D\u3067\u66F8\u304F"
       });
     }
-    target.states.push({ id: prefix(stateOrig.id), initial });
+    target.states.push({ id: valuePrefix(stateOrig.id), initial });
+  }
+  for (const derivedOrig of part.derived ?? []) {
+    if (!target.derived) target.derived = [];
+    const id = valuePrefix(derivedOrig.id);
+    target.derived.push({
+      id,
+      expression: rewriteDerivedExpression(derivedOrig.expression)
+    });
+    recordDerivedSourceLine(derivedSourceLines, id, noticeLine);
   }
   for (const edgeOrig of part.edges) {
     target.edges.push({
@@ -1651,8 +2074,8 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
         ...phaseOrig,
         id: prefix(phaseOrig.id),
         activate: phaseOrig.activate.map(prefix),
-        tweens: phaseOrig.tweens.map((t) => ({ ...t, stateId: prefix(t.stateId) })),
-        sets: phaseOrig.sets.map((s) => ({ ...s, stateId: prefix(s.stateId) }))
+        tweens: phaseOrig.tweens.map((t) => ({ ...t, stateId: valuePrefix(t.stateId) })),
+        sets: phaseOrig.sets.map((s) => ({ ...s, stateId: valuePrefix(s.stateId) }))
       });
     }
   } else {
@@ -1664,8 +2087,8 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
       const partPhase = part.phases[i];
       targetPhase.duration = Math.max(targetPhase.duration, partPhase.duration);
       targetPhase.activate = [...targetPhase.activate, ...partPhase.activate.map(prefix)];
-      targetPhase.tweens = [...targetPhase.tweens, ...partPhase.tweens.map((t) => ({ ...t, stateId: prefix(t.stateId) }))];
-      targetPhase.sets = [...targetPhase.sets, ...partPhase.sets.map((s) => ({ ...s, stateId: prefix(s.stateId) }))];
+      targetPhase.tweens = [...targetPhase.tweens, ...partPhase.tweens.map((t) => ({ ...t, stateId: valuePrefix(t.stateId) }))];
+      targetPhase.sets = [...targetPhase.sets, ...partPhase.sets.map((s) => ({ ...s, stateId: valuePrefix(s.stateId) }))];
     }
     for (let i = commonLen; i < partsLen; i++) {
       const phaseOrig = part.phases[i];
@@ -1673,8 +2096,8 @@ function mergePartIntoDiagram(target, part, alias, stateOverride, laneMapping, o
         ...phaseOrig,
         id: prefix(phaseOrig.id),
         activate: phaseOrig.activate.map(prefix),
-        tweens: phaseOrig.tweens.map((t) => ({ ...t, stateId: prefix(t.stateId) })),
-        sets: phaseOrig.sets.map((s) => ({ ...s, stateId: prefix(s.stateId) }))
+        tweens: phaseOrig.tweens.map((t) => ({ ...t, stateId: valuePrefix(t.stateId) })),
+        sets: phaseOrig.sets.map((s) => ({ ...s, stateId: valuePrefix(s.stateId) }))
       });
     }
   }
@@ -1694,6 +2117,15 @@ function deepRewriteStrings(value, rewrite, seen = /* @__PURE__ */ new WeakSet()
   return out;
 }
 function applyEdgeInlineOptions(diagram2, doc, sourceLines) {
+  if (\u9396\u3067\u3064\u306A\u3050\u5F62\u304B(doc)) {
+    diagram2.edges.forEach((e, idx) => {
+      const s = \u9396\u306E\u3069\u306E\u884C\u304B\u3089\u6765\u305F\u304B(doc, idx);
+      if (s === void 0) return;
+      sourceLines?.set(e.id, s.pos.line);
+      \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(e, s, doc);
+    });
+    return;
+  }
   const used = /* @__PURE__ */ new Set();
   const isSeqLike = doc.type === "sequence" || doc.type === "solidity";
   doc.flow.forEach((s, stepIdx) => {
@@ -1709,20 +2141,35 @@ function applyEdgeInlineOptions(diagram2, doc, sourceLines) {
     if (!target) return;
     used.add(target.id);
     sourceLines?.set(target.id, s.pos.line);
-    if (s.guard !== void 0) {
-      target.guard = s.guard;
-      if (doc.type === "state" && target.sub === void 0) target.sub = s.guard;
-    }
-    if (s.cardinality !== void 0) {
-      target.cardinality = s.cardinality;
-      if (doc.type === "er" && !target.label.includes(s.cardinality)) {
-        target.label = target.label ? `${target.label} (${s.cardinality})` : `(${s.cardinality})`;
-      }
-    }
-    if (s.labelOffsetX !== void 0) target.labelOffsetX = s.labelOffsetX;
-    if (s.labelOffsetY !== void 0) target.labelOffsetY = s.labelOffsetY;
+    \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(target, s, doc);
   });
 }
+function \u77E2\u5370\u3078\u66F8\u304D\u5199\u3059(target, s, doc) {
+  if (s.sub !== void 0) 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;
+  }
+  if (s.cardinality !== void 0) {
+    target.cardinality = s.cardinality;
+    if (doc.type === "er" && !target.label.includes(s.cardinality)) {
+      target.label = target.label ? `${target.label} (${s.cardinality})` : `(${s.cardinality})`;
+    }
+  }
+  if (s.labelOffsetX !== void 0) target.labelOffsetX = s.labelOffsetX;
+  if (s.labelOffsetY !== void 0) target.labelOffsetY = s.labelOffsetY;
+  if (s.overlay !== void 0) target.overlay = s.overlay;
+}
+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;
+  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];
+  if (to === void 0) return void 0;
+  return doc.flow.find((s) => s.to === to.name);
+}
 var DRAWABLE_KINDS = new Set(cdl.NODE_KINDS);
 var KIND_ALIAS = {
   eoa: "shape-wallet",
@@ -1733,13 +2180,312 @@ var KIND_ALIAS = {
   library: "shape-code-block",
   interface: "shape-code-block"
 };
+function \u5F0F\u306B\u66F8\u304F\u6570(n) {
+  if (!Number.isFinite(n)) return "0";
+  const text = String(n);
+  if (!/[eE]/.test(text)) return text;
+  const [coefficient = "0", exponentText = "0"] = text.toLowerCase().split("e");
+  const negative = coefficient.startsWith("-");
+  const unsigned = negative ? coefficient.slice(1) : coefficient;
+  const [whole = "0", fraction = ""] = unsigned.split(".");
+  const digits = `${whole}${fraction}`;
+  const decimalAt = whole.length + Number(exponentText);
+  let expanded;
+  if (decimalAt <= 0) expanded = `0.${"0".repeat(-decimalAt)}${digits}`;
+  else if (decimalAt >= digits.length) expanded = `${digits}${"0".repeat(decimalAt - digits.length)}`;
+  else expanded = `${digits.slice(0, decimalAt)}.${digits.slice(decimalAt)}`;
+  return negative ? `-${expanded}` : expanded;
+}
+function \u5883\u76EE\u3092\u901A\u308B\u6642\u523B(\u533A\u9593, op, \u5883\u76EE) {
+  const \u6E80\u305F\u3059 = (x) => {
+    switch (op) {
+      case ">=":
+        return x >= \u5883\u76EE;
+      case ">":
+        return x > \u5883\u76EE;
+      case "<=":
+        return x <= \u5883\u76EE;
+      case "<":
+        return x < \u5883\u76EE;
+      case "==":
+        return x === \u5883\u76EE;
+      case "!=":
+        return x !== \u5883\u76EE;
+      default:
+        return false;
+    }
+  };
+  if (\u6E80\u305F\u3059(\u533A\u9593.from)) return \u533A\u9593.start;
+  if (op === "==") {
+    const min = Math.min(\u533A\u9593.from, \u533A\u9593.to);
+    const max = Math.max(\u533A\u9593.from, \u533A\u9593.to);
+    if (\u5883\u76EE < min || \u5883\u76EE > max) return null;
+  } else if (!\u6E80\u305F\u3059(\u533A\u9593.to)) {
+    return null;
+  }
+  if (\u533A\u9593.to === \u533A\u9593.from) return null;
+  const t = \u533A\u9593.start + \u533A\u9593.dur * (\u5883\u76EE - \u533A\u9593.from) / (\u533A\u9593.to - \u533A\u9593.from);
+  if (!Number.isFinite(t)) return null;
+  return Math.min(Math.max(t, \u533A\u9593.start), \u533A\u9593.end);
+}
+function foldValueTriggers(diagram2, doc, onNotice) {
+  const \u51FA\u529B = /* @__PURE__ */ new Map();
+  const \u304D\u3063\u304B\u3051\u4ED8\u304D = (doc.values ?? []).filter((v) => v.trigger !== void 0);
+  if (\u304D\u3063\u304B\u3051\u4ED8\u304D.length === 0) return \u51FA\u529B;
+  const \u5BA3\u8A00 = /* @__PURE__ */ new Map();
+  for (const v of \u304D\u3063\u304B\u3051\u4ED8\u304D) if (!\u5BA3\u8A00.has(v.name)) \u5BA3\u8A00.set(v.name, v);
+  const \u521D\u671F\u5024 = /* @__PURE__ */ new Map();
+  for (const s of diagram2.states) {
+    const n = Number(s.initial);
+    if (Number.isFinite(n)) \u521D\u671F\u5024.set(s.id, n);
+  }
+  const \u6BB5\u306E\u756A\u53F7 = /* @__PURE__ */ new Map();
+  diagram2.phases.forEach((p, i) => {
+    if (!\u6BB5\u306E\u756A\u53F7.has(p.title)) \u6BB5\u306E\u756A\u53F7.set(p.title, i);
+    if (!\u6BB5\u306E\u756A\u53F7.has(p.id)) \u6BB5\u306E\u756A\u53F7.set(p.id, i);
+  });
+  const \u89E3\u3051\u305F = /* @__PURE__ */ new Map();
+  const \u89E3\u3051\u306A\u3044 = /* @__PURE__ */ new Set();
+  const \u89E3\u6C7A\u4E2D = /* @__PURE__ */ new Set();
+  const \u77E5\u3089\u305B\u308B = (v, message, hint) => {
+    onNotice?.({ kind: "value-trigger-unresolved", actor: v.name, line: v.pos?.line ?? 0, message, hint });
+  };
+  const \u89E3\u304F = (name) => {
+    const \u65E2\u51FA = \u89E3\u3051\u305F.get(name);
+    if (\u65E2\u51FA) return \u65E2\u51FA;
+    if (\u89E3\u3051\u306A\u3044.has(name)) return null;
+    const v = \u5BA3\u8A00.get(name);
+    if (!v || !v.trigger) return null;
+    if (\u89E3\u6C7A\u4E2D.has(name)) {
+      \u89E3\u3051\u306A\u3044.add(name);
+      \u77E5\u3089\u305B\u308B(v, `"${name}" \u306E\u304D\u3063\u304B\u3051\u304C\u4E00\u5468\u3057\u3066\u3044\u307E\u3059`, "\u3069\u308C\u304B 1 \u3064\u3092 `trigger: step ...` \u306B\u5909\u3048\u308B");
+      return null;
+    }
+    \u89E3\u6C7A\u4E2D.add(name);
+    const \u533A\u9593 = \u7D44\u307F\u7ACB\u3066\u308B(v);
+    \u89E3\u6C7A\u4E2D.delete(name);
+    if (!\u533A\u9593) {
+      \u89E3\u3051\u306A\u3044.add(name);
+      return null;
+    }
+    \u89E3\u3051\u305F.set(name, \u533A\u9593);
+    return \u533A\u9593;
+  };
+  const \u7D44\u307F\u7ACB\u3066\u308B = (v) => {
+    const trigger = v.trigger;
+    const from = \u521D\u671F\u5024.get(v.name) ?? 0;
+    const to = v.to ?? 0;
+    const dur = v.durationMs ?? 0;
+    let \u6BB5 = 0;
+    let start = 0;
+    if (trigger.kind === "step") {
+      const idx = \u6BB5\u306E\u756A\u53F7.get(trigger.step);
+      if (idx === void 0) {
+        \u77E5\u3089\u305B\u308B(v, `"${trigger.step}" \u3068\u3044\u3046\u6BB5\u304C\u3042\u308A\u307E\u305B\u3093`, "`animation:` \u306B\u305D\u306E\u540D\u524D\u306E\u6BB5\u3092\u66F8\u304F\u304B\u3001 \u6BB5\u306E\u540D\u524D\u306B\u5408\u308F\u305B\u308B");
+        return null;
+      }
+      \u6BB5 = idx;
+      start = 0;
+    } else {
+      const \u76F8\u624B = \u89E3\u304F(trigger.source);
+      if (!\u76F8\u624B) {
+        \u77E5\u3089\u305B\u308B(
+          v,
+          `"${trigger.source}" \u304C\u52D5\u304F\u5024\u3067\u306A\u3044\u305F\u3081\u3001 \u304D\u3063\u304B\u3051\u306E\u6642\u523B\u3092\u6C7A\u3081\u3089\u308C\u307E\u305B\u3093`,
+          "\u898B\u5F35\u308B\u76F8\u624B\u3082 `trigger:` \u3092\u6301\u3064\u5024\u306B\u3059\u308B"
+        );
+        return null;
+      }
+      const at = \u5883\u76EE\u3092\u901A\u308B\u6642\u523B(\u76F8\u624B, trigger.op, trigger.threshold);
+      if (at === null) {
+        \u77E5\u3089\u305B\u308B(
+          v,
+          `"${trigger.source}" \u306F ${trigger.op} ${trigger.threshold} \u3092\u6E80\u305F\u3057\u307E\u305B\u3093`,
+          "\u76F8\u624B\u304C\u901A\u308B\u5024\u3092\u5883\u76EE\u306B\u3059\u308B\u304B\u3001 \u76F8\u624B\u306E `to` \u3092\u898B\u76F4\u3059"
+        );
+        return null;
+      }
+      \u6BB5 = \u76F8\u624B.\u6BB5;
+      start = at;
+    }
+    const \u6BB5\u306E\u9577\u3055 = diagram2.phases[\u6BB5]?.duration ?? 0;
+    if (start + dur > \u6BB5\u306E\u9577\u3055) {
+      \u77E5\u3089\u305B\u308B(
+        v,
+        `\u6BB5 "${diagram2.phases[\u6BB5]?.title ?? ""}" (${\u6BB5\u306E\u9577\u3055}ms) \u306B\u53CE\u307E\u308A\u307E\u305B\u3093 (${Math.round(start + dur)}ms \u5FC5\u8981)`,
+        "\u6BB5\u3092\u9577\u304F\u3059\u308B\u304B `dur` \u3092\u77ED\u304F\u3059\u308B"
+      );
+      return null;
+    }
+    return { \u6BB5, start, end: start + dur, dur, from, to };
+  };
+  for (const v of \u5BA3\u8A00.values()) \u89E3\u304F(v.name);
+  if (\u89E3\u3051\u305F.size === 0) return \u51FA\u529B;
+  const \u4F7F\u7528\u4E2D = new Set(diagram2.states.map((s) => s.id));
+  for (const v of doc.values ?? []) \u4F7F\u7528\u4E2D.add(v.name);
+  const \u6BB5\u3054\u3068\u306E\u6642\u8A08 = /* @__PURE__ */ new Map();
+  const \u6642\u8A08\u3092\u7528\u610F\u3059\u308B = (\u6BB5) => {
+    const \u65E2\u51FA = \u6BB5\u3054\u3068\u306E\u6642\u8A08.get(\u6BB5);
+    if (\u65E2\u51FA) return \u65E2\u51FA;
+    let \u540D\u524D = `__step_clock_${\u6BB5}`;
+    let \u9023\u756A = 2;
+    while (\u4F7F\u7528\u4E2D.has(\u540D\u524D)) \u540D\u524D = `__step_clock_${\u6BB5}_${\u9023\u756A++}`;
+    \u4F7F\u7528\u4E2D.add(\u540D\u524D);
+    \u6BB5\u3054\u3068\u306E\u6642\u8A08.set(\u6BB5, \u540D\u524D);
+    diagram2.states.push({ id: \u540D\u524D, initial: 0 });
+    const \u6BB5\u306E\u4E2D\u8EAB = diagram2.phases[\u6BB5];
+    if (\u6BB5\u306E\u4E2D\u8EAB) \u6BB5\u306E\u4E2D\u8EAB.tweens = [...\u6BB5\u306E\u4E2D\u8EAB.tweens, { stateId: \u540D\u524D, from: 0, to: \u6BB5\u306E\u4E2D\u8EAB.duration }];
+    return \u540D\u524D;
+  };
+  for (const [name, \u533A\u9593] of \u89E3\u3051\u305F) {
+    const \u6642\u8A08 = \u6642\u8A08\u3092\u7528\u610F\u3059\u308B(\u533A\u9593.\u6BB5);
+    const \u9032\u307F = `min(max(({${\u6642\u8A08}} - ${\u5F0F\u306B\u66F8\u304F\u6570(\u533A\u9593.start)}) / ${\u5F0F\u306B\u66F8\u304F\u6570(\u533A\u9593.dur)}, 0), 1)`;
+    \u51FA\u529B.set(name, `((${\u9032\u307F} * ${\u5F0F\u306B\u66F8\u304F\u6570(\u533A\u9593.to - \u533A\u9593.from)}) + ${\u5F0F\u306B\u66F8\u304F\u6570(\u533A\u9593.from)})`);
+  }
+  return \u51FA\u529B;
+}
+function attachDerivedValues(diagram2, doc, onNotice, inheritedSourceLines, foldedTriggers) {
+  const values = doc.values ?? [];
+  if (values.length === 0) {
+    if ((diagram2.derived?.length ?? 0) > 0) {
+      reportUnresolvedValues(diagram2, doc, onNotice, inheritedSourceLines);
+    }
+    return;
+  }
+  const \u72B6\u614B\u306E\u540D\u524D = new Set(diagram2.states.map((s) => s.id));
+  for (const v of values) {
+    if (!\u72B6\u614B\u306E\u540D\u524D.has(v.name)) continue;
+    if (v.trigger !== void 0) continue;
+    onNotice?.({
+      kind: "value-shadows-state",
+      actor: v.name,
+      line: v.pos?.line ?? 0,
+      message: `"${v.name}" \u3092 states \u3068 values \u306E\u4E21\u65B9\u306B\u66F8\u3044\u3066\u3044\u307E\u3059\u3002 values \u3092\u4F7F\u3044\u307E\u3059`,
+      hint: "states \u304B\u3089\u5916\u3059\u304B\u3001 values \u306E\u540D\u524D\u3092\u5909\u3048\u308B"
+    });
+  }
+  const \u8F09\u305B\u308B = [];
+  for (const v of values) {
+    const expression = v.expression ?? foldedTriggers?.get(v.name);
+    if (expression === void 0) continue;
+    \u8F09\u305B\u308B.push({ id: v.name, expression });
+  }
+  diagram2.derived = [...\u8F09\u305B\u308B, ...diagram2.derived ?? []];
+  reportUnresolvedValues(diagram2, doc, onNotice, inheritedSourceLines);
+}
+function renameFormulaIdentifiers(ast, rename) {
+  switch (ast.type) {
+    case "number":
+      return ast;
+    case "identifier":
+      return { type: "identifier", name: rename(ast.name) };
+    case "unaryOp":
+      return { ...ast, operand: renameFormulaIdentifiers(ast.operand, rename) };
+    case "binaryOp":
+      return {
+        ...ast,
+        left: renameFormulaIdentifiers(ast.left, rename),
+        right: renameFormulaIdentifiers(ast.right, rename)
+      };
+    case "ternary":
+      return {
+        type: "ternary",
+        condition: renameFormulaIdentifiers(ast.condition, rename),
+        whenTrue: renameFormulaIdentifiers(ast.whenTrue, rename),
+        whenFalse: renameFormulaIdentifiers(ast.whenFalse, rename)
+      };
+    case "call":
+      return { ...ast, args: ast.args.map((a) => renameFormulaIdentifiers(a, rename)) };
+  }
+}
+function writeNumber(value) {
+  if (!Number.isFinite(value)) throw new Error(`cannot write non-finite number: ${String(value)}`);
+  const s = String(value);
+  if (!/[eE]/.test(s)) return s;
+  const m = /^(-?)(\d+)(?:\.(\d+))?[eE]([+-]?\d+)$/.exec(s);
+  if (!m) throw new Error(`cannot write number: ${s}`);
+  const sign = m[1] ?? "";
+  const int = m[2] ?? "";
+  const frac = m[3] ?? "";
+  const digits = int + frac;
+  const point = int.length + Number(m[4] ?? "0");
+  if (point <= 0) return `${sign}0.${"0".repeat(-point)}${digits}`;
+  if (point >= digits.length) return `${sign}${digits}${"0".repeat(point - digits.length)}`;
+  return `${sign}${digits.slice(0, point)}.${digits.slice(point)}`;
+}
+function writeFormula(ast) {
+  switch (ast.type) {
+    case "number":
+      return writeNumber(ast.value);
+    case "identifier":
+      return /^[A-Za-z_$][\w$]*$/.test(ast.name) ? ast.name : `{${ast.name}}`;
+    case "unaryOp":
+      return `(${ast.op}${writeFormula(ast.operand)})`;
+    case "binaryOp":
+      return `(${writeFormula(ast.left)} ${ast.op} ${writeFormula(ast.right)})`;
+    case "ternary":
+      return `(${writeFormula(ast.condition)} ? ${writeFormula(ast.whenTrue)} : ${writeFormula(ast.whenFalse)})`;
+    case "call":
+      return `${ast.fn}(${ast.args.map(writeFormula).join(", ")})`;
+  }
+}
+function recordDerivedSourceLine(sourceLines, id, line) {
+  if (!sourceLines) return;
+  const lines = sourceLines.get(id) ?? [];
+  lines.push(line);
+  sourceLines.set(id, lines);
+}
+function reportUnresolvedValues(diagram2, doc, onNotice, inheritedSourceLines) {
+  if (!onNotice) return;
+  const \u521D\u671F\u5024 = /* @__PURE__ */ Object.create(null);
+  for (const s of diagram2.states) \u521D\u671F\u5024[s.id] = String(s.initial);
+  const \u6700\u521D\u306E\u884C = /* @__PURE__ */ new Map();
+  const \u91CD\u8907\u3057\u305F\u884C = /* @__PURE__ */ new Map();
+  for (const v of doc.values ?? []) {
+    if (!\u6700\u521D\u306E\u884C.has(v.name)) {
+      \u6700\u521D\u306E\u884C.set(v.name, v.pos?.line ?? 0);
+      continue;
+    }
+    const \u540C\u3058\u540D\u524D\u306E\u884C = \u91CD\u8907\u3057\u305F\u884C.get(v.name) ?? [];
+    \u540C\u3058\u540D\u524D\u306E\u884C.push(v.pos?.line ?? 0);
+    \u91CD\u8907\u3057\u305F\u884C.set(v.name, \u540C\u3058\u540D\u524D\u306E\u884C);
+  }
+  for (const [id, lines] of inheritedSourceLines ?? []) {
+    for (const line of lines) {
+      if (!\u6700\u521D\u306E\u884C.has(id)) {
+        \u6700\u521D\u306E\u884C.set(id, line);
+        continue;
+      }
+      const \u540C\u3058\u540D\u524D\u306E\u884C = \u91CD\u8907\u3057\u305F\u884C.get(id) ?? [];
+      \u540C\u3058\u540D\u524D\u306E\u884C.push(line);
+      \u91CD\u8907\u3057\u305F\u884C.set(id, \u540C\u3058\u540D\u524D\u306E\u884C);
+    }
+  }
+  for (const n of cdl.applyDerivedValues(\u521D\u671F\u5024, diagram2.derived).notices) {
+    onNotice({
+      kind: n.kind === "duplicate-id" ? "value-duplicate" : "value-unresolved",
+      actor: n.id,
+      // 重複は後から書いた宣言そのものを、式の問題は engine が使う最初の宣言を指す
+      line: n.kind === "duplicate-id" ? \u91CD\u8907\u3057\u305F\u884C.get(n.id)?.shift() ?? \u6700\u521D\u306E\u884C.get(n.id) ?? 0 : \u6700\u521D\u306E\u884C.get(n.id) ?? 0,
+      message: n.message,
+      hint: VALUE_NOTICE_HINT[n.kind]
+    });
+  }
+}
+var VALUE_NOTICE_HINT = {
+  cycle: "\u53C2\u7167\u304C\u4E00\u5468\u3057\u3066\u3044\u307E\u3059\u3002 \u3069\u308C\u304B 1 \u3064\u3092 states \u306E\u521D\u671F\u5024\u306B\u5909\u3048\u308B",
+  "unknown-reference": "\u305D\u306E\u540D\u524D\u306E states / values \u3092\u8DB3\u3059\u304B\u3001\u7DB4\u308A\u3092\u76F4\u3059",
+  "parse-error": "\u5F0F\u306B\u66F8\u3051\u308B\u306E\u306F\u56DB\u5247 (+ - * /) \u3068\u62EC\u5F27\u3001\u6BD4\u8F03\u3001min / max \u3060\u3051",
+  "eval-error": "\u521D\u671F\u5024\u3067\u8A08\u7B97\u3067\u304D\u306A\u3044\u5F62\u3067\u3059\u3002 \u5272\u308B\u6570\u3084\u3001\u6570\u3068\u3057\u3066\u8AAD\u3081\u306A\u3044\u521D\u671F\u5024\u3092\u898B\u76F4\u3059",
+  "duplicate-id": "\u540C\u3058\u540D\u524D\u304C 2 \u5EA6\u3042\u308A\u307E\u3059\u3002 \u7247\u65B9\u3092\u6D88\u3059\u304B\u540D\u524D\u3092\u5909\u3048\u308B",
+  "invalid-id": "\u540D\u524D\u306B\u4F7F\u3048\u308B\u306E\u306F\u82F1\u6570\u5B57\u3068 _ \u3060\u3051"
+};
 var SINGLE_BOX_KINDS = /* @__PURE__ */ new Set([
   "chart-pie",
   "chart-line",
   "chart-bar",
   "gantt-timeline",
   "mind-map",
-  "mind-radial",
   "funnel-stages",
   "quadrant-matrix",
   "tree-hierarchy",
@@ -1838,17 +2584,6 @@ function dropUnfittableEndKinds(diagram2, doc) {
     }
   }
 }
-function fillFlowEdgeSources(diagram2, doc, sourceLines) {
-  if (doc.type !== "flow") return;
-  if (doc.animate && doc.animate.phases.length > 0) return;
-  diagram2.edges.forEach((e, idx) => {
-    const to = doc.actors[idx + 1];
-    if (to === void 0) return;
-    const step = doc.flow.find((s) => s.to === to.name);
-    if (step === void 0) return;
-    sourceLines.set(e.id, step.pos.line);
-  });
-}
 function applyGroupContainers(diagram2, doc) {
   if (!doc.groups || Object.keys(doc.groups).length === 0) return;
   for (const [id, g] of Object.entries(doc.groups)) {
@@ -1885,10 +2620,57 @@ function compileSolidity(doc) {
   const sortedDoc = { ...doc, actors: sorted };
   return compileSequence(sortedDoc);
 }
+function \u72B6\u614B\u304C\u53D6\u308B\u5024(\u53C2\u7167, doc) {
+  const \u540D = \u53C2\u7167.slice(1, -1);
+  const out = [];
+  const \u6570\u306B\u3059\u308B = (v) => {
+    if (typeof v === "number") {
+      if (Number.isFinite(v)) out.push(v);
+      return;
+    }
+    const \u6587\u5B57 = String(v).trim();
+    if (\u6587\u5B57 === "") return;
+    const n = Number(\u6587\u5B57);
+    if (Number.isFinite(n)) out.push(n);
+  };
+  for (const st of doc.animate?.states ?? []) if (st.name === \u540D) \u6570\u306B\u3059\u308B(st.initial);
+  for (const p of doc.animate?.phases ?? []) {
+    for (const t of p.tweens ?? []) {
+      if (t.state !== \u540D) continue;
+      \u6570\u306B\u3059\u308B(t.from);
+      \u6570\u306B\u3059\u308B(t.to);
+    }
+    for (const v of p.sets ?? []) if (v.state === \u540D) \u6570\u306B\u3059\u308B(v.value);
+  }
+  return out;
+}
+function \u7D42\u308F\u308B\u4F4D\u7F6E(end, \u59CB\u307E\u308A, \u76EE\u76DB\u308A, \u540D\u524D, \u4F1D\u3048\u308B, doc) {
+  if (end === void 0) return { idx: \u59CB\u307E\u308A };
+  if (/^\{\w+\}$/.test(end)) {
+    const \u4F4E\u3044 = \u72B6\u614B\u304C\u53D6\u308B\u5024(end, doc).filter((v) => v < \u59CB\u307E\u308A);
+    if (\u4F4E\u3044.length > 0) {
+      \u4F1D\u3048\u308B(
+        \u540D\u524D,
+        `type: gantt \u3067 ${truncateForMessage(\u540D\u524D)} \u306E\u7D42\u308F\u308A (${truncateForMessage(end)}) \u304C\u59CB\u307E\u308A\u3088\u308A\u524D\u306B\u306A\u308B\u5024\u3092\u53D6\u308A\u307E\u3059 (${[...new Set(\u4F4E\u3044)].join(", ")})\u3002 \u59CB\u307E\u308A\u306F ${\u59CB\u307E\u308A} \u756A\u76EE\u3067\u3059`
+      );
+    }
+    return { idx: end };
+  }
+  const i = \u76EE\u76DB\u308A.indexOf(end);
+  if (i < 0) return { idx: \u59CB\u307E\u308A };
+  if (i < \u59CB\u307E\u308A) {
+    \u4F1D\u3048\u308B(
+      \u540D\u524D,
+      `type: gantt \u3067 ${truncateForMessage(\u540D\u524D)} \u306E\u7D42\u308F\u308A (${truncateForMessage(end)}) \u304C\u59CB\u307E\u308A\u3088\u308A\u524D\u3067\u3059 (\u59CB\u307E\u308A\u3068\u540C\u3058\u306B\u5012\u3057\u307E\u3057\u305F)`
+    );
+    return { idx: \u59CB\u307E\u308A };
+  }
+  return { idx: i, label: end };
+}
 function compileGantt(doc) {
   const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
   const CHART_W = 720;
-  b.lane("gantt", { width: CHART_W, label: doc.title });
+  b.lane("gantt", { width: CHART_W });
   const \u76EE\u76DB\u308A = [];
   const \u76EE\u76DB\u308A\u306A\u3057 = [];
   const \u30BF\u30B9\u30AF = [];
@@ -1899,7 +2681,13 @@ function compileGantt(doc) {
       continue;
     }
     if (!\u76EE\u76DB\u308A.includes(label)) \u76EE\u76DB\u308A.push(label);
-    \u30BF\u30B9\u30AF.push({ name: a.name, label, ...a.tone !== void 0 ? { tone: a.tone } : {} });
+    \u30BF\u30B9\u30AF.push({
+      name: a.name,
+      label,
+      ...a.tone !== void 0 ? { tone: a.tone } : {},
+      ...a.owner !== void 0 ? { owner: a.owner } : {},
+      ...a.end !== void 0 ? { end: a.end } : {}
+    });
   }
   if (\u76EE\u76DB\u308A\u306A\u3057.length > 0 && typeof console !== "undefined" && console.warn) {
     console.warn(
@@ -1930,24 +2718,30 @@ function compileGantt(doc) {
       `[dragon] type: gantt \u306E\u77E2\u5370\u306F\u524D\u5F8C\u306E\u95A2\u4FC2\u3060\u3051\u3092\u4F7F\u3044\u307E\u3059 (\u6587\u5B57 / \u8272 / \u7DDA\u7A2E\u306F\u63CF\u3051\u307E\u305B\u3093): ${\u88C5\u98FE\u3064\u304D.join(", ")}`
     );
   }
+  const \u9006\u5411\u304D\u3092\u4F1D\u3048\u308B = (_\u540D, message) => {
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${message}`);
+  };
   const CHART_H = Math.max(360, 48 * \u30BF\u30B9\u30AF.length + 96);
   b.node(`${slugify(doc.title)}-chart`, {
     lane: "gantt",
     stack: 0,
     kind: "gantt-timeline",
     title: doc.title,
+    ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
     w: CHART_W,
     h: CHART_H,
     ganttData: \u30BF\u30B9\u30AF.map((t) => {
       const idx = \u76EE\u76DB\u308A.indexOf(t.label);
       const from = \u4F9D\u5B58\u5143.get(t.name);
+      const \u7D42\u308F\u308A = \u7D42\u308F\u308B\u4F4D\u7F6E(t.end, idx, \u76EE\u76DB\u308A, t.name, \u9006\u5411\u304D\u3092\u4F1D\u3048\u308B, doc);
       return {
         id: slugify(t.name),
         title: t.name,
         startIdx: idx,
-        endIdx: idx,
+        endIdx: \u7D42\u308F\u308A.idx,
         startLabel: t.label,
-        endLabel: t.label,
+        endLabel: \u7D42\u308F\u308A.label ?? t.label,
+        ...t.owner !== void 0 ? { owner: t.owner } : {},
         ...from !== void 0 ? { dependsOn: slugify(from) } : {},
         ...t.tone !== void 0 ? { tone: t.tone } : {}
       };
@@ -1958,13 +2752,15 @@ function compileGantt(doc) {
 function compileClass(doc) {
   const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
   const CLASS_W = 400;
+  const CLASS_LANE_W = 450;
   if (doc.actors.length === 0) return b.build();
-  b.lane("class-stack", { width: CLASS_W, label: doc.title });
   doc.actors.forEach((a, idx) => {
     const nodeId = slugify(a.name);
+    const laneId = `lane-${nodeId}`;
+    b.lane(laneId, { width: CLASS_LANE_W });
     b.node(nodeId, {
-      lane: "class-stack",
-      stack: idx,
+      lane: laneId,
+      stack: 0,
       kind: "storage",
       title: a.name,
       w: CLASS_W
@@ -1984,47 +2780,474 @@ function compileClass(doc) {
 }
 function parseShareValue(raw) {
   if (raw === void 0) return null;
-  const m = raw.trim().match(/^(\d+(?:\.\d+)?)\s*%?$/);
+  const m = raw.trim().match(/^(-?\d+(?:\.\d+)?)\s*%?$/);
   if (m === null) return null;
   const v = Number(m[1]);
   return Number.isFinite(v) ? v : null;
 }
-function compilePie(doc) {
+function parseBoundValue(raw) {
+  if (raw === void 0) return null;
+  const t = raw.trim();
+  return /^\{\w+(?:\.(?:length|sum|max|min|avg)|\[\d+\])?\}$/.test(t) ? t : null;
+}
+function parseChartValue(raw) {
+  const n = parseShareValue(raw);
+  if (n !== null) return n;
+  return parseBoundValue(raw);
+}
+function \u53C2\u7167\u3059\u308B\u540D\u524D(value) {
+  if (typeof value !== "string") return null;
+  const m = value.match(/^\{(\w+)/);
+  return m ? m[1] : null;
+}
+function compileValueChart(doc, \u578B, kind, onNotice) {
   const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
   const CHART_W = 640;
-  const CHART_H = 320;
-  b.lane("chart", { width: CHART_W + 64, label: doc.title });
+  const CHART_H = \u578B === "pie" ? 320 : 368;
+  b.lane("chart", { width: CHART_W + 64 });
   const data = [];
   const \u8AAD\u3081\u306A\u3044 = [];
+  const \u672A\u5BA3\u8A00 = [];
+  let \u672A\u5BA3\u8A00\u884C = 0;
+  const \u53C2\u7167\u3067\u304D\u308B = \u6570\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc);
+  let \u8AAD\u3081\u306A\u3044\u884C = 0;
   for (const a of doc.actors) {
-    const value = parseShareValue(a.value ?? a.subtitle);
-    if (value === null) {
+    const value = parseChartValue(a.value ?? a.subtitle);
+    if (value === null || typeof value === "number" && value < 0 && \u578B !== "line") {
+      if (\u8AAD\u3081\u306A\u3044.length === 0) \u8AAD\u3081\u306A\u3044\u884C = a.pos?.line ?? 0;
       \u8AAD\u3081\u306A\u3044.push(a.name);
       continue;
     }
+    const \u540D\u524D = \u53C2\u7167\u3059\u308B\u540D\u524D(value);
+    if (\u540D\u524D !== null && !\u53C2\u7167\u3067\u304D\u308B.has(\u540D\u524D)) {
+      if (\u672A\u5BA3\u8A00.length === 0) \u672A\u5BA3\u8A00\u884C = a.pos?.line ?? 0;
+      \u672A\u5BA3\u8A00.push(a.name);
+      continue;
+    }
     data.push({ label: a.name, value, ...a.tone !== void 0 ? { tone: a.tone } : {} });
   }
-  if (\u8AAD\u3081\u306A\u3044.length > 0 && typeof console !== "undefined" && console.warn) {
-    console.warn(
-      `[dragon] type: pie \u3067\u5272\u5408\u3092\u8AAD\u3081\u306A\u3044\u9805\u76EE\u304C\u3042\u308A\u307E\u3059 (\u5186\u306B\u8F09\u305B\u307E\u305B\u3093): ${\u8AAD\u3081\u306A\u3044.join(", ")}\u3002 \`- \u540D\u524D: "45%"\` \u306E\u5F62\u3067\u66F8\u3044\u3066\u304F\u3060\u3055\u3044`
+  const \u8A9E = \u578B === "pie" ? { \u91CF: "\u5272\u5408", \u56F3: "\u5186", \u4F8B: '"45%"' } : \u578B === "bar" ? { \u91CF: "\u5024", \u56F3: "\u68D2", \u4F8B: '"420"' } : { \u91CF: "\u5024", \u56F3: "\u6298\u308C\u7DDA", \u4F8B: '"180"' };
+  const \u4F1D\u3048\u308B = (\u7A2E\u985E, \u540D\u524D, message, line = 0) => {
+    onNotice?.({ kind: \u7A2E\u985E, actor: \u540D\u524D, line, message });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${message}`);
+  };
+  if (\u8AAD\u3081\u306A\u3044.length > 0) {
+    \u4F1D\u3048\u308B(
+      "chart-value-unreadable",
+      \u8AAD\u3081\u306A\u3044[0],
+      `type: ${\u578B} \u3067${\u8A9E.\u91CF}\u3092\u8AAD\u3081\u306A\u3044\u9805\u76EE\u304C\u3042\u308A\u307E\u3059 (${\u8A9E.\u56F3}\u306B\u8F09\u305B\u307E\u305B\u3093): ${\u8AAD\u3081\u306A\u3044.join(", ")}\u3002 \`- \u540D\u524D: ${\u8A9E.\u4F8B}\` \u306E\u5F62\u3067\u66F8\u3044\u3066\u304F\u3060\u3055\u3044`,
+      \u8AAD\u3081\u306A\u3044\u884C
     );
   }
-  if (doc.flow.length > 0 && typeof console !== "undefined" && console.warn) {
-    console.warn(
-      `[dragon] type: pie \u3067\u306F\u77E2\u5370\u3092\u63CF\u3051\u307E\u305B\u3093 (${doc.flow.length} \u672C\u3092\u7121\u8996\u3057\u307E\u3057\u305F)\u3002 \u95A2\u4FC2\u3092\u63CF\u304F\u306A\u3089 type: flow \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044`
+  if (\u672A\u5BA3\u8A00.length > 0) {
+    \u4F1D\u3048\u308B(
+      "chart-value-unreadable",
+      \u672A\u5BA3\u8A00[0],
+      `type: ${\u578B} \u3067\u6570\u306B\u306A\u3089\u306A\u3044\u5024\u3092\u53C2\u7167\u3057\u305F\u9805\u76EE\u304C\u3042\u308A\u307E\u3059 (${\u8A9E.\u56F3}\u306B\u8F09\u305B\u307E\u305B\u3093): ${\u672A\u5BA3\u8A00.join(", ")}\u3002 \`states:\` \u306B\u305D\u306E\u540D\u524D\u3092\u6570\u3067\u66F8\u3044\u3066\u304F\u3060\u3055\u3044`,
+      \u672A\u5BA3\u8A00\u884C
+    );
+  }
+  if (doc.flow.length > 0) {
+    \u4F1D\u3048\u308B(
+      "chart-edge-dropped",
+      doc.flow[0]?.from ?? "",
+      `type: ${\u578B} \u3067\u306F\u77E2\u5370\u3092\u63CF\u3051\u307E\u305B\u3093 (${doc.flow.length} \u672C\u3092\u7121\u8996\u3057\u307E\u3057\u305F)\u3002 \u95A2\u4FC2\u3092\u63CF\u304F\u306A\u3089 type: flow \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044`,
+      doc.flow[0]?.pos?.line ?? 0
     );
   }
   b.node(`${slugify(doc.title)}-chart`, {
     lane: "chart",
     stack: 0,
-    kind: "chart-pie",
+    kind,
     title: doc.title,
+    ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
     w: CHART_W,
     h: CHART_H,
     chartData: data
   });
   return b.build();
 }
+var \u56F3\u8868\u306E\u5927\u304D\u3055 = {
+  funnel: { w: 560, h: 480 },
+  tree: { w: 720, h: 480 },
+  mind: { w: 720, h: 480 },
+  journey: { w: 720, h: 480 },
+  quadrant: { w: 640, h: 480 }
+};
+var \u6C17\u6301\u3061 = /* @__PURE__ */ new Map([
+  ["\u6700\u9AD8", "delighted"],
+  ["\u6E80\u8DB3", "happy"],
+  ["\u666E\u901A", "neutral"],
+  ["\u4E0D\u6E80", "frustrated"],
+  ["\u6012\u308A", "angry"]
+]);
+var \u533A\u753B = /* @__PURE__ */ new Map([
+  ["\u5DE6\u4E0A", "topLeft"],
+  ["\u53F3\u4E0A", "topRight"],
+  ["\u5DE6\u4E0B", "bottomLeft"],
+  ["\u53F3\u4E0B", "bottomRight"]
+]);
+function \u56F3\u8868\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc, \u6B04) {
+  const \u5B9F\u52B9 = /* @__PURE__ */ new Map();
+  for (const s of doc.animate?.states ?? []) \u5B9F\u52B9.set(s.name, s.initial);
+  const \u58CA\u308C\u308B = /* @__PURE__ */ new Set();
+  for (const p of doc.animate?.phases ?? []) {
+    for (const st of p.sets ?? []) if (!\u6B04.\u8AAD\u3081\u308B\u304B(st.value)) \u58CA\u308C\u308B.add(st.state);
+    if (\u6B04.\u88DC\u9593\u3067\u58CA\u308C\u308B\u304B) for (const tw of p.tweens ?? []) \u58CA\u308C\u308B.add(tw.state);
+  }
+  const out = /* @__PURE__ */ new Set();
+  for (const [\u540D\u524D, \u5024] of \u5B9F\u52B9) {
+    if (!\u6B04.\u8AAD\u3081\u308B\u304B(\u5024)) continue;
+    if (\u58CA\u308C\u308B.has(\u540D\u524D)) continue;
+    out.add(\u540D\u524D);
+  }
+  if (\u6B04.\u81EA\u52D5\u306E\u5024\u3092\u8A31\u3059\u304B) for (const v of doc.values ?? []) out.add(v.name);
+  return out;
+}
+function \u6570\u3068\u3057\u3066\u8AAD\u3081\u308B\u304B(v) {
+  if (typeof v === "number") return Number.isFinite(v);
+  const t = v.trim();
+  if (t === "") return false;
+  return Number.isFinite(Number(t));
+}
+function \u6570\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc) {
+  return \u56F3\u8868\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc, {
+    \u8AAD\u3081\u308B\u304B: \u6570\u3068\u3057\u3066\u8AAD\u3081\u308B\u304B,
+    // 補間の行き先は数なので、数の欄では壊れない
+    \u88DC\u9593\u3067\u58CA\u308C\u308B\u304B: false,
+    \u81EA\u52D5\u306E\u5024\u3092\u8A31\u3059\u304B: true
+  });
+}
+function \u8A9E\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc, \u8A9E\u8868) {
+  return \u56F3\u8868\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc, {
+    \u8AAD\u3081\u308B\u304B: (v) => \u8A9E\u8868.has(String(v).trim()),
+    // 補間の行き先は数。 語の欄が読む状態を補間すると、その段で語が数に変わる
+    \u88DC\u9593\u3067\u58CA\u308C\u308B\u304B: true,
+    // 式の評価結果は数になるため、語の欄からは読めない
+    \u81EA\u52D5\u306E\u5024\u3092\u8A31\u3059\u304B: false
+  });
+}
+function \u8A9E\u306E\u72B6\u614B\u3092\u56F3\u306E\u8A9E\u3078\u76F4\u3059(diagram2) {
+  const \u5BFE\u8C61 = /* @__PURE__ */ new Map();
+  const \u6570\u306E\u6B04\u304B\u3089 = /* @__PURE__ */ new Set();
+  const \u62FE\u3046 = (v, \u8A9E\u8868) => {
+    const m = typeof v === "string" ? v.match(/^\{(\w+)/) : null;
+    if (m) \u5BFE\u8C61.set(m[1], \u8A9E\u8868);
+  };
+  for (const n of diagram2.nodes) {
+    for (const st of n.journeyData ?? []) \u62FE\u3046(st.emotion, \u6C17\u6301\u3061);
+    for (const it of n.quadrantData?.items ?? []) \u62FE\u3046(it.quadrant, \u533A\u753B);
+    for (const d of n.chartData ?? []) {
+      const m = typeof d.value === "string" ? d.value.match(/^\{(\w+)/) : null;
+      if (m) \u6570\u306E\u6B04\u304B\u3089.add(m[1]);
+    }
+    for (const f of n.funnelData ?? []) {
+      const m = typeof f.count === "string" ? f.count.match(/^\{(\w+)/) : null;
+      if (m) \u6570\u306E\u6B04\u304B\u3089.add(m[1]);
+    }
+  }
+  if (\u5BFE\u8C61.size === 0) return;
+  const \u76F4\u3059 = (\u540D\u524D, \u5024) => {
+    const \u8A9E\u8868 = \u5BFE\u8C61.get(\u540D\u524D);
+    if (!\u8A9E\u8868 || \u6570\u306E\u6B04\u304B\u3089.has(\u540D\u524D)) return \u5024;
+    return \u8A9E\u8868.get(String(\u5024).trim()) ?? \u5024;
+  };
+  for (const s of diagram2.states) s.initial = \u76F4\u3059(s.id, s.initial);
+  for (const p of diagram2.phases) {
+    for (const st of p.sets) st.value = \u76F4\u3059(st.stateId, st.value);
+  }
+}
+function compileFunnel(doc, onNotice) {
+  const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
+  const { w: W, h: H } = \u56F3\u8868\u306E\u5927\u304D\u3055.funnel;
+  b.lane("chart", { width: W + 64 });
+  const data = [];
+  const \u8AAD\u3081\u306A\u3044 = [];
+  const \u672A\u5BA3\u8A00 = [];
+  const \u53C2\u7167\u3067\u304D\u308B = \u6570\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc);
+  for (const a of doc.actors) {
+    const v = parseChartValue(a.value ?? a.subtitle);
+    if (v === null || typeof v === "number" && v < 0) {
+      \u8AAD\u3081\u306A\u3044.push(a.name);
+      continue;
+    }
+    const \u540D\u524D = \u53C2\u7167\u3059\u308B\u540D\u524D(v);
+    if (\u540D\u524D !== null && !\u53C2\u7167\u3067\u304D\u308B.has(\u540D\u524D)) {
+      \u672A\u5BA3\u8A00.push(a.name);
+      continue;
+    }
+    data.push({ id: slugify(a.name), title: a.name, count: v });
+  }
+  if (\u672A\u5BA3\u8A00.length > 0) {
+    const m3 = `type: funnel \u3067\u6570\u306B\u306A\u3089\u306A\u3044\u5024\u3092\u53C2\u7167\u3057\u305F\u9805\u76EE\u304C\u3042\u308A\u307E\u3059 (\u6BB5\u306B\u8F09\u305B\u307E\u305B\u3093): ${\u672A\u5BA3\u8A00.join(", ")}\u3002 \`states:\` \u306B\u305D\u306E\u540D\u524D\u3092\u6570\u3067\u66F8\u3044\u3066\u304F\u3060\u3055\u3044`;
+    onNotice?.({ kind: "chart-value-unreadable", actor: \u672A\u5BA3\u8A00[0], line: 0, message: m3 });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${m3}`);
+  }
+  if (\u8AAD\u3081\u306A\u3044.length > 0) {
+    const m = `type: funnel \u3067\u6570\u3092\u8AAD\u3081\u306A\u3044\u9805\u76EE\u304C\u3042\u308A\u307E\u3059 (\u6BB5\u306B\u8F09\u305B\u307E\u305B\u3093): ${\u8AAD\u3081\u306A\u3044.join(", ")}\u3002 \`- \u8A2A\u554F: "12000"\` \u306E\u5F62\u3067\u66F8\u3044\u3066\u304F\u3060\u3055\u3044`;
+    onNotice?.({ kind: "chart-value-unreadable", actor: \u8AAD\u3081\u306A\u3044[0], line: 0, message: m });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${m}`);
+  }
+  if (doc.flow.length > 0) {
+    const m2 = `type: funnel \u3067\u306F\u77E2\u5370\u3092\u63CF\u3051\u307E\u305B\u3093 (${doc.flow.length} \u672C\u3092\u7121\u8996\u3057\u307E\u3057\u305F)\u3002 \u95A2\u4FC2\u3092\u63CF\u304F\u306A\u3089 type: flow \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044`;
+    onNotice?.({ kind: "chart-edge-dropped", actor: doc.flow[0]?.from ?? "", line: doc.flow[0]?.pos?.line ?? 0, message: m2 });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${m2}`);
+  }
+  b.node(`${slugify(doc.title)}-chart`, {
+    lane: "chart",
+    stack: 0,
+    kind: "funnel-stages",
+    title: doc.title,
+    ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
+    w: W,
+    h: H,
+    funnelData: data
+  });
+  return b.build();
+}
+function \u77E2\u5370\u304B\u3089\u89AA\u3092\u6C7A\u3081\u308B(doc, \u56F3\u7A2E, \u540D\u524D, \u4F1D\u3048\u308B) {
+  const \u89AA = /* @__PURE__ */ new Map();
+  for (const f of doc.flow) {
+    const \u5B50 = slugify(f.to);
+    const \u89AA\u540D = slugify(f.from);
+    if (!\u540D\u524D.has(\u89AA\u540D)) {
+      \u4F1D\u3048\u308B(f.from, `type: ${\u56F3\u7A2E} \u3067\u66F8\u3044\u3066\u3044\u306A\u3044\u540D\u524D\u3092\u89AA\u306B\u3057\u3066\u3044\u307E\u3059: ${f.from} -> ${f.to}`, f.pos?.line ?? 0);
+      continue;
+    }
+    if (!\u540D\u524D.has(\u5B50)) {
+      \u4F1D\u3048\u308B(f.to, `type: ${\u56F3\u7A2E} \u3067\u66F8\u3044\u3066\u3044\u306A\u3044\u540D\u524D\u3092\u5B50\u306B\u3057\u3066\u3044\u307E\u3059: ${f.from} -> ${f.to}`, f.pos?.line ?? 0);
+      continue;
+    }
+    if (\u5B50 === \u89AA\u540D) {
+      \u4F1D\u3048\u308B(f.to, `type: ${\u56F3\u7A2E} \u3067\u81EA\u5206\u3092\u89AA\u306B\u3057\u3066\u3044\u307E\u3059: ${f.to}`, f.pos?.line ?? 0);
+      continue;
+    }
+    const \u65E2\u5B58 = \u89AA.get(\u5B50);
+    if (\u65E2\u5B58 !== void 0 && \u65E2\u5B58 !== \u89AA\u540D) {
+      \u4F1D\u3048\u308B(f.to, `type: ${\u56F3\u7A2E} \u3067 ${f.to} \u306B\u89AA\u304C 2 \u3064\u3042\u308A\u307E\u3059 (\u5F8C\u306E ${f.from} \u306F\u4F7F\u3044\u307E\u305B\u3093)`, f.pos?.line ?? 0);
+      continue;
+    }
+    \u89AA.set(\u5B50, \u89AA\u540D);
+  }
+  for (const \u5B50 of [...\u89AA.keys()]) {
+    const \u898B\u305F = /* @__PURE__ */ new Set([\u5B50]);
+    let p2 = \u89AA.get(\u5B50);
+    while (p2 !== void 0) {
+      if (\u898B\u305F.has(p2)) {
+        \u4F1D\u3048\u308B(\u5B50, `type: ${\u56F3\u7A2E} \u3067\u89AA\u3092\u8FBF\u308B\u3068\u8F2A\u306B\u306A\u308A\u307E\u3059 (${\u5B50} \u306E\u89AA\u3092\u5916\u3057\u307E\u3057\u305F)`);
+        \u89AA.delete(\u5B50);
+        break;
+      }
+      \u898B\u305F.add(p2);
+      p2 = \u89AA.get(p2);
+    }
+  }
+  return \u89AA;
+}
+function compileTree(doc, onNotice) {
+  const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
+  const { w: W, h: H } = \u56F3\u8868\u306E\u5927\u304D\u3055.tree;
+  b.lane("chart", { width: W + 64 });
+  const slug\u5225 = /* @__PURE__ */ new Map();
+  for (const a of doc.actors) {
+    const k = slugify(a.name);
+    slug\u5225.set(k, [...slug\u5225.get(k) ?? [], a.name]);
+  }
+  const \u540D\u524D = new Set(slug\u5225.keys());
+  const \u4F1D\u3048\u308B = (\u540D, message, line = 0) => {
+    onNotice?.({ kind: "chart-value-unreadable", actor: \u540D, line, message });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${message}`);
+  };
+  for (const [k, \u7FA4] of slug\u5225) {
+    if (\u7FA4.length > 1) {
+      \u4F1D\u3048\u308B(\u7FA4[0], `type: tree \u3067 ${\u7FA4.join(" / ")} \u304C\u540C\u3058 id (${k}) \u306B\u306A\u308A\u307E\u3059\u3002 \u540D\u524D\u3092\u5909\u3048\u3066\u304F\u3060\u3055\u3044`);
+    }
+  }
+  const \u89AA = \u77E2\u5370\u304B\u3089\u89AA\u3092\u6C7A\u3081\u308B(doc, "tree", \u540D\u524D, \u4F1D\u3048\u308B);
+  const data = doc.actors.map((a) => {
+    const id = slugify(a.name);
+    const p3 = \u89AA.get(id);
+    return { id, title: a.name, ...p3 !== void 0 ? { parent: p3 } : {} };
+  });
+  b.node(`${slugify(doc.title)}-chart`, {
+    lane: "chart",
+    stack: 0,
+    kind: "tree-hierarchy",
+    title: doc.title,
+    ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
+    w: W,
+    h: H,
+    treeData: data
+  });
+  return b.build();
+}
+function \u9053\u7B4B\u306E\u6B04(a) {
+  return {
+    ...a.touchpoint !== void 0 ? { touchpoint: a.touchpoint } : {},
+    ...a.opportunity !== void 0 ? { opportunity: a.opportunity } : {}
+  };
+}
+function reportChartFieldsNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.type === "mind") return;
+  for (const a of doc.actors) {
+    if (a.partId !== void 0) continue;
+    const \u9053\u7B4B = doc.type === "journey" ? [] : [
+      ...a.touchpoint !== void 0 ? ["touchpoint"] : [],
+      ...a.opportunity !== void 0 ? ["opportunity"] : []
+    ];
+    const \u5DE5\u7A0B = doc.type === "gantt" ? [] : [
+      ...a.owner !== void 0 ? ["owner"] : [],
+      ...a.end !== void 0 ? ["end"] : []
+    ];
+    if (\u9053\u7B4B.length > 0) {
+      onNotice({
+        kind: "chart-value-unreadable",
+        actor: a.name,
+        line: a.pos?.line ?? 0,
+        message: `"${truncateForMessage(a.name)}" \u306B\u66F8\u3044\u305F ${\u9053\u7B4B.join(" / ")} \u306F\u52B9\u304D\u307E\u305B\u3093 (type: ${doc.type} \u306B\u306F\u4F53\u9A13\u306E\u9053\u7B4B\u306E\u6B04\u304C\u3042\u308A\u307E\u305B\u3093)`,
+        hint: "\u4F53\u9A13\u306E\u9053\u7B4B\u3092\u63CF\u304F\u306A\u3089 type: journey \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044"
+      });
+    }
+    if (\u5DE5\u7A0B.length > 0) {
+      onNotice({
+        kind: "chart-value-unreadable",
+        actor: a.name,
+        line: a.pos?.line ?? 0,
+        message: `"${truncateForMessage(a.name)}" \u306B\u66F8\u3044\u305F ${\u5DE5\u7A0B.join(" / ")} \u306F\u52B9\u304D\u307E\u305B\u3093 (type: ${doc.type} \u306B\u306F\u5DE5\u7A0B\u306E\u4E26\u3073\u306E\u6B04\u304C\u3042\u308A\u307E\u305B\u3093)`,
+        hint: "\u5DE5\u7A0B\u306E\u4E26\u3073\u3092\u63CF\u304F\u306A\u3089 type: gantt \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044"
+      });
+    }
+  }
+}
+function compileJourney(doc, onNotice) {
+  const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
+  const { w: W, h: H } = \u56F3\u8868\u306E\u5927\u304D\u3055.journey;
+  b.lane("chart", { width: W + 64 });
+  const data = [];
+  const \u8AAD\u3081\u306A\u3044 = [];
+  const \u53C2\u7167\u3067\u304D\u308B = \u8A9E\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc, \u6C17\u6301\u3061);
+  for (const a of doc.actors) {
+    const \u8A9E = (a.value ?? a.subtitle ?? "").trim();
+    const \u53C2\u7167 = \u8A9E.match(/^\{(\w+)\}$/);
+    if (\u53C2\u7167) {
+      if (!\u53C2\u7167\u3067\u304D\u308B.has(\u53C2\u7167[1])) {
+        \u8AAD\u3081\u306A\u3044.push(a.name);
+        continue;
+      }
+      data.push({ id: slugify(a.name), title: a.name, emotion: \u8A9E, ...\u9053\u7B4B\u306E\u6B04(a) });
+      continue;
+    }
+    const e = \u6C17\u6301\u3061.get(\u8A9E);
+    if (e === void 0) {
+      \u8AAD\u3081\u306A\u3044.push(a.name);
+      continue;
+    }
+    data.push({ id: slugify(a.name), title: a.name, emotion: e, ...\u9053\u7B4B\u306E\u6B04(a) });
+  }
+  if (\u8AAD\u3081\u306A\u3044.length > 0) {
+    const m = `type: journey \u3067\u6C17\u6301\u3061\u3092\u8AAD\u3081\u306A\u3044\u9805\u76EE\u304C\u3042\u308A\u307E\u3059 (\u9053\u7B4B\u306B\u8F09\u305B\u307E\u305B\u3093): ${\u8AAD\u3081\u306A\u3044.join(", ")}\u3002 \`- \u767B\u9332: "\u4E0D\u6E80"\` \u306E\u5F62\u3067\u3001 ${[...\u6C17\u6301\u3061.keys()].join(" / ")} \u306E\u3069\u308C\u304B\u3092\u66F8\u3044\u3066\u304F\u3060\u3055\u3044`;
+    onNotice?.({ kind: "chart-value-unreadable", actor: \u8AAD\u3081\u306A\u3044[0], line: 0, message: m });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${m}`);
+  }
+  if (doc.flow.length > 0) {
+    const m2 = `type: journey \u3067\u306F\u77E2\u5370\u3092\u63CF\u3051\u307E\u305B\u3093 (${doc.flow.length} \u672C\u3092\u7121\u8996\u3057\u307E\u3057\u305F)\u3002 \u95A2\u4FC2\u3092\u63CF\u304F\u306A\u3089 type: flow \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044`;
+    onNotice?.({ kind: "chart-edge-dropped", actor: doc.flow[0]?.from ?? "", line: doc.flow[0]?.pos?.line ?? 0, message: m2 });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${m2}`);
+  }
+  b.node(`${slugify(doc.title)}-chart`, {
+    lane: "chart",
+    stack: 0,
+    kind: "journey-map",
+    title: doc.title,
+    ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
+    w: W,
+    h: H,
+    journeyData: data
+  });
+  return b.build();
+}
+var \u8EF8\u306E\u65E2\u5B9A = {
+  xAxis: { left: "\u5C0F\u3055\u3044", right: "\u5927\u304D\u3044" },
+  yAxis: { bottom: "\u5C0F\u3055\u3044", top: "\u5927\u304D\u3044" },
+  quadrantLabels: { topLeft: "\u5DE6\u4E0A", topRight: "\u53F3\u4E0A", bottomLeft: "\u5DE6\u4E0B", bottomRight: "\u53F3\u4E0B" }
+};
+function \u8EF8\u3068\u533A\u753B\u306E\u540D\u524D(doc) {
+  if (doc.axes === void 0) return \u8EF8\u306E\u65E2\u5B9A;
+  const left = doc.axes.x?.left ?? \u8EF8\u306E\u65E2\u5B9A.xAxis.left;
+  const right = doc.axes.x?.right ?? \u8EF8\u306E\u65E2\u5B9A.xAxis.right;
+  const bottom = doc.axes.y?.bottom ?? \u8EF8\u306E\u65E2\u5B9A.yAxis.bottom;
+  const top = doc.axes.y?.top ?? \u8EF8\u306E\u65E2\u5B9A.yAxis.top;
+  return {
+    xAxis: { left, right },
+    yAxis: { bottom, top },
+    quadrantLabels: {
+      topLeft: `${top} \xD7 ${left}`,
+      topRight: `${top} \xD7 ${right}`,
+      bottomLeft: `${bottom} \xD7 ${left}`,
+      bottomRight: `${bottom} \xD7 ${right}`
+    }
+  };
+}
+function reportAxesNotHonored(doc, onNotice) {
+  if (!onNotice) return;
+  if (doc.axes === void 0) return;
+  if (doc.type === "quadrant") return;
+  onNotice({
+    kind: "chart-value-unreadable",
+    actor: doc.title,
+    line: doc.axesPos?.line ?? doc.pos?.line ?? 0,
+    message: `\u6700\u4E0A\u4F4D\u306B\u66F8\u3044\u305F axes \u306F\u52B9\u304D\u307E\u305B\u3093 (type: ${doc.type} \u306B\u306F\u8EF8\u304C\u3042\u308A\u307E\u305B\u3093)`,
+    hint: "2 \u3064\u306E\u8EF8\u3067\u4ED5\u5206\u3051\u308B\u56F3\u3092\u63CF\u304F\u306A\u3089 type: quadrant \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044"
+  });
+}
+function compileQuadrant(doc, onNotice) {
+  const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
+  const { w: W, h: H } = \u56F3\u8868\u306E\u5927\u304D\u3055.quadrant;
+  b.lane("chart", { width: W + 64 });
+  const items = [];
+  const \u8AAD\u3081\u306A\u3044 = [];
+  const \u53C2\u7167\u3067\u304D\u308B = \u8A9E\u306E\u6B04\u304B\u3089\u53C2\u7167\u3067\u304D\u308B\u540D\u524D(doc, \u533A\u753B);
+  for (const a of doc.actors) {
+    const \u8A9E = (a.value ?? a.subtitle ?? "").trim();
+    const \u53C2\u7167 = \u8A9E.match(/^\{(\w+)\}$/);
+    if (\u53C2\u7167) {
+      if (!\u53C2\u7167\u3067\u304D\u308B.has(\u53C2\u7167[1])) {
+        \u8AAD\u3081\u306A\u3044.push(a.name);
+        continue;
+      }
+      items.push({ id: slugify(a.name), title: a.name, quadrant: \u8A9E });
+      continue;
+    }
+    const q = \u533A\u753B.get(\u8A9E);
+    if (q === void 0) {
+      \u8AAD\u3081\u306A\u3044.push(a.name);
+      continue;
+    }
+    items.push({ id: slugify(a.name), title: a.name, quadrant: q });
+  }
+  if (\u8AAD\u3081\u306A\u3044.length > 0) {
+    const m = `type: quadrant \u3067\u533A\u753B\u3092\u8AAD\u3081\u306A\u3044\u9805\u76EE\u304C\u3042\u308A\u307E\u3059 (\u56F3\u306B\u8F09\u305B\u307E\u305B\u3093): ${\u8AAD\u3081\u306A\u3044.join(", ")}\u3002 \`- \u91CD\u8907\u524A\u9664: "\u5DE6\u4E0A"\` \u306E\u5F62\u3067\u3001 ${[...\u533A\u753B.keys()].join(" / ")} \u306E\u3069\u308C\u304B\u3092\u66F8\u3044\u3066\u304F\u3060\u3055\u3044`;
+    onNotice?.({ kind: "chart-value-unreadable", actor: \u8AAD\u3081\u306A\u3044[0], line: 0, message: m });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${m}`);
+  }
+  if (doc.flow.length > 0) {
+    const m2 = `type: quadrant \u3067\u306F\u77E2\u5370\u3092\u63CF\u3051\u307E\u305B\u3093 (${doc.flow.length} \u672C\u3092\u7121\u8996\u3057\u307E\u3057\u305F)\u3002 \u95A2\u4FC2\u3092\u63CF\u304F\u306A\u3089 type: flow \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044`;
+    onNotice?.({ kind: "chart-edge-dropped", actor: doc.flow[0]?.from ?? "", line: doc.flow[0]?.pos?.line ?? 0, message: m2 });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${m2}`);
+  }
+  b.node(`${slugify(doc.title)}-chart`, {
+    lane: "chart",
+    stack: 0,
+    kind: "quadrant-matrix",
+    title: doc.title,
+    ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
+    w: W,
+    h: H,
+    quadrantData: { ...\u8EF8\u3068\u533A\u753B\u306E\u540D\u524D(doc), items }
+  });
+  return b.build();
+}
 function \u6BB5\u3092\u8AAD\u307F\u53D6\u308B(subtitle) {
   const \u5143 = (subtitle ?? "").trim();
   const m = \u5143.match(/^L([123])(?![0-9A-Za-z])/i);
@@ -2076,74 +3299,196 @@ function compileC4(doc) {
   }
   return b.build();
 }
-function compileMind(doc) {
+var \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u306E\u540D\u524D = {
+  kind: "\u7A2E\u985E",
+  eyebrow: "\u4E0A\u306E\u5C0F\u898B\u51FA\u3057",
+  touchpoint: "\u5834\u6240 (\u4F53\u9A13\u306E\u9053\u7B4B\u306E\u6B04)",
+  opportunity: "\u6539\u5584\u306E\u4F59\u5730 (\u4F53\u9A13\u306E\u9053\u7B4B\u306E\u6B04)",
+  owner: "\u62C5\u5F53 (\u5DE5\u7A0B\u306E\u4E26\u3073\u306E\u6B04)",
+  end: "\u7D42\u308F\u308B\u6642\u671F (\u5DE5\u7A0B\u306E\u4E26\u3073\u306E\u6B04)",
+  rows: "\u884C",
+  lane: "\u67A0\u306E\u6307\u5B9A",
+  stack: "\u7A4D\u3080\u9806",
+  initial: "\u59CB\u307E\u308A / \u7D42\u308F\u308A \u306E\u5370",
+  final: "\u59CB\u307E\u308A / \u7D42\u308F\u308A \u306E\u5370",
+  colorHex: "\u8272\u756A\u53F7",
+  stateOverride: "\u72B6\u614B\u306E\u4E0A\u66F8\u304D",
+  // 位置は「登場人物ごとの箱をどこに置くか」 の指定で、 箱が 1 つの図では置く先が無い
+  posX: "\u4F4D\u7F6E (\u5EA7\u6A19)",
+  posY: "\u4F4D\u7F6E (\u5EA7\u6A19)",
+  posW: "\u5927\u304D\u3055",
+  posH: "\u5927\u304D\u3055",
+  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"
+};
+function \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u3092\u66F8\u3044\u305F\u304B(a, \u6B04) {
+  if (\u6B04 === "kind") return a.kindWritten === true;
+  const v = a[\u6B04];
+  if (typeof v === "boolean") return v;
+  return v !== void 0;
+}
+function \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(a) {
+  const \u7D9A\u304D = [a.subtitle, a.value].map((x) => x?.trim()).filter((x) => !!x);
+  return \u7D9A\u304D.length > 0 ? `${a.name} ${\u7D9A\u304D.join(" ")}` : a.name;
+}
+function compileMind(doc, onNotice) {
   const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
-  const LEAF_W = 280;
-  const ROOT_W = 320;
-  const GAP = 80;
-  const \u679D\u306E\u6570 = Math.max(0, doc.actors.length - 1);
-  const \u5DE6\u306B\u7F6E\u304F\u6570 = Math.ceil(\u679D\u306E\u6570 / 2);
-  const \u53F3\u306B\u7F6E\u304F\u6570 = \u679D\u306E\u6570 - \u5DE6\u306B\u7F6E\u304F\u6570;
-  const \u5DE6\u3092\u4F7F\u3046 = \u5DE6\u306B\u7F6E\u304F\u6570 > 0;
-  const \u53F3\u3092\u4F7F\u3046 = \u53F3\u306B\u7F6E\u304F\u6570 > 0;
-  if (doc.actors.length === 0) return b.build();
-  let x = 0;
-  if (\u5DE6\u3092\u4F7F\u3046) {
-    b.lane("mind-left", { x, width: LEAF_W, label: "" });
-    x += LEAF_W + GAP;
-  }
-  b.lane("mind-center", { x, width: ROOT_W, label: doc.title });
-  x += ROOT_W + GAP;
-  if (\u53F3\u3092\u4F7F\u3046) {
-    b.lane("mind-right", { x, width: LEAF_W, label: "" });
+  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 });
+    if (typeof console !== "undefined" && console.warn) console.warn(`[dragon] ${message}`);
+  };
+  const \u898B\u672C\u3067\u306A\u3044 = [];
+  for (const a of doc.actors) {
+    if (a.partId !== void 0) {
+      \u4F1D\u3048\u308B(
+        "part-not-drawn",
+        a.name,
+        `type: mind \u3067\u306F\u898B\u672C (${a.partId}) \u3092\u4E2D\u5FC3\u306B\u3082\u679D\u306B\u3082\u3067\u304D\u307E\u305B\u3093\u3002 \u898B\u672C\u306F\u305D\u306E\u307E\u307E\u63CF\u304D\u3001 \u653E\u5C04\u306B\u306F\u8F09\u305B\u307E\u305B\u3093`,
+        a.pos?.line ?? 0
+      );
+      continue;
+    }
+    \u898B\u672C\u3067\u306A\u3044.push(a);
+  }
+  const \u679D\u306E\u540D\u524D = new Set(\u898B\u672C\u3067\u306A\u3044.map((a) => slugify(a.name)));
+  const \u89AA = \u77E2\u5370\u304B\u3089\u89AA\u3092\u6C7A\u3081\u308B(
+    doc,
+    "mind",
+    \u679D\u306E\u540D\u524D,
+    (\u540D, message, line) => (
+      // 親にできなかった矢印は描かれない。 知らせの種別も「矢印を落とした」 にする
+      \u4F1D\u3048\u308B("chart-edge-dropped", \u540D, message, line ?? 0)
+    )
+  );
+  if (\u898B\u672C\u3067\u306A\u3044.length === 0) return b.build();
+  b.lane("chart", { width: W + 64 });
+  const slug\u5225 = /* @__PURE__ */ new Map();
+  for (const a of \u898B\u672C\u3067\u306A\u3044) {
+    const k = slugify(a.name);
+    slug\u5225.set(k, [...slug\u5225.get(k) ?? [], a.name]);
+  }
+  for (const [k, \u7FA4] of slug\u5225) {
+    if (\u7FA4.length > 1) {
+      \u4F1D\u3048\u308B(
+        "chart-value-unreadable",
+        \u7FA4[0],
+        `type: mind \u3067 ${\u7FA4.join(" / ")} \u304C\u540C\u3058 id (${k}) \u306B\u306A\u308A\u307E\u3059\u3002 \u540D\u524D\u3092\u5909\u3048\u3066\u304F\u3060\u3055\u3044`
+      );
+    }
   }
-  const root = doc.actors[0];
+  const root = \u898B\u672C\u3067\u306A\u3044[0];
   const rootId = slugify(root.name);
-  const leafCount = doc.actors.length - 1;
-  const rootStack = Math.floor(leafCount / 2);
-  b.node(rootId, {
-    lane: "mind-center",
-    stack: rootStack,
-    kind: "card",
-    title: root.name,
-    w: ROOT_W
-  });
-  const stackLeft = { v: 0 };
-  const stackRight = { v: 0 };
-  doc.actors.slice(1).forEach((a, i) => {
-    const isLeft = i % 2 === 0;
-    const lid = isLeft ? "mind-left" : "mind-right";
-    const counter = isLeft ? stackLeft : stackRight;
-    const nodeId = slugify(a.name);
-    b.node(nodeId, {
-      lane: lid,
-      stack: counter.v,
-      kind: "card",
-      title: a.name,
-      w: LEAF_W
+  for (const f of doc.flow) {
+    if (slugify(f.to) !== rootId) continue;
+    \u4F1D\u3048\u308B(
+      "chart-edge-dropped",
+      f.to,
+      `type: mind \u3067\u4E2D\u5FC3 (${truncateForMessage(f.to)}) \u3092\u5B50\u306B\u306F\u3067\u304D\u307E\u305B\u3093 (${truncateForMessage(f.from)} -> ${truncateForMessage(f.to)} \u3092\u4F7F\u3044\u307E\u305B\u3093)\u3002 \u4E2D\u5FC3\u306F\u653E\u5C04\u306E\u771F\u3093\u4E2D\u306B\u7F6E\u304F 1 \u3064\u3060\u3051\u3067\u3059`,
+      f.pos?.line ?? 0
+    );
+  }
+  const \u63CF\u3051\u306A\u3044\u6B04 = (a) => {
+    const out = [];
+    for (const \u6B04 of Object.keys(\u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u306E\u540D\u524D)) {
+      if (!\u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u3092\u66F8\u3044\u305F\u304B(a, \u6B04)) continue;
+      const \u540D\u524D = \u653E\u5C04\u3067\u63CF\u3051\u306A\u3044\u6B04\u306E\u540D\u524D[\u6B04];
+      if (!out.includes(\u540D\u524D)) out.push(\u540D\u524D);
+    }
+    return out;
+  };
+  const \u6D88\u3048\u305F\u6B04 = /* @__PURE__ */ new Map();
+  const \u8A18\u9332\u3059\u308B = (a) => {
+    const \u6B04 = \u63CF\u3051\u306A\u3044\u6B04(a);
+    if (\u6B04.length > 0) \u6D88\u3048\u305F\u6B04.set(a.name, \u6B04);
+  };
+  const branches = [];
+  const \u4F7F\u3063\u305F = /* @__PURE__ */ new Set([rootId]);
+  \u8A18\u9332\u3059\u308B(root);
+  if (root.tone) \u6D88\u3048\u305F\u6B04.set(root.name, [...\u6D88\u3048\u305F\u6B04.get(root.name) ?? [], "\u8272 (\u4E2D\u5FC3\u306F\u6301\u3066\u306A\u3044)"]);
+  \u898B\u672C\u3067\u306A\u3044.slice(1).forEach((a, i) => {
+    const id = slugify(a.name);
+    if (\u4F7F\u3063\u305F.has(id)) {
+      \u4F1D\u3048\u308B(
+        "chart-value-unreadable",
+        a.name,
+        `type: mind \u3067 ${a.name} \u304C\u65E2\u306B\u3042\u308B id (${id}) \u3068\u91CD\u306A\u308A\u307E\u3059 (\u679D\u306B\u8F09\u305B\u307E\u305B\u3093)`,
+        a.pos?.line ?? 0
+      );
+      return;
+    }
+    \u4F7F\u3063\u305F.add(id);
+    \u8A18\u9332\u3059\u308B(a);
+    branches.push({
+      id,
+      title: \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(a),
+      parent: \u89AA.get(id) ?? rootId,
+      ...a.tone ? { tone: a.tone } : {}
     });
-    counter.v += 1;
   });
-  if (doc.flow.length === 0 && doc.actors.length > 1) {
-    doc.actors.slice(1).forEach((a) => {
-      const leafId = slugify(a.name);
-      b.edge(rootId, leafId, { label: "" });
-    });
-  } else {
-    for (const s of doc.flow) {
-      const fromId = slugify(s.from);
-      const toId = slugify(s.to);
-      b.edge(fromId, toId, {
-        label: s.label,
-        ...s.sub ? { sub: s.sub } : {},
-        ...s.tone ? { tone: s.tone } : {},
-        ...s.style ? { style: s.style } : {}
-      });
-    }
+  if (\u6D88\u3048\u305F\u6B04.size > 0) {
+    const \u4E00\u89A7 = [...\u6D88\u3048\u305F\u6B04].map(([\u540D, \u6B04]) => `${\u540D} \u306E${\u6B04.join(" / ")}`).join("\u3001 ");
+    \u4F1D\u3048\u308B(
+      "chart-value-unreadable",
+      [...\u6D88\u3048\u305F\u6B04.keys()][0],
+      `type: mind \u306F\u540D\u524D\u3068\u526F\u984C / \u5024\u3001 \u679D\u306E\u8272\u3057\u304B\u63CF\u3051\u307E\u305B\u3093 (\u63CF\u304B\u306A\u3044\u6B04: ${\u4E00\u89A7})\u3002 \u3053\u308C\u3089\u3092\u63CF\u304F\u306A\u3089 type: tree \u304B type: flow \u3092\u4F7F\u3063\u3066\u304F\u3060\u3055\u3044`
+    );
   }
+  b.node(`${slugify(doc.title)}-chart`, {
+    lane: "chart",
+    stack: 0,
+    kind: "mind-map",
+    title: doc.title,
+    ...\u56F3\u306E\u5C0F\u898B\u51FA\u3057(doc),
+    w: W,
+    h: H,
+    mindData: { rootId, rootTitle: \u653E\u5C04\u306B\u51FA\u3059\u6587\u5B57(root), branches }
+  });
   return b.build();
 }
-function applyV05Extensions(diagram2, doc) {
+function mergeDuplicateDeclaredLanes(diagram2, \u8FFD\u52A0\u3057\u305F\u7E26\u5217) {
+  for (const \u5BA3\u8A00 of \u8FFD\u52A0\u3057\u305F\u7E26\u5217) {
+    const { id } = \u5BA3\u8A00;
+    const \u540C\u4E00id\u306E\u7E26\u5217 = diagram2.lanes.filter((l) => l.id === id);
+    if (\u540C\u4E00id\u306E\u7E26\u5217.length < 2) continue;
+    const \u6B8B\u3059 = \u540C\u4E00id\u306E\u7E26\u5217.at(-1);
+    if (\u6B8B\u3059 === void 0) continue;
+    const \u5143\u306E\u4E2D\u5FC3X = (\u6B8B\u3059.x ?? 0) + \u6B8B\u3059.width / 2;
+    if (\u5BA3\u8A00.x !== void 0) \u6B8B\u3059.x = \u5BA3\u8A00.x;
+    if (\u5BA3\u8A00.width !== void 0) \u6B8B\u3059.width = \u5BA3\u8A00.width;
+    if (\u5BA3\u8A00.label !== void 0) \u6B8B\u3059.label = \u5BA3\u8A00.label;
+    if (\u5BA3\u8A00.contain !== void 0) \u6B8B\u3059.contain = \u5BA3\u8A00.contain;
+    if (\u5BA3\u8A00.lifeline !== void 0) \u6B8B\u3059.lifeline = \u5BA3\u8A00.lifeline;
+    const \u79FB\u52D5X = (\u6B8B\u3059.x ?? 0) + \u6B8B\u3059.width / 2 - \u5143\u306E\u4E2D\u5FC3X;
+    for (const node of diagram2.nodes) {
+      if (node.lane === id && node.posX !== void 0) node.posX += \u79FB\u52D5X;
+    }
+    for (let i = diagram2.lanes.length - 1; i >= 0; i -= 1) {
+      if (diagram2.lanes[i]?.id === id && diagram2.lanes[i] !== \u6B8B\u3059) diagram2.lanes.splice(i, 1);
+    }
+  }
+}
+function reportEmptyDeclaredLanes(diagram2, \u8FFD\u52A0\u3057\u305F\u7E26\u5217, onNotice) {
+  if (\u8FFD\u52A0\u3057\u305F\u7E26\u5217.length === 0) return;
+  mergeDuplicateDeclaredLanes(diagram2, \u8FFD\u52A0\u3057\u305F\u7E26\u5217);
+  if (!onNotice) return;
+  const \u4F7F\u308F\u308C\u3066\u3044\u308B = new Set(diagram2.nodes.map((n) => n.lane));
+  const \u3042\u308B\u7E26\u5217 = diagram2.lanes.map((l) => l.id).filter((x) => \u4F7F\u308F\u308C\u3066\u3044\u308B.has(x));
+  for (const { id, pos } of \u8FFD\u52A0\u3057\u305F\u7E26\u5217) {
+    if (\u4F7F\u308F\u308C\u3066\u3044\u308B.has(id)) continue;
+    onNotice({
+      kind: "lane-declared-empty",
+      actor: id,
+      line: pos?.line ?? 0,
+      message: `lanes \u306B\u66F8\u3044\u305F ${truncateForMessage(id)} \u306F\u3069\u306E\u7BB1\u3082\u5165\u3089\u306A\u3044\u7E26\u5217\u3067\u3059 (\u65B0\u3057\u304F\u4F5C\u308A\u307E\u3057\u305F)`,
+      hint: \u3042\u308B\u7E26\u5217.length > 0 ? `\u3053\u306E\u56F3\u304C\u6301\u3064\u7E26\u5217 = ${\u3042\u308B\u7E26\u5217.join(" / ")}` : "\u3053\u306E\u56F3\u306F\u7BB1\u306E\u5165\u3063\u305F\u7E26\u5217\u3092\u6301\u3061\u307E\u305B\u3093"
+    });
+  }
+}
+function applyV05Extensions(diagram2, doc, \u8FFD\u52A0\u3057\u305F\u7E26\u5217out) {
   const isSeqLike = doc.type === "sequence" || doc.type === "solidity";
   for (const a of doc.actors) {
     const dragonSlug = slugify(a.name);
@@ -2162,6 +3507,10 @@ function applyV05Extensions(diagram2, doc) {
       if (a.eyebrow !== void 0) node.eyebrow = a.eyebrow;
       if (a.value !== void 0) node.value = a.value;
       if (a.rows !== void 0) node.rows = a.rows;
+      if (!isSeqLike) {
+        if (a.posW !== void 0) node.w = a.posW;
+        if (a.posH !== void 0) node.h = a.posH;
+      }
       const drawn = isSeqLike && a.kindWritten !== false ? drawableKind(a.kind) : void 0;
       if (drawn !== void 0) {
         node.kind = drawn;
@@ -2185,6 +3534,7 @@ function applyV05Extensions(diagram2, doc) {
   if (doc.animate && doc.animate.phases.length > 0 && diagram2.phases.length === 0) {
     injectPhasesFallback(diagram2, doc);
   }
+  const \u8FFD\u52A0\u3057\u305F\u7E26\u5217 = \u8FFD\u52A0\u3057\u305F\u7E26\u5217out ?? [];
   if (doc.lanes) {
     for (const [id, laneOpt] of Object.entries(doc.lanes)) {
       const lane = diagram2.lanes.find((l) => l.id === id);
@@ -2203,6 +3553,7 @@ function applyV05Extensions(diagram2, doc) {
           contain: laneOpt.contain,
           lifeline: laneOpt.lifeline
         });
+        \u8FFD\u52A0\u3057\u305F\u7E26\u5217.push(laneOpt);
       }
     }
   }
@@ -2323,8 +3674,9 @@ function compileSequenceWithAnimate(doc) {
     b.node(spacerId, { lane: id, stack: 1, kind: "card", title: "", w: 2, h: 40 });
   });
   doc.flow.forEach((s, idx) => {
-    const fromLaneId = actorIds.get(s.from) ?? s.from;
-    const toLaneId = actorIds.get(s.to) ?? s.to;
+    const fromLaneId = actorIds.get(s.from);
+    const toLaneId = actorIds.get(s.to);
+    if (fromLaneId === void 0 || toLaneId === void 0) return;
     const stack = idx + 2;
     const fromBoxId = `s${idx}-${fromLaneId}`;
     const toBoxId = `s${idx}-${toLaneId}`;
@@ -2338,11 +3690,7 @@ function compileSequenceWithAnimate(doc) {
       label: s.label,
       ...s.sub ? { sub: s.sub } : {},
       ...s.tone ? { tone: s.tone } : {},
-      ...s.style ? { style: s.style } : {},
-      ...s.guard ? { guard: s.guard } : {},
-      ...s.cardinality ? { cardinality: s.cardinality } : {},
-      ...s.labelOffsetX !== void 0 ? { labelOffsetX: s.labelOffsetX } : {},
-      ...s.labelOffsetY !== void 0 ? { labelOffsetY: s.labelOffsetY } : {}
+      ...s.style ? { style: s.style } : {}
     });
   });
   const footerStack = doc.flow.length + 2;
@@ -2350,12 +3698,20 @@ function compileSequenceWithAnimate(doc) {
     const laneId = actorIds.get(a.name) ?? slugify(a.name);
     const footerId = `${laneId}-footer`;
     const actorW = Math.max(140, a.name.length * 22 + 52);
-    b.node(footerId, { lane: laneId, stack: footerStack, kind: "card", title: a.name, w: actorW, h: 72 });
+    b.node(footerId, {
+      lane: laneId,
+      stack: footerStack,
+      kind: "card",
+      title: a.name,
+      w: actorW,
+      h: 72,
+      role: "lifeline-footer"
+    });
   });
-  for (const st of doc.animate.states) {
+  for (const st of doc.animate?.states ?? []) {
     b.state(st.name, { initial: st.initial });
   }
-  for (const p of doc.animate.phases) {
+  for (const p of doc.animate?.phases ?? []) {
     b.phase(
       slugify(p.name),
       {
@@ -2434,7 +3790,7 @@ function slugLookup(byName, wanted) {
   return hit;
 }
 function compileFlow(doc) {
-  if (doc.animate && doc.animate.phases.length > 0) {
+  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("flow", doc)) {
     return compileGenericWithAnimate(doc, { kind: "flow", laneId: "main", laneWidth: 400 });
   }
   if (doc.actors.length === 0) {
@@ -2460,7 +3816,7 @@ function compileFlow(doc) {
   return flowBuilder.build();
 }
 function compileSwimlane(doc) {
-  if (doc.animate && doc.animate.phases.length > 0) {
+  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("swimlane", doc)) {
     return compileGenericWithAnimate(doc, { kind: "swimlane", laneWidth: 400 });
   }
   const swim = cdl.swimlane({
@@ -2494,11 +3850,17 @@ function compileSwimlane(doc) {
       label: s.label,
       ...s.sub ? { sub: s.sub } : {},
       ...s.tone ? { tone: s.tone } : {},
-      ...s.style ? { style: s.style } : {},
-      ...s.guard ? { guard: s.guard } : {},
-      ...s.cardinality ? { cardinality: s.cardinality } : {},
-      ...s.labelOffsetX !== void 0 ? { labelOffsetX: s.labelOffsetX } : {},
-      ...s.labelOffsetY !== void 0 ? { labelOffsetY: s.labelOffsetY } : {}
+      ...s.style ? { style: s.style } : {}
+    });
+  }
+  if (placedNodes.size === 0) {
+    doc.actors.forEach((a, i) => {
+      swim.node(slugify(a.name), {
+        lane: swim.laneId(a.name),
+        stack: 0,
+        kind: a.kind ?? "actor",
+        title: a.name
+      });
     });
   }
   return swim.build();
@@ -2530,6 +3892,14 @@ function compileEr(doc) {
   }
   return erBuilder.build();
 }
+function \u59CB\u307E\u308A\u3068\u7D42\u308F\u308A\u306E\u6C7A\u3081\u65B9(doc) {
+  const \u66F8\u3044\u305F\u59CB\u307E\u308A = doc.actors.some((a) => a.initial === true);
+  const \u66F8\u3044\u305F\u7D42\u308F\u308A = doc.actors.some((a) => a.final === true);
+  return {
+    \u59CB\u307E\u308A: (a, idx) => \u66F8\u3044\u305F\u59CB\u307E\u308A ? a.initial === true : idx === 0,
+    \u7D42\u308F\u308A: (a, idx) => \u66F8\u3044\u305F\u7D42\u308F\u308A ? a.final === true : idx === doc.actors.length - 1 && doc.actors.length > 1
+  };
+}
 function compileState(doc) {
   if (doc.animate && doc.animate.phases.length > 0) {
     return compileGenericWithAnimate(doc, { kind: "state", laneWidth: 360 });
@@ -2538,10 +3908,11 @@ function compileState(doc) {
     id: slugify(doc.title),
     topic: doc.title
   });
+  const \u6C7A\u3081\u65B9 = \u59CB\u307E\u308A\u3068\u7D42\u308F\u308A\u306E\u6C7A\u3081\u65B9(doc);
   for (let i = 0; i < doc.actors.length; i++) {
     const a = doc.actors[i];
-    const initial = i === 0;
-    const final = i === doc.actors.length - 1 && doc.actors.length > 1;
+    const initial = \u6C7A\u3081\u65B9.\u59CB\u307E\u308A(a, i);
+    const final = \u6C7A\u3081\u65B9.\u7D42\u308F\u308A(a, i);
     fsm.state({
       id: slugify(a.name),
       title: a.name,
@@ -2561,7 +3932,7 @@ function compileState(doc) {
   return fsm.build();
 }
 function compileTopology(doc) {
-  if (doc.animate && doc.animate.phases.length > 0) {
+  if (doc.animate && doc.animate.phases.length > 0 || \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F("topology", doc)) {
     return compileGenericWithAnimate(doc, { kind: "topology", laneWidth: 460 });
   }
   if (doc.actors.length === 0) {
@@ -2590,11 +3961,42 @@ function compileTopology(doc) {
   }
   return topo.build();
 }
+function \u5F8C\u308D\u3078\u623B\u308B\u77E2\u5370\u304B(kind, fromId, toId, \u7BB1\u306E\u4E26\u3073) {
+  if (kind !== "state") return false;
+  const \u5143 = \u7BB1\u306E\u4E26\u3073.get(fromId);
+  const \u5148 = \u7BB1\u306E\u4E26\u3073.get(toId);
+  if (\u5143 === void 0 || \u5148 === void 0) return false;
+  return \u5148 < \u5143;
+}
+var \u7E26\u5217\u3092\u9078\u3079\u308B\u56F3\u7A2E = /* @__PURE__ */ new Set(["flow", "topology", "swimlane"]);
+function \u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F(kind, doc) {
+  if (!\u7E26\u5217\u3092\u9078\u3079\u308B\u56F3\u7A2E.has(kind)) return false;
+  const \u5BFE\u8C61 = doc.actors.filter((a) => a.partId === void 0);
+  return \u5BFE\u8C61.length > 0 && \u5BFE\u8C61.every((a) => a.lane !== void 0);
+}
 function compileGenericWithAnimate(doc, opts) {
   const b = cdl.diagram(slugify(doc.title), { topic: doc.title });
   const { kind, laneWidth } = opts;
   const actorToNodeId = /* @__PURE__ */ new Map();
-  if (kind === "flow" || kind === "topology") {
+  if (\u66F8\u3044\u305F\u7E26\u5217\u306B\u7F6E\u304F(kind, doc)) {
+    const \u4E26\u3073 = [];
+    for (const a of doc.actors) {
+      const lid = a.lane;
+      if (lid !== void 0 && !\u4E26\u3073.includes(lid)) \u4E26\u3073.push(lid);
+    }
+    for (const lid of \u4E26\u3073) {
+      b.lane(lid, { width: laneWidth, ...kind === "topology" ? { contain: true } : {} });
+    }
+    const \u7A4D\u3093\u3060\u6570 = /* @__PURE__ */ new Map();
+    doc.actors.forEach((a, idx) => {
+      const id = slugify(a.name);
+      actorToNodeId.set(a.name, id);
+      const lid = a.lane;
+      const stack = \u7A4D\u3093\u3060\u6570.get(lid) ?? 0;
+      \u7A4D\u3093\u3060\u6570.set(lid, stack + 1);
+      b.node(id, { lane: lid, stack, kind: a.kind, title: a.name });
+    });
+  } else if (kind === "flow" || kind === "topology") {
     const lid = opts.laneId ?? "main";
     b.lane(lid, { width: laneWidth, label: doc.title, ...kind === "topology" ? { contain: true } : {} });
     doc.actors.forEach((a, idx) => {
@@ -2603,13 +4005,15 @@ function compileGenericWithAnimate(doc, opts) {
       b.node(id, { lane: lid, stack: idx, kind: a.kind, title: a.name });
     });
   } else {
+    const \u898B\u51FA\u3057\u3092\u4ED8\u3051\u308B = kind === "swimlane";
+    const \u6C7A\u3081\u65B92 = \u59CB\u307E\u308A\u3068\u7D42\u308F\u308A\u306E\u6C7A\u3081\u65B9(doc);
     doc.actors.forEach((a, idx) => {
       const lid = `lane-${slugify(a.name)}`;
-      b.lane(lid, { width: laneWidth, label: a.name });
+      b.lane(lid, { width: laneWidth, ...\u898B\u51FA\u3057\u3092\u4ED8\u3051\u308B ? { label: a.name } : {} });
       const id = slugify(a.name);
       actorToNodeId.set(a.name, id);
-      const isInitial = kind === "state" && idx === 0;
-      const isFinal = kind === "state" && idx === doc.actors.length - 1 && doc.actors.length > 1;
+      const isInitial = kind === "state" && \u6C7A\u3081\u65B92.\u59CB\u307E\u308A(a, idx);
+      const isFinal = kind === "state" && \u6C7A\u3081\u65B92.\u7D42\u308F\u308A(a, idx);
       b.node(id, {
         lane: lid,
         stack: 0,
@@ -2620,29 +4024,28 @@ function compileGenericWithAnimate(doc, opts) {
       });
     });
   }
+  const \u7BB1\u306E\u4E26\u3073 = new Map([...actorToNodeId.values()].map((id, i) => [id, i]));
   const edgeIds = [];
   doc.flow.forEach((s, idx) => {
-    const fromId = actorToNodeId.get(s.from) ?? slugify(s.from);
-    const toId = actorToNodeId.get(s.to) ?? slugify(s.to);
+    const fromId = actorToNodeId.get(s.from);
+    const toId = actorToNodeId.get(s.to);
+    if (fromId === void 0 || toId === void 0) return;
     const edgeId = `e${idx}-${fromId}-${toId}`;
     const labelWithCard = kind === "er" && s.cardinality && !s.label.includes(s.cardinality) ? s.label ? `${s.label} (${s.cardinality})` : `(${s.cardinality})` : s.label;
     b.edge(fromId, toId, {
       id: edgeId,
       label: labelWithCard,
+      ...\u5F8C\u308D\u3078\u623B\u308B\u77E2\u5370\u304B(kind, fromId, toId, \u7BB1\u306E\u4E26\u3073) ? { routing: "back-detour" } : {},
       ...s.sub ? { sub: s.sub } : {},
       ...s.tone ? { tone: s.tone } : {},
-      ...s.style ? { style: s.style } : {},
-      ...s.guard ? { guard: s.guard } : {},
-      ...s.cardinality ? { cardinality: s.cardinality } : {},
-      ...s.labelOffsetX !== void 0 ? { labelOffsetX: s.labelOffsetX } : {},
-      ...s.labelOffsetY !== void 0 ? { labelOffsetY: s.labelOffsetY } : {}
+      ...s.style ? { style: s.style } : {}
     });
     edgeIds.push(edgeId);
   });
-  for (const st of doc.animate.states) {
+  for (const st of doc.animate?.states ?? []) {
     b.state(st.name, { initial: st.initial });
   }
-  for (const p of doc.animate.phases) {
+  for (const p of doc.animate?.phases ?? []) {
     b.phase(
       slugify(p.name),
       {
@@ -2685,51 +4088,284 @@ function resolveHighlightGeneric(phase, doc, actorToNodeId, edgeIds) {
       }
       continue;
     }
-    const nodeId = actorToNodeId.get(entry.name) ?? slugLookup(actorToNodeId, entry.name);
-    if (nodeId) {
-      out.push(nodeId);
+    const nodeId = actorToNodeId.get(entry.name) ?? slugLookup(actorToNodeId, entry.name);
+    if (nodeId) {
+      out.push(nodeId);
+    }
+  }
+  return out;
+}
+var ID_MAX = 64;
+function slugify(s) {
+  return s.toLowerCase().normalize("NFKC").replace(/[^a-z0-9ぁ-んァ-ヶ一-龯\-_]+/g, "-").replace(/^-+|-+$/g, "").slice(0, ID_MAX) || "n";
+}
+var CARDINALITY_PATTERNS = [
+  [/1:1/, "1:1"],
+  [/1:N/i, "1:N"],
+  [/N:1/i, "N:1"],
+  [/N:M/i, "N:M"],
+  [/0\.\.1/, "0..1"],
+  [/1\.\.\*/, "1..*"]
+];
+function boundedCardinalityRegExp(pattern, extraFlags = "") {
+  const base = pattern.flags.includes("i") ? "i" : "";
+  return new RegExp(`(?<![A-Za-z0-9_])(?:${pattern.source})(?![A-Za-z0-9_])`, base + extraFlags);
+}
+function parseCardinalityFromLabel(label) {
+  for (const [pattern, card] of CARDINALITY_PATTERNS) {
+    if (boundedCardinalityRegExp(pattern).test(label)) return card;
+  }
+  return null;
+}
+var HORIZONTAL_WS = " \\t\\u3000";
+var HWS = `[${HORIZONTAL_WS}]`;
+function stripCardinality(label) {
+  let r = label;
+  let removed = false;
+  for (const [pattern] of CARDINALITY_PATTERNS) {
+    const src = pattern.source;
+    const flags = pattern.flags.includes("i") ? "gi" : "g";
+    const before = r;
+    r = r.replace(new RegExp(`\\(${HWS}*${src}${HWS}*\\)`, flags), "");
+    r = r.replace(boundedCardinalityRegExp(pattern, "g"), "");
+    if (r !== before) removed = true;
+  }
+  if (!removed) return label;
+  r = r.replace(new RegExp(`${HWS}{2,}`, "g"), " ").replace(new RegExp(`${HWS}*([\\r\\n])${HWS}*`, "g"), "$1").replace(new RegExp(`^${HWS}+|${HWS}+$`, "g"), "");
+  const hasVisible = /[^\p{White_Space}\p{Cf}\p{Cc}\p{Default_Ignorable_Code_Point}]/u.test(r);
+  return hasVisible ? r : label;
+}
+
+// src/value-syntax.ts
+var VALUE_NAME_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+var VALUE_FNS = /* @__PURE__ */ new Set(["min", "max"]);
+function isValueName(name) {
+  return VALUE_NAME_RE.test(name);
+}
+function valueNameIssue(name) {
+  return {
+    message: `invalid value name: "${name}"`,
+    hint: "\u82F1\u5B57\u304B _ \u3067\u59CB\u3081\u3001 \u82F1\u6570\u5B57\u3068 _ \u3060\u3051\u3092\u4F7F\u3046 (states \u3068\u540C\u3058\u898F\u5247)"
+  };
+}
+var TRIGGER_OPS = [">=", "<=", "==", "!=", ">", "<"];
+function parseDurationMs(text) {
+  const m = text.trim().match(/^(\d+(?:\.\d+)?)\s*(ms|s)?$/);
+  if (!m) return null;
+  const n = parseFloat(m[1] ?? "0");
+  if (!Number.isFinite(n) || n <= 0) return null;
+  const unit = m[2] ?? "s";
+  const durationMs = unit === "ms" ? Math.round(n) : Math.round(n * 1e3);
+  return durationMs > 0 ? durationMs : null;
+}
+function splitOutsideQuotes(body) {
+  const out = [];
+  let cur = "";
+  let quote = null;
+  for (const ch of body) {
+    if (quote) {
+      if (ch === quote) quote = null;
+      cur += ch;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      cur += ch;
+      continue;
+    }
+    if (ch === ",") {
+      out.push(cur);
+      cur = "";
+      continue;
+    }
+    cur += ch;
+  }
+  out.push(cur);
+  return out.map((s) => s.trim()).filter((s) => s !== "");
+}
+function unquote(s) {
+  const t = s.trim();
+  if (t.length >= 2 && (t[0] === '"' || t[0] === "'") && t[t.length - 1] === t[0]) {
+    return t.slice(1, -1);
+  }
+  return t;
+}
+function parseTriggerExpression(raw, name) {
+  const text = raw.trim();
+  const stepMatch = text.match(/^step\s+(.+)$/);
+  if (stepMatch) {
+    const step = unquote(stepMatch[1] ?? "");
+    if (step === "") {
+      return { message: `trigger \u306E\u6BB5\u540D\u304C\u7A7A\u3067\u3059 ("${name}")`, hint: '`trigger: step "\u53D6\u8FBC\u307F"` \u306E\u5F62\u3067\u6BB5\u306E\u540D\u524D\u3092\u66F8\u304F' };
+    }
+    return { kind: "step", step };
+  }
+  for (const op of TRIGGER_OPS) {
+    const at = text.indexOf(op);
+    if (at < 0) continue;
+    const source = text.slice(0, at).trim();
+    const rhs = text.slice(at + op.length).trim();
+    if (!isValueName(source)) {
+      return {
+        message: `trigger \u304C\u898B\u5F35\u308B\u5024\u306E\u540D\u524D\u304C\u4F7F\u3048\u307E\u305B\u3093: "${source}" ("${name}")`,
+        hint: "\u82F1\u5B57\u304B _ \u3067\u59CB\u3081\u3001 \u82F1\u6570\u5B57\u3068 _ \u3060\u3051\u3092\u4F7F\u3046"
+      };
+    }
+    const threshold = Number(rhs);
+    if (rhs === "" || !Number.isFinite(threshold)) {
+      return {
+        message: `trigger \u306E\u5883\u76EE\u304C\u6570\u3067\u306F\u3042\u308A\u307E\u305B\u3093: "${rhs}" ("${name}")`,
+        hint: "`trigger: vDone >= 100` \u306E\u3088\u3046\u306B\u6570\u3067\u66F8\u304F"
+      };
+    }
+    return { kind: "reaches", source, op, threshold };
+  }
+  return {
+    message: `trigger \u306E\u5F62\u304C\u8AAD\u3081\u307E\u305B\u3093: "${text}" ("${name}")`,
+    hint: '`step "\u53D6\u8FBC\u307F"` \u304B `vDone >= 100` \u306E\u5F62\u3067\u66F8\u304F'
+  };
+}
+function isTriggerBody(raw) {
+  const t = raw.trim();
+  if (!t.startsWith("{") || !t.endsWith("}") || t.length < 2) return false;
+  const inner = t.slice(1, -1);
+  let quote = null;
+  for (const ch of inner) {
+    if (quote) {
+      if (ch === quote) quote = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      quote = ch;
+      continue;
     }
+    if (ch === ":") return true;
   }
-  return out;
-}
-function slugify(s) {
-  return s.toLowerCase().normalize("NFKC").replace(/[^a-z0-9ぁ-んァ-ヶ一-龯\-_]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 64) || "n";
-}
-var CARDINALITY_PATTERNS = [
-  [/1:1/, "1:1"],
-  [/1:N/i, "1:N"],
-  [/N:1/i, "N:1"],
-  [/N:M/i, "N:M"],
-  [/0\.\.1/, "0..1"],
-  [/1\.\.\*/, "1..*"]
-];
-function boundedCardinalityRegExp(pattern, extraFlags = "") {
-  const base = pattern.flags.includes("i") ? "i" : "";
-  return new RegExp(`(?<![A-Za-z0-9_])(?:${pattern.source})(?![A-Za-z0-9_])`, base + extraFlags);
+  return false;
 }
-function parseCardinalityFromLabel(label) {
-  for (const [pattern, card] of CARDINALITY_PATTERNS) {
-    if (boundedCardinalityRegExp(pattern).test(label)) return card;
+function parseValueTriggerBody(body, name) {
+  const issues = [];
+  const seen = /* @__PURE__ */ new Map();
+  for (const part of splitOutsideQuotes(body)) {
+    const at = part.indexOf(":");
+    if (at < 0) {
+      issues.push({ message: `"${part}" \u306F key: value \u306E\u5F62\u3067\u306F\u3042\u308A\u307E\u305B\u3093 ("${name}")`, hint: "`trigger: ... , to: 100, dur: 2s` \u306E\u5F62\u3067\u66F8\u304F" });
+      continue;
+    }
+    const key = part.slice(0, at).trim().toLowerCase();
+    const value = part.slice(at + 1).trim();
+    if (seen.has(key)) {
+      issues.push({ message: `"${key}" \u3092 2 \u5EA6\u66F8\u3044\u3066\u3044\u307E\u3059 ("${name}")`, hint: "\u540C\u3058\u9805\u76EE\u306F 1 \u5EA6\u3060\u3051\u66F8\u304F" });
+      continue;
+    }
+    seen.set(key, value);
   }
-  return null;
+  const known = /* @__PURE__ */ new Set(["trigger", "to", "dur"]);
+  for (const key of seen.keys()) {
+    if (known.has(key)) continue;
+    issues.push({
+      message: `"${key}" \u306F values \u306B\u66F8\u3051\u307E\u305B\u3093 ("${name}")`,
+      hint: `\u66F8\u3051\u308B\u306E\u306F ${[...known].join(" / ")} \u3060\u3051`
+    });
+  }
+  const triggerRaw = seen.get("trigger");
+  let trigger = null;
+  if (triggerRaw === void 0) {
+    issues.push({ message: `trigger \u304C\u3042\u308A\u307E\u305B\u3093 ("${name}")`, hint: '`trigger: step "\u53D6\u8FBC\u307F"` \u304B `trigger: vDone >= 100` \u3092\u66F8\u304F' });
+  } else {
+    const parsed = parseTriggerExpression(triggerRaw, name);
+    if ("message" in parsed) issues.push(parsed);
+    else trigger = parsed;
+  }
+  const toRaw = seen.get("to");
+  let to = 0;
+  if (toRaw === void 0) {
+    issues.push({ message: `to \u304C\u3042\u308A\u307E\u305B\u3093 ("${name}")`, hint: "`to: 100` \u306E\u3088\u3046\u306B\u52D5\u3044\u305F\u5148\u306E\u5024\u3092\u66F8\u304F" });
+  } else {
+    to = Number(unquote(toRaw));
+    if (!Number.isFinite(to)) {
+      issues.push({ message: `to \u304C\u6570\u3067\u306F\u3042\u308A\u307E\u305B\u3093: "${toRaw}" ("${name}")`, hint: "`to: 100` \u306E\u3088\u3046\u306B\u6570\u3067\u66F8\u304F" });
+    }
+  }
+  const durRaw = seen.get("dur");
+  let durationMs = 0;
+  if (durRaw === void 0) {
+    issues.push({ message: `dur \u304C\u3042\u308A\u307E\u305B\u3093 ("${name}")`, hint: "`dur: 2s` \u306E\u3088\u3046\u306B\u52D5\u304F\u9577\u3055\u3092\u66F8\u304F" });
+  } else {
+    const parsedDur = parseDurationMs(unquote(durRaw));
+    if (parsedDur === null) {
+      issues.push({ message: `dur \u304C\u8AAD\u3081\u307E\u305B\u3093: "${durRaw}" ("${name}")`, hint: "`2s` / `1.5s` / `500ms` \u306E\u5F62\u3067\u3001 0 \u3088\u308A\u5927\u304D\u3044\u9577\u3055\u3092\u66F8\u304F" });
+    } else {
+      durationMs = parsedDur;
+    }
+  }
+  if (issues.length > 0 || trigger === null) return { spec: null, issues };
+  return { spec: { trigger, to, durationMs }, issues: [] };
 }
-var HORIZONTAL_WS = " \\t\\u3000";
-var HWS = `[${HORIZONTAL_WS}]`;
-function stripCardinality(label) {
-  let r = label;
-  let removed = false;
-  for (const [pattern] of CARDINALITY_PATTERNS) {
-    const src = pattern.source;
-    const flags = pattern.flags.includes("i") ? "gi" : "g";
-    const before = r;
-    r = r.replace(new RegExp(`\\(${HWS}*${src}${HWS}*\\)`, flags), "");
-    r = r.replace(boundedCardinalityRegExp(pattern, "g"), "");
-    if (r !== before) removed = true;
+function checkValueExpression(expression, name) {
+  const issues = [];
+  const refRe = /\{([^}]*)\}/g;
+  let m;
+  while ((m = refRe.exec(expression)) !== null) {
+    const ref = (m[1] ?? "").trim();
+    if (!VALUE_NAME_RE.test(ref)) {
+      issues.push({
+        message: `invalid reference "{${ref}}" in "${name}"`,
+        hint: "\u82F1\u5B57\u304B _ \u3067\u59CB\u3081\u3001 \u82F1\u6570\u5B57\u3068 _ \u3060\u3051\u3092\u4F7F\u3046"
+      });
+    }
   }
-  if (!removed) return label;
-  r = r.replace(new RegExp(`${HWS}{2,}`, "g"), " ").replace(new RegExp(`${HWS}*([\\r\\n])${HWS}*`, "g"), "$1").replace(new RegExp(`^${HWS}+|${HWS}+$`, "g"), "");
-  const hasVisible = /[^\p{White_Space}\p{Cf}\p{Cc}\p{Default_Ignorable_Code_Point}]/u.test(r);
-  return hasVisible ? r : label;
+  if (expression.includes("{") && !expression.includes("}")) {
+    issues.push({ message: `unclosed "{" in "${name}"`, hint: "`{\u540D\u524D}` \u306E\u5F62\u3067\u9589\u3058\u308B" });
+  }
+  const outside = expression.replace(/\{[^}]*\}/g, " ");
+  if (outside.includes("%")) {
+    issues.push({ message: `"%" \u306F\u5F0F\u306B\u66F8\u3051\u306A\u3044 ("${name}")`, hint: "\u56DB\u5247 (+ - * /) \u3060\u3051\u3092\u4F7F\u3046" });
+  }
+  if (outside.includes("?")) {
+    issues.push({
+      message: `\u6761\u4EF6\u5206\u5C90 (?:) \u306F\u5F0F\u306B\u66F8\u3051\u306A\u3044 ("${name}")`,
+      hint: "\u6BD4\u8F03\u306E\u7D50\u679C\u306F\u771F = 1 / \u507D = 0 \u306E\u6570\u306B\u306A\u308B\u306E\u3067\u3001 \u639B\u3051\u7B97\u3067\u5207\u308A\u66FF\u3048\u308B"
+    });
+  }
+  for (const fn of outside.matchAll(/[a-zA-Z_][a-zA-Z0-9_.]*/g)) {
+    const word = fn[0];
+    if (VALUE_FNS.has(word)) continue;
+    issues.push({
+      message: `"${word}" \u306F\u5F0F\u306B\u66F8\u3051\u306A\u3044 ("${name}")`,
+      hint: word.startsWith("Math.") ? "min / max \u306F Math. \u3092\u4ED8\u3051\u305A\u306B\u66F8\u304F" : `\u4F7F\u3048\u308B\u306E\u306F ${[...VALUE_FNS].join(" / ")} \u3060\u3051\u3002 \u5024\u306F {\u540D\u524D} \u3067\u8AAD\u3080`
+    });
+  }
+  const stray = outside.replace(/[a-zA-Z_][a-zA-Z0-9_.]*/g, " ").match(/[^0-9.,+\-*/()<>=!\s]/g);
+  if (stray) {
+    issues.push({
+      message: `"${[...new Set(stray)].join("")}" \u306F\u5F0F\u306B\u66F8\u3051\u306A\u3044 ("${name}")`,
+      hint: "\u56DB\u5247 (+ - * /) / \u62EC\u5F27 / \u6BD4\u8F03 (> >= < <= == !=) / min / max \u3060\u3051\u3092\u4F7F\u3046"
+    });
+  }
+  return issues;
+}
+
+// src/v05/parser.ts
+var TOP_LEVEL_KEYS = [
+  "title",
+  "type",
+  "actors",
+  "flow",
+  "states",
+  "values",
+  "animation",
+  "viewport",
+  "lanes",
+  "groups",
+  // 図全体を 1 箱にする図種で、 その箱の上に出す小見出し (#1247)
+  "eyebrow",
+  // 2 軸で仕分ける図の軸の名前 (#1251)
+  "axes"
+];
+var LANE_ID_ENTRY = /^([\p{L}\p{N}_-]+)\s*:\s*\{([^}]*)\}\s*$/u;
+function isTopLevelKey(key) {
+  return TOP_LEVEL_KEYS.includes(key);
 }
 var PRESET_TYPES = /* @__PURE__ */ new Set([
   "sequence",
@@ -2742,6 +4378,12 @@ var PRESET_TYPES = /* @__PURE__ */ new Set([
   "gantt",
   "class",
   "pie",
+  "bar",
+  "line",
+  "funnel",
+  "tree",
+  "journey",
+  "quadrant",
   "c4",
   "mind"
 ]);
@@ -2792,9 +4434,14 @@ function parseTextDslV05(src) {
   const lines = tokenize(src);
   let title = null;
   let type = null;
+  let eyebrow = null;
+  let eyebrowLine = 0;
+  let axes = void 0;
+  let axesLine = 0;
   let actors = [];
   const flow2 = [];
   let animate = void 0;
+  const values = [];
   let viewport = void 0;
   let lanesMap = void 0;
   let groupsMap = void 0;
@@ -2806,11 +4453,11 @@ function parseTextDslV05(src) {
       continue;
     }
     const head = matchTopHeader(line.trimmed);
-    if (!head) {
+    if (!head || !isTopLevelKey(head.key)) {
       errors.push({
         line: line.no,
         message: `unknown top-level key: "${line.trimmed}"`,
-        hint: "expected one of: title, type, actors, flow, states, animation, viewport, lanes, groups"
+        hint: `expected one of: ${TOP_LEVEL_KEYS.join(", ")}`
       });
       i += 1;
       continue;
@@ -2823,6 +4470,13 @@ function parseTextDslV05(src) {
       i += 1;
       continue;
     }
+    if (head.key === "eyebrow") {
+      const v = (head.value ?? "").trim();
+      eyebrow = v.length > 0 ? v : null;
+      eyebrowLine = line.no;
+      i += 1;
+      continue;
+    }
     if (head.key === "type") {
       const v = (head.value ?? "").trim().toLowerCase();
       if (!PRESET_TYPES.has(v)) {
@@ -2897,6 +4551,25 @@ function parseTextDslV05(src) {
       i = next;
       continue;
     }
+    if (head.key === "values") {
+      const inline = head.value?.trim();
+      if (inline) {
+        errors.push({
+          line: line.no,
+          message: "values \u306F 1 \u884C\u306B\u307E\u3068\u3081\u3066\u66F8\u3051\u306A\u3044",
+          hint: '\u5F0F\u306B `,` \u304C\u5165\u308B\u305F\u3081\u3002 \u6B21\u306E\u884C\u304B\u3089\u5B57\u4E0B\u3052\u3057\u3066 `waiting: "{inflow} - {done}"` \u306E\u5F62\u3067\u4E26\u3079\u308B'
+        });
+        i += 1;
+        continue;
+      }
+      const { items, next } = collectIndentedRaw(lines, i + 1, line.indent);
+      for (const it of items) {
+        const v = parseValueEntry(it.trimmed.replace(/^-\s*/, ""), it.no, errors);
+        if (v) values.push(v);
+      }
+      i = next;
+      continue;
+    }
     if (head.key === "animation") {
       const { items: stepBlocks, next } = collectAnimationSteps(lines, i + 1, line.indent);
       animate = ensureAnimate(animate, line.no);
@@ -2945,11 +4618,42 @@ function parseTextDslV05(src) {
       i = next;
       continue;
     }
+    if (head.key === "axes") {
+      if (head.value !== null && head.value.trim() !== "") {
+        errors.push({
+          line: line.no,
+          message: "axes \u306F 1 \u884C\u306B\u307E\u3068\u3081\u3066\u66F8\u3051\u306A\u3044",
+          hint: '\u6B21\u306E\u884C\u304B\u3089\u5B57\u4E0B\u3052\u3057\u3066 `x: { left: "...", right: "..." }` \u306E\u5F62\u3067\u4E26\u3079\u308B'
+        });
+        i += 1;
+        continue;
+      }
+      const { items, next } = collectIndentedRaw(lines, i + 1, line.indent);
+      axesLine = line.no;
+      const \u7D44\u307F\u7ACB\u3066 = {};
+      for (const it of items) {
+        const m = it.trimmed.match(/^(x|y)\s*:\s*\{([^}]*)\}\s*$/);
+        if (!m) {
+          errors.push({
+            line: it.no,
+            message: `invalid axes entry: "${it.trimmed}"`,
+            hint: 'use `x: { left: "...", right: "..." }` or `y: { bottom: "...", top: "..." }`'
+          });
+          continue;
+        }
+        const opts = parseInlineMapping(m[2] ?? "");
+        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 };
+      }
+      axes = \u7D44\u307F\u7ACB\u3066.x !== void 0 || \u7D44\u307F\u7ACB\u3066.y !== void 0 ? \u7D44\u307F\u7ACB\u3066 : void 0;
+      i = next;
+      continue;
+    }
     if (head.key === "lanes") {
       const { items, next } = collectIndentedList(lines, i + 1, line.indent);
       lanesMap = {};
       for (const it of items) {
-        const m = it.trimmed.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*:\s*\{([^}]*)\}\s*$/);
+        const m = it.trimmed.match(LANE_ID_ENTRY);
         if (m) {
           const id = m[1];
           const opts = parseInlineMapping(m[2]);
@@ -2977,7 +4681,7 @@ function parseTextDslV05(src) {
       const { items, next } = collectIndentedList(lines, i + 1, line.indent);
       groupsMap = {};
       for (const it of items) {
-        const m = it.trimmed.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*:\s*\{([^}]*)\}\s*$/);
+        const m = it.trimmed.match(LANE_ID_ENTRY);
         if (m) {
           const id = m[1];
           const opts = parseInlineMapping(m[2]);
@@ -3009,9 +4713,12 @@ function parseTextDslV05(src) {
     doc: {
       title,
       type,
+      ...eyebrow !== null ? { eyebrow, eyebrowPos: { line: eyebrowLine } } : {},
+      ...axes !== void 0 ? { axes, axesPos: { line: axesLine } } : {},
       actors,
       flow: flow2,
       animate,
+      ...values.length > 0 ? { values } : {},
       viewport,
       lanes: lanesMap,
       groups: groupsMap,
@@ -3276,6 +4983,7 @@ function applyContinuationLines(actor, rest, errors) {
   const state = { ...actor.stateOverride ?? {} };
   let touchedState = false;
   const scaleWritten = /* @__PURE__ */ new Map();
+  const \u56F3\u7A2E\u3054\u3068\u306E\u6B04 = /* @__PURE__ */ new Map();
   const unknownKeys = [];
   for (const ln of rest) {
     const idx = ln.trimmed.indexOf(":");
@@ -3364,6 +5072,12 @@ function applyContinuationLines(actor, rest, errors) {
         });
         break;
       }
+      case "touchpoint":
+      case "opportunity":
+      case "owner":
+      case "end":
+        \u56F3\u7A2E\u3054\u3068\u306E\u6B04.set(key, stripQuotes(raw));
+        break;
       case "lane":
         out.lane = stripQuotes(raw);
         break;
@@ -3382,6 +5096,17 @@ function applyContinuationLines(actor, rest, errors) {
     out.scale = s.scale;
     out.scaleKeys = [.../* @__PURE__ */ new Set([...actor.scaleKeys ?? [], ...s.keys])];
   }
+  for (const [key, v] of \u56F3\u7A2E\u3054\u3068\u306E\u6B04) {
+    if (out.partId !== void 0) {
+      state[key] = coerceStateValue(v);
+      touchedState = true;
+      continue;
+    }
+    if (key === "touchpoint") out.touchpoint = v;
+    else if (key === "opportunity") out.opportunity = v;
+    else if (key === "owner") out.owner = v;
+    else out.end = v;
+  }
   if (out.partId !== void 0) {
     if (touchedState) out.stateOverride = state;
     return out;
@@ -3414,7 +5139,13 @@ var ACTOR_ITEM_KEYS = /* @__PURE__ */ new Set([
   "\u500D\u7387",
   "scale",
   "lane",
-  "stack"
+  "stack",
+  // 体験の道筋の欄 (#1251)
+  "touchpoint",
+  "opportunity",
+  // 工程の並びの欄 (#1251)
+  "owner",
+  "end"
 ]);
 function validateRelativePositions(actors, errors) {
   const named = new Set(actors.map((a) => a.name));
@@ -3513,6 +5244,9 @@ var ACTOR_RESERVED_FIELDS = /* @__PURE__ */ new Set([
   "initial",
   "final",
   "state",
+  // 体験の道筋の欄 (`touchpoint` / `opportunity`) はここに載せない (#1251 Round 1 の指摘)。
+  // 載せるとパーツで同じ名前の状態を書いた時に横取りされる = 既に動いている見本が静かに変わる。
+  // パーツでない箱でだけ道筋の欄として読む (`parseActor` / `applyContinuationLines` が分岐する)
   // canvas pivot 新 spec = 絶対座標 4 field (dragon canvas pivot spec §layout-role-conversion)
   "posX",
   "posY",
@@ -3619,6 +5353,12 @@ var INLINE_ACTOR_KEYS = /* @__PURE__ */ new Set([
   "final",
   "tone",
   "nodes",
+  // 体験の道筋の欄 (#1251)。 他の図種では組み立て側が知らせる
+  "touchpoint",
+  "opportunity",
+  // 工程の並びの欄 (#1251)
+  "owner",
+  "end",
   "posX",
   "posY",
   "posW",
@@ -3628,6 +5368,15 @@ var INLINE_ACTOR_KEYS = /* @__PURE__ */ new Set([
   "scale",
   "\u500D\u7387"
 ]);
+var FLOW_INLINE_READERS = {
+  sub: (v) => v,
+  guard: (v) => v,
+  cardinality: (v) => v,
+  labelOffsetX: (v) => numberOrUndef(v),
+  labelOffsetY: (v) => numberOrUndef(v),
+  overlay: (v) => boolOrUndef(v)
+};
+var FLOW_INLINE_KEYS = Object.keys(FLOW_INLINE_READERS);
 function reportUnknownInlineKeys(isPart, inner, line, errors) {
   if (isPart) return;
   for (const field of splitInlineFields(inner)) {
@@ -3665,6 +5414,12 @@ function parseActor2(line, errors) {
       kindWritten: kindRaw !== "" && !isPart,
       subtitle: opts.subtitle,
       eyebrow: opts.eyebrow,
+      // パーツでは状態の上書きとして意味を持つため、道筋の欄として横取りしない (#1251)
+      touchpoint: isPart ? void 0 : opts.touchpoint,
+      opportunity: isPart ? void 0 : opts.opportunity,
+      // 見本では状態の上書きとして意味を持つため横取りしない (#1251)
+      owner: isPart ? void 0 : opts.owner,
+      end: isPart ? void 0 : opts.end,
       value: opts.value,
       rows: opts.rows ? opts.rows.replace(/^\[|\]$/g, "").split(/,(?![^[]*\])/).map((x) => stripQuotes(x.trim())).filter(Boolean) : void 0,
       lane: opts.lane,
@@ -3730,21 +5485,19 @@ function parseFlowStep(line, no) {
   let label = "";
   let tone;
   let style;
-  let sub;
-  let guard;
-  let cardinality;
-  let labelOffsetX;
-  let labelOffsetY;
+  const \u4E2D\u62EC\u5F27 = {};
   const mapMatch = rest.match(/\s*\{([^}]*)\}\s*$/);
   if (mapMatch) {
     const opts = parseInlineMapping(mapMatch[1]);
-    sub = opts.sub;
-    guard = opts.guard;
-    cardinality = opts.cardinality;
-    labelOffsetX = numberOrUndef(opts.labelOffsetX);
-    labelOffsetY = numberOrUndef(opts.labelOffsetY);
+    for (const k of FLOW_INLINE_KEYS) \u4E2D\u62EC\u5F27[k] = FLOW_INLINE_READERS[k](opts[k]);
     rest = rest.slice(0, mapMatch.index ?? 0).trim();
   }
+  const sub = \u4E2D\u62EC\u5F27.sub;
+  const guard = \u4E2D\u62EC\u5F27.guard;
+  const cardinality = \u4E2D\u62EC\u5F27.cardinality;
+  const labelOffsetX = \u4E2D\u62EC\u5F27.labelOffsetX;
+  const labelOffsetY = \u4E2D\u62EC\u5F27.labelOffsetY;
+  const overlay = \u4E2D\u62EC\u5F27.overlay;
   const optMatch = rest.match(/\s*\(([^)]*)\)\s*$/);
   if (optMatch) {
     const opts = (optMatch[1] ?? "").split(",").map((s) => s.trim());
@@ -3793,19 +5546,72 @@ function parseFlowStep(line, no) {
     cardinality,
     labelOffsetX,
     labelOffsetY,
+    overlay,
     pos: { line: line.no }
   };
 }
 function parseStateEntry(text, lineNo) {
-  const m = text.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*:\s*(.+)$/);
+  const m = text.match(/^([^:]+?)\s*:\s*(.+)$/);
   if (!m) return null;
-  const name = m[1] ?? "";
+  const name = (m[1] ?? "").trim();
+  if (!isValueName(name)) return null;
   const raw = (m[2] ?? "").trim();
   const stripped = stripQuotes(raw);
   const asNum = Number(stripped);
   const initial = Number.isFinite(asNum) && stripped !== "" && !isNaN(asNum) ? asNum : stripped;
   return { name, initial, pos: { line: lineNo } };
 }
+function collectIndentedRaw(lines, start, parentIndent) {
+  const items = [];
+  let i = start;
+  while (i < lines.length) {
+    const ln = lines[i];
+    if (!ln || !ln.trimmed || ln.trimmed.startsWith("#")) {
+      i += 1;
+      continue;
+    }
+    if (ln.indent <= parentIndent) break;
+    items.push(ln);
+    i += 1;
+  }
+  return { items, next: i };
+}
+function parseValueEntry(text, lineNo, errors) {
+  const m = text.match(/^([^:]+?)\s*:\s*(.+)$/);
+  if (!m) {
+    errors.push({
+      line: lineNo,
+      message: `invalid value entry: "${text}"`,
+      hint: '`waiting: "{inflow} - {done}"` \u306E\u5F62\u3067\u66F8\u304F'
+    });
+    return null;
+  }
+  const name = (m[1] ?? "").trim();
+  if (!isValueName(name)) {
+    errors.push({ line: lineNo, ...valueNameIssue(name) });
+    return null;
+  }
+  const rest = (m[2] ?? "").trim();
+  if (isTriggerBody(rest)) {
+    const { spec, issues: issues2 } = parseValueTriggerBody(rest.slice(1, -1), name);
+    if (spec === null) {
+      for (const issue of issues2) errors.push({ line: lineNo, ...issue });
+      return null;
+    }
+    return { name, trigger: spec.trigger, to: spec.to, durationMs: spec.durationMs, pos: { line: lineNo } };
+  }
+  const expression = stripQuotes(rest);
+  if (expression === "") {
+    errors.push({ line: lineNo, message: `empty expression for "${name}"`, hint: '`"{a} + {b}"` \u306E\u3088\u3046\u306B\u5F0F\u3092\u66F8\u304F' });
+    return null;
+  }
+  const issues = checkValueExpression(expression, name);
+  if (issues.length > 0) {
+    for (const issue of issues) errors.push({ line: lineNo, ...issue });
+    return null;
+  }
+  return { name, expression, pos: { line: lineNo } };
+}
 function splitTopLevelCommas(s) {
   return s.split(",").map((x) => x.trim()).filter(Boolean);
 }
@@ -3929,12 +5735,23 @@ function parseStepHead(s) {
 function parseFocusList(s) {
   let body = s.trim();
   if (body.startsWith("[") && body.endsWith("]")) body = body.slice(1, -1);
-  const parts = [];
+  const groups = [];
+  let group = [];
   let buf = "";
   let quote = null;
+  const pushFragment = (quoted) => {
+    if (buf.trim()) group.push({ text: buf, quoted });
+    buf = "";
+  };
+  const pushGroup = () => {
+    pushFragment(false);
+    if (group.length > 0) groups.push(group);
+    group = [];
+  };
   for (const ch of body) {
     if (quote) {
       if (ch === quote) {
+        pushFragment(true);
         quote = null;
         continue;
       }
@@ -3942,41 +5759,49 @@ function parseFocusList(s) {
       continue;
     }
     if (ch === '"' || ch === "'") {
-      quote = ch;
-      continue;
+      if (!buf || /\s$/.test(buf)) {
+        pushFragment(false);
+        quote = ch;
+        continue;
+      }
     }
     if (ch === ",") {
-      const t = buf.trim();
-      if (t) parts.push(t);
-      buf = "";
+      pushGroup();
       continue;
     }
     buf += ch;
   }
-  const tail = buf.trim();
-  if (tail) parts.push(tail);
+  pushFragment(quote !== null);
+  if (group.length > 0) groups.push(group);
   const out = [];
-  for (const p of parts) {
-    if (/[-→][>]?/.test(p) && /\s/.test(p)) {
-      out.push(p);
+  for (const fragments of groups) {
+    const whole = fragments.map(({ text }) => text).join("").trim();
+    if (fragments.every(({ quoted }) => !quoted) && /[-→][>]?/.test(whole) && /\s/.test(whole)) {
+      out.push(whole);
       continue;
     }
-    if (/\s/.test(p)) {
-      for (const x of p.split(/\s+/)) {
-        if (x) out.push(x);
+    for (const { text, quoted } of fragments) {
+      const p = text.trim();
+      if (!p) continue;
+      if (quoted) {
+        out.push(p);
+      } else {
+        for (const x of p.split(/\s+/)) {
+          if (x) out.push(x);
+        }
       }
-      continue;
     }
-    out.push(p);
   }
   return out;
 }
 function parseTweenLine(s, lineNo) {
   const cleaned = s.replace(/^-\s*/, "").trim();
-  const m = cleaned.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*[:\s]\s*(-?\d+(?:\.\d+)?)\s*->\s*(-?\d+(?:\.\d+)?)$/);
+  const m = cleaned.match(/^([^:\s]+)\s*[:\s]\s*(-?\d+(?:\.\d+)?)\s*->\s*(-?\d+(?:\.\d+)?)$/);
   if (!m) return null;
+  const state = m[1] ?? "";
+  if (!isValueName(state)) return null;
   return {
-    state: m[1] ?? "",
+    state,
     from: parseFloat(m[2] ?? "0"),
     to: parseFloat(m[3] ?? "0"),
     pos: { line: lineNo }
@@ -3984,13 +5809,15 @@ function parseTweenLine(s, lineNo) {
 }
 function parseSetLine(s, lineNo) {
   const cleaned = s.replace(/^-\s*/, "").trim();
-  const m = cleaned.match(/^([a-zA-Z_][a-zA-Z0-9_]*)\s*[:\s]\s*(.+)$/);
+  const m = cleaned.match(/^([^:\s]+)\s*[:\s]\s*(.+)$/);
   if (!m) return null;
+  const state = m[1] ?? "";
+  if (!isValueName(state)) return null;
   const raw = (m[2] ?? "").trim();
   const stripped = stripQuotes(raw);
   const asNum = Number(stripped);
   const value = Number.isFinite(asNum) && stripped !== "" && !isNaN(asNum) ? asNum : stripped;
-  return { state: m[1] ?? "", value, pos: { line: lineNo } };
+  return { state, value, pos: { line: lineNo } };
 }
 
 // src/notation-lint.ts
@@ -4040,7 +5867,6 @@ var KIND_TO_JA = {
   tree: "\u968E\u5C64\u30C4\u30EA\u30FC",
   userJourney: "\u30E6\u30FC\u30B6\u30FC\u30B8\u30E3\u30FC\u30CB\u30FC",
   mindMap: "\u30DE\u30A4\u30F3\u30C9\u30DE\u30C3\u30D7",
-  mindMapRadial: "\u653E\u5C04\u72B6\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",
@@ -4049,7 +5875,7 @@ var KIND_TO_JA = {
 };
 function applyTopicAutoFix(topic) {
   const kindMatch = topic.match(
-    /^\s*(chart|flow|swimlane|sequence|topology|er|stateMachine2?|infrastructure|classDiagram|tree|userJourney|mindMap(?:Radial)?|funnel|quadrant|gantt|flowchart|network|line chart|pie chart|bar chart)\b/i
+    /^\s*(chart|flow|swimlane|sequence|topology|er|stateMachine2?|infrastructure|classDiagram|tree|userJourney|mindMap|funnel|quadrant|gantt|flowchart|network|line chart|pie chart|bar chart)\b/i
   );
   if (kindMatch) {
     const kind = kindMatch[1].toLowerCase();
@@ -4135,7 +5961,7 @@ function ruleGanttUnknownDependsOn(d) {
 function ruleMindMapParentReference(d) {
   const out = [];
   for (const n of d.nodes) {
-    if ((n.kind === "mind-map" || n.kind === "mind-radial") && n.mindData) {
+    if (n.kind === "mind-map" && n.mindData) {
       const known = /* @__PURE__ */ new Set([n.mindData.rootId]);
       for (const b of n.mindData.branches) known.add(b.id);
       for (const b of n.mindData.branches) {
@@ -4211,7 +6037,10 @@ function ruleFunnelMonotonicCount(d) {
     if (n.kind === "funnel-stages" && n.funnelData) {
       const stages = n.funnelData;
       for (let i = 1; i < stages.length; i++) {
-        if (stages[i].count > stages[i - 1].count) {
+        const \u4ECA = stages[i].count;
+        const \u524D = stages[i - 1].count;
+        if (typeof \u4ECA !== "number" || typeof \u524D !== "number") continue;
+        if (\u4ECA > \u524D) {
           out.push({
             rule: "funnel-increasing-count",
             severity: "warn",
@@ -4299,7 +6128,7 @@ function matchActorHead(line) {
       indentText: indentText2,
       indent: indentText2.length,
       rawName: rawName2,
-      name: unquote(rawName2),
+      name: unquote2(rawName2),
       hasColon: true,
       rest: rest.trimEnd()
     };
@@ -4312,21 +6141,21 @@ function matchActorHead(line) {
     indentText,
     indent: indentText.length,
     rawName,
-    name: unquote(rawName),
+    name: unquote2(rawName),
     hasColon: false,
     rest: ""
   };
 }
-function unquote(raw) {
+function unquote2(raw) {
   if (!raw.startsWith('"') || !raw.endsWith('"') || raw.length < 2) return raw;
   return raw.slice(1, -1).replace(/\\(.)/g, "$1");
 }
 function upsertAtToken(rest, x, y) {
-  const kept = splitOutsideQuotes(rest).filter((t) => !/^@-?\d+(\.\d+)?\s*[,、]\s*-?\d+(\.\d+)?$/.test(t));
+  const kept = splitOutsideQuotes2(rest).filter((t) => !/^@-?\d+(\.\d+)?\s*[,、]\s*-?\d+(\.\d+)?$/.test(t));
   kept.push(`@${x},${y}`);
   return kept.join(" ");
 }
-function splitOutsideQuotes(s) {
+function splitOutsideQuotes2(s) {
   const out = [];
   let buf = "";
   let quote = null;
@@ -4453,20 +6282,7 @@ var VALID_KIND_SET = /* @__PURE__ */ new Set([
   "library",
   "interface"
 ]);
-var VALID_PRESETS = [
-  "sequence",
-  "flow",
-  "swimlane",
-  "er",
-  "state",
-  "topology",
-  "solidity",
-  "gantt",
-  "class",
-  "pie",
-  "c4",
-  "mind"
-];
+var VALID_PRESETS = [...PRESET_TYPES];
 function validateLayoutPos(v, path, errors) {
   if (v === void 0) return;
   if (!v || typeof v !== "object" || Array.isArray(v)) {
@@ -4481,15 +6297,122 @@ function validateLayoutPos(v, path, errors) {
     errors.push({ path: `${path}.y`, message: "pos.y must be a finite number" });
   }
 }
+var \u5199\u3057\u306E\u6700\u5927\u306E\u6DF1\u3055 = 64;
+var \u5199\u3057\u306E\u6700\u5927\u306E\u9805\u76EE\u6570 = 5e6;
+var \u5199\u305B\u306A\u3044 = class extends Error {
+  constructor(path, \u7406\u7531) {
+    super(`${path}: ${\u7406\u7531}`);
+    this.path = path;
+    this.\u7406\u7531 = \u7406\u7531;
+  }
+  path;
+  \u7406\u7531;
+};
+function \u7D20\u306E\u30C7\u30FC\u30BF\u306B\u5199\u3059(root) {
+  const \u5199\u3057\u6E08 = /* @__PURE__ */ new WeakMap();
+  let \u9805\u76EE\u6570 = 0;
+  let \u8AAD\u3093\u3067\u3044\u308B\u5834\u6240 = "$";
+  const \u5668\u3092\u4F5C\u308B = (v, \u6DF1\u3055, path) => {
+    \u9805\u76EE\u6570 += 1;
+    if (\u9805\u76EE\u6570 > \u5199\u3057\u306E\u6700\u5927\u306E\u9805\u76EE\u6570) {
+      throw new \u5199\u305B\u306A\u3044(path, `\u9805\u76EE\u304C\u591A\u3059\u304E\u308B (\u4E0A\u9650 ${\u5199\u3057\u306E\u6700\u5927\u306E\u9805\u76EE\u6570})`);
+    }
+    if (v === null || typeof v !== "object") return { \u5024: v, \u67A0: null };
+    const \u65E2\u306B\u3042\u308B = \u5199\u3057\u6E08.get(v);
+    if (\u65E2\u306B\u3042\u308B !== void 0) return { \u5024: \u65E2\u306B\u3042\u308B, \u67A0: null };
+    if (\u6DF1\u3055 >= \u5199\u3057\u306E\u6700\u5927\u306E\u6DF1\u3055) {
+      throw new \u5199\u305B\u306A\u3044(path, `\u5165\u308C\u5B50\u304C\u6DF1\u3059\u304E\u308B (\u4E0A\u9650 ${\u5199\u3057\u306E\u6700\u5927\u306E\u6DF1\u3055})`);
+    }
+    \u8AAD\u3093\u3067\u3044\u308B\u5834\u6240 = path;
+    const \u4E26\u3073\u304B = Array.isArray(v);
+    const \u5668 = \u4E26\u3073\u304B ? [] : {};
+    \u5199\u3057\u6E08.set(v, \u5668);
+    if (\u4E26\u3073\u304B) {
+      const \u751F\u306E\u9577\u3055 = +v.length;
+      const \u9577\u3055 = Number.isNaN(\u751F\u306E\u9577\u3055) ? 0 : Math.min(Math.max(Math.trunc(\u751F\u306E\u9577\u3055), 0), Number.MAX_SAFE_INTEGER);
+      \u9805\u76EE\u6570 += \u9577\u3055;
+      if (\u9805\u76EE\u6570 > \u5199\u3057\u306E\u6700\u5927\u306E\u9805\u76EE\u6570) {
+        throw new \u5199\u305B\u306A\u3044(path, `\u9805\u76EE\u304C\u591A\u3059\u304E\u308B (\u4E0A\u9650 ${\u5199\u3057\u306E\u6700\u5927\u306E\u9805\u76EE\u6570})`);
+      }
+      return { \u5024: \u5668, \u67A0: { \u5143: v, \u5668, \u540D\u524D\u306E\u4E26\u3073: null, \u9577\u3055, \u6B21: 0, \u6DF1\u3055, path } };
+    }
+    const \u540D\u524D\u306E\u4E26\u3073 = Object.keys(v);
+    \u9805\u76EE\u6570 += \u540D\u524D\u306E\u4E26\u3073.length;
+    if (\u9805\u76EE\u6570 > \u5199\u3057\u306E\u6700\u5927\u306E\u9805\u76EE\u6570) {
+      throw new \u5199\u305B\u306A\u3044(path, `\u9805\u76EE\u304C\u591A\u3059\u304E\u308B (\u4E0A\u9650 ${\u5199\u3057\u306E\u6700\u5927\u306E\u9805\u76EE\u6570})`);
+    }
+    return { \u5024: \u5668, \u67A0: { \u5143: v, \u5668, \u540D\u524D\u306E\u4E26\u3073, \u9577\u3055: \u540D\u524D\u306E\u4E26\u3073.length, \u6B21: 0, \u6DF1\u3055, path } };
+  };
+  try {
+    const \u5148\u982D = \u5668\u3092\u4F5C\u308B(root, 0, "$");
+    const \u7A4D\u307F = \u5148\u982D.\u67A0 ? [\u5148\u982D.\u67A0] : [];
+    while (\u7A4D\u307F.length > 0) {
+      const \u4ECA = \u7A4D\u307F[\u7A4D\u307F.length - 1];
+      if (\u4ECA.\u6B21 >= \u4ECA.\u9577\u3055) {
+        \u7A4D\u307F.pop();
+        continue;
+      }
+      const key = \u4ECA.\u540D\u524D\u306E\u4E26\u3073 === null ? String(\u4ECA.\u6B21) : \u4ECA.\u540D\u524D\u306E\u4E26\u3073[\u4ECA.\u6B21];
+      \u4ECA.\u6B21 += 1;
+      const \u5B50\u306Epath = \u4ECA.\u540D\u524D\u306E\u4E26\u3073 === null ? `${\u4ECA.path}[${key}]` : `${\u4ECA.path}.${key}`;
+      \u8AAD\u3093\u3067\u3044\u308B\u5834\u6240 = \u5B50\u306Epath;
+      const \u751F\u306E\u5024 = \u4ECA.\u5143[key];
+      const \u5B50 = \u5668\u3092\u4F5C\u308B(\u751F\u306E\u5024, \u4ECA.\u6DF1\u3055 + 1, \u5B50\u306Epath);
+      if (Array.isArray(\u4ECA.\u5668)) \u4ECA.\u5668.push(\u5B50.\u5024);
+      else {
+        Object.defineProperty(\u4ECA.\u5668, key, {
+          value: \u5B50.\u5024,
+          enumerable: true,
+          writable: true,
+          configurable: true
+        });
+      }
+      if (\u5B50.\u67A0) \u7A4D\u307F.push(\u5B50.\u67A0);
+    }
+    return { ok: true, value: \u5148\u982D.\u5024 };
+  } catch (e) {
+    if (e instanceof \u5199\u305B\u306A\u3044) {
+      return { ok: false, error: { path: e.path, message: e.\u7406\u7531 } };
+    }
+    return {
+      ok: false,
+      error: {
+        path: \u8AAD\u3093\u3067\u3044\u308B\u5834\u6240,
+        message: "\u5165\u529B\u3092\u8AAD\u307F\u53D6\u308C\u306A\u3044",
+        hint: e instanceof Error ? e.message : String(e)
+      }
+    };
+  }
+}
 function validateJson(json) {
   const errors = [];
-  if (!json || typeof json !== "object" || Array.isArray(json)) {
+  let root\u304Cobject\u304B;
+  try {
+    root\u304Cobject\u304B = !!json && typeof json === "object" && !Array.isArray(json);
+  } catch (e) {
+    return {
+      ok: false,
+      errors: [
+        {
+          path: "$",
+          message: "\u5165\u529B\u3092\u8AAD\u307F\u53D6\u308C\u306A\u3044",
+          hint: e instanceof Error ? e.message : String(e)
+        }
+      ]
+    };
+  }
+  if (!root\u304Cobject\u304B) {
     return { ok: false, errors: [{ path: "$", message: "root must be a JSON object" }] };
   }
-  const j = json;
+  const \u5199\u3057 = \u7D20\u306E\u30C7\u30FC\u30BF\u306B\u5199\u3059(json);
+  if (!\u5199\u3057.ok) return { ok: false, errors: [\u5199\u3057.error] };
+  const j = \u5199\u3057.value;
   if (typeof j.title !== "string" || j.title.length === 0) {
     errors.push({ path: "$.title", message: "title must be a non-empty string" });
   }
+  if (j.eyebrow !== void 0 && typeof j.eyebrow !== "string") {
+    errors.push({ path: "$.eyebrow", message: "eyebrow must be a string if present" });
+  }
   if (j.layout !== void 0 && j.layout !== "auto" && j.layout !== "manual") {
     errors.push({ path: "$.layout", message: 'layout must be "auto" or "manual" if present' });
   }
@@ -4569,12 +6492,109 @@ function validateJson(json) {
         if (typeof po.step !== "string" || po.step.length === 0) {
           errors.push({ path: `$.animation[${i}].step`, message: "phase.step must be a non-empty string" });
         }
+        validatePhaseMotion(po, i, errors);
       });
     }
   }
+  validateStates(j.states, errors);
+  validateValues(j.values, errors);
   if (errors.length > 0) return { ok: false, errors };
   return { ok: true, data: j };
 }
+function validatePhaseMotion(po, i, errors) {
+  if (po.tween !== void 0) {
+    if (!po.tween || typeof po.tween !== "object" || Array.isArray(po.tween)) {
+      errors.push({
+        path: `$.animation[${i}].tween`,
+        message: "tween must be a plain object of state -> [from, to]"
+      });
+    } else {
+      for (const [name, range] of Object.entries(po.tween)) {
+        const path = `$.animation[${i}].tween.${name}`;
+        if (!isValueName(name)) errors.push({ path, ...valueNameIssue(name) });
+        if (!Array.isArray(range) || range.length !== 2) {
+          errors.push({ path, message: "tween value must be [from, to]" });
+          continue;
+        }
+        for (const v of range) {
+          if (typeof v !== "number" || !Number.isFinite(v)) {
+            errors.push({ path, message: "tween value must be finite numbers", hint: `got ${typeof v}` });
+            break;
+          }
+        }
+      }
+    }
+  }
+  if (po.set !== void 0) {
+    if (!po.set || typeof po.set !== "object" || Array.isArray(po.set)) {
+      errors.push({
+        path: `$.animation[${i}].set`,
+        message: "set must be a plain object of state -> value"
+      });
+    } else {
+      for (const [name, value] of Object.entries(po.set)) {
+        const path = `$.animation[${i}].set.${name}`;
+        if (!isValueName(name)) errors.push({ path, ...valueNameIssue(name) });
+        const t = typeof value;
+        if (t !== "number" && t !== "string") {
+          errors.push({ path, message: "set value must be a number or string", hint: `got ${t}` });
+        } else if (t === "number" && !Number.isFinite(value)) {
+          errors.push({ path, message: "set value must be a finite number" });
+        }
+      }
+    }
+  }
+}
+function validateStates(v, errors) {
+  if (v === void 0) return;
+  if (!v || typeof v !== "object" || Array.isArray(v)) {
+    errors.push({ path: "$.states", message: "states must be a plain object of name -> initial value" });
+    return;
+  }
+  for (const [name, initial] of Object.entries(v)) {
+    if (!isValueName(name)) {
+      errors.push({ path: `$.states.${name}`, ...valueNameIssue(name) });
+    }
+    const t = typeof initial;
+    if (t !== "number" && t !== "string") {
+      errors.push({
+        path: `$.states.${name}`,
+        message: "state initial must be a number or string",
+        hint: `got ${t}`
+      });
+    } else if (t === "number" && !Number.isFinite(initial)) {
+      errors.push({ path: `$.states.${name}`, message: "state initial must be a finite number" });
+    }
+  }
+}
+function validateValues(v, errors) {
+  if (v === void 0) return;
+  if (!v || typeof v !== "object" || Array.isArray(v)) {
+    errors.push({ path: "$.values", message: "values must be a plain object of name -> expression" });
+    return;
+  }
+  for (const [name, expression] of Object.entries(v)) {
+    if (!isValueName(name)) {
+      errors.push({ path: `$.values.${name}`, ...valueNameIssue(name) });
+    }
+    if (typeof expression !== "string" || expression.trim() === "") {
+      errors.push({
+        path: `$.values.${name}`,
+        message: "value expression must be a non-empty string",
+        hint: '`"{inflow} - {done}"` \u306E\u5F62\u3067\u66F8\u304F'
+      });
+      continue;
+    }
+    for (const issue of checkValueExpression(expression, name)) {
+      errors.push({ path: `$.values.${name}`, ...issue });
+    }
+  }
+}
+function \u6574\u3048\u305F\u5C0F\u898B\u51FA\u3057(v) {
+  if (v === void 0) return void 0;
+  const t = v.trim();
+  return t.length > 0 ? t : void 0;
+}
 function jsonToDoc(json) {
   const p0 = { line: 0 };
   const actors = json.actors.map((a) => {
@@ -4616,28 +6636,44 @@ function jsonToDoc(json) {
     cardinality: s.cardinality,
     labelOffsetX: s.labelOffsetX,
     labelOffsetY: s.labelOffsetY,
+    overlay: s.overlay,
     // CAR-1693 Phase 1: DSL 表面 pos → 内部 AST layoutPos
     layoutPos: s.pos,
     pos: p0
   }));
-  let animate;
-  if (json.animation && json.animation.length > 0) {
-    const phases = json.animation.map((p) => ({
-      name: p.step,
-      durationMs: Math.round((p.duration ?? 1.4) * 1e3),
-      highlight: p.focus,
-      body: p.body,
-      badge: p.badge,
-      pos: p0
-    }));
-    animate = { states: [], phases, pos: p0 };
-  }
+  const states = Object.entries(json.states ?? {}).map(([name, initial]) => ({
+    name,
+    initial,
+    pos: p0
+  }));
+  const phases = (json.animation ?? []).map((p) => ({
+    name: p.step,
+    durationMs: Math.round((p.duration ?? 1.4) * 1e3),
+    highlight: p.focus,
+    body: p.body,
+    badge: p.badge,
+    // 段の中で動かす分 (#1186)。 記法側の `tweens` / `sets` と同じ形に写す。
+    // 空の配列を置かないのは、記法側が「無ければ field ごと持たない」 形だから
+    ...p.tween && Object.keys(p.tween).length > 0 ? {
+      tweens: Object.entries(p.tween).map(([state, [from, to]]) => ({ state, from, to, pos: p0 }))
+    } : {},
+    ...p.set && Object.keys(p.set).length > 0 ? { sets: Object.entries(p.set).map(([state, value]) => ({ state, value, pos: p0 })) } : {},
+    pos: p0
+  }));
+  const animate = states.length > 0 || phases.length > 0 ? { states, phases, pos: p0 } : void 0;
   return {
     title: json.title,
     type: json.type,
+    // 前後の空白を落としてから見る。 記法側 (`v05/parser.ts`) が `trim()` してから
+    // 空かどうかを判定するため、 揃えないと **空白だけの値で入口ごとに図が変わる**
+    // (記法は書かなかった扱い、 JSON は中身のない帯を描く。 Round 2 の指摘で実測)
+    ...\u6574\u3048\u305F\u5C0F\u898B\u51FA\u3057(json.eyebrow) !== void 0 ? { eyebrow: \u6574\u3048\u305F\u5C0F\u898B\u51FA\u3057(json.eyebrow), eyebrowPos: p0 } : {},
     actors,
     flow: flow2,
     animate,
+    // 他の値から決まる値 (#1181)。 書いた順に並べる = 解く順は参照から決まるので順序に
+    // 意味は無いが、知らせの並びが書いた順になる
+    values: json.values ? Object.entries(json.values).map(([name, expression]) => ({ name, expression, pos: p0 })) : void 0,
     viewport: json.viewport ? { ...json.viewport, pos: p0 } : void 0,
     lanes: json.lanes ? Object.fromEntries(
       Object.entries(json.lanes).map(([id, l]) => {
@@ -4684,8 +6720,12 @@ var diagram_default = {
     },
     type: {
       type: "string",
-      enum: ["sequence", "flow", "swimlane", "er", "state", "topology", "solidity", "gantt", "class", "pie", "c4", "mind"],
-      description: "preset type = \u56F3\u306E\u7A2E\u985E\u3002 sequence (\u6642\u7CFB\u5217 API \u547C\u3073\u51FA\u3057) / flow (\u51E6\u7406 flow) / swimlane (\u8CAC\u52D9\u5206\u62C5 flow) / er (DB schema) / state (\u72B6\u614B\u9077\u79FB) / topology (network) / solidity (contract) / gantt (schedule) / class (UML class) / pie (\u5186\u30B0\u30E9\u30D5) / c4 (architecture) / mind (mind map)"
+      enum: ["sequence", "flow", "swimlane", "er", "state", "topology", "solidity", "gantt", "class", "pie", "bar", "line", "funnel", "tree", "journey", "quadrant", "c4", "mind"],
+      description: '\u56F3\u306E\u7A2E\u985E\u3002 \u578B\u3054\u3068\u306B actors \u306E\u66F8\u304D\u65B9\u304C\u9055\u3046\u3002 [\u95A2\u4FC2\u3092\u63CF\u304F] sequence (\u6642\u7CFB\u5217\u306E\u547C\u3073\u51FA\u3057) / flow (\u51E6\u7406\u306E\u6D41\u308C) / swimlane (\u8CAC\u52D9\u3054\u3068\u306E\u6D41\u308C) / er (DB \u306E schema) / state (\u72B6\u614B\u306E\u9077\u79FB) / topology (network) / solidity (contract) / class (UML \u306E class) / c4 (architecture) / mind (\u767A\u60F3\u306E\u679D\u5206\u304B\u308C) \u306F actors \u306B\u540D\u524D\u3092\u4E26\u3079 flow \u306B\u77E2\u5370\u3092\u66F8\u304F\u3002 [\u5024\u3092\u63CF\u304F] pie (\u5272\u5408) / bar (\u68D2\u306E\u9AD8\u3055) / line (\u7DDA\u306E\u9AD8\u3055\u3001 \u66F8\u3044\u305F\u9806\u306B\u4E26\u3076) \u306F actors \u306B `- \u540D\u524D: "45"` \u306E\u5F62\u3067\u6570\u3092\u66F8\u304F\u3002 funnel (\u6BB5\u3054\u3068\u306B\u6E1B\u308B\u6570) \u3082\u540C\u3058\u5F62\u3002 [\u8A9E\u3092\u63CF\u304F] journey (\u4F53\u9A13\u306E\u8D77\u4F0F) \u306F `- \u767B\u9332: "\u4E0D\u6E80"` \u306E\u5F62\u3067 \u6700\u9AD8 / \u6E80\u8DB3 / \u666E\u901A / \u4E0D\u6E80 / \u6012\u308A \u306E\u3069\u308C\u304B\u3092\u66F8\u304F\u3002 quadrant (2 \u8EF8\u306E\u4ED5\u5206\u3051) \u306F `- \u91CD\u8907\u524A\u9664: "\u5DE6\u4E0A"` \u306E\u5F62\u3067 \u5DE6\u4E0A / \u53F3\u4E0A / \u5DE6\u4E0B / \u53F3\u4E0B \u306E\u3069\u308C\u304B\u3092\u66F8\u304F\u3002 [\u6642\u671F\u3092\u63CF\u304F] gantt (\u5DE5\u7A0B\u306E\u4E26\u3073) \u306F `- \u8A2D\u8A08: "1\u6708"` \u306E\u5F62\u3067\u59CB\u307E\u308A\u306E\u6642\u671F\u3092\u66F8\u304D\u3001 flow \u306E\u77E2\u5370\u3067\u524D\u5F8C\u95A2\u4FC2\u3092\u66F8\u304F\u3002 [\u89AA\u5B50\u3092\u63CF\u304F] tree (\u89AA\u5B50\u306E\u5165\u308C\u5B50) \u306F actors \u306B\u540D\u524D\u3092\u4E26\u3079 flow \u306E\u77E2\u5370\u3067\u89AA\u5B50\u3092\u66F8\u304F (\u77E2\u5370\u306E\u5148\u304C\u5B50)'
+    },
+    eyebrow: {
+      type: "string",
+      description: "\u56F3\u8868\u306E\u7BB1\u306E\u4E0A\u306B\u51FA\u3059\u5C0F\u898B\u51FA\u3057 (\u7701\u7565\u53EF)\u3002 \u52B9\u304F\u306E\u306F\u56F3\u5168\u4F53\u3092 1 \u7BB1\u306B\u3059\u308B\u578B (pie / bar / line / funnel / tree / journey / quadrant / mind / gantt) \u3060\u3051\u3002 \u7BB1\u3054\u3068\u306B\u5206\u304B\u308C\u308B\u578B\u3067\u306F\u76F8\u624B\u304C\u6C7A\u307E\u3089\u306A\u3044\u305F\u3081\u3001 actors[].eyebrow \u306B\u66F8\u304F"
     },
     actors: {
       type: "array",
@@ -4737,13 +6777,39 @@ var diagram_default = {
           guard: { type: "string", description: "state \u9077\u79FB\u306E\u6761\u4EF6 (kind: state \u7528)" },
           cardinality: { type: "string", description: "ER \u306E\u591A\u91CD\u5EA6 (1..N \u7B49\u3001 kind: er \u7528)" },
           labelOffsetX: { type: "number", description: "\u30E9\u30D9\u30EB\u4F4D\u7F6E x \u8ABF\u6574" },
-          labelOffsetY: { type: "number", description: "\u30E9\u30D9\u30EB\u4F4D\u7F6E y \u8ABF\u6574" }
+          labelOffsetY: { type: "number", description: "\u30E9\u30D9\u30EB\u4F4D\u7F6E y \u8ABF\u6574" },
+          overlay: { 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)" }
         }
       }
     },
+    states: {
+      type: "object",
+      description: "\u72B6\u614B\u306E\u521D\u671F\u5024\u3002 \u540D\u524D -> \u521D\u671F\u5024 \u306E object\u3002 optional\u3002 \u7BB1\u306E\u6587\u5B57\u306B `{\u540D\u524D}` \u3092\u7F6E\u304F\u3068\u3001 \u3053\u3053\u306B\u66F8\u3044\u305F\u5024\u304C\u63CF\u753B\u6642\u306B\u7F6E\u304D\u63DB\u308F\u308B\u3002 \u6BB5\u3067\u52D5\u304B\u3059\u306B\u306F animation[].tween / animation[].set \u3092\u4F7F\u3046\u3002",
+      additionalProperties: false,
+      patternProperties: {
+        "^[a-zA-Z_][a-zA-Z0-9_]*$": {
+          type: ["number", "string"],
+          description: "\u521D\u671F\u5024\u3002 \u6570\u304B\u6587\u5B57\u5217\u3002 \u540D\u524D\u306F\u82F1\u5B57\u304B _ \u3067\u59CB\u3081\u3001 \u82F1\u6570\u5B57\u3068 _ \u3060\u3051\u3092\u4F7F\u3046"
+        }
+      },
+      examples: [{ inflow: 0, done: 0 }]
+    },
+    values: {
+      type: "object",
+      description: "\u4ED6\u306E\u5024\u304B\u3089\u81EA\u52D5\u3067\u6C7A\u307E\u308B\u5024\u3002 \u540D\u524D -> \u5F0F \u306E object\u3002 optional\u3002 \u5F0F\u306B\u306F\u56DB\u5247 (+ - * /) \u3068\u62EC\u5F27\u3001 \u6BD4\u8F03 (> >= < <= == !=)\u3001 min / max \u304C\u66F8\u3051\u308B\u3002 \u4ED6\u306E\u5024\u306F {\u540D\u524D} \u3067\u8AAD\u3080\u3002 \u89E3\u304F\u306E\u306F\u63CF\u753B\u5074\u3067\u3001 \u53C2\u7167\u3057\u305F\u5024\u304C\u52D5\u3051\u3070\u8FFD\u968F\u3059\u308B\u3002",
+      additionalProperties: false,
+      patternProperties: {
+        "^[a-zA-Z_][a-zA-Z0-9_]*$": {
+          type: "string",
+          minLength: 1,
+          description: "\u5F0F\u3002 \u4F8B `{inflow} - {done}`"
+        }
+      },
+      examples: [{ waiting: "{inflow} - {done}", busy: "{waiting} > 80" }]
+    },
     animation: {
       type: "array",
-      description: "\u30A2\u30CB\u30E1\u30FC\u30B7\u30E7\u30F3 phase \u914D\u5217\u3002 \u5404 phase \u3067 focus \u5BFE\u8C61\u3092 highlight \u3059\u308B\u3002 optional\u3002",
+      description: "\u30A2\u30CB\u30E1\u30FC\u30B7\u30E7\u30F3 phase \u914D\u5217\u3002 \u5404 phase \u3067 focus \u5BFE\u8C61\u3092 highlight \u3057\u3001 tween / set \u3067 states \u306E\u5024\u3092\u52D5\u304B\u3059\u3002 optional\u3002",
       items: {
         type: "object",
         required: ["step"],
@@ -4753,7 +6819,28 @@ var diagram_default = {
           duration: { type: "number", minimum: 0.1, description: "phase \u6642\u9593 (\u79D2\u3001 default 1.4)" },
           focus: { type: "array", items: { type: "string" }, description: "\u3053\u306E phase \u3067 active \u5316\u3059\u308B actor \u540D or edge 'A -> B' \u306E\u914D\u5217" },
           body: { type: "string", description: "phase \u8AAC\u660E\u6587" },
-          badge: { type: "string", description: "phase \u4E2D\u306B\u8868\u793A\u3059\u308B badge label" }
+          badge: { type: "string", description: "phase \u4E2D\u306B\u8868\u793A\u3059\u308B badge label" },
+          tween: {
+            type: "object",
+            description: "\u3053\u306E phase \u3067\u88DC\u9593\u3059\u308B\u72B6\u614B\u3002 \u72B6\u614B\u540D -> [\u958B\u59CB\u5024, \u7D42\u4E86\u5024]\u3002 \u540D\u524D\u306F\u82F1\u5B57\u304B _ \u3067\u59CB\u3081\u3001 \u82F1\u6570\u5B57\u3068 _ \u3060\u3051\u3092\u4F7F\u3046",
+            additionalProperties: false,
+            patternProperties: {
+              "^[a-zA-Z_][a-zA-Z0-9_]*$": {
+                type: "array",
+                items: { type: "number" },
+                minItems: 2,
+                maxItems: 2
+              }
+            }
+          },
+          set: {
+            type: "object",
+            description: "\u3053\u306E phase \u306E\u5207\u66FF\u3067\u5DEE\u3057\u66FF\u3048\u308B\u72B6\u614B\u3002 \u72B6\u614B\u540D -> \u5024\u3002 \u540D\u524D\u306F\u82F1\u5B57\u304B _ \u3067\u59CB\u3081\u3001 \u82F1\u6570\u5B57\u3068 _ \u3060\u3051\u3092\u4F7F\u3046",
+            additionalProperties: false,
+            patternProperties: {
+              "^[a-zA-Z_][a-zA-Z0-9_]*$": { type: ["number", "string"] }
+            }
+          }
         }
       }
     },
@@ -4876,6 +6963,7 @@ exports.NODE_KIND_VALID = NODE_KIND_VALID;
 exports.PRESET_TYPES = PRESET_TYPES;
 exports.RELATIVE_GAP_DEFAULT = RELATIVE_GAP_DEFAULT;
 exports.TONE_ALIAS = TONE_ALIAS;
+exports.TOP_LEVEL_KEYS = TOP_LEVEL_KEYS;
 exports.autoFix = autoFix;
 exports.compileToCdl = compileToCdl;
 exports.computeDiagramBoundingBox = computeDiagramBoundingBox;