@diagrammo/dgmo 0.30.0 → 0.32.0

package/src/org/renderer.ts

@@ -10,7 +10,12 @@ import {
 } from '../utils/export-container';
 import { ScaleContext } from '../utils/scaling';
 import type { PaletteColors } from '../palettes';
-import { contrastText, mix, shapeFill } from '../palettes/color-utils';
+import {
+  contrastText,
+  mix,
+  shapeFill,
+  themeBaseBg,
+} from '../palettes/color-utils';
 import { resolveTagColor } from '../utils/tag-groups';
 import type { ParsedOrg } from './parser';
 import type { OrgLayoutResult } from './layout';
@@ -26,6 +31,7 @@ import {
   EYE_CLOSED_PATH,
 } from '../utils/legend-constants';
 import { renderIntegratedLegend } from '../utils/legend-integration';
+import { renderNodeCard, renderCollapseBar } from '../utils/card';
 import { measureText } from '../utils/text-measure';
 import { getMaxLegendReservedHeight } from '../utils/legend-layout';
 import type { LegendConfig } from '../utils/legend-types';
@@ -38,23 +44,25 @@ const DIAGRAM_PADDING = 20;
 const MAX_SCALE = 3;
 import { TITLE_FONT_SIZE, TITLE_FONT_WEIGHT } from '../utils/title-constants';
 const TITLE_HEIGHT = 30;
-const LABEL_FONT_SIZE = 13;
-const META_FONT_SIZE = 11;
-const META_LINE_HEIGHT = 16;
-const HEADER_HEIGHT = 28;
-const SEPARATOR_GAP = 6;
-const EDGE_STROKE_WIDTH = 1.5;
-const NODE_STROKE_WIDTH = 1.5;
-const CARD_RADIUS = 6;
-const CONTAINER_RADIUS = 8;
-const CONTAINER_LABEL_FONT_SIZE = 13;
-const CONTAINER_META_FONT_SIZE = 11;
-const CONTAINER_META_LINE_HEIGHT = 16;
-const CONTAINER_HEADER_HEIGHT = 28;
-
-// Collapsed-node accent bar
-const COLLAPSE_BAR_HEIGHT = 6;
-const COLLAPSE_BAR_INSET = 0;
+// Shared card / group / collapse constants (Story 111.1). org matches every
+// convention default, so it imports the full set.
+import {
+  LABEL_FONT_SIZE,
+  META_FONT_SIZE,
+  META_LINE_HEIGHT,
+  HEADER_HEIGHT,
+  SEPARATOR_GAP,
+  EDGE_STROKE_WIDTH,
+  NODE_STROKE_WIDTH,
+  CARD_RADIUS,
+  CONTAINER_RADIUS,
+  CONTAINER_LABEL_FONT_SIZE,
+  CONTAINER_META_FONT_SIZE,
+  CONTAINER_META_LINE_HEIGHT,
+  CONTAINER_HEADER_HEIGHT,
+  COLLAPSE_BAR_HEIGHT,
+  COLLAPSE_BAR_INSET,
+} from '../utils/visual-conventions';
 
 // Ancestor breadcrumb trail (focus mode)
 const ANCESTOR_DOT_R = 4;
@@ -90,7 +98,7 @@ function containerFill(
   nodeColor?: string
 ): string {
   if (nodeColor) {
-    return mix(nodeColor, isDark ? palette.surface : palette.bg, 10);
+    return mix(nodeColor, themeBaseBg(palette, isDark), 10);
   }
   return mix(palette.surface, palette.bg, 40);
 }
@@ -360,21 +368,16 @@ export function renderOrg(
     }
 
     if (!exportDims && c.hiddenCount && c.hiddenCount > 0) {
-      const clipId = `clip-${c.nodeId}`;
-      cG.append('clipPath')
-        .attr('id', clipId)
-        .append('rect')
-        .attr('width', c.width)
-        .attr('height', c.height)
-        .attr('rx', sContainerRadius);
-      cG.append('rect')
-        .attr('x', sCollapseBarInset)
-        .attr('y', c.height - sCollapseBarHeight)
-        .attr('width', c.width - sCollapseBarInset * 2)
-        .attr('height', sCollapseBarHeight)
-        .attr('fill', containerStroke(palette, colorOff ? undefined : c.color))
-        .attr('clip-path', `url(#${clipId})`)
-        .attr('class', 'org-collapse-bar');
+      renderCollapseBar(cG, {
+        width: c.width,
+        height: c.height,
+        barHeight: sCollapseBarHeight,
+        inset: sCollapseBarInset,
+        rx: sContainerRadius,
+        fill: containerStroke(palette, colorOff ? undefined : c.color),
+        clipId: `clip-${c.nodeId}`,
+        className: 'org-collapse-bar',
+      });
     }
 
     // Focus icon (hover-reveal, interactive only) — for non-root containers with children
@@ -399,6 +402,13 @@ export function renderOrg(
         .attr('height', iconSize + 6)
         .attr('fill', 'transparent');
 
+      // Use the container's contrast text color so it stays legible on darker
+      // fills, mirroring the node icon.
+      const iconColor = contrastText(
+        fill,
+        palette.textOnFillLight,
+        palette.textOnFillDark
+      );
       const cx = iconSize / 2;
       const cy = iconSize / 2;
       focusG
@@ -407,14 +417,14 @@ export function renderOrg(
         .attr('cy', cy)
         .attr('r', iconSize / 2 - 1)
         .attr('fill', 'none')
-        .attr('stroke', palette.textMuted)
+        .attr('stroke', iconColor)
         .attr('stroke-width', 1.5);
       focusG
         .append('circle')
         .attr('cx', cx)
         .attr('cy', cy)
         .attr('r', 2)
-        .attr('fill', palette.textMuted);
+        .attr('fill', iconColor);
     }
   }
 
@@ -489,103 +499,52 @@ export function renderOrg(
     );
     const stroke = nodeStroke(palette, colorOff ? undefined : node.color);
 
-    const rect = nodeG
-      .append('rect')
-      .attr('x', 0)
-      .attr('y', 0)
-      .attr('width', node.width)
-      .attr('height', node.height)
-      .attr('rx', sCardRadius)
-      .attr('fill', fill)
-      .attr('stroke', stroke)
-      .attr('stroke-width', sNodeStrokeWidth);
-
-    if (node.isContainer) {
-      rect.attr('stroke-dasharray', '6 3');
-    }
-
     const labelColor = contrastText(
       fill,
       palette.textOnFillLight,
       palette.textOnFillDark
     );
-    nodeG
-      .append('text')
-      .attr('x', node.width / 2)
-      .attr('y', sHeaderHeight / 2 + sLabelFontSize / 2 - 2)
-      .attr('text-anchor', 'middle')
-      .attr('fill', labelColor)
-      .attr('font-size', sLabelFontSize)
-      .attr('font-weight', 'bold')
-      .text(node.label);
 
     const metaEntries = Object.entries(node.metadata);
-    if (metaEntries.length > 0) {
-      nodeG
-        .append('line')
-        .attr('x1', 0)
-        .attr('y1', sHeaderHeight)
-        .attr('x2', node.width)
-        .attr('y2', sHeaderHeight)
-        .attr('stroke', solid ? labelColor : stroke)
-        .attr('stroke-opacity', 0.3)
-        .attr('stroke-width', 1);
-
-      const metaDisplayKeys = metaEntries.map(
-        ([k]) => displayNames.get(k) ?? k
-      );
-      const maxKeyWidth = Math.max(
-        ...metaDisplayKeys.map((k) => measureText(`${k}: `, sMetaFontSize))
-      );
-      const valueX = 10 + maxKeyWidth;
-
-      const metaStartY = sHeaderHeight + sSeparatorGap + sMetaFontSize;
-      for (let i = 0; i < metaEntries.length; i++) {
-        const [, value] = metaEntries[i]!;
-        const displayKey = metaDisplayKeys[i]!;
-        const rowY = metaStartY + i * sMetaLineHeight;
-
-        nodeG
-          .append('text')
-          .attr('x', 10)
-          .attr('y', rowY)
-          .attr('fill', labelColor)
-          .attr('font-size', sMetaFontSize)
-          .text(`${displayKey}: `);
-
-        nodeG
-          .append('text')
-          .attr('x', valueX)
-          .attr('y', rowY)
-          .attr('fill', labelColor)
-          .attr('font-size', sMetaFontSize)
-          .text(value);
-      }
-    }
+    renderNodeCard(nodeG, {
+      width: node.width,
+      height: node.height,
+      rx: sCardRadius,
+      fill,
+      stroke,
+      strokeWidth: sNodeStrokeWidth,
+      ...(node.isContainer && { dashed: true }),
+      label: node.label,
+      labelColor,
+      labelFontSize: sLabelFontSize,
+      headerHeight: sHeaderHeight,
+      ...(metaEntries.length > 0 && {
+        meta: {
+          rows: metaEntries.map(
+            ([k, value]) => [displayNames.get(k) ?? k, value] as const
+          ),
+          fontSize: sMetaFontSize,
+          lineHeight: sMetaLineHeight,
+          separatorGap: sSeparatorGap,
+          separatorColor: solid ? labelColor : stroke,
+          textColor: labelColor,
+        },
+      }),
+    });
 
     if (!exportDims && node.hiddenCount && node.hiddenCount > 0) {
-      const clipId = `clip-${node.id}`;
-      nodeG
-        .append('clipPath')
-        .attr('id', clipId)
-        .append('rect')
-        .attr('width', node.width)
-        .attr('height', node.height)
-        .attr('rx', sCardRadius);
-      nodeG
-        .append('rect')
-        .attr('x', sCollapseBarInset)
-        .attr('y', node.height - sCollapseBarHeight)
-        .attr('width', node.width - sCollapseBarInset * 2)
-        .attr('height', sCollapseBarHeight)
-        .attr(
-          'fill',
-          solid
-            ? labelColor
-            : nodeStroke(palette, colorOff ? undefined : node.color)
-        )
-        .attr('clip-path', `url(#${clipId})`)
-        .attr('class', 'org-collapse-bar');
+      renderCollapseBar(nodeG, {
+        width: node.width,
+        height: node.height,
+        barHeight: sCollapseBarHeight,
+        inset: sCollapseBarInset,
+        rx: sCardRadius,
+        fill: solid
+          ? labelColor
+          : nodeStroke(palette, colorOff ? undefined : node.color),
+        clipId: `clip-${node.id}`,
+        className: 'org-collapse-bar',
+      });
     }
 
     // Focus icon (hover-reveal, interactive only) — for non-root nodes with children
@@ -611,7 +570,10 @@ export function renderOrg(
         .attr('height', iconSize + 6)
         .attr('fill', 'transparent');
 
-      // Scope/target icon: outer circle + inner dot
+      // Scope/target icon: outer circle + inner dot. Use the card's contrast
+      // text color so it stays legible on solid-fill dark cards, not just the
+      // light default surface.
+      const iconColor = labelColor;
       const cx = iconSize / 2;
       const cy = iconSize / 2;
       focusG
@@ -620,14 +582,14 @@ export function renderOrg(
         .attr('cy', cy)
         .attr('r', iconSize / 2 - 1)
         .attr('fill', 'none')
-        .attr('stroke', palette.textMuted)
+        .attr('stroke', iconColor)
         .attr('stroke-width', 1.5);
       focusG
         .append('circle')
         .attr('cx', cx)
         .attr('cy', cy)
         .attr('r', 2)
-        .attr('fill', palette.textMuted);
+        .attr('fill', iconColor);
     }
   }
 

package/src/palettes/color-utils.ts

@@ -1,3 +1,4 @@
+import { CATEGORICAL_COLOR_ORDER } from '../colors';
 import type { PaletteColors } from './types';
 
 // ============================================================
@@ -304,6 +305,16 @@ export function contrastText(
  * `opts.solid` (per `option solid-fill`): bypass the 25% tint and return
  * the raw intent. Opt-in only; default behavior unchanged.
  */
+/**
+ * The theme-aware base background a diagram's tinted shapes blend toward:
+ * `surface` in dark, page `bg` in light. Concentrates the
+ * `isDark ? palette.surface : palette.bg` pick repeated across ~20 renderers
+ * (Story 111.3).
+ */
+export function themeBaseBg(palette: PaletteColors, isDark: boolean): string {
+  return isDark ? palette.surface : palette.bg;
+}
+
 export function shapeFill(
   palette: PaletteColors,
   intent: string,
@@ -311,17 +322,21 @@ export function shapeFill(
   opts?: { solid?: boolean }
 ): string {
   if (opts?.solid) return intent;
-  return mix(intent, isDark ? palette.surface : palette.bg, 25);
+  return mix(intent, themeBaseBg(palette, isDark), 25);
 }
 
 // ============================================================
 // Series Colors
 // ============================================================
 
-/** Derive the 8-color series rotation from a palette's named colors. */
+/**
+ * Derive the 8-color series rotation from a palette's named colors, in the
+ * shared {@link CATEGORICAL_COLOR_ORDER} (RGB-seeded, max-contrast). Tag
+ * swatches and chart series colors thus share one canonical rotation.
+ */
 export function getSeriesColors(palette: PaletteColors): string[] {
   const c = palette.colors;
-  return [c.blue, c.green, c.yellow, c.orange, c.purple, c.red, c.teal, c.cyan];
+  return CATEGORICAL_COLOR_ORDER.map((name) => c[name]!);
 }
 
 /**
@@ -403,7 +418,7 @@ export function politicalTints(
   isDark: boolean
 ): string[] {
   if (count <= 0) return [];
-  const base = isDark ? palette.surface : palette.bg;
+  const base = themeBaseBg(palette, isDark);
   const c = palette.colors;
   // Land-first: greens/earth tones lead; water-like blue & cyan trail.
   const swatches = [

package/src/palettes/index.ts

@@ -21,6 +21,7 @@ export {
   getSegmentColors,
   contrastText,
   shapeFill,
+  themeBaseBg,
 } from './color-utils';
 
 // Re-export palette definitions (alphabetical)

package/src/pert/renderer.ts

@@ -33,7 +33,7 @@ import * as d3Selection from 'd3-selection';
 import * as d3Shape from 'd3-shape';
 import { FONT_FAMILY } from '../fonts';
 import type { PaletteColors } from '../palettes';
-import { contrastText, mix, shapeFill } from '../palettes/color-utils';
+import { contrastText, mix, shapeFill, themeBaseBg } from '../palettes/color-utils';
 import { ScaleContext } from '../utils/scaling';
 import {
   measureText,
@@ -87,7 +87,16 @@ const NODE_CELL_FONT_SIZE = 11;
 // row holds the name and is taller than the corner cells so the name
 // reads as the primary label (mirroring textbook proportions).
 const NODE_RADIUS = 6;
-const NODE_STROKE_WIDTH = 1.5;
+// Shared card / group / collapse constants (Story 111.1). The explanatory
+// comments below stay with the renderer; the values now live in one module.
+import {
+  NODE_STROKE_WIDTH,
+  EDGE_STROKE_WIDTH,
+  CONTAINER_RADIUS,
+  CONTAINER_LABEL_FONT_SIZE,
+  CONTAINER_HEADER_HEIGHT,
+  COLLAPSE_BAR_HEIGHT,
+} from '../utils/visual-conventions';
 
 // Analysis-block chrome (Summary / Activity Risk / Completion / Field
 // labels). These sit BELOW the diagram and shouldn't compete with it
@@ -99,7 +108,7 @@ function analysisBlockChrome(
   palette: PaletteColors,
   isDark: boolean
 ): { fill: string; stroke: string } {
-  const surfaceBg = isDark ? palette.surface : palette.bg;
+  const surfaceBg = themeBaseBg(palette, isDark);
   return {
     fill: mix(palette.surface, palette.bg, 40),
     stroke: mix(palette.textMuted, surfaceBg, 35),
@@ -113,18 +122,14 @@ const NODE_BOTTOM_ROW_HEIGHT = 26;
 // stroke and a matching red arrowhead because the critical path is the
 // central concept of a PERT chart, and a binary `data-critical` attr
 // alone left it visually invisible to readers.
-const EDGE_STROKE_WIDTH = 1.5;
 const ARROWHEAD_W = 10;
 const ARROWHEAD_H = 7;
 // Group-rect treatment per §2: neutral surface fill on textMuted stroke,
 // solid border, rx=8, top-center 13pt 'bold' label inside a reserved
 // 28px header band — exactly matching org's container recipe.
-const CONTAINER_RADIUS = 8;
-const CONTAINER_LABEL_FONT_SIZE = 13;
-const CONTAINER_HEADER_HEIGHT = 28;
-// Collapse-bar height — see conventions doc §3 Pattern A/B (matches
-// org's `COLLAPSE_BAR_HEIGHT`). Universal "this is collapsed" signal.
-const COLLAPSE_BAR_HEIGHT = 6;
+// CONTAINER_RADIUS/LABEL_FONT_SIZE/HEADER_HEIGHT + COLLAPSE_BAR_HEIGHT now
+// imported from utils/visual-conventions (Story 111.1). Group-rect treatment
+// per §2; collapse-bar height matches org per §3 Pattern A/B.
 // Always-on fade applied to bottom-20% (by duration) activity nodes
 // so the eye is drawn to the longer, schedule-dominating work first.
 // Less aggressive than FADE_OPACITY because these cards still need to

package/src/pyramid/parser.ts

@@ -4,8 +4,8 @@
 
 import {
   bareDescriptionRemovedMessage,
-  formatDgmoError,
   makeDgmoError,
+  makeFail,
   METADATA_DIAGNOSTIC_CODES,
   pipeOperatorRemovedMessage,
 } from '../diagnostics';
@@ -61,12 +61,7 @@ export function parsePyramid(content: string): ParsedPyramid {
   let headerParsed = false;
   let currentLayer: Writable<PyramidLayer> | null = null;
 
-  const fail = (line: number, message: string): ParsedPyramid => {
-    const diag = makeDgmoError(line, message);
-    result.diagnostics.push(diag);
-    result.error = formatDgmoError(diag);
-    return result;
-  };
+  const fail = makeFail(result);
 
   const warn = (
     line: number,

package/src/quadrant/renderer.ts

@@ -11,7 +11,7 @@ import { ScaleContext } from '../utils/scaling';
 import { initD3Chart, renderChartTitle } from '../utils/d3-helpers';
 import type { ParsedQuadrant, QuadrantLabel } from '../visualizations/types';
 import type { PaletteColors } from '../palettes';
-import { mix } from '../palettes/color-utils';
+import { mix, themeBaseBg } from '../palettes/color-utils';
 
 // Quadrant Chart Renderer
 // ============================================================
@@ -99,7 +99,7 @@ export function renderQuadrant(
     .append('g')
     .attr('transform', `translate(${margin.left}, ${margin.top})`);
 
-  const bg = isDark ? palette.surface : palette.bg;
+  const bg = themeBaseBg(palette, isDark);
 
   // Full palette color for a quadrant (used for border and label tinting)
   const getQuadrantColor = (

package/src/raci/parser.ts

@@ -19,8 +19,8 @@
 // See `docs/dgmo-language-spec.md` § "RACI Matrix".
 
 import {
-  formatDgmoError,
   makeDgmoError,
+  makeFail,
   METADATA_DIAGNOSTIC_CODES,
   pipeOperatorRemovedMessage,
   suggest,
@@ -181,12 +181,7 @@ export function parseRaci(
     error: null,
   };
 
-  const fail = (line: number, message: string): ParsedRaci => {
-    const diag = makeDgmoError(line, message);
-    result.diagnostics.push(diag);
-    result.error = formatDgmoError(diag);
-    return result;
-  };
+  const fail = makeFail(result);
 
   const warn = (line: number, message: string, code?: string): void => {
     result.diagnostics.push(makeDgmoError(line, message, 'warning', code));

package/src/raci/renderer.ts

@@ -30,7 +30,7 @@ import {
   TITLE_FONT_WEIGHT,
   TITLE_Y,
 } from '../utils/title-constants';
-import { contrastText, mix } from '../palettes/color-utils';
+import { contrastText, mix, themeBaseBg } from '../palettes/color-utils';
 import type { PaletteColors } from '../palettes';
 import type { D3ExportDimensions } from '../utils/d3-types';
 import type {
@@ -267,7 +267,7 @@ const TINT_PCT = 25;
  * kanban `CARD_RADIUS = 6`). Keeps RACI markers visually consistent
  * with nodes elsewhere in the diagram language.
  */
-const NODE_STROKE_WIDTH = 1.5;
+import { NODE_STROKE_WIDTH } from '../utils/visual-conventions'; // shared (Story 111.1)
 const NODE_RADIUS = 6;
 
 /**
@@ -394,7 +394,7 @@ export function renderRaci(
   if (tasksAll.length === 0 && parsed.phases.length === 0) return;
 
   const solid = parsed.options['solid-fill'] === 'on';
-  const surfaceBg = isDark ? palette.surface : palette.bg;
+  const surfaceBg = themeBaseBg(palette, isDark);
 
   // --- ScaleContext: differential scaling ---
   const roleCount = Math.max(1, parsed.roles.length);
@@ -679,10 +679,10 @@ export function renderRaci(
     // each column has a subtle visual identity instead of every column
     // reading as the same neutral gray.
     const roleColor = parsed.roleColors[i] ?? autoAccent(i, palette);
-    const bodyFill = mix(roleColor, isDark ? palette.surface : palette.bg, 16);
+    const bodyFill = mix(roleColor, themeBaseBg(palette, isDark), 16);
     const headerFill = mix(
       roleColor,
-      isDark ? palette.surface : palette.bg,
+      themeBaseBg(palette, isDark),
       30
     );
     const colG = columnsG

package/src/ring/parser.ts

@@ -4,8 +4,8 @@
 
 import {
   bareDescriptionRemovedMessage,
-  formatDgmoError,
   makeDgmoError,
+  makeFail,
   METADATA_DIAGNOSTIC_CODES,
   pipeOperatorRemovedMessage,
   suggest,
@@ -48,12 +48,7 @@ export function parseRing(content: string): ParsedRing {
   let headerParsed = false;
   let currentLayer: Writable<RingLayer> | null = null;
 
-  const fail = (line: number, message: string): ParsedRing => {
-    const diag = makeDgmoError(line, message);
-    result.diagnostics.push(diag);
-    result.error = formatDgmoError(diag);
-    return result;
-  };
+  const fail = makeFail(result);
 
   const warn = (
     line: number,

package/src/sequence/parser.ts

@@ -10,6 +10,7 @@ import {
   akaRemovedMessage,
   formatDgmoError,
   makeDgmoError,
+  makeFail,
   METADATA_DIAGNOSTIC_CODES,
   NAME_DIAGNOSTIC_CODES,
   nameMergedMessage,
@@ -528,12 +529,7 @@ export function parseSequenceDgmo(
     return nameAliasMap.get(trimmed) ?? trimmed;
   };
 
-  const fail = (line: number, message: string): ParsedSequenceDgmo => {
-    const diag = makeDgmoError(line, message);
-    result.diagnostics.push(diag);
-    result.error = formatDgmoError(diag);
-    return result;
-  };
+  const fail = makeFail(result);
 
   /** Push a recoverable error and continue parsing. */
   const pushError = (line: number, message: string): void => {
@@ -554,6 +550,13 @@ export function parseSequenceDgmo(
   const lines = content.split('\n');
   let hasExplicitChart = false;
   let contentStarted = false;
+  // Whether the message body has begun (first message, section, block, or note).
+  // Unlike `contentStarted` — which any declaration trips to close the
+  // options/tag-group "headers first" window — `bodyStarted` stays false through
+  // the entire declaration preamble so bare and typed participant declarations
+  // can be freely interleaved. It gates bare-name declarations: once real body
+  // content appears, a bare word is treated as a stray line, not a participant.
+  let bodyStarted = false;
   let firstLineIndex = -1; // line index of the `sequence [Title]` first line (to skip in main loop)
 
   // Handle first non-empty, non-comment line for `sequence Title` syntax
@@ -997,6 +1000,7 @@ export function parseSequenceDgmo(
         );
       }
       contentStarted = true;
+      bodyStarted = true;
       const section: SequenceSection = {
         kind: 'section',
         // Capture group 1 guaranteed present after successful match.
@@ -1301,7 +1305,7 @@ export function parseSequenceDgmo(
       if (
         /^\S+$/.test(bareCore) &&
         !ARROW_PATTERN.test(bareCore) &&
-        (inGroup || !contentStarted || bareMeta)
+        (inGroup || !bodyStarted || bareMeta)
       ) {
         contentStarted = true;
         const id = bareCore;
@@ -1369,6 +1373,7 @@ export function parseSequenceDgmo(
     }
     if (labeledArrow) {
       contentStarted = true;
+      bodyStarted = true;
       const { from, to, label: rawLabel, async: isAsync } = labeledArrow;
       const fromKey = addParticipant(resolveAlias(from), lineNumber);
       const toKey = addParticipant(resolveAlias(to), lineNumber);
@@ -1445,6 +1450,7 @@ export function parseSequenceDgmo(
     const bareCall = bareCallSync || bareCallAsync;
     if (bareCall) {
       contentStarted = true;
+      bodyStarted = true;
       // Capture groups 1 and 2 guaranteed present after successful match.
       const from = bareCall[1]!;
       const to = bareCall[2]!;
@@ -1470,6 +1476,7 @@ export function parseSequenceDgmo(
     const ifMatch = trimmed.match(/^if\s+(.+)$/i);
     if (ifMatch) {
       contentStarted = true;
+      bodyStarted = true;
       const block: Writable<SequenceBlock> = {
         kind: 'block',
         type: 'if',
@@ -1488,6 +1495,7 @@ export function parseSequenceDgmo(
     const loopMatch = trimmed.match(/^loop\s+(.+)$/i);
     if (loopMatch) {
       contentStarted = true;
+      bodyStarted = true;
       const block: Writable<SequenceBlock> = {
         kind: 'block',
         type: 'loop',
@@ -1506,6 +1514,7 @@ export function parseSequenceDgmo(
     const parallelMatch = trimmed.match(/^parallel(?:\s+(.+))?$/i);
     if (parallelMatch) {
       contentStarted = true;
+      bodyStarted = true;
       const block: Writable<SequenceBlock> = {
         kind: 'block',
         type: 'parallel',
@@ -1629,6 +1638,7 @@ export function parseSequenceDgmo(
             lineNumber,
             endLineNumber: lineNumber,
           };
+          bodyStarted = true;
           currentContainer().push(note);
           continue;
         }
@@ -1654,6 +1664,7 @@ export function parseSequenceDgmo(
             lineNumber,
             endLineNumber: i + 1, // i has advanced past the body lines (1-based)
           };
+          bodyStarted = true;
           currentContainer().push(note);
           continue;
         }