agentic-mermaid 0.1.2 → 0.2.0

package/dist/{chunk-ZYMMKQ3I.js → chunk-BJYMBT4I.js}

@@ -1,242 +1,3 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJS = (cb, mod) => function __require() {
-  try {
-    return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-  } catch (e2) {
-    throw mod = 0, e2;
-  }
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// package.json
-var require_package = __commonJS({
-  "package.json"(exports, module) {
-    module.exports = {
-      name: "agentic-mermaid",
-      mcpName: "io.github.adewale/agentic-mermaid",
-      version: "0.1.2",
-      license: "MIT",
-      description: "Agentic Mermaid: render, verify, and safely edit Mermaid diagrams as ASCII, PNG, SVG, or structured agent workflows \u2014 with composable styles (hand-drawn, excalidraw, watercolor, or your own as JSON).",
-      type: "module",
-      main: "dist/index.js",
-      types: "dist/index.d.ts",
-      exports: {
-        ".": {
-          types: "./dist/index.d.ts",
-          import: "./dist/index.js",
-          default: "./dist/index.js"
-        },
-        "./agent": {
-          types: "./dist/agent.d.ts",
-          import: "./dist/agent.js",
-          default: "./dist/agent.js"
-        },
-        "./agent/core": {
-          types: "./dist/agent-core.d.ts",
-          import: "./dist/agent-core.js",
-          default: "./dist/agent-core.js"
-        },
-        "./style-spec.schema.json": "./docs/schemas/style-spec.schema.json",
-        "./package.json": "./package.json"
-      },
-      bin: {
-        am: "dist/am.js",
-        "agentic-mermaid": "dist/am.js",
-        "agentic-mermaid-mcp": "dist/agentic-mermaid-mcp.js"
-      },
-      engines: {
-        node: ">=18"
-      },
-      publishConfig: {
-        access: "public",
-        provenance: true
-      },
-      repository: {
-        type: "git",
-        url: "git+https://github.com/adewale/agentic-mermaid.git"
-      },
-      homepage: "https://agentic-mermaid.dev/",
-      bugs: {
-        url: "https://github.com/adewale/agentic-mermaid/issues"
-      },
-      keywords: [
-        "mermaid",
-        "agentic-mermaid",
-        "agent",
-        "ai",
-        "mcp",
-        "cli",
-        "diagram",
-        "svg",
-        "png",
-        "ascii",
-        "flowchart",
-        "sequence-diagram",
-        "class-diagram",
-        "er-diagram",
-        "timeline-diagram",
-        "journey-diagram",
-        "architecture-diagram",
-        "xychart",
-        "pie-chart",
-        "quadrant-chart",
-        "gantt-chart",
-        "state-diagram",
-        "mindmap",
-        "git-graph",
-        "radar-chart",
-        "visualization",
-        "theming",
-        "styles",
-        "hand-drawn",
-        "sketch",
-        "excalidraw",
-        "watercolor",
-        "llms-txt"
-      ],
-      author: "Adewale",
-      files: [
-        "dist/",
-        "assets/fonts/",
-        "docs/schemas/style-spec.schema.json",
-        "examples/styles/",
-        "skills/",
-        "server.json",
-        "CHANGELOG.md",
-        "SECURITY.md",
-        "LICENSE",
-        "LICENSES/",
-        "THIRD_PARTY_NOTICES.md",
-        "README.md",
-        "!dist/**/*.map"
-      ],
-      scripts: {
-        test: "bun test --coverage --timeout 30000 src/__tests__/",
-        typecheck: "bun run website/build.ts && tsc --noEmit",
-        "test:browser": "bun run e2e/run-browser-contracts.ts",
-        editor: "bun run scripts/site/editor.ts",
-        dev: "bun run website:dev",
-        bench: "bun run eval/benchmark/sample-bench.ts",
-        "benchmark:palette": "bun run eval/palette-performance/run.ts --record",
-        "benchmark:palette:check": "bun run eval/palette-performance/run.ts --check",
-        "harvest:upstream": "bun run eval/mermaid-upstream-suite-bench/harvest.ts",
-        "harvest:upstream:refresh-check": "bun run eval/mermaid-upstream-suite-bench/refresh-check.ts",
-        build: "tsup",
-        "build:binary": "bun build ./bin/am.ts --compile --outfile dist/am",
-        website: "bun run website/build.ts",
-        "website:check": "bun run website/build.ts --check",
-        "website:dev": "cd website && WRANGLER_SEND_METRICS=false npx --yes wrangler@latest dev --port 9095 --ip 127.0.0.1",
-        deploy: "bun run website && cd website && WRANGLER_SEND_METRICS=false npx --yes wrangler@latest deploy",
-        prepublishOnly: "npm run build",
-        "goldens:ascii": "bun run scripts/update-ascii-goldens.ts",
-        "goldens:ascii:check": "bun run scripts/update-ascii-goldens.ts --check",
-        hero: "bun run scripts/site/hero.ts",
-        "hero:check": "bun run scripts/site/hero.ts --check",
-        site: "bun run website",
-        "site:check": "bun run website:check",
-        "style:audit": "bun test src/__tests__/style-role-audit.test.ts",
-        "sketch:check": "bun test scripts/sketch-prototype/styles.test.ts && bun run scripts/sketch-prototype/contrast-audit.ts",
-        "characterization:check": "bun run scripts/characterization/contact-sheet.ts --check && bun run scripts/characterization/contact-sheet-families.ts --check && bun run scripts/characterization/visual-quality.ts --check",
-        "agent-doc-artifacts": "bun run scripts/generate-agent-doc-artifacts.ts",
-        "agent-doc-artifacts:check": "bun run scripts/generate-agent-doc-artifacts.ts --check",
-        "section-a-report": "bun run scripts/generate-section-a-capability-report.ts",
-        "section-a-report:check": "bun run scripts/generate-section-a-capability-report.ts --check",
-        "section-b-report": "bun run scripts/generate-section-b-capability-report.ts",
-        "section-b-report:check": "bun run scripts/generate-section-b-capability-report.ts --check",
-        "render-options-docs": "bun run scripts/generate-render-options-docs.ts",
-        "render-options-docs:check": "bun run scripts/generate-render-options-docs.ts --check",
-        "style-spec-artifacts": "bun run scripts/generate-style-spec-artifacts.ts",
-        "style-spec-artifacts:check": "bun run scripts/generate-style-spec-artifacts.ts --check",
-        "upstream-manifest": "bun run scripts/generate-upstream-mermaid-manifest.ts",
-        "upstream-manifest:check": "bun run scripts/generate-upstream-mermaid-manifest.ts --check",
-        "mutation-test": "bun run scripts/quality/mutation-profile.ts",
-        "sabotage:routes": "bun run eval/sabotage/route-regressions.ts",
-        "test:family-elevation-reverts": "bun run scripts/quality/family-elevation-revert-probes.ts",
-        lint: "bun test src/__tests__/agent-substrate-lint.test.ts src/__tests__/test-quality-lint.test.ts",
-        "eval:agent-live": "bun run eval/agent-usage/live.ts",
-        "eval:agent-subagent": "bun run eval/agent-usage/capture-subagent-prompt-eval.ts",
-        "rubric:visual": "bun run eval/visual-rubric/run.ts",
-        "contact:sheet": "bun run eval/visual-rubric/contact-sheet.ts",
-        "contact:sheet:test-portfolio": "bun run scripts/pr-assets/test-portfolio-contact-sheet.ts",
-        "contact:sheet:test-portfolio:review": "bun run scripts/ci/test-portfolio-visual-review.ts",
-        "gallery:custom-styles": "bun run scripts/docs/custom-style-cookbook.ts",
-        "gallery:custom-styles:check": "bun run scripts/docs/custom-style-cookbook.ts --check",
-        "gallery:linkrank-feedback-packing": "bun run scripts/pr-assets/linkrank-feedback-packing-evidence.ts",
-        "gallery:linkrank-feedback-packing:check": "bun run scripts/pr-assets/linkrank-feedback-packing-evidence.ts --check",
-        "gallery:mindmap-gitgraph": "bun run scripts/pr-assets/mindmap-gitgraph-content-gallery.ts",
-        "gallery:mindmap-gitgraph:check": "bun run scripts/pr-assets/mindmap-gitgraph-content-gallery.ts --check",
-        "gallery:mermaid-docs": "bun run scripts/pr-assets/mermaid-doc-showcase-gallery.ts",
-        "gallery:mermaid-docs:check": "bun run scripts/pr-assets/mermaid-doc-showcase-gallery.ts --check",
-        "gallery:style-switch": "bun run scripts/pr-assets/style-switch-contact-sheet.ts",
-        "gallery:style-switch:check": "bun run scripts/pr-assets/style-switch-contact-sheet.ts --check",
-        "gallery:pie-highlight": "bun run scripts/pr-assets/pie-highlightslice-evidence.ts",
-        "gallery:pie-highlight:check": "bun run scripts/pr-assets/pie-highlightslice-evidence.ts --check",
-        "gallery:palette-rollout:baseline": "bun run scripts/pr-assets/palette-rollout-evidence.ts --record-baseline",
-        "gallery:palette-rollout": "bun run scripts/pr-assets/palette-rollout-evidence.ts",
-        "gallery:palette-rollout:check": "bun run scripts/pr-assets/palette-rollout-evidence.ts --check",
-        "gallery:palette-harmony": "bun run scripts/pr-assets/palette-harmony-experiment.ts",
-        "gallery:palette-harmony:check": "bun run scripts/pr-assets/palette-harmony-experiment.ts --check",
-        "gallery:section-b": "bun run scripts/pr-assets/section-b-brand-evidence.ts",
-        "gallery:section-b:check": "bun run scripts/pr-assets/section-b-brand-evidence.ts --check",
-        track: "bun run eval/heuristic-tracker/run.ts",
-        "audit:ugly": "bun run eval/ugly-detector/audit.ts",
-        "audit:dependencies": "bun audit --audit-level=high"
-      },
-      dependencies: {
-        "@resvg/resvg-js": "2.6.2",
-        acorn: "8.16.0",
-        elkjs: "^0.11.0",
-        entities: "^7.0.1",
-        yaml: "^2.8.3"
-      },
-      overrides: {
-        "brace-expansion": "5.0.7",
-        esbuild: "0.28.1",
-        "lodash-es": "4.18.1",
-        picomatch: "4.0.5",
-        qs: "6.15.3"
-      },
-      devDependencies: {
-        "@modelcontextprotocol/sdk": "1.29.0",
-        "@resvg/resvg-wasm": "2.6.2",
-        "@stryker-mutator/core": "^9.6.1",
-        "@types/bun": "^1.3.9",
-        "beautiful-mermaid": "1.1.3",
-        "fast-check": "^4.6.0",
-        mermaid: "11.16.0",
-        "mermaid-ast": "0.8.2",
-        playwright: "^1.58.2",
-        "perfect-freehand": "1.2.3",
-        roughjs: "4.6.6",
-        shiki: "^3.19.0",
-        tsup: "^8.5.1",
-        typescript: "^5.9.3",
-        "upng-js": "^2.1.0"
-      }
-    };
-  }
-});
-
 // src/svg-structure.ts
 import { decodeXML } from "entities";
 function isNameChar(char) {
@@ -1356,8 +1117,10 @@ function negotiateRenderCapabilityTuple(output, tuple) {
   );
 }
 
+// src/version.ts
+var PACKAGE_VERSION = "0.2.0";
+
 // src/shared/extension-identity.ts
-var import_package = __toESM(require_package(), 1);
 function sameExtensionIdentity(left, right2) {
   if (left === void 0 || right2 === void 0) return false;
   if (left.id !== right2.id || left.kind !== right2.kind || left.version !== right2.version) return false;
@@ -1371,7 +1134,7 @@ function sameExtensionIdentity(left, right2) {
   return left.provenance.owner === right2.provenance.owner && left.provenance.source === right2.provenance.source && left.provenance.reference === right2.provenance.reference;
 }
 var KNOWN_EXTENSION_CONTRACT_VERSIONS = Object.freeze({
-  core: import_package.default.version,
+  core: PACKAGE_VERSION,
   scene: SCENE_CONTRACT_SEMVER
 });
 function requireExtensionContractCompatibility(identity, contract) {
@@ -1705,7 +1468,7 @@ var SCENE_ROLE_DESCRIPTORS = Object.freeze(
       id: `role:${role}`,
       kind: "role",
       version: "1.0.0",
-      compatibility: { core: "^0.1.1", scene: "^2.0.0" },
+      compatibility: { core: "^0.2.0", scene: "^2.0.0" },
       provenance: { owner: "agentic-mermaid", source: "built-in", reference: "src/scene/roles.ts" }
     }),
     role,
@@ -2581,6 +2344,116 @@ function labelOverflowWarning(target, text3, cap) {
   return charCount > cap ? { code: "LABEL_OVERFLOW", target, charCount, limit: cap } : null;
 }
 
+// src/agent/body-utils.ts
+function indexedIdAllocator(existing, prefix) {
+  const seen = new Set(existing);
+  let index = 0;
+  return () => {
+    while (seen.has(`${prefix}-${index}`)) index++;
+    const id = `${prefix}-${index}`;
+    seen.add(id);
+    index++;
+    return id;
+  };
+}
+function labelOverflowCollector(warnings, opts, cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP) {
+  return (target, text3) => {
+    const warning = labelOverflowWarning(target, text3, cap);
+    if (warning) warnings.push(warning);
+  };
+}
+
+// src/shared/accessibility-directives.ts
+var ACC_TITLE_RE = /^\s*accTitle(?:\s*:\s*|\s+)(.+)$/i;
+var ACC_DESCR_INLINE_RE = /^\s*accDescr(?:\s*:\s*|\s+)(.+)$/i;
+var ACC_DESCR_BLOCK_RE = /^\s*accDescr\s*:?\s*\{(.*)$/i;
+function parseAccessibilityDirective(lines, startIndex) {
+  const line2 = lines[startIndex];
+  if (line2 === void 0) return null;
+  const block = line2.match(ACC_DESCR_BLOCK_RE);
+  if (block) {
+    const parts = [];
+    for (let index = startIndex; index < lines.length; index++) {
+      const content = index === startIndex ? block[1] : lines[index];
+      const closing = content.indexOf("}");
+      if (closing < 0) {
+        if (content.trim()) parts.push(content.trim());
+        continue;
+      }
+      const beforeClosing = content.slice(0, closing).trim();
+      if (beforeClosing) parts.push(beforeClosing);
+      const suffix = content.slice(closing + 1);
+      const indent = lines[index].match(/^\s*/)?.[0] ?? "";
+      return {
+        title: false,
+        form: "block",
+        value: parts.join("\n").trim(),
+        endIndex: index,
+        ...suffix.trim() ? { suffixLine: indent + suffix.trimStart() } : {}
+      };
+    }
+    return void 0;
+  }
+  const title = line2.match(ACC_TITLE_RE);
+  if (title) return { title: true, form: "inline", value: title[1].trim(), endIndex: startIndex };
+  const description = line2.match(ACC_DESCR_INLINE_RE);
+  if (description) return { title: false, form: "inline", value: description[1].trim(), endIndex: startIndex };
+  return null;
+}
+function scanAccessibilityDirectives(lines) {
+  const accessibility = {};
+  const familyLines = [];
+  let unclosedIndex;
+  for (let index = 0; index < lines.length; index++) {
+    const directive = parseAccessibilityDirective(lines, index);
+    if (directive === void 0) {
+      unclosedIndex = index;
+      familyLines.push(...lines.slice(index));
+      break;
+    }
+    if (directive === null) {
+      familyLines.push(lines[index]);
+      continue;
+    }
+    if (directive.title) accessibility.title = directive.value;
+    else accessibility.descr = directive.value;
+    if (directive.suffixLine) familyLines.push(directive.suffixLine);
+    index = directive.endIndex;
+  }
+  return {
+    accessibility,
+    familyLines,
+    ...unclosedIndex !== void 0 ? { unclosedIndex } : {}
+  };
+}
+function requireClosedAccessibility(scan) {
+  if (scan.unclosedIndex !== void 0) throw new Error("Unclosed accDescr block");
+}
+function accessibilityFields(accessibility) {
+  return {
+    ...accessibility.title !== void 0 ? { accessibilityTitle: accessibility.title } : {},
+    ...accessibility.descr !== void 0 ? { accessibilityDescription: accessibility.descr } : {}
+  };
+}
+function withAccessibilityFields(value, accessibility) {
+  if (accessibility.title === void 0 && accessibility.descr === void 0) {
+    return value;
+  }
+  return { ...value, ...accessibilityFields(accessibility) };
+}
+function withAccessibilityObject(value, accessibility) {
+  if (accessibility.title === void 0 && accessibility.descr === void 0) {
+    return value;
+  }
+  return {
+    ...value,
+    accessibility: {
+      ...accessibility.title !== void 0 ? { title: accessibility.title } : {},
+      ...accessibility.descr !== void 0 ? { description: accessibility.descr } : {}
+    }
+  };
+}
+
 // src/shared/direction-statement.ts
 var DIRECTION_RE = /^direction\s+(TB|TD|BT|LR|RL)\s*$/i;
 function parseDirectionStatement(line2) {
@@ -2680,13 +2553,17 @@ function parseClassInteraction(line2) {
   return ref && /^(?:https?:|mailto:)/i.test(href) ? { ...ref, href } : null;
 }
 function parseClassDiagram(lines) {
-  lines = lines.flatMap(expandInlineNamespaceStatement);
+  const accessibility = scanAccessibilityDirectives(lines);
+  requireClosedAccessibility(accessibility);
+  lines = accessibility.familyLines.flatMap(expandInlineNamespaceStatement);
   const diagram = {
     classes: [],
     classDefs: /* @__PURE__ */ new Map(),
     relationships: [],
     notes: [],
-    namespaces: []
+    namespaces: [],
+    ...accessibility.accessibility.title !== void 0 ? { accessibilityTitle: normalizeBrTags(accessibility.accessibility.title) } : {},
+    ...accessibility.accessibility.descr !== void 0 ? { accessibilityDescription: normalizeBrTags(accessibility.accessibility.descr) } : {}
   };
   const classMap = /* @__PURE__ */ new Map();
   const namespaceByPath = /* @__PURE__ */ new Map();
@@ -2723,23 +2600,6 @@ function parseClassDiagram(lines) {
   const namespaceFrameSizes = [];
   for (let i2 = 1; i2 < lines.length; i2++) {
     const line2 = lines[i2];
-    const accTitle = parseAccessibilityLine(line2, "accTitle");
-    if (accTitle !== void 0) {
-      diagram.accessibilityTitle = accTitle;
-      continue;
-    }
-    const accDescrStart = line2.match(/^accDescr\s*:?\s*\{\s*(.*)$/i);
-    if (accDescrStart) {
-      const parsed = collectAccessibilityBlock(accDescrStart[1] ?? "", lines, i2);
-      diagram.accessibilityDescription = normalizeBrTags(parsed.text);
-      i2 = parsed.nextIndex;
-      continue;
-    }
-    const accDescr = parseAccessibilityLine(line2, "accDescr");
-    if (accDescr !== void 0) {
-      diagram.accessibilityDescription = accDescr;
-      continue;
-    }
     if (currentClass && braceDepth > 0) {
       if (line2 === "}") {
         braceDepth--;
@@ -2883,26 +2743,6 @@ function parseClassDiagram(lines) {
   diagram.classes = [...classMap.values()];
   return diagram;
 }
-function parseAccessibilityLine(line2, directive) {
-  const match = line2.match(new RegExp(`^${directive}\\s*:?[ \\t]+(.+)$`, "i"));
-  return match ? normalizeBrTags(match[1].trim()) : void 0;
-}
-function collectAccessibilityBlock(initial, lines, startIndex) {
-  const initialEnd = initial.indexOf("}");
-  if (initialEnd !== -1) return { text: initial.slice(0, initialEnd).trim(), nextIndex: startIndex };
-  const parts = [initial.trim()].filter(Boolean);
-  for (let i2 = startIndex + 1; i2 < lines.length; i2++) {
-    const line2 = lines[i2];
-    const end = line2.indexOf("}");
-    if (end !== -1) {
-      const beforeBrace = line2.slice(0, end).trim();
-      if (beforeBrace) parts.push(beforeBrace);
-      return { text: parts.join("\n"), nextIndex: i2 };
-    }
-    parts.push(line2);
-  }
-  throw new Error('Class accDescr block is missing a closing "}"');
-}
 function ensureClass(classMap, id, generic) {
   let cls = classMap.get(id);
   if (!cls) {
@@ -3536,15 +3376,11 @@ function mutateClass(body, op) {
 }
 function verifyClass(body, opts) {
   const warnings = [];
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   if (body.classes.length === 0 && body.title === void 0) {
     warnings.push({ code: "EMPTY_DIAGRAM" });
     return warnings;
   }
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   if (body.title) overflow("title", body.title);
   const ids = new Set(body.classes.map((c2) => c2.id));
   for (const c2 of body.classes) {
@@ -3613,11 +3449,16 @@ function parseErGroupHeader(line2) {
   return { id, label: formatErMarkdown(explicit[2]?.trim() || id) };
 }
 function parseErDiagram(lines) {
+  const accessibility = scanAccessibilityDirectives(lines);
+  requireClosedAccessibility(accessibility);
+  lines = accessibility.familyLines;
   const diagram = {
     entities: [],
     classDefs: /* @__PURE__ */ new Map(),
     relationships: [],
-    groups: []
+    groups: [],
+    ...accessibility.accessibility.title !== void 0 ? { accessibilityTitle: normalizeBrTags(accessibility.accessibility.title) } : {},
+    ...accessibility.accessibility.descr !== void 0 ? { accessibilityDescription: normalizeBrTags(accessibility.accessibility.descr) } : {}
   };
   const entityMap = /* @__PURE__ */ new Map();
   let currentEntity = null;
@@ -3626,23 +3467,6 @@ function parseErDiagram(lines) {
   const currentGroup = () => groupStack.at(-1);
   for (let i2 = 1; i2 < lines.length; i2++) {
     const line2 = lines[i2];
-    const accTitle = parseAccessibilityLine2(line2, "accTitle");
-    if (accTitle !== void 0) {
-      diagram.accessibilityTitle = accTitle;
-      continue;
-    }
-    const accDescrStart = line2.match(/^accDescr\s*:?\s*\{\s*(.*)$/i);
-    if (accDescrStart) {
-      const parsed = collectAccessibilityBlock2(accDescrStart[1] ?? "", lines, i2);
-      diagram.accessibilityDescription = normalizeBrTags(parsed.text);
-      i2 = parsed.nextIndex;
-      continue;
-    }
-    const accDescr = parseAccessibilityLine2(line2, "accDescr");
-    if (accDescr !== void 0) {
-      diagram.accessibilityDescription = accDescr;
-      continue;
-    }
     if (currentEntity) {
       if (line2 === "}") {
         currentEntity = null;
@@ -3721,26 +3545,6 @@ function parseErDiagram(lines) {
   diagram.entities = [...entityMap.values()];
   return diagram;
 }
-function parseAccessibilityLine2(line2, directive) {
-  const match = line2.match(new RegExp(`^${directive}\\s*:?[ \\t]+(.+)$`, "i"));
-  return match ? normalizeBrTags(match[1].trim()) : void 0;
-}
-function collectAccessibilityBlock2(initial, lines, startIndex) {
-  const initialEnd = initial.indexOf("}");
-  if (initialEnd !== -1) return { text: initial.slice(0, initialEnd).trim(), nextIndex: startIndex };
-  const parts = [initial.trim()].filter(Boolean);
-  for (let i2 = startIndex + 1; i2 < lines.length; i2++) {
-    const line2 = lines[i2];
-    const end = line2.indexOf("}");
-    if (end !== -1) {
-      const beforeBrace = line2.slice(0, end).trim();
-      if (beforeBrace) parts.push(beforeBrace);
-      return { text: parts.join("\n"), nextIndex: i2 };
-    }
-    parts.push(line2);
-  }
-  throw new Error('ER accDescr block is missing a closing "}"');
-}
 function ensureEntity(entityMap, id, label, className, groupId) {
   let entity = entityMap.get(id);
   if (!entity) {
@@ -4274,16 +4078,12 @@ function mutateEr(body, op) {
 }
 function verifyErBody(body, opts) {
   const warnings = [];
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   if (body.entities.length === 0 && body.relations.length === 0 && (body.groups?.length ?? 0) === 0) {
     warnings.push({ code: "EMPTY_DIAGRAM" });
     return warnings;
   }
   const ids = /* @__PURE__ */ new Set([...body.entities.map((e2) => e2.id), ...(body.groups ?? []).map((group2) => group2.id)]);
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   for (const group2 of body.groups ?? []) overflow(group2.id, group2.label);
   for (const e2 of body.entities) {
     if (e2.label) overflow(e2.id, e2.label);
@@ -4343,13 +4143,17 @@ function parseSequenceMessageLine(line2) {
   };
 }
 function parseSequenceDiagram(lines, opts = {}) {
+  const accessibility = scanAccessibilityDirectives(lines);
+  lines = accessibility.familyLines;
   const diagram = {
     actors: [],
     messages: [],
     blocks: [],
     notes: [],
     activationEvents: [],
-    boxes: []
+    boxes: [],
+    ...accessibility.accessibility.title !== void 0 ? { accessibilityTitle: normalizeBrTags(accessibility.accessibility.title) } : {},
+    ...accessibility.accessibility.descr !== void 0 ? { accessibilityDescription: normalizeBrTags(accessibility.accessibility.descr) } : {}
   };
   const actorIds = /* @__PURE__ */ new Set();
   const blockStack = [];
@@ -4387,25 +4191,6 @@ function parseSequenceDiagram(lines, opts = {}) {
   };
   for (let i2 = 1; i2 < lines.length; i2++) {
     const line2 = lines[i2];
-    const accTitle = parseAccessibilityLine3(line2, "accTitle");
-    if (accTitle !== void 0) {
-      diagram.accessibilityTitle = accTitle;
-      continue;
-    }
-    const accDescrStart = line2.match(/^accDescr\s*:?\s*\{\s*(.*)$/i);
-    if (accDescrStart) {
-      const parsed = collectAccessibilityBlock3(accDescrStart[1] ?? "", lines, i2);
-      if (parsed) {
-        diagram.accessibilityDescription = normalizeBrTags(parsed.text);
-        i2 = parsed.nextIndex;
-      }
-      continue;
-    }
-    const accDescr = parseAccessibilityLine3(line2, "accDescr");
-    if (accDescr !== void 0) {
-      diagram.accessibilityDescription = accDescr;
-      continue;
-    }
     const actorDeclaration = parseActorDeclaration(line2);
     if (actorDeclaration) {
       const { id, label, type } = actorDeclaration;
@@ -4615,26 +4400,6 @@ function parseMessageArrow(arrow) {
   }
   return { lineStyle, startHead: "none", endHead: "open" };
 }
-function parseAccessibilityLine3(line2, directive) {
-  const match = line2.match(new RegExp(`^${directive}\\s*:?[ \\t]+(.+)$`, "i"));
-  return match ? normalizeBrTags(match[1].trim()) : void 0;
-}
-function collectAccessibilityBlock3(initial, lines, startIndex) {
-  const initialEnd = initial.indexOf("}");
-  if (initialEnd !== -1) return { text: initial.slice(0, initialEnd).trim(), nextIndex: startIndex };
-  const parts = [initial.trim()].filter(Boolean);
-  for (let i2 = startIndex + 1; i2 < lines.length; i2++) {
-    const line2 = lines[i2];
-    const end = line2.indexOf("}");
-    if (end !== -1) {
-      const beforeBrace = line2.slice(0, end).trim();
-      if (beforeBrace) parts.push(beforeBrace);
-      return { text: parts.join("\n"), nextIndex: i2 };
-    }
-    parts.push(line2);
-  }
-  return null;
-}
 function ensureActor(diagram, actorIds, id) {
   if (!actorIds.has(id)) {
     actorIds.add(id);
@@ -5195,9 +4960,6 @@ function syntaxError(detail) {
 var TIMELINE_HEADER_DIRECTION_RE = /^timeline\s+(LR|TD)\s*$/i;
 var TIMELINE_TITLE_RE = /^title\s+(.+)$/i;
 var TIMELINE_SECTION_RE = /^section\s+([^:]+)$/i;
-var TIMELINE_ACCESSIBILITY_TITLE_RE = /^accTitle\s*:\s*(.+)$/i;
-var TIMELINE_ACCESSIBILITY_DESCRIPTION_RE = /^accDescr\s*:\s*(.+)$/i;
-var TIMELINE_ACCESSIBILITY_DESCRIPTION_BLOCK_RE = /^accDescr\s*\{\s*$/i;
 var TIMELINE_CONTINUATION_RE = /^:\s+(.+)$/;
 var TIMELINE_PERIOD_RE = /^([^:#\n]+?)(\s*:\s+.+)$/;
 function splitTimelineEvents(raw) {
@@ -5243,11 +5005,16 @@ function parseTimelineEventSegments(raw) {
   }
 }
 function parseTimelineBody(lines, accessibility = {}) {
+  const scanned = scanAccessibilityDirectives(lines);
+  if (scanned.unclosedIndex !== void 0) return null;
+  lines = scanned.familyLines;
+  const accessibilityTitle = scanned.accessibility.title ?? accessibility.title;
+  const accessibilityDescription = scanned.accessibility.descr ?? accessibility.descr;
   const body = {
     kind: "timeline",
     sections: [],
-    ...accessibility.title !== void 0 ? { accessibilityTitle: accessibility.title } : {},
-    ...accessibility.descr !== void 0 ? { accessibilityDescription: accessibility.descr } : {}
+    ...accessibilityTitle !== void 0 ? { accessibilityTitle } : {},
+    ...accessibilityDescription !== void 0 ? { accessibilityDescription } : {}
   };
   let currentSection;
   let currentPeriod;
@@ -5270,31 +5037,6 @@ function parseTimelineBody(lines, accessibility = {}) {
       body.title = title;
       continue;
     }
-    const at = line2.match(TIMELINE_ACCESSIBILITY_TITLE_RE);
-    if (at) {
-      body.accessibilityTitle = normalizeTimelineText(at[1]);
-      continue;
-    }
-    const ad = line2.match(TIMELINE_ACCESSIBILITY_DESCRIPTION_RE);
-    if (ad) {
-      body.accessibilityDescription = normalizeTimelineText(ad[1]);
-      continue;
-    }
-    if (TIMELINE_ACCESSIBILITY_DESCRIPTION_BLOCK_RE.test(line2)) {
-      const descriptionLines = [];
-      let closed = false;
-      while (++i2 < lines.length) {
-        const blockLine = lines[i2].trim();
-        if (blockLine === "}") {
-          closed = true;
-          break;
-        }
-        descriptionLines.push(blockLine);
-      }
-      if (!closed) return null;
-      body.accessibilityDescription = descriptionLines.join("\n").trim();
-      continue;
-    }
     const sm = line2.match(TIMELINE_SECTION_RE);
     if (sm) {
       const label = normalizeTimelineText(sm[1]);
@@ -5384,21 +5126,16 @@ function cloneTimeline(b2) {
   };
 }
 function makeTimelineIdAllocator(body) {
-  const seen = /* @__PURE__ */ new Set();
-  for (const s2 of body.sections) {
-    seen.add(s2.id);
-    for (const p2 of s2.periods) {
-      seen.add(p2.id);
-      for (const e2 of p2.events) seen.add(e2.id);
-    }
-  }
-  return (prefix) => {
-    let n2 = 0;
-    while (seen.has(`${prefix}-${n2}`)) n2++;
-    const id = `${prefix}-${n2}`;
-    seen.add(id);
-    return id;
+  const ids = body.sections.flatMap((section2) => [
+    section2.id,
+    ...section2.periods.flatMap((period) => [period.id, ...period.events.map((event) => event.id)])
+  ]);
+  const allocators = {
+    section: indexedIdAllocator(ids, "section"),
+    period: indexedIdAllocator(ids, "period"),
+    event: indexedIdAllocator(ids, "event")
   };
+  return (prefix) => allocators[prefix]();
 }
 function normalizeTimelineOpText(value, opts) {
   if (typeof value !== "string") return err({ code: "INVALID_OP", message: `Timeline ${opts.field} must be a string` });
@@ -5600,8 +5337,6 @@ var JOURNEY_TITLE_RE = /^title\s+(.+)$/i;
 var JOURNEY_SECTION_RE = /^section\s+(.+)$/i;
 var JOURNEY_TASK_RE = /^([^:]+?)\s*:\s*([0-9]+)\s*(?::\s*(.*))?$/;
 var TASK_LIKE_RE = /^([^:]+?)\s*:\s*([^:]+?)(?:\s*:\s*.*)?$/;
-var ACC_LINE_RE = (directive) => new RegExp(`^${directive}\\s*:[ \\t]*(.+)$`, "i");
-var ACC_DESCR_BLOCK_START_RE = /^accDescr\s*:?\s*\{\s*(.*)$/i;
 function normalizeJourneyLabel(label) {
   return label.replace(/<br\s*\/?>/gi, "\n").replace(/\\n/g, "\n").replace(/<\/?(?:sub|sup|small|mark)\s*>/gi, "").replace(/\*\*(.+?)\*\*/g, "<b>$1</b>").replace(/(?<!\*)\*([^\s*](?:[^*]*[^\s*])?)\*(?!\*)/g, "<i>$1</i>").replace(/~~(.+?)~~/g, "<s>$1</s>");
 }
@@ -5622,23 +5357,22 @@ function walkJourneyLines(lines, startIndex, events) {
     const line2 = lines[i2].trim();
     if (!line2) continue;
     if (isJourneyComment(line2)) continue;
-    const accDescrStart = line2.match(ACC_DESCR_BLOCK_START_RE);
-    if (accDescrStart) {
-      const collected = collectJourneyAccessibilityBlock(accDescrStart[1] ?? "", lines, i2);
-      if (!collected) {
-        const outcome2 = events.issue?.({
-          code: "unclosed_accdescr",
-          lineIndex: i2,
-          statement: line2,
-          detail: 'Journey accDescr block is missing a closing "}"'
-        });
-        if (outcome2 === "stop") return;
-        return;
-      }
-      events.accDescr?.(normalizeJourneyText(collected.text), i2);
-      i2 = collected.nextIndex;
-      for (const statement of splitJourneyStatements(collected.suffix)) {
-        const outcome2 = classifyStatement(statement, collected.nextIndex, events);
+    const accessibility = parseAccessibilityDirective(lines, i2);
+    if (accessibility === void 0) {
+      const outcome2 = events.issue?.({
+        code: "unclosed_accdescr",
+        lineIndex: i2,
+        statement: line2,
+        detail: 'Journey accDescr block is missing a closing "}"'
+      });
+      if (outcome2 === "stop") return;
+      return;
+    }
+    if (accessibility?.form === "block") {
+      events.accDescr?.(normalizeJourneyText(accessibility.value), i2);
+      i2 = accessibility.endIndex;
+      for (const statement of splitJourneyStatements(accessibility.suffixLine ?? "")) {
+        const outcome2 = classifyStatement(statement, accessibility.endIndex, events);
         if (outcome2 === "stop") return;
       }
       continue;
@@ -5651,14 +5385,11 @@ function walkJourneyLines(lines, startIndex, events) {
 }
 function classifyStatement(statement, lineIndex, events) {
   const issue = (code, detail) => events.issue?.({ code, lineIndex, statement, detail });
-  const accTitle = matchAccessibilityLine(statement, "accTitle");
-  if (accTitle !== void 0) {
-    events.accTitle?.(accTitle, lineIndex);
-    return;
-  }
-  const accDescr = matchAccessibilityLine(statement, "accDescr");
-  if (accDescr !== void 0) {
-    events.accDescr?.(accDescr, lineIndex);
+  const accessibility = parseAccessibilityDirective([statement], 0);
+  if (accessibility) {
+    const text3 = normalizeJourneyText(accessibility.value);
+    if (accessibility.title) events.accTitle?.(text3, lineIndex);
+    else events.accDescr?.(text3, lineIndex);
     return;
   }
   const titleMatch = statement.match(JOURNEY_TITLE_RE);
@@ -5727,36 +5458,6 @@ function splitJourneyStatements(line2) {
   parts.push(line2.slice(start));
   return parts.map((part) => part.trim()).filter((part) => part && !isJourneyComment(part));
 }
-function matchAccessibilityLine(line2, directive) {
-  const match = line2.match(ACC_LINE_RE(directive));
-  return match ? normalizeJourneyText(match[1]) : void 0;
-}
-function collectJourneyAccessibilityBlock(initial, lines, startIndex) {
-  const initialEnd = initial.indexOf("}");
-  if (initialEnd !== -1) {
-    return {
-      text: initial.slice(0, initialEnd).trim(),
-      nextIndex: startIndex,
-      suffix: initial.slice(initialEnd + 1).trim()
-    };
-  }
-  const parts = [initial.trim()].filter(Boolean);
-  for (let i2 = startIndex + 1; i2 < lines.length; i2++) {
-    const line2 = lines[i2];
-    const end = line2.indexOf("}");
-    if (end !== -1) {
-      const beforeBrace = line2.slice(0, end).trim();
-      if (beforeBrace) parts.push(beforeBrace);
-      return {
-        text: parts.join("\n"),
-        nextIndex: i2,
-        suffix: line2.slice(end + 1).trim()
-      };
-    }
-    parts.push(line2);
-  }
-  return null;
-}
 
 // src/agent/journey-body.ts
 function formatJourneyInline(value) {
@@ -5848,18 +5549,10 @@ function cloneJourney(b2) {
   };
 }
 function makeIdAllocator(body) {
-  const seen = /* @__PURE__ */ new Set();
-  for (const s2 of body.sections) {
-    seen.add(s2.id);
-    for (const t2 of s2.tasks) seen.add(t2.id);
-  }
-  return (prefix) => {
-    let n2 = 0;
-    while (seen.has(`${prefix}-${n2}`)) n2++;
-    const id = `${prefix}-${n2}`;
-    seen.add(id);
-    return id;
-  };
+  const ids = body.sections.flatMap((section3) => [section3.id, ...section3.tasks.map((task2) => task2.id)]);
+  const section2 = indexedIdAllocator(ids, "section");
+  const task = indexedIdAllocator(ids, "task");
+  return (prefix) => prefix === "section" ? section2() : task();
 }
 function normalizeOpText(value, field, opts = {}) {
   if (typeof value !== "string") return err({ code: "INVALID_OP", message: `Journey ${field} must be a string` });
@@ -6070,16 +5763,12 @@ function journeySemantics(body) {
 function verifyJourney(body, opts) {
   const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   const warnings = [];
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts, cap);
   const hasTask = body.sections.some((s2) => s2.tasks.length > 0);
   const hasHeaderFurniture = body.title !== void 0 || body.accessibilityTitle !== void 0 || body.accessibilityDescription !== void 0 || body.sections.length > 0;
   if (!hasTask && !hasHeaderFurniture) warnings.push({ code: "EMPTY_DIAGRAM" });
   if (body.title !== void 0) {
-    const w2 = labelOverflowWarning("title", body.title, Math.max(cap, 80));
-    if (w2) warnings.push(w2);
+    labelOverflowCollector(warnings, opts, Math.max(cap, 80))("title", body.title);
   }
   const actors = new Set(body.sections.flatMap((section2) => section2.tasks.flatMap((task) => task.actors)));
   if (actors.size > JOURNEY_ACTOR_COLOR_LIMIT) {
@@ -6260,9 +5949,12 @@ function parseEdge(line2) {
   };
 }
 function parseArchitectureBody(lines, accessibility = {}) {
+  const scanned = scanAccessibilityDirectives(lines);
+  if (scanned.unclosedIndex !== void 0) return null;
+  lines = scanned.familyLines;
   let title;
-  let accessibilityTitle = accessibility.title;
-  let accessibilityDescription = accessibility.descr;
+  const accessibilityTitle = scanned.accessibility.title ?? accessibility.title;
+  const accessibilityDescription = scanned.accessibility.descr ?? accessibility.descr;
   const groups = [];
   const services = [];
   const junctions = [];
@@ -6283,43 +5975,6 @@ function parseArchitectureBody(lines, accessibility = {}) {
       if (!title) return null;
       continue;
     }
-    const accessibilityTitleMatch = line2.match(/^accTitle\s*:\s*(.+)$/i);
-    if (accessibilityTitleMatch) {
-      accessibilityTitle = normalizeText(accessibilityTitleMatch[1]);
-      if (!accessibilityTitle) return null;
-      continue;
-    }
-    const accessibilityDescriptionMatch = line2.match(/^accDescr\s*:\s*(?!\{)(.+)$/i);
-    if (accessibilityDescriptionMatch) {
-      accessibilityDescription = normalizeText(accessibilityDescriptionMatch[1]);
-      if (!accessibilityDescription) return null;
-      continue;
-    }
-    const accessibilityDescriptionBlock = line2.match(/^accDescr\s*:?\s*\{\s*(.*)$/i);
-    if (accessibilityDescriptionBlock) {
-      const blockLines = [];
-      let remainder = accessibilityDescriptionBlock[1];
-      let closed = false;
-      if (remainder.includes("}")) {
-        blockLines.push(remainder.slice(0, remainder.indexOf("}")).trim());
-        closed = true;
-      } else {
-        if (remainder.trim()) blockLines.push(remainder.trim());
-        while (++lineIndex < lines.length) {
-          const blockLine = lines[lineIndex];
-          if (blockLine.includes("}")) {
-            const before = blockLine.slice(0, blockLine.indexOf("}")).trim();
-            if (before) blockLines.push(before);
-            closed = true;
-            break;
-          }
-          blockLines.push(blockLine.trim());
-        }
-      }
-      if (!closed) return null;
-      accessibilityDescription = blockLines.filter(Boolean).join("\n");
-      continue;
-    }
     const gm = line2.match(GROUP_RE);
     if (gm) {
       const id = gm[1];
@@ -6846,12 +6501,8 @@ function verifyOpaqueArchitectureIcons(source) {
   return warnings;
 }
 function verifyArchitecture(body, opts) {
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   const warnings = [];
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   if (body.groups.length === 0 && body.services.length === 0 && body.junctions.length === 0 && body.title === void 0 && body.accessibilityTitle === void 0 && body.accessibilityDescription === void 0) {
     warnings.push({ code: "EMPTY_DIAGRAM" });
   }
@@ -7168,16 +6819,6 @@ function cloneXyChart(b2) {
     series: b2.series.map((s2) => ({ id: s2.id, kind: s2.kind, name: s2.name, values: [...s2.values], ...s2.pointLabels ? { pointLabels: [...s2.pointLabels] } : {} }))
   };
 }
-function makeSeriesIdAllocator(body) {
-  const seen = new Set(body.series.map((s2) => s2.id));
-  return () => {
-    let n2 = 0;
-    while (seen.has(`series-${n2}`)) n2++;
-    const id = `series-${n2}`;
-    seen.add(id);
-    return id;
-  };
-}
 function validBareText(value, field) {
   if (typeof value !== "string") return err({ code: "INVALID_OP", message: `XY chart ${field} must be a string` });
   const normalized = normalizeText2(value);
@@ -7234,7 +6875,7 @@ function buildAxis(spec, axisName) {
 }
 function mutateXyChart(body, op) {
   const next = cloneXyChart(body);
-  const nextId = makeSeriesIdAllocator(next);
+  const nextId = indexedIdAllocator(next.series.map((series) => series.id), "series");
   switch (op.kind) {
     case "set_title": {
       if (op.title === null) {
@@ -7352,12 +6993,8 @@ function mutateXyChart(body, op) {
   return ok(next);
 }
 function verifyXyChart(body, opts) {
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   const warnings = [];
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   if (body.series.length === 0) warnings.push({ code: "EMPTY_DIAGRAM" });
   if (body.title !== void 0) overflow("title", body.title);
   if (body.xAxis?.name !== void 0) overflow("x-axis", body.xAxis.name);
@@ -7377,46 +7014,11 @@ function verifyXyChart(body, opts) {
   return warnings;
 }
 
-// src/shared/accessibility-directives.ts
-function accessibilityFields(accessibility) {
-  return {
-    ...accessibility.title !== void 0 ? { accessibilityTitle: accessibility.title } : {},
-    ...accessibility.descr !== void 0 ? { accessibilityDescription: accessibility.descr } : {}
-  };
-}
-function withAccessibilityFields(value, accessibility) {
-  if (accessibility.title === void 0 && accessibility.descr === void 0) {
-    return value;
-  }
-  return { ...value, ...accessibilityFields(accessibility) };
-}
-function withAccessibilityObject(value, accessibility) {
-  if (accessibility.title === void 0 && accessibility.descr === void 0) {
-    return value;
-  }
-  return {
-    ...value,
-    accessibility: {
-      ...accessibility.title !== void 0 ? { title: accessibility.title } : {},
-      ...accessibility.descr !== void 0 ? { description: accessibility.descr } : {}
-    }
-  };
-}
-function accessibilityDirectiveEnd(lines, i2) {
-  const line2 = lines[i2].trim();
-  if (/^acc(Title|Descr)\s*:/i.test(line2)) return i2;
-  if (/^accDescr\s*\{/i.test(line2)) {
-    let end = i2;
-    while (end < lines.length && !lines[end].includes("}")) end++;
-    return end;
-  }
-  return -1;
-}
-
 // src/pie/parser.ts
 var ENTRY_RE = /^"((?:[^"\\]|\\.)*)"\s*:\s*(.+)$/;
 var NUMBER_RE = /^\+?(?:\d+(?:\.\d+)?|\.\d+)$/;
 function parsePieChart(lines) {
+  lines = scanAccessibilityDirectives(lines).familyLines;
   if (lines.length === 0) {
     throw new Error("Pie chart is empty");
   }
@@ -7443,11 +7045,6 @@ function parsePieChart(lines) {
   for (let i2 = 1; i2 < lines.length; i2++) {
     const line2 = lines[i2].trim();
     if (line2.length === 0 || line2.startsWith("%%")) continue;
-    const accEnd = accessibilityDirectiveEnd(lines, i2);
-    if (accEnd !== -1) {
-      i2 = accEnd;
-      continue;
-    }
     if (/^showData\s*$/i.test(line2)) {
       showData = true;
       continue;
@@ -7543,16 +7140,6 @@ function clonePie(b2) {
     slices: b2.slices.map((s2) => ({ id: s2.id, label: s2.label, value: s2.value }))
   };
 }
-function makeSliceIdAllocator(body) {
-  const seen = new Set(body.slices.map((s2) => s2.id));
-  return () => {
-    let n2 = 0;
-    while (seen.has(`slice-${n2}`)) n2++;
-    const id = `slice-${n2}`;
-    seen.add(id);
-    return id;
-  };
-}
 function validLabel(value, field) {
   if (typeof value !== "string") return err({ code: "INVALID_OP", message: `Pie ${field} must be a string` });
   const trimmed = value.trim();
@@ -7572,7 +7159,7 @@ function findSlice(body, label) {
 }
 function mutatePie(body, op) {
   const next = clonePie(body);
-  const nextId = makeSliceIdAllocator(next);
+  const nextId = indexedIdAllocator(next.slices.map((slice) => slice.id), "slice");
   switch (op.kind) {
     case "set_title": {
       if (op.title === null) {
@@ -7653,12 +7240,8 @@ function mutatePie(body, op) {
   return ok(next);
 }
 function verifyPie(body, opts) {
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   const warnings = [];
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   if (body.slices.length === 0) warnings.push({ code: "EMPTY_DIAGRAM" });
   if (body.title !== void 0) overflow("title", body.title);
   for (const s2 of body.slices) overflow(s2.id, s2.label);
@@ -7779,10 +7362,10 @@ var AXIS_RE = /^([xy])-axis\s+(.+)$/i;
 var QUADRANT_RE = /^quadrant-([1-4])\s+(.+)$/i;
 var POINT_RE = /^(.+?)\s*:\s*\[\s*([^,\]]+)\s*,\s*([^,\]]+)\s*\]\s*(.*)$/;
 var CLASSDEF_RE = /^classDef\s+(.+)$/i;
-var ACC_TITLE_RE = /^accTitle\s*:\s*(.+)$/i;
-var ACC_DESCR_RE = /^accDescr\s*:\s*(?!\{)(.+)$/i;
-var ACC_DESCR_BLOCK_RE = /^accDescr\s*:?\s*\{\s*(.*)$/i;
 function parseQuadrantChart(lines) {
+  const scanned = scanAccessibilityDirectives(lines);
+  requireClosedAccessibility(scanned);
+  lines = scanned.familyLines;
   if (lines.length === 0) {
     throw new Error("Quadrant chart is empty");
   }
@@ -7791,7 +7374,10 @@ function parseQuadrantChart(lines) {
     throw new Error(`Quadrant chart must start with "quadrant" or "quadrantChart", got: "${header}"`);
   }
   let title;
-  const accessibility = {};
+  const accessibility = {
+    ...scanned.accessibility.title !== void 0 ? { title: normalizeBrTags(scanned.accessibility.title) } : {},
+    ...scanned.accessibility.descr !== void 0 ? { description: normalizeBrTags(scanned.accessibility.descr) } : {}
+  };
   let xAxis;
   let yAxis;
   const quadrants = [void 0, void 0, void 0, void 0];
@@ -7810,38 +7396,6 @@ function parseQuadrantChart(lines) {
       classDefs[parsed.name] = parsed.style;
       continue;
     }
-    if (m2 = line2.match(ACC_TITLE_RE)) {
-      accessibility.title = normalizeBrTags(m2[1].trim());
-      continue;
-    }
-    if (m2 = line2.match(ACC_DESCR_RE)) {
-      accessibility.description = normalizeBrTags(m2[1].trim());
-      continue;
-    }
-    if (m2 = line2.match(ACC_DESCR_BLOCK_RE)) {
-      const parts = [];
-      let rest = m2[1];
-      let closed = false;
-      for (; ; ) {
-        const end = rest.indexOf("}");
-        if (end !== -1) {
-          const text3 = rest.slice(0, end).trim();
-          if (text3) parts.push(text3);
-          if (rest.slice(end + 1).trim()) {
-            throw new Error(`Unrecognized text after quadrant accDescr block: "${rest.slice(end + 1).trim()}"`);
-          }
-          closed = true;
-          break;
-        }
-        if (rest.trim()) parts.push(rest.trim());
-        i2++;
-        if (i2 >= lines.length) break;
-        rest = lines[i2];
-      }
-      if (!closed) throw new Error('Quadrant accDescr block is missing a closing "}"');
-      accessibility.description = normalizeBrTags(parts.join("\n"));
-      continue;
-    }
     if (m2 = line2.match(TITLE_RE2)) {
       title = normalizeBrTags(m2[1].trim());
       continue;
@@ -8152,12 +7706,8 @@ function mutateQuadrant(body, op) {
   return ok(next);
 }
 function verifyQuadrant(body, opts) {
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   const warnings = [];
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   const empty = body.title === void 0 && !body.xAxis && !body.yAxis && body.quadrants.every((q) => q === void 0) && body.points.length === 0;
   if (empty) warnings.push({ code: "EMPTY_DIAGRAM" });
   if (body.title !== void 0) overflow("title", body.title);
@@ -11687,15 +11237,11 @@ function renameInTransitions(body, from, to) {
   walk(body.states, body.transitions);
 }
 function verifyState(body, opts) {
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   const warnings = [];
   if (body.states.length === 0 && body.transitions.length === 0 && (body.notes ?? []).length === 0) {
     return [{ code: "EMPTY_DIAGRAM" }];
   }
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   const known = /* @__PURE__ */ new Set([PSEUDO]);
   collectIds(body.states, known);
   const anchors = (endpoint) => {
@@ -11841,12 +11387,14 @@ var DIRECTIVE_RES = {
   weekday: /^weekday\s+(.+)$/i,
   weekend: /^weekend\s+(.+)$/i,
   section: /^section\s+(.+)$/i,
-  click: /^click\s+([\w-]+)\s+(href|call)\s+(.+)$/i,
-  accTitle: /^accTitle\s*:\s*(.+)$/i,
-  accDescrInline: /^accDescr\s*:\s*(.+)$/i,
-  accDescrBlock: /^accDescr\s*\{\s*$/i
+  click: /^click\s+([\w-]+)\s+(href|call)\s+(.+)$/i
 };
 function parseGanttModel(lines) {
+  const accessibility = scanAccessibilityDirectives(lines);
+  if (accessibility.unclosedIndex !== void 0) {
+    throw new GanttError("GANTT_BAD_DIRECTIVE", "Unclosed accDescr block", accessibility.unclosedIndex + 1);
+  }
+  lines = accessibility.familyLines;
   const header = (lines[0] ?? "").trim();
   if (!/^gantt\s*$/i.test(header)) {
     throw new GanttError("GANTT_BAD_DIRECTIVE", `Expected "gantt" header, got "${header}"`, 1);
@@ -11861,25 +11409,16 @@ function parseGanttModel(lines) {
     weekStart: "sunday",
     sections: [{ taskIndexes: [] }],
     tasks: [],
-    clicks: []
+    clicks: [],
+    ...accessibility.accessibility.title !== void 0 ? { accTitle: accessibility.accessibility.title } : {},
+    ...accessibility.accessibility.descr !== void 0 ? { accDescr: accessibility.accessibility.descr.replace(/\s*\n\s*/g, " ") } : {}
   };
   const seenIds = /* @__PURE__ */ new Set();
   let currentSection = 0;
-  let inAccDescr = false;
-  const accDescrBuf = [];
   for (let i2 = 1; i2 < lines.length; i2++) {
     const line2 = lines[i2].trim();
     const lineNo = i2 + 1;
     if (!line2 || line2.startsWith("%%")) continue;
-    if (inAccDescr) {
-      if (/^\}\s*$/.test(line2)) {
-        model.accDescr = accDescrBuf.join(" ").trim();
-        inAccDescr = false;
-      } else {
-        accDescrBuf.push(line2);
-      }
-      continue;
-    }
     let m2;
     if (m2 = line2.match(DIRECTIVE_RES.title)) {
       model.title = m2[1].trim();
@@ -11939,18 +11478,6 @@ function parseGanttModel(lines) {
       model.clicks.push({ taskId: m2[1], action: m2[2].toLowerCase(), rest: m2[3].trim(), line: lineNo });
       continue;
     }
-    if (m2 = line2.match(DIRECTIVE_RES.accTitle)) {
-      model.accTitle = m2[1].trim();
-      continue;
-    }
-    if (DIRECTIVE_RES.accDescrBlock.test(line2)) {
-      inAccDescr = true;
-      continue;
-    }
-    if (m2 = line2.match(DIRECTIVE_RES.accDescrInline)) {
-      model.accDescr = m2[1].trim();
-      continue;
-    }
     if (m2 = line2.match(DIRECTIVE_RES.section)) {
       model.sections.push({ label: m2[1].trim(), taskIndexes: [], line: lineNo });
       currentSection = model.sections.length - 1;
@@ -11983,7 +11510,6 @@ function parseGanttModel(lines) {
     }
     throw new GanttError("GANTT_BAD_DIRECTIVE", `Unrecognized gantt line "${line2}"`, lineNo);
   }
-  if (inAccDescr) throw new GanttError("GANTT_BAD_DIRECTIVE", "Unclosed accDescr block");
   return model;
 }
 function applyGanttFrontmatterConfig(model, frontmatter) {
@@ -12020,8 +11546,7 @@ function applyResolvedGanttFrontmatterConfig(model, resolved) {
 }
 
 // src/agent/gantt-body.ts
-var DIRECTIVE_LINE_RE = /^(dateFormat|axisFormat|tickInterval|inclusiveEndDates|topAxis|excludes|includes|todayMarker|weekday|weekend|click|accTitle|accDescr)\b/i;
-var ACC_DESCR_BLOCK_OPEN_RE = /^accDescr\s*\{\s*$/i;
+var DIRECTIVE_LINE_RE = /^(dateFormat|axisFormat|tickInterval|inclusiveEndDates|topAxis|excludes|includes|todayMarker|weekday|weekend|click)\b/i;
 var TITLE_RE3 = /^title\s+(.+)$/i;
 var SECTION_RE = /^section\s+(.+)$/i;
 var TASK_ID_RE = /^[\w-]+$/;
@@ -12049,21 +11574,11 @@ function parseGanttBody(trimmedLines, rawLines) {
       i2++;
       continue;
     }
-    if (ACC_DESCR_BLOCK_OPEN_RE.test(line2)) {
-      const blockLines = [rawLine];
-      i2++;
-      let closed = false;
-      while (i2 < raw.length) {
-        const inner = raw[i2];
-        blockLines.push(inner);
-        i2++;
-        if (/^\}\s*$/.test(inner.trim())) {
-          closed = true;
-          break;
-        }
-      }
-      if (!closed) return null;
-      appendOpaqueSegment(statements, blockLines, ganttOpaqueBlock);
+    const accessibility = parseAccessibilityDirective(raw, i2);
+    if (accessibility === void 0) return null;
+    if (accessibility !== null) {
+      appendOpaqueSegment(statements, raw.slice(i2, accessibility.endIndex + 1), ganttOpaqueBlock);
+      i2 = accessibility.endIndex + 1;
       continue;
     }
     if (DIRECTIVE_LINE_RE.test(line2)) {
@@ -12176,18 +11691,10 @@ function deriveStatements(b2) {
   return out;
 }
 function makeIdAllocator2(body, prefix) {
-  const seen = /* @__PURE__ */ new Set();
-  for (const s2 of body.sections) {
-    seen.add(s2.id);
-    for (const t2 of s2.tasks) seen.add(t2.id);
-  }
-  return () => {
-    let n2 = 0;
-    while (seen.has(`${prefix}-${n2}`)) n2++;
-    const id = `${prefix}-${n2}`;
-    seen.add(id);
-    return id;
-  };
+  return indexedIdAllocator(
+    body.sections.flatMap((section2) => [section2.id, ...section2.tasks.map((task) => task.id)]),
+    prefix
+  );
 }
 function validateTask(task) {
   if (!task.label || /[:\r\n]/.test(task.label)) {
@@ -12610,10 +12117,7 @@ function verifyGantt(body, opts) {
   if (tasks.length === 0 && body.title === void 0 && opaqueLines.length === 0) {
     return [{ code: "EMPTY_DIAGRAM" }];
   }
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts, cap);
   if (body.title !== void 0) overflow("title", body.title);
   for (const s2 of body.sections) {
     if (s2.label !== void 0) overflow(s2.id, s2.label);
@@ -13920,15 +13424,21 @@ var MindmapDuplicateIdError = class extends MindmapParseError {
   code = "MINDMAP_DUPLICATE_ID";
 };
 function parseMindmap(source) {
-  const rawLines = source.replace(/^\uFEFF/, "").split(/\r?\n/);
+  const sourceLines = source.replace(/^\uFEFF/, "").split(/\r?\n/);
+  const accessibilityLines = sourceLines.map((line2) => parseAccessibilityDirective([line2], 0)?.form === "inline" ? stripInlineComment(line2) : line2);
+  const scanned = scanAccessibilityDirectives(accessibilityLines);
+  if (scanned.unclosedIndex !== void 0) {
+    throw new MindmapParseError("Unclosed accDescr block", scanned.unclosedIndex + 1);
+  }
+  const rawLines = scanned.familyLines;
   const headerIndex = rawLines.findIndex((line2) => /^\s*mindmap\s*$/i.test(line2));
   if (headerIndex < 0) throw new MindmapParseError("Mindmap source must start with the mindmap header");
   const stack = [];
   const ids = /* @__PURE__ */ new Set();
   let root;
   let lastNode;
-  let accessibilityTitle;
-  let accessibilityDescription;
+  const accessibilityTitle = scanned.accessibility.title !== void 0 ? normalizeBrTags(scanned.accessibility.title) : void 0;
+  const accessibilityDescription = scanned.accessibility.descr !== void 0 ? normalizeBrTags(scanned.accessibility.descr) : void 0;
   for (let index = headerIndex + 1; index < rawLines.length; index++) {
     let raw = rawLines[index];
     if (raw.includes('["`') && !raw.includes('`"]')) {
@@ -13947,38 +13457,9 @@ function parseMindmap(source) {
     raw = stripInlineComment(raw);
     const trimmed = raw.trim();
     if (!trimmed || trimmed.startsWith("%%")) continue;
-    const accTitle = trimmed.match(/^accTitle\s*:\s*(.+)$/i);
-    if (accTitle) {
-      accessibilityTitle = normalizeBrTags(accTitle[1].trim());
-      continue;
-    }
-    if (/^accTitle\s*:/i.test(trimmed)) throw new MindmapParseError("Mindmap accTitle must contain a non-empty value", index + 1);
-    const accDescr = trimmed.match(/^accDescr\s*:\s*(.+)$/i);
-    if (accDescr) {
-      accessibilityDescription = normalizeBrTags(accDescr[1].trim());
-      continue;
-    }
-    if (/^accDescr\s*:/i.test(trimmed)) throw new MindmapParseError("Mindmap accDescr must contain a non-empty value", index + 1);
-    const accDescrBlock = trimmed.match(/^accDescr\s*\{\s*(.*)$/i);
-    if (accDescrBlock) {
-      const parts = [];
-      let rest = accDescrBlock[1];
-      let closed = false;
-      while (true) {
-        const close = rest.indexOf("}");
-        if (close >= 0) {
-          if (rest.slice(0, close).trim()) parts.push(rest.slice(0, close).trim());
-          closed = true;
-          break;
-        }
-        if (rest.trim()) parts.push(rest.trim());
-        index++;
-        if (index >= rawLines.length) break;
-        rest = rawLines[index].trim();
-      }
-      if (!closed) throw new MindmapParseError("Unclosed accDescr block", index + 1);
-      accessibilityDescription = normalizeBrTags(parts.join("\n").trim());
-      continue;
+    if (/^acc(?:Title|Descr)\b/i.test(trimmed)) {
+      const kind = /^accTitle\b/i.test(trimmed) ? "accTitle" : "accDescr";
+      throw new MindmapParseError(`Mindmap ${kind} must contain a non-empty value`, index + 1);
     }
     if (/^::icon\b/i.test(trimmed)) {
       const icon = trimmed.match(/^::icon\(([^)]*)\)$/i);
@@ -14307,10 +13788,9 @@ function mutateMindmap(body, op) {
 }
 function verifyMindmap(body, opts) {
   const warnings = [];
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
+  const overflow = labelOverflowCollector(warnings, opts);
   const visit2 = (node2) => {
-    const overflow = labelOverflowWarning(node2.id, node2.label, cap);
-    if (overflow) warnings.push(overflow);
+    overflow(node2.id, node2.label);
     node2.children.forEach(visit2);
   };
   visit2(body.root);
@@ -14335,7 +13815,11 @@ var GitGraphDuplicateCommitError = class extends GitGraphParseError {
   code = "GITGRAPH_DUPLICATE_COMMIT_ID";
 };
 function parseGitGraph(source, options = {}) {
-  const lines = source.replace(/^\uFEFF/, "").split(/\r?\n/);
+  const scanned = scanAccessibilityDirectives(source.replace(/^\uFEFF/, "").split(/\r?\n/));
+  if (scanned.unclosedIndex !== void 0) {
+    throw new GitGraphParseError("Unclosed accDescr block", scanned.unclosedIndex + 1);
+  }
+  const lines = scanned.familyLines;
   const headerIndex = lines.findIndex((line2) => /^\s*gitgraph\b/i.test(line2));
   if (headerIndex < 0) throw new GitGraphParseError("gitGraph source must start with a gitGraph header");
   const header = lines[headerIndex].trim().match(/^gitGraph(?:\s+(LR|TB|BT))?\s*:?[ \t]*$/i);
@@ -14350,8 +13834,8 @@ function parseGitGraph(source, options = {}) {
   const commitById = /* @__PURE__ */ new Map();
   let currentBranch = mainBranchName;
   let sequence = 0;
-  let accessibilityTitle;
-  let accessibilityDescription;
+  const accessibilityTitle = scanned.accessibility.title;
+  const accessibilityDescription = scanned.accessibility.descr;
   const addCommit = (attrs, sourceKind, line2, extra = {}, parents) => {
     const customId = attrs.id !== void 0;
     const id = attrs.id ?? `c${sequence}`;
@@ -14378,37 +13862,6 @@ function parseGitGraph(source, options = {}) {
   for (let index = headerIndex + 1; index < lines.length; index++) {
     const text3 = lines[index].trim();
     if (!text3 || text3.startsWith("%%")) continue;
-    const accTitle = text3.match(/^accTitle\s*:\s*(.+)$/i);
-    if (accTitle) {
-      accessibilityTitle = accTitle[1].trim();
-      continue;
-    }
-    const accDescr = text3.match(/^accDescr\s*:\s*(.+)$/i);
-    if (accDescr) {
-      accessibilityDescription = accDescr[1].trim();
-      continue;
-    }
-    const accDescrBlock = text3.match(/^accDescr\s*\{\s*(.*)$/i);
-    if (accDescrBlock) {
-      const parts = [];
-      let rest = accDescrBlock[1];
-      let closed = false;
-      while (true) {
-        const close = rest.indexOf("}");
-        if (close >= 0) {
-          if (rest.slice(0, close).trim()) parts.push(rest.slice(0, close).trim());
-          closed = true;
-          break;
-        }
-        if (rest.trim()) parts.push(rest.trim());
-        index++;
-        if (index >= lines.length) break;
-        rest = lines[index].trim();
-      }
-      if (!closed) throw new GitGraphParseError("Unclosed accDescr block", index + 1);
-      accessibilityDescription = parts.join("\n").trim();
-      continue;
-    }
     const commitLine = text3.match(/^commit(?:\s+(.*))?$/i);
     if (commitLine) {
       const payload = commitLine[1] ?? "";
@@ -14725,10 +14178,9 @@ function mutateGitGraph(body, op) {
 function verifyGitGraph(body, opts) {
   const warnings = [];
   const ids = new Set(body.commits.map((commit) => commit.id));
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
+  const overflow = labelOverflowCollector(warnings, opts);
   for (const commit of body.commits) {
-    const overflow = labelOverflowWarning(commit.id, commit.message || commit.id, cap);
-    if (overflow) warnings.push(overflow);
+    overflow(commit.id, commit.message || commit.id);
     for (const parent of commit.parents) if (!ids.has(parent)) warnings.push({ code: "EDGE_MISANCHORED", edge: `${parent}->${commit.id}`, to: commit.id });
   }
   return warnings;
@@ -14739,9 +14191,6 @@ var MAX_RADAR_TICKS = 64;
 var MAX_RADAR_AXES = 256;
 var HEADER_RE = /^radar-beta(?:[\t ]*:)?(?=$|\s)/i;
 var TITLE_RE4 = /^title(?:[\t ]+(.*))?$/i;
-var ACC_TITLE_RE2 = /^accTitle[\t ]*:[\t ]*(.*)$/i;
-var ACC_DESCR_RE2 = /^accDescr[\t ]*:[\t ]*(.*)$/i;
-var ACC_DESCR_BLOCK_RE2 = /^accDescr\s*:?\s*\{/i;
 var AXIS_RE2 = /^axis\s+(.+)$/i;
 var CURVE_RE = /^curve\s+([\s\S]+)$/i;
 var OPTION_RE = /^(showLegend|ticks|max|min|graticule)\b(.*)$/i;
@@ -15013,13 +14462,18 @@ function parseCurveItem(item, axes) {
   return { id, label, values };
 }
 function parseRadarChart(lines, options = {}) {
-  const source = stripComments(lines.join("\n")).trimStart();
+  const scanned = scanAccessibilityDirectives(stripComments(lines.join("\n")).split(/\r?\n/));
+  requireClosedAccessibility(scanned);
+  const source = scanned.familyLines.join("\n").trimStart();
   if (!source) throw new Error("Radar chart is empty");
   const header = source.match(HEADER_RE);
   if (!header) throw new Error(`Radar chart must start with "radar-beta", got: "${source.split(/\r?\n/, 1)[0]}"`);
   const statements = bodyStatements(source.slice(header[0].length));
   let title = options.title;
-  const accessibility = {};
+  const accessibility = {
+    ...scanned.accessibility.title !== void 0 ? { title: normalizeBrTags(scanned.accessibility.title) } : {},
+    ...scanned.accessibility.descr !== void 0 ? { description: normalizeBrTags(scanned.accessibility.descr) } : {}
+  };
   const axes = [];
   const pendingCurves = [];
   let min = 0;
@@ -15030,20 +14484,11 @@ function parseRadarChart(lines, options = {}) {
   for (let i2 = 0; i2 < statements.length; i2++) {
     const line2 = statements[i2];
     let match;
-    if (match = line2.match(ACC_TITLE_RE2)) {
-      accessibility.title = normalizeBrTags(match[1].trim());
-      continue;
-    }
-    if (ACC_DESCR_BLOCK_RE2.test(line2)) {
-      const open = line2.indexOf("{");
-      const close = line2.lastIndexOf("}");
-      if (open < 0 || close <= open) throw new Error('Radar accDescr block is missing a closing "}"');
-      if (line2.slice(close + 1).trim()) throw new Error(`Unrecognized text after radar accDescr block: "${line2.slice(close + 1).trim()}"`);
-      accessibility.description = normalizeBrTags(line2.slice(open + 1, close).trim().split("\n").map((part) => part.trim()).filter(Boolean).join("\n"));
-      continue;
-    }
-    if (match = line2.match(ACC_DESCR_RE2)) {
-      accessibility.description = normalizeBrTags(match[1].trim());
+    const accessibilityDirective = parseAccessibilityDirective([line2], 0);
+    if (accessibilityDirective === void 0) throw new Error('Radar accDescr block is missing a closing "}"');
+    if (accessibilityDirective !== null) {
+      if (accessibilityDirective.title) accessibility.title = normalizeBrTags(accessibilityDirective.value);
+      else accessibility.description = normalizeBrTags(accessibilityDirective.value);
       continue;
     }
     if (match = line2.match(TITLE_RE4)) {
@@ -15492,12 +14937,8 @@ function reorder(len, from, to, what) {
   return ok({ from, to });
 }
 function verifyRadar(body, opts) {
-  const cap = opts.labelCharCap ?? DEFAULT_LABEL_CHAR_CAP;
   const warnings = [];
-  const overflow = (target, text3) => {
-    const w2 = labelOverflowWarning(target, text3, cap);
-    if (w2) warnings.push(w2);
-  };
+  const overflow = labelOverflowCollector(warnings, opts);
   if (body.axes.length === 0 && body.curves.length === 0) warnings.push({ code: "EMPTY_DIAGRAM" });
   if (body.title !== void 0) overflow("title", body.title);
   for (const a2 of body.axes) overflow(a2.id, a2.label);
@@ -28425,7 +27866,7 @@ ${pageRect}` : sceneNodeSerialization(part)).join("\n");
   }
 };
 var CORE_BACKEND_VERSION = "1.0.0";
-var CORE_BACKEND_COMPATIBILITY = Object.freeze({ core: "^0.1.1", scene: "^2.0.0" });
+var CORE_BACKEND_COMPATIBILITY = Object.freeze({ core: "^0.2.0", scene: "^2.0.0" });
 var CORE_BACKEND_PROVENANCE = Object.freeze({
   owner: "agentic-mermaid",
   source: "built-in",
@@ -30652,7 +30093,7 @@ var INTERNAL_STYLE_FACE_PROJECTION = Object.freeze({
   group: Object.freeze({ sourceRole: "group", fields: Object.freeze([...INTERNAL_TEXT_FACE_FIELDS, ...INTERNAL_BOX_FACE_FIELDS, "fontFamily", "headerFillColor"]) })
 });
 var CORE_STYLE_VERSION = "1.0.0";
-var CORE_STYLE_COMPATIBILITY = Object.freeze({ core: "^0.1.1" });
+var CORE_STYLE_COMPATIBILITY = Object.freeze({ core: "^0.2.0" });
 var CORE_STYLE_PROVENANCE = Object.freeze({
   owner: "agentic-mermaid",
   source: "built-in",
@@ -34360,7 +33801,13 @@ var escapeXml4 = escapeXml;
 
 // src/timeline/parser.ts
 function parseTimelineDiagram(lines, accessibility = {}) {
-  const diagram = { sections: [], ...accessibilityFields(accessibility) };
+  const scanned = scanAccessibilityDirectives(lines);
+  requireClosedAccessibility(scanned);
+  lines = scanned.familyLines;
+  const diagram = {
+    sections: [],
+    ...accessibilityFields({ ...accessibility, ...scanned.accessibility })
+  };
   const headerDirection = lines[0]?.trim().match(TIMELINE_HEADER_DIRECTION_RE);
   if (headerDirection) {
     diagram.direction = headerDirection[1].toUpperCase();
@@ -34399,33 +33846,6 @@ function parseTimelineDiagram(lines, accessibility = {}) {
       diagram.title = normalizeBrTags(titleMatch[1].trim());
       continue;
     }
-    const accTitleMatch = line2.match(TIMELINE_ACCESSIBILITY_TITLE_RE);
-    if (accTitleMatch) {
-      diagram.accessibilityTitle = normalizeBrTags(accTitleMatch[1].trim());
-      continue;
-    }
-    const accDescrMatch = line2.match(TIMELINE_ACCESSIBILITY_DESCRIPTION_RE);
-    if (accDescrMatch) {
-      diagram.accessibilityDescription = normalizeBrTags(accDescrMatch[1].trim());
-      continue;
-    }
-    if (TIMELINE_ACCESSIBILITY_DESCRIPTION_BLOCK_RE.test(line2)) {
-      const descriptionLines = [];
-      let foundClosingBrace = false;
-      while (++i2 < lines.length) {
-        const blockLine = lines[i2];
-        if (blockLine === "}") {
-          foundClosingBrace = true;
-          break;
-        }
-        descriptionLines.push(blockLine);
-      }
-      if (!foundClosingBrace) {
-        throw new Error('Timeline accDescr block was not closed with "}"');
-      }
-      diagram.accessibilityDescription = normalizeBrTags(descriptionLines.join("\n").trim());
-      continue;
-    }
     const sectionMatch = line2.match(TIMELINE_SECTION_RE);
     if (sectionMatch) {
       currentSection = {
@@ -36862,13 +36282,19 @@ function letterAttr5(value) {
 
 // src/xychart/parser.ts
 function parseXYChart(lines) {
+  const expandedStatements = expandXYChartStatements(lines);
+  const accessibility = scanAccessibilityDirectives(expandedStatements);
+  const accessibilityMetadata = accessibility.accessibility;
+  const unclosed = accessibility.unclosedIndex;
+  const familyLines = unclosed === void 0 ? accessibility.familyLines : accessibility.familyLines.slice(0, unclosed - expandedStatements.length);
+  if (unclosed !== void 0) {
+    accessibilityMetadata.descr = expandedStatements.slice(unclosed).join("\n").replace(/^[^{]*\{/, "").trim() || void 0;
+  }
   const xAxis = {};
   const yAxis = {};
   const series = [];
-  const statements = expandXYChartStatements(lines);
+  const statements = expandXYChartStatements(familyLines);
   let title;
-  let accTitle;
-  let accDescription;
   let horizontal = false;
   let headerOrientation;
   for (let index = 0; index < statements.length; index++) {
@@ -36883,27 +36309,6 @@ function parseXYChart(lines) {
       }
       continue;
     }
-    const accTitleMatch = line2.match(/^accTitle\s*:?\s*(.+)$/i);
-    if (accTitleMatch) {
-      accTitle = parseDirectiveText(accTitleMatch[1]);
-      continue;
-    }
-    const accDescrBlockMatch = line2.match(/^accDescr\s*:?\s*\{\s*$/i);
-    if (accDescrBlockMatch) {
-      const block = [];
-      for (index += 1; index < statements.length; index++) {
-        const blockLine = statements[index];
-        if (blockLine === "}") break;
-        block.push(blockLine);
-      }
-      accDescription = block.join("\n").trim() || void 0;
-      continue;
-    }
-    const accDescrMatch = line2.match(/^accDescr\s*:?\s*(.+)$/i);
-    if (accDescrMatch) {
-      accDescription = parseDirectiveText(accDescrMatch[1]);
-      continue;
-    }
     const titleMatch = line2.match(/^title\s+(.+)$/);
     if (titleMatch) {
       title = parseDirectiveText(titleMatch[1]);
@@ -36957,7 +36362,10 @@ function parseXYChart(lines) {
   }
   return {
     title,
-    accessibility: accTitle || accDescription ? { title: accTitle, description: accDescription } : void 0,
+    accessibility: accessibilityMetadata.title || accessibilityMetadata.descr ? {
+      title: accessibilityMetadata.title,
+      description: accessibilityMetadata.descr
+    } : void 0,
     horizontal,
     headerOrientation,
     xAxis,
@@ -37201,13 +36609,14 @@ function expandXYChartStatements(lines) {
     if (!line2) continue;
     if (inAccDescrBlock) {
       statements.push(line2);
-      if (line2 === "}") inAccDescrBlock = false;
+      if (line2.includes("}")) inAccDescrBlock = false;
       continue;
     }
     const parts = splitSemicolonStatements(line2);
     for (const part of parts) {
       statements.push(part);
-      if (/^accDescr\s*:?\s*\{\s*$/i.test(part)) inAccDescrBlock = true;
+      const block = part.match(/^accDescr\s*:?\s*\{(.*)$/i);
+      if (block && !block[1].includes("}")) inAccDescrBlock = true;
     }
   }
   return statements;
@@ -43054,6 +42463,9 @@ var JUNCTION_RE2 = new RegExp(`^junction\\s+(${IDENT2})(?:\\s+in\\s+(${IDENT2}))
 var SOURCE_RE2 = new RegExp(`^(${IDENT2})(\\{group\\})?:(L|R|T|B)$`);
 var TARGET_RE2 = new RegExp(`^(L|R|T|B):(${IDENT2})(\\{group\\})?$`);
 function parseArchitectureDiagram(lines) {
+  const accessibility = scanAccessibilityDirectives(lines);
+  requireClosedAccessibility(accessibility);
+  lines = accessibility.familyLines;
   if (lines.length === 0) {
     throw new Error("Empty mermaid diagram");
   }
@@ -43067,8 +42479,8 @@ function parseArchitectureDiagram(lines) {
   const edges = [];
   const alignments = [];
   let title;
-  let accessibilityTitle;
-  let accessibilityDescription;
+  const accessibilityTitle = accessibility.accessibility.title === void 0 ? void 0 : normalizeBrTags(accessibility.accessibility.title);
+  const accessibilityDescription = accessibility.accessibility.descr === void 0 ? void 0 : normalizeBrTags(accessibility.accessibility.descr);
   for (let i2 = 1; i2 < lines.length; i2++) {
     const line2 = lines[i2];
     const titleMatch = line2.match(/^title\s+(.+)$/i);
@@ -43076,35 +42488,6 @@ function parseArchitectureDiagram(lines) {
       title = normalizeBrTags(titleMatch[1].trim());
       continue;
     }
-    const accTitleMatch = line2.match(/^accTitle\s*:\s*(.+)$/i);
-    if (accTitleMatch) {
-      accessibilityTitle = normalizeBrTags(accTitleMatch[1].trim());
-      continue;
-    }
-    const accDescrBlockMatch = line2.match(/^accDescr\s*:?\s*\{\s*(.*)$/i);
-    if (accDescrBlockMatch) {
-      const blockLines = [];
-      if (accDescrBlockMatch[1].trim()) blockLines.push(accDescrBlockMatch[1].trim());
-      let closed = false;
-      for (i2++; i2 < lines.length; i2++) {
-        const blockLine = lines[i2];
-        if (blockLine.includes("}")) {
-          const before = blockLine.slice(0, blockLine.indexOf("}")).trim();
-          if (before) blockLines.push(before);
-          closed = true;
-          break;
-        }
-        blockLines.push(blockLine);
-      }
-      if (!closed) throw new Error('Unterminated accDescr block \u2014 missing closing "}"');
-      accessibilityDescription = normalizeBrTags(blockLines.join("\n").trim());
-      continue;
-    }
-    const accDescrMatch = line2.match(/^accDescr\s*:\s*(.+)$/i);
-    if (accDescrMatch) {
-      accessibilityDescription = normalizeBrTags(accDescrMatch[1].trim());
-      continue;
-    }
     const groupMatch = line2.match(GROUP_RE2);
     if (groupMatch) {
       const id = groupMatch[1];
@@ -52068,7 +51451,7 @@ function renderBody(body, kind, meta, parsedDescriptorIdentity) {
   const descriptorMatches = body.kind !== "extension" || sameExtensionIdentity(parsedDescriptorIdentity, plugin?.identity);
   if (plugin?.serialize && descriptorMatches) {
     const rendered2 = plugin.serialize(body);
-    return body.kind === "extension" ? rendered2 : ensureAccessibilityLines(rendered2, meta.accessibility);
+    return ensureAccessibilityLines(rendered2, meta.accessibility);
   }
   if (body.kind === "extension") return body.source.endsWith("\n") ? body.source : body.source + "\n";
   throw new Error(`No serializer registered for diagram kind "${kind}"`);
@@ -52555,7 +51938,7 @@ var HOSTED_FONT_RESOURCES = Object.freeze(
       id: `resource:${fontResourceLocalId(face)}`,
       kind: "resource",
       version: "1.0.0",
-      compatibility: { core: "^0.1.1" },
+      compatibility: { core: "^0.2.0" },
       provenance: { owner: "agentic-mermaid", source: "bundled", reference: `assets/fonts/${face.file}` }
     })
   }))
@@ -55889,7 +55272,7 @@ var RADAR_RENDER_HOOKS = {
   ), { injectAccessibility: false }),
   projectPositioned: positionedView(projectRadarPositioned),
   lowerScene: scene(lowerRadarScene),
-  renderAscii: (ctx) => renderRadarAscii(ctx.source.lines, ctx.config, ctx.colorMode, ctx.theme, ctx.source.frontmatter, ctx.options.targetWidth, ctx.styleFace)
+  renderAscii: (ctx) => renderRadarAscii(ctx.source.familyLines, ctx.config, ctx.colorMode, ctx.theme, ctx.source.frontmatter, ctx.options.targetWidth, ctx.styleFace)
 };
 var GANTT_RENDER_HOOKS = {
   normalizeRequest: (ctx) => ({
@@ -56530,7 +55913,7 @@ function completeBuiltinDescriptor(seed) {
       id: `family:${seed.id}`,
       kind: "family",
       version: "1.0.0",
-      compatibility: { core: "^0.1.1" },
+      compatibility: { core: "^0.2.0" },
       provenance: { owner: "agentic-mermaid", source: "built-in" }
     }),
     collisionPriority: 100,
@@ -57127,36 +56510,11 @@ function detectRegisteredFamilyFromFirstLine(firstLine, mode = "strict") {
 var FRONTMATTER_REGEX = /^\uFEFF?\s*---\s*\r?\n([\s\S]*?)\r?\n\s*---\s*(?:\r?\n|$)/;
 var INIT_DIRECTIVE_REGEX = /^\s*%%\{\s*(?:init|initialize)\s*:\s*([\s\S]*?)\}\s*%%\s*(?:\r?\n|$)?/gm;
 var COMMENT_LINE_REGEX = /^\s*%%(?!\{)\s*(.*)$/;
-var ACC_TITLE_REGEX = /^\s*accTitle(?:\s*:\s*|\s+)(.+)$/i;
-var ACC_DESCR_INLINE_REGEX = /^\s*accDescr(?:\s*:\s*|\s+)(.+)$/i;
-var ACC_DESCR_BLOCK_START = /^\s*accDescr\s*:?\s*\{(.*)$/i;
-function accessibilityDescriptionBlockAt(lines, startIndex) {
-  const opening = lines[startIndex].match(ACC_DESCR_BLOCK_START);
-  if (!opening) return void 0;
-  const parts = [];
-  for (let index = startIndex; index < lines.length; index++) {
-    const content = index === startIndex ? opening[1] : lines[index];
-    const closing = content.indexOf("}");
-    if (closing < 0) {
-      if (content.trim()) parts.push(content.trim());
-      continue;
-    }
-    const beforeClosing = content.slice(0, closing).trim();
-    if (beforeClosing) parts.push(beforeClosing);
-    const suffix = content.slice(closing + 1);
-    const indent = lines[index].match(/^\s*/)?.[0] ?? "";
-    return {
-      description: parts.join("\n").trim(),
-      endIndex: index,
-      ...suffix.trim() ? { suffixLine: indent + suffix.trimStart() } : {}
-    };
-  }
-  return null;
-}
 function normalizeMermaidSource(text3, baseConfig = {}) {
   const processed = preprocessMermaidSource(text3, runtimeConfigToFrontmatterMap(baseConfig));
-  const envelope = sourceEnvelopeMetadata(text3);
-  const familyBody = withoutUniversalAccessibilityBody(processed.body);
+  const accessibilityScan = scanAccessibilityDirectives(processed.body.split(/\r?\n/));
+  const envelope = sourceEnvelopeMetadata(text3, accessibilityScan.accessibility);
+  const familyBody = accessibilityScan.familyLines.join("\n");
   const familyLines = toMermaidLines(familyBody);
   return {
     originalText: text3,
@@ -57175,26 +56533,6 @@ function normalizeMermaidSource(text3, baseConfig = {}) {
     accessibility: envelope.accessibility
   };
 }
-function withoutUniversalAccessibilityBody(body) {
-  const kept = [];
-  const lines = body.split(/\r?\n/);
-  for (let index = 0; index < lines.length; index++) {
-    const line2 = lines[index];
-    const block = accessibilityDescriptionBlockAt(lines, index);
-    if (block !== void 0) {
-      if (block === null) {
-        kept.push(...lines.slice(index));
-        break;
-      }
-      if (block.suffixLine) kept.push(block.suffixLine);
-      index = block.endIndex;
-      continue;
-    }
-    if (ACC_TITLE_REGEX.test(line2) || ACC_DESCR_INLINE_REGEX.test(line2)) continue;
-    kept.push(line2);
-  }
-  return kept.join("\n");
-}
 function normalizeMermaidSourceWithOverrides(text3, overrides = {}) {
   const source = normalizeMermaidSource(text3);
   if (Object.keys(overrides).length === 0) return source;
@@ -57205,7 +56543,7 @@ function normalizeMermaidSourceWithOverrides(text3, overrides = {}) {
     config: normalizeMermaidRuntimeConfig(frontmatter)
   };
 }
-function sourceEnvelopeMetadata(text3) {
+function sourceEnvelopeMetadata(text3, accessibility) {
   const frontmatter = text3.match(FRONTMATTER_REGEX);
   const frontmatterEnd = frontmatter?.[0].length ?? 0;
   const initDirectives = [];
@@ -57220,27 +56558,15 @@ function sourceEnvelopeMetadata(text3) {
   }
   const withoutUniversalConfig = text3.replace(FRONTMATTER_REGEX, "").replace(new RegExp(INIT_DIRECTIVE_REGEX.source, "gm"), "");
   const comments = [];
-  const accessibility = {};
   const lines = withoutUniversalConfig.split(/\r?\n/);
   for (let index = 0; index < lines.length; index++) {
-    const line2 = lines[index];
-    const block = accessibilityDescriptionBlockAt(lines, index);
-    if (block !== void 0) {
-      if (block === null) break;
-      accessibility.descr = block.description;
-      index = block.endIndex;
-      continue;
-    }
-    const title = line2.match(ACC_TITLE_REGEX);
-    if (title) {
-      accessibility.title = title[1].trim();
-      continue;
-    }
-    const description = line2.match(ACC_DESCR_INLINE_REGEX);
-    if (description) {
-      accessibility.descr = description[1].trim();
+    const accessibility2 = parseAccessibilityDirective(lines, index);
+    if (accessibility2 === void 0) break;
+    if (accessibility2 !== null) {
+      index = accessibility2.endIndex;
       continue;
     }
+    const line2 = lines[index];
     const comment = line2.match(COMMENT_LINE_REGEX);
     if (comment) comments.push({ text: comment[1], line: index + 1 });
   }
@@ -62324,7 +61650,6 @@ async function renderMermaidSVGAsync(text3, options = {}) {
 }
 
 export {
-  __toESM,
   scanSvgStartTags,
   decodedSvgAttributeValue,
   toHex,
@@ -62348,7 +61673,7 @@ export {
   negotiateCapabilities,
   CORE_CAPABILITY_OFFERS,
   negotiateRenderCapabilities,
-  require_package,
+  PACKAGE_VERSION,
   sameExtensionIdentity,
   KNOWN_EXTENSION_CONTRACT_VERSIONS,
   evaluateExtensionCompatibility,
@@ -62411,6 +61736,7 @@ export {
   measureMultilineText,
   normalizeBrTags,
   labelOverflowWarning,
+  parseAccessibilityDirective,
   expandInlineNamespaceStatement,
   parseClassDeclaration,
   parseClassReference,
@@ -62634,4 +61960,4 @@ export {
   renderMermaidSVGWithReceipt,
   renderMermaidSVGAsync
 };
-//# sourceMappingURL=chunk-ZYMMKQ3I.js.map
+//# sourceMappingURL=chunk-BJYMBT4I.js.map