@shibayama/pdgkit 0.1.0 → 0.1.2

package/dist/index.d.cts

@@ -1,21 +1,16 @@
 import { Lang, DiagramKind, Diagnostic } from './core.cjs';
 export { Bilingual, Box, Containment, Doc, Edge, EdgeOp, LabelPlacement, LaidOut, LaidOutEdge, LaidOutNode, Node, OP_TABLE, PATTERN_LABEL, PATTERN_SOURCE, PatternId, RenderOptions, SAMPLES, SAMPLE_ORDER, SampleId, Shape, chooseLabelPlacement, estimateTextWidth, layout, parse, refsToCsv, refsToMarkdown, render, splitBilingual, stripComment } from './core.cjs';
 
-/**
- * Minimal, zero-dependency SVG DOM shim. Implements the few element operations the
- * renderer needs (createElementNS, setAttribute, appendChild, textContent) and
- * serializes the tree to XML. `withShimDocument()` scopes the shim around a render
- * call, so rendering also works in a real browser without altering the page's document.
- */
-/** A serializable SVG node. The shape `render()` actually produces and consumes. */
+/** Minimal, zero-dependency SVG DOM shim: the element operations render() needs, plus XML serialization. */
+/** A serializable SVG node. */
 interface SvgNode {
     readonly nodeType: 'element';
     tagName: string;
     namespaceURI: string;
-    /** Attribute names in insertion order, mapped to string values. */
+    /** Attributes, in insertion order. */
     attrs: Map<string, string>;
     children: SvgNode[];
-    /** Text content, or null when the element holds child elements instead. */
+    /** Text content, or null when the node has element children. */
     text: string | null;
     setAttribute(name: string, value: string): void;
     getAttribute(name: string): string | null;
@@ -24,24 +19,12 @@ interface SvgNode {
     set textContent(value: string);
     get textContent(): string;
 }
-/**
- * Install the shim as `globalThis.document`, idempotently, but only when no DOM
- * with `createElementNS` is already present. In a real browser this is a no-op,
- * so the same code path serves both environments.
- */
+/** Install the shim as `globalThis.document`, unless a real DOM is already present. Idempotent. */
 declare function installDomShim(): void;
-/**
- * Serialize a shim element tree to an XML string. Produces self-closing tags for
- * empty elements and correctly escapes attribute values and text content.
- */
+/** Serialize a shim element tree to an XML string (self-closing empty tags, escaped values). */
 declare function serializeSvg(node: SvgNode): string;
 
-/**
- * Compute the tight content bounding box of a rendered SVG tree analytically
- * (without `getBBox`), by walking the element tree and measuring each primitive;
- * text width reuses {@link estimateTextWidth}. Used to crop exports to the drawn
- * extent. Also provides raster and display dimension helpers.
- */
+/** Tight content bounding box of a rendered SVG tree, computed analytically (no `getBBox`), reusing {@link estimateTextWidth} for text. Also provides raster/display dimension helpers. */
 
 interface ViewBox {
     minX: number;
@@ -49,26 +32,16 @@ interface ViewBox {
     width: number;
     height: number;
 }
-/**
- * Compute the tight content bounding box of a rendered SVG tree, padded by `bleed`
- * (default 3 units).
- */
+/** Tight content bounding box of a rendered SVG tree, padded by `bleed` (default 3 units). */
 declare function computeContentBox(root: SvgNode, bleed?: number): ViewBox;
-/**
- * Display dimensions for a viewBox so the long side is at least `targetSide` px
- * (browser default: 1600). Mirrors `svgDisplayDimensionsForViewBox()`.
- */
+/** Display dimensions for a viewBox so the long side is at least `targetSide` px (default 1600). */
 declare function svgDisplayDimensions(viewBox: Pick<ViewBox, 'width' | 'height'>, targetSide?: number): {
     width: number;
     height: number;
     scale: number;
 };
 
-/**
- * Headless SVG rendering: `.pdg` source -> standalone SVG string.
- * Crops to the real drawn extent (bleed 3) and sizes the document so the long side
- * is at least `targetSide` px (default 1600).
- */
+/** Headless SVG rendering: `.pdg` source → standalone SVG string. */
 
 interface RenderToSvgOptions {
     /** Display language: 'ja' (default), 'en', or 'both' (bilingual two-line labels). */
@@ -100,16 +73,10 @@ interface RenderToSvgResult {
 declare function renderToSvg(source: string, opts?: RenderToSvgOptions): RenderToSvgResult;
 
 /**
- * Validation for AI authoring. Runs the core parser and adds a kind assertion and
- * friendly lints, returning all diagnostics.
- *
- *   - Kind assertion: an optional `#! kind: block|flow|state|seq` directive (written
- *     in a comment) is checked against the kind inferred from structure; a mismatch
- *     is reported as an error. Guards against producing the wrong diagram type.
- *   - Lints: clearer hints for chained connections (`A -> B -> C`) and operators
- *     without surrounding spaces (`11-12`).
- *
- * Run on AI-generated `.pdg` and feed the diagnostics back until there are no errors.
+ * Validation for AI authoring: runs the core parser, checks the optional
+ * `#! kind: block|flow|state|seq` directive against the kind inferred from
+ * structure (mismatch = error), and adds lints for chained connections and
+ * unspaced operators. Feed the diagnostics back to the author until no errors remain.
  */
 
 interface ValidateResult {
@@ -135,11 +102,7 @@ interface ValidateResult {
  */
 declare function validate(source: string): ValidateResult;
 
-/**
- * Raster output (PNG / JPEG) via `@resvg/resvg-js`, with the bundled IPAex Gothic
- * font embedded and a white background. Default scale is 8x the content box (capped
- * to 24000 px/side and 1e8 px total). Native dependencies are imported lazily.
- */
+/** Raster output (PNG / JPEG) via `@resvg/resvg-js` with the bundled IPAex Gothic font and a white background. Native dependencies are imported lazily. */
 
 interface RasterOptions {
     lang?: Lang;
@@ -153,12 +116,7 @@ declare function renderToPng(source: string, opts?: RasterOptions): Promise<Uint
 /** Render `.pdg` source to a JPEG (8× by default, white background). */
 declare function renderToJpeg(source: string, opts?: RasterOptions): Promise<Uint8Array>;
 
-/**
- * PDF output (A4, IPAex font embedded). Vector by default (jsPDF + svg2pdf.js under
- * jsdom, with analytic getBBox / getComputedTextLength shims), falling back to a
- * high-resolution raster PDF if the vector path fails. The figure is centered with
- * a 10 mm margin and the page orientation follows its aspect ratio.
- */
+/** PDF output (A4, IPAex font embedded). Vector by default (jsPDF + svg2pdf.js under jsdom, with analytic getBBox/getComputedTextLength shims), falling back to a high-resolution raster PDF if the vector path fails. */
 
 interface PdfOptions {
     lang?: Lang;
@@ -172,14 +130,7 @@ interface PdfOptions {
 /** Render `.pdg` source to a PDF (A4, IPAex font, vector preferred). */
 declare function renderToPdf(source: string, opts?: PdfOptions): Promise<Uint8Array>;
 
-/**
- * PPTX output: `.pdg` → PowerPoint presentation (one 16:9 slide).
- *
- *   - image mode (default): the figure is rasterized (resvg) and placed as a
- *     centered picture — highest visual fidelity.
- *   - editable mode (`editable: true`): every SVG primitive is converted to an
- *     editable PowerPoint shape / connector / text box, for later tweaking.
- */
+/** PPTX output: `.pdg` → PowerPoint (one 16:9 slide). Image mode (default) places a rasterized picture; editable mode converts each SVG primitive to an editable PowerPoint shape, connector, or text box. */
 
 interface PptxOptions {
     lang?: Lang;
@@ -193,22 +144,13 @@ interface PptxOptions {
 /** Render `.pdg` source to a PPTX (image by default, or editable shapes). */
 declare function renderToPptx(source: string, opts?: PptxOptions): Promise<Uint8Array>;
 
-/**
- * pdgkit Node API — the browser-free rendering surface a host tool calls.
- *
- * Implemented: SVG, PNG, JPEG, PDF, PPTX (image + editable), validation, and the
- * reference-sign table exporters. All run with no browser.
- */
+/** pdgkit Node API — the browser-free rendering surface a host tool calls. */
 
 /** The pdgkit package version. Keep in sync with package.json. */
-declare const VERSION = "0.1.0";
+declare const VERSION = "0.1.2";
 /** Convenience: render to SVG and return just the string. */
 declare function toSvgString(source: string, lang?: Lang): string;
-/**
- * Read the bundled AI authoring guide (docs/ai-authoring-guide.md) as a string.
- * Inject this into an LLM's system prompt so it can write valid `.pdg`, instead of
- * pasting the guide by hand.
- */
+/** Read the bundled AI authoring guide (docs/ai-authoring-guide.md) as a string, for injecting into an LLM's system prompt. */
 declare function loadAuthoringGuide(): string;
 
 export { Diagnostic, DiagramKind, Lang, type PdfOptions, type PptxOptions, type RasterOptions, type RenderToSvgOptions, type RenderToSvgResult, type SvgNode, VERSION, type ValidateResult, type ViewBox, computeContentBox, installDomShim, loadAuthoringGuide, renderToJpeg, renderToPdf, renderToPng, renderToPptx, renderToSvg, serializeSvg, svgDisplayDimensions, toSvgString, validate };

package/dist/index.d.ts

@@ -1,21 +1,16 @@
 import { Lang, DiagramKind, Diagnostic } from './core.js';
 export { Bilingual, Box, Containment, Doc, Edge, EdgeOp, LabelPlacement, LaidOut, LaidOutEdge, LaidOutNode, Node, OP_TABLE, PATTERN_LABEL, PATTERN_SOURCE, PatternId, RenderOptions, SAMPLES, SAMPLE_ORDER, SampleId, Shape, chooseLabelPlacement, estimateTextWidth, layout, parse, refsToCsv, refsToMarkdown, render, splitBilingual, stripComment } from './core.js';
 
-/**
- * Minimal, zero-dependency SVG DOM shim. Implements the few element operations the
- * renderer needs (createElementNS, setAttribute, appendChild, textContent) and
- * serializes the tree to XML. `withShimDocument()` scopes the shim around a render
- * call, so rendering also works in a real browser without altering the page's document.
- */
-/** A serializable SVG node. The shape `render()` actually produces and consumes. */
+/** Minimal, zero-dependency SVG DOM shim: the element operations render() needs, plus XML serialization. */
+/** A serializable SVG node. */
 interface SvgNode {
     readonly nodeType: 'element';
     tagName: string;
     namespaceURI: string;
-    /** Attribute names in insertion order, mapped to string values. */
+    /** Attributes, in insertion order. */
     attrs: Map<string, string>;
     children: SvgNode[];
-    /** Text content, or null when the element holds child elements instead. */
+    /** Text content, or null when the node has element children. */
     text: string | null;
     setAttribute(name: string, value: string): void;
     getAttribute(name: string): string | null;
@@ -24,24 +19,12 @@ interface SvgNode {
     set textContent(value: string);
     get textContent(): string;
 }
-/**
- * Install the shim as `globalThis.document`, idempotently, but only when no DOM
- * with `createElementNS` is already present. In a real browser this is a no-op,
- * so the same code path serves both environments.
- */
+/** Install the shim as `globalThis.document`, unless a real DOM is already present. Idempotent. */
 declare function installDomShim(): void;
-/**
- * Serialize a shim element tree to an XML string. Produces self-closing tags for
- * empty elements and correctly escapes attribute values and text content.
- */
+/** Serialize a shim element tree to an XML string (self-closing empty tags, escaped values). */
 declare function serializeSvg(node: SvgNode): string;
 
-/**
- * Compute the tight content bounding box of a rendered SVG tree analytically
- * (without `getBBox`), by walking the element tree and measuring each primitive;
- * text width reuses {@link estimateTextWidth}. Used to crop exports to the drawn
- * extent. Also provides raster and display dimension helpers.
- */
+/** Tight content bounding box of a rendered SVG tree, computed analytically (no `getBBox`), reusing {@link estimateTextWidth} for text. Also provides raster/display dimension helpers. */
 
 interface ViewBox {
     minX: number;
@@ -49,26 +32,16 @@ interface ViewBox {
     width: number;
     height: number;
 }
-/**
- * Compute the tight content bounding box of a rendered SVG tree, padded by `bleed`
- * (default 3 units).
- */
+/** Tight content bounding box of a rendered SVG tree, padded by `bleed` (default 3 units). */
 declare function computeContentBox(root: SvgNode, bleed?: number): ViewBox;
-/**
- * Display dimensions for a viewBox so the long side is at least `targetSide` px
- * (browser default: 1600). Mirrors `svgDisplayDimensionsForViewBox()`.
- */
+/** Display dimensions for a viewBox so the long side is at least `targetSide` px (default 1600). */
 declare function svgDisplayDimensions(viewBox: Pick<ViewBox, 'width' | 'height'>, targetSide?: number): {
     width: number;
     height: number;
     scale: number;
 };
 
-/**
- * Headless SVG rendering: `.pdg` source -> standalone SVG string.
- * Crops to the real drawn extent (bleed 3) and sizes the document so the long side
- * is at least `targetSide` px (default 1600).
- */
+/** Headless SVG rendering: `.pdg` source → standalone SVG string. */
 
 interface RenderToSvgOptions {
     /** Display language: 'ja' (default), 'en', or 'both' (bilingual two-line labels). */
@@ -100,16 +73,10 @@ interface RenderToSvgResult {
 declare function renderToSvg(source: string, opts?: RenderToSvgOptions): RenderToSvgResult;
 
 /**
- * Validation for AI authoring. Runs the core parser and adds a kind assertion and
- * friendly lints, returning all diagnostics.
- *
- *   - Kind assertion: an optional `#! kind: block|flow|state|seq` directive (written
- *     in a comment) is checked against the kind inferred from structure; a mismatch
- *     is reported as an error. Guards against producing the wrong diagram type.
- *   - Lints: clearer hints for chained connections (`A -> B -> C`) and operators
- *     without surrounding spaces (`11-12`).
- *
- * Run on AI-generated `.pdg` and feed the diagnostics back until there are no errors.
+ * Validation for AI authoring: runs the core parser, checks the optional
+ * `#! kind: block|flow|state|seq` directive against the kind inferred from
+ * structure (mismatch = error), and adds lints for chained connections and
+ * unspaced operators. Feed the diagnostics back to the author until no errors remain.
  */
 
 interface ValidateResult {
@@ -135,11 +102,7 @@ interface ValidateResult {
  */
 declare function validate(source: string): ValidateResult;
 
-/**
- * Raster output (PNG / JPEG) via `@resvg/resvg-js`, with the bundled IPAex Gothic
- * font embedded and a white background. Default scale is 8x the content box (capped
- * to 24000 px/side and 1e8 px total). Native dependencies are imported lazily.
- */
+/** Raster output (PNG / JPEG) via `@resvg/resvg-js` with the bundled IPAex Gothic font and a white background. Native dependencies are imported lazily. */
 
 interface RasterOptions {
     lang?: Lang;
@@ -153,12 +116,7 @@ declare function renderToPng(source: string, opts?: RasterOptions): Promise<Uint
 /** Render `.pdg` source to a JPEG (8× by default, white background). */
 declare function renderToJpeg(source: string, opts?: RasterOptions): Promise<Uint8Array>;
 
-/**
- * PDF output (A4, IPAex font embedded). Vector by default (jsPDF + svg2pdf.js under
- * jsdom, with analytic getBBox / getComputedTextLength shims), falling back to a
- * high-resolution raster PDF if the vector path fails. The figure is centered with
- * a 10 mm margin and the page orientation follows its aspect ratio.
- */
+/** PDF output (A4, IPAex font embedded). Vector by default (jsPDF + svg2pdf.js under jsdom, with analytic getBBox/getComputedTextLength shims), falling back to a high-resolution raster PDF if the vector path fails. */
 
 interface PdfOptions {
     lang?: Lang;
@@ -172,14 +130,7 @@ interface PdfOptions {
 /** Render `.pdg` source to a PDF (A4, IPAex font, vector preferred). */
 declare function renderToPdf(source: string, opts?: PdfOptions): Promise<Uint8Array>;
 
-/**
- * PPTX output: `.pdg` → PowerPoint presentation (one 16:9 slide).
- *
- *   - image mode (default): the figure is rasterized (resvg) and placed as a
- *     centered picture — highest visual fidelity.
- *   - editable mode (`editable: true`): every SVG primitive is converted to an
- *     editable PowerPoint shape / connector / text box, for later tweaking.
- */
+/** PPTX output: `.pdg` → PowerPoint (one 16:9 slide). Image mode (default) places a rasterized picture; editable mode converts each SVG primitive to an editable PowerPoint shape, connector, or text box. */
 
 interface PptxOptions {
     lang?: Lang;
@@ -193,22 +144,13 @@ interface PptxOptions {
 /** Render `.pdg` source to a PPTX (image by default, or editable shapes). */
 declare function renderToPptx(source: string, opts?: PptxOptions): Promise<Uint8Array>;
 
-/**
- * pdgkit Node API — the browser-free rendering surface a host tool calls.
- *
- * Implemented: SVG, PNG, JPEG, PDF, PPTX (image + editable), validation, and the
- * reference-sign table exporters. All run with no browser.
- */
+/** pdgkit Node API — the browser-free rendering surface a host tool calls. */
 
 /** The pdgkit package version. Keep in sync with package.json. */
-declare const VERSION = "0.1.0";
+declare const VERSION = "0.1.2";
 /** Convenience: render to SVG and return just the string. */
 declare function toSvgString(source: string, lang?: Lang): string;
-/**
- * Read the bundled AI authoring guide (docs/ai-authoring-guide.md) as a string.
- * Inject this into an LLM's system prompt so it can write valid `.pdg`, instead of
- * pasting the guide by hand.
- */
+/** Read the bundled AI authoring guide (docs/ai-authoring-guide.md) as a string, for injecting into an LLM's system prompt. */
 declare function loadAuthoringGuide(): string;
 
 export { Diagnostic, DiagramKind, Lang, type PdfOptions, type PptxOptions, type RasterOptions, type RenderToSvgOptions, type RenderToSvgResult, type SvgNode, VERSION, type ValidateResult, type ViewBox, computeContentBox, installDomShim, loadAuthoringGuide, renderToJpeg, renderToPdf, renderToPng, renderToPptx, renderToSvg, serializeSvg, svgDisplayDimensions, toSvgString, validate };

package/dist/index.js

@@ -189,6 +189,8 @@ var THICK_ARROW_TERMINAL_CLEARANCE = 5.4;
 var VERTICAL_PORT_RATIO = 0.25;
 var PORT_STUB = 6;
 var MAX_ROUTE_LANES = 18;
+var LOOP_LANE_GAP = 10;
+var LOOP_LANE_STEP = 7;
 var EPS = 1e-3;
 function layout(doc) {
   switch (doc.kind) {
@@ -368,7 +370,6 @@ function layoutFlow(doc) {
   const positions = /* @__PURE__ */ new Map();
   const sortedRanks = [...byRank.keys()].sort((a, b) => a - b);
   let y = MARGIN;
-  let maxX = 0;
   for (const r of sortedRanks) {
     const lane = byRank.get(r);
     const widths = lane.map((id) => shapeOf(id) === "diamond" ? NODE_W * 1.2 : NODE_W);
@@ -380,7 +381,6 @@ function layoutFlow(doc) {
       positions.set(lane[i], { x, y, w: widths[i], h: NODE_H });
       x += widths[i] + H_GAP;
     }
-    if (x > maxX) maxX = x;
     y += NODE_H + V_GAP;
   }
   for (const id of ids) {
@@ -400,7 +400,8 @@ function layoutFlow(doc) {
     });
   }
   const edges = makeEdges(doc.edges, positions);
-  return { nodes: placed, edges, width: maxX + MARGIN, height: y + MARGIN, kind: "flow" };
+  const { width, height } = flowExtent(placed, edges);
+  return { nodes: placed, edges, width, height, kind: "flow" };
 }
 function layoutState(doc) {
   const { byRank } = computeRanks(doc);
@@ -412,7 +413,6 @@ function layoutState(doc) {
   const positions = /* @__PURE__ */ new Map();
   const sortedRanks = [...byRank.keys()].sort((a, b) => a - b);
   let y = MARGIN;
-  let maxX = 0;
   for (const r of sortedRanks) {
     const lane = byRank.get(r);
     const widths = lane.map((id) => shapeOf(id) === "circle" ? 6 : NODE_W);
@@ -424,7 +424,6 @@ function layoutState(doc) {
       positions.set(lane[i], { x, y: y + (NODE_H - heights[i]) / 2, w: widths[i], h: heights[i] });
       x += widths[i] + H_GAP;
     }
-    if (x > maxX) maxX = x;
     y += NODE_H + V_GAP;
   }
   for (const id of doc.nodes.keys()) {
@@ -444,7 +443,8 @@ function layoutState(doc) {
     });
   }
   const edges = makeEdges(doc.edges, positions);
-  return { nodes: placed, edges, width: maxX + MARGIN, height: y + MARGIN, kind: "state" };
+  const { width, height } = flowExtent(placed, edges);
+  return { nodes: placed, edges, width, height, kind: "state" };
 }
 function layoutSeq(doc) {
   const seen = /* @__PURE__ */ new Set();
@@ -563,21 +563,50 @@ function computeRanks(doc) {
   return { byRank };
 }
 function makeEdges(srcEdges, positions) {
-  return srcEdges.map((e) => {
+  const boxes = [...positions.values()];
+  const rightLimit = boxes.length ? Math.max(...boxes.map((b) => b.x + b.w)) : MARGIN;
+  const feedback = srcEdges.map((e, index) => ({ index, a: positions.get(e.from), b: positions.get(e.to) })).filter((r) => !!r.a && !!r.b && r.b.y + r.b.h <= r.a.y + EPS).sort((p, q) => feedbackSpan(p.a, p.b) - feedbackSpan(q.a, q.b));
+  const laneOf = /* @__PURE__ */ new Map();
+  feedback.forEach((r, nest) => laneOf.set(r.index, nest));
+  return srcEdges.map((e, index) => {
     const a = positions.get(e.from);
     const b = positions.get(e.to);
     if (!a || !b) {
       return { from: e.from, to: e.to, points: [], label: e.label, op: e.op };
     }
-    return {
-      from: e.from,
-      to: e.to,
-      points: orthogonalRoute(a, b),
-      label: e.label,
-      op: e.op
-    };
+    const nest = laneOf.get(index);
+    const points = nest === void 0 ? orthogonalRoute(a, b) : feedbackRoute(a, b, rightLimit + LOOP_LANE_GAP + nest * LOOP_LANE_STEP);
+    return { from: e.from, to: e.to, points, label: e.label, op: e.op };
   });
 }
+function feedbackSpan(a, b) {
+  return a.y + a.h / 2 - (b.y + b.h / 2);
+}
+function feedbackRoute(a, b, laneX) {
+  const ay = a.y + a.h / 2;
+  const by = b.y + b.h / 2;
+  return [
+    [a.x + a.w, ay],
+    [laneX, ay],
+    [laneX, by],
+    [b.x + b.w, by]
+  ];
+}
+function flowExtent(placed, edges) {
+  let maxX = MARGIN;
+  let maxY = MARGIN;
+  for (const n of placed) {
+    if (n.x + n.w > maxX) maxX = n.x + n.w;
+    if (n.y + n.h > maxY) maxY = n.y + n.h;
+  }
+  for (const e of edges) {
+    for (const [x, y] of e.points) {
+      if (x > maxX) maxX = x;
+      if (y > maxY) maxY = y;
+    }
+  }
+  return { width: maxX + MARGIN, height: maxY + MARGIN };
+}
 function hasLinearChildFlow(children, edges, childMap) {
   const childSet = new Set(children);
   const pairs = /* @__PURE__ */ new Set();
@@ -3437,7 +3466,7 @@ async function renderToPptx(source, opts = {}) {
 }
 
 // src/node/index.ts
-var VERSION = "0.1.0";
+var VERSION = "0.1.2";
 function toSvgString(source, lang = "ja") {
   return renderToSvg(source, { lang }).svg;
 }

package/dist/pdgkit-mcp.cjs

@@ -320,6 +320,8 @@ var THICK_ARROW_TERMINAL_CLEARANCE = 5.4;
 var VERTICAL_PORT_RATIO = 0.25;
 var PORT_STUB = 6;
 var MAX_ROUTE_LANES = 18;
+var LOOP_LANE_GAP = 10;
+var LOOP_LANE_STEP = 7;
 var EPS = 1e-3;
 function layout(doc) {
   switch (doc.kind) {
@@ -499,7 +501,6 @@ function layoutFlow(doc) {
   const positions = /* @__PURE__ */ new Map();
   const sortedRanks = [...byRank.keys()].sort((a, b) => a - b);
   let y = MARGIN;
-  let maxX = 0;
   for (const r of sortedRanks) {
     const lane = byRank.get(r);
     const widths = lane.map((id) => shapeOf(id) === "diamond" ? NODE_W * 1.2 : NODE_W);
@@ -511,7 +512,6 @@ function layoutFlow(doc) {
       positions.set(lane[i], { x, y, w: widths[i], h: NODE_H });
       x += widths[i] + H_GAP;
     }
-    if (x > maxX) maxX = x;
     y += NODE_H + V_GAP;
   }
   for (const id of ids) {
@@ -531,7 +531,8 @@ function layoutFlow(doc) {
     });
   }
   const edges = makeEdges(doc.edges, positions);
-  return { nodes: placed, edges, width: maxX + MARGIN, height: y + MARGIN, kind: "flow" };
+  const { width, height } = flowExtent(placed, edges);
+  return { nodes: placed, edges, width, height, kind: "flow" };
 }
 function layoutState(doc) {
   const { byRank } = computeRanks(doc);
@@ -543,7 +544,6 @@ function layoutState(doc) {
   const positions = /* @__PURE__ */ new Map();
   const sortedRanks = [...byRank.keys()].sort((a, b) => a - b);
   let y = MARGIN;
-  let maxX = 0;
   for (const r of sortedRanks) {
     const lane = byRank.get(r);
     const widths = lane.map((id) => shapeOf(id) === "circle" ? 6 : NODE_W);
@@ -555,7 +555,6 @@ function layoutState(doc) {
       positions.set(lane[i], { x, y: y + (NODE_H - heights[i]) / 2, w: widths[i], h: heights[i] });
       x += widths[i] + H_GAP;
     }
-    if (x > maxX) maxX = x;
     y += NODE_H + V_GAP;
   }
   for (const id of doc.nodes.keys()) {
@@ -575,7 +574,8 @@ function layoutState(doc) {
     });
   }
   const edges = makeEdges(doc.edges, positions);
-  return { nodes: placed, edges, width: maxX + MARGIN, height: y + MARGIN, kind: "state" };
+  const { width, height } = flowExtent(placed, edges);
+  return { nodes: placed, edges, width, height, kind: "state" };
 }
 function layoutSeq(doc) {
   const seen = /* @__PURE__ */ new Set();
@@ -694,21 +694,50 @@ function computeRanks(doc) {
   return { byRank };
 }
 function makeEdges(srcEdges, positions) {
-  return srcEdges.map((e) => {
+  const boxes = [...positions.values()];
+  const rightLimit = boxes.length ? Math.max(...boxes.map((b) => b.x + b.w)) : MARGIN;
+  const feedback = srcEdges.map((e, index) => ({ index, a: positions.get(e.from), b: positions.get(e.to) })).filter((r) => !!r.a && !!r.b && r.b.y + r.b.h <= r.a.y + EPS).sort((p, q) => feedbackSpan(p.a, p.b) - feedbackSpan(q.a, q.b));
+  const laneOf = /* @__PURE__ */ new Map();
+  feedback.forEach((r, nest) => laneOf.set(r.index, nest));
+  return srcEdges.map((e, index) => {
     const a = positions.get(e.from);
     const b = positions.get(e.to);
     if (!a || !b) {
       return { from: e.from, to: e.to, points: [], label: e.label, op: e.op };
     }
-    return {
-      from: e.from,
-      to: e.to,
-      points: orthogonalRoute(a, b),
-      label: e.label,
-      op: e.op
-    };
+    const nest = laneOf.get(index);
+    const points = nest === void 0 ? orthogonalRoute(a, b) : feedbackRoute(a, b, rightLimit + LOOP_LANE_GAP + nest * LOOP_LANE_STEP);
+    return { from: e.from, to: e.to, points, label: e.label, op: e.op };
   });
 }
+function feedbackSpan(a, b) {
+  return a.y + a.h / 2 - (b.y + b.h / 2);
+}
+function feedbackRoute(a, b, laneX) {
+  const ay = a.y + a.h / 2;
+  const by = b.y + b.h / 2;
+  return [
+    [a.x + a.w, ay],
+    [laneX, ay],
+    [laneX, by],
+    [b.x + b.w, by]
+  ];
+}
+function flowExtent(placed, edges) {
+  let maxX = MARGIN;
+  let maxY = MARGIN;
+  for (const n of placed) {
+    if (n.x + n.w > maxX) maxX = n.x + n.w;
+    if (n.y + n.h > maxY) maxY = n.y + n.h;
+  }
+  for (const e of edges) {
+    for (const [x, y] of e.points) {
+      if (x > maxX) maxX = x;
+      if (y > maxY) maxY = y;
+    }
+  }
+  return { width: maxX + MARGIN, height: maxY + MARGIN };
+}
 function hasLinearChildFlow(children, edges, childMap) {
   const childSet = new Set(children);
   const pairs = /* @__PURE__ */ new Set();
@@ -3131,7 +3160,7 @@ var langSchema = import_zod.z.enum(["ja", "en", "both"]).default("ja");
 function textResult(text) {
   return { content: [{ type: "text", text }] };
 }
-function buildServer(version = "0.1.0") {
+function buildServer(version = "0.1.2") {
   const server = new import_mcp.McpServer({ name: "pdgkit", version });
   server.registerTool(
     "pdg_validate",
@@ -3205,7 +3234,7 @@ function buildServer(version = "0.1.0") {
 
 // src/node/index.ts
 var import_node_fs3 = require("fs");
-var VERSION = "0.1.0";
+var VERSION = "0.1.2";
 
 // bin/pdgkit-mcp.ts
 async function main() {