@primmel/primmel 1.5.0 → 1.5.2

package/dist-cli/primmel.mjs

@@ -389,11 +389,39 @@ function forEachEntry(data, visitor, errCtx) {
         `Parsing error: ${errCtx.construct}. ID ${errCtx.id}: Expecting value for ${keyword}`
       );
     }
-    const claimed = visitor(keyword, () => t[i++]);
+    const claimed = visitor(
+      keyword,
+      () => t[i++],
+      () => t[i]
+    );
     if (!claimed) {
+      if (keyword === "ref") {
+        i++;
+        i++;
+        if (i < t.length && t[i].startsWith("{")) {
+          i++;
+        }
+      } else {
+        i++;
+      }
+    }
+  }
+}
+function skipUnknownValue(t, i, keyword) {
+  if (keyword === "ref") {
+    i++;
+    if (i < t.length) {
       i++;
     }
+    if (i < t.length && t[i].startsWith("{")) {
+      i++;
+    }
+    return i;
+  }
+  if (i < t.length) {
+    i++;
   }
+  return i;
 }
 function forEachAttribute(data, visitor, errCtx) {
   if (data === "") {
@@ -1080,6 +1108,125 @@ var parseMetadata = function(token) {
   };
 };
 
+// src/ser-des/config/ref.ts
+function parseRef(t, i, stripWrapping2, unwrapBlock2) {
+  const predicate = stripWrapping2(t[i++] ?? "");
+  const target = stripWrapping2(t[i++] ?? "");
+  const ref = { predicate, target };
+  if (i < t.length && t[i].startsWith("{")) {
+    const block = unwrapBlock2(t[i++]);
+    const m = /note\s+"([^"]*)"/.exec(block) ?? /note\s+(\S+)/.exec(block);
+    if (m) {
+      ref.note = m[1];
+    }
+  }
+  return { ref, next: i };
+}
+function parseRefFromReaders(value, peek, stripWrapping2, unwrapBlock2) {
+  const parts = [value(), value()];
+  const next = peek();
+  if (next && next.startsWith("{")) {
+    parts.push(value());
+  }
+  return parseRef(parts, 0, stripWrapping2, unwrapBlock2).ref;
+}
+function dumpRefs(refs, indent, escapeString2) {
+  if (!refs || refs.length === 0) {
+    return "";
+  }
+  let out = "";
+  for (const r of refs) {
+    out += `${indent}ref ${r.predicate} "${escapeString2(r.target)}"`;
+    out += r.note ? ` {
+${indent}  note "${escapeString2(r.note)}"
+${indent}}
+` : "\n";
+  }
+  return out;
+}
+function refTargetToSourceRef(target) {
+  const m = /^(urn:[^#]+)(?:#(.+))?$/.exec(target);
+  if (!m) {
+    return null;
+  }
+  const anchor = m[2];
+  if (!anchor) {
+    return { doc: target, clause: "" };
+  }
+  if (anchor.startsWith("clause-")) {
+    const rest = anchor.slice("clause-".length);
+    const slash = rest.indexOf("/");
+    if (slash >= 0) {
+      return {
+        doc: m[1],
+        clause: rest.slice(0, slash),
+        fragment: rest.slice(slash + 1)
+      };
+    }
+    return { doc: m[1], clause: rest };
+  }
+  return { doc: target, clause: "" };
+}
+function foldRefIntoLegacy(el, ref) {
+  if (ref.predicate === "derives-from") {
+    const roleChannel = el.fieldReferences ?? el.formReferences;
+    const hasProvenanceSlot = "source" in el || "sourceRef" in el || el.sourceRefs !== void 0;
+    if (roleChannel && !hasProvenanceSlot) {
+      roleChannel.push({ urn: ref.target, role: "source" });
+      return true;
+    }
+    const b = refTargetToSourceRef(ref.target);
+    if (!b) {
+      return false;
+    }
+    (el.sourceRefs ??= []).push(b);
+    if ("source" in el && !el.source) {
+      el.source = b;
+    }
+    if ("sourceRef" in el && !el.sourceRef) {
+      el.sourceRef = b;
+    }
+    if ("reference" in el && !el.reference) {
+      el.reference = b.doc;
+    }
+    return true;
+  }
+  if (ref.predicate === "cites") {
+    if (el.fieldReferences) {
+      el.fieldReferences.push({ urn: ref.target, role: "reference" });
+    } else if (el.formReferences) {
+      el.formReferences.push({ urn: ref.target, role: "reference" });
+    } else if (el.referenceIds) {
+      el.referenceIds.push(ref.target);
+    }
+    return true;
+  }
+  const CITATION_ROLES = [
+    "requirement",
+    "test-procedure",
+    "calculation",
+    "report-format",
+    "method"
+  ];
+  if (CITATION_ROLES.includes(ref.predicate)) {
+    const channel = el.fieldReferences ?? el.formReferences;
+    if (!channel) {
+      return false;
+    }
+    channel.push({ urn: ref.target, role: ref.predicate });
+    return true;
+  }
+  return false;
+}
+function dumpSourceRefAsRef(src, indent, escapeString2) {
+  if (src.doc && src.doc.startsWith("urn:")) {
+    const anchor = `${src.doc}${src.clause ? "#clause-" + src.clause : ""}${src.fragment ? "/" + src.fragment : ""}`;
+    return `${indent}ref derives-from "${escapeString2(anchor)}"
+`;
+  }
+  return `${indent}source { doc "${escapeString2(src.doc ?? "")}" clause "${escapeString2(String(src.clause ?? ""))}"` + (src.fragment ? ` fragment "${escapeString2(src.fragment)}"` : "") + " }\n";
+}
+
 // src/ser-des/config/series.ts
 function parseSeriesDecl(block) {
   const decl = { axes: [], cellSymbol: "", cellUnit: "" };
@@ -1168,21 +1315,6 @@ function dumpSeriesDecl(decl) {
   return out;
 }
 
-// src/ser-des/config/ref.ts
-function parseRef(t, i, stripWrapping2, unwrapBlock2) {
-  const predicate = stripWrapping2(t[i++] ?? "");
-  const target = stripWrapping2(t[i++] ?? "");
-  const ref = { predicate, target };
-  if (i < t.length && t[i].startsWith("{")) {
-    const block = unwrapBlock2(t[i++]);
-    const m = /note\s+"([^"]*)"/.exec(block) ?? /note\s+(\S+)/.exec(block);
-    if (m) {
-      ref.note = m[1];
-    }
-  }
-  return { ref, next: i };
-}
-
 // src/ser-des/config/sourceDiscrepancy.ts
 var VALID_RESOLUTIONS = ["follows_clause_x", "annotated_only"];
 function parseSourceDiscrepancy(block) {
@@ -1499,7 +1631,9 @@ function parseFormField(name, block, type) {
       field.fieldReferences = parseRoleReferences(unwrapBlock(t[i++]));
     } else if (cmd === "ref") {
       const r = parseRef(t, i, stripWrapping, unwrapBlock);
-      field.refs.push(r.ref);
+      if (!foldRefIntoLegacy(field, r.ref)) {
+        field.refs.push(r.ref);
+      }
       i = r.next;
     } else if (cmd === "specification_reference") {
       field.specificationReference = stripWrapping(t[i++]);
@@ -1830,10 +1964,17 @@ function dumpFormField(field, indent) {
   if (field.targets.length > 0) {
     inner.push("targets { " + field.targets.join(" ") + " }");
   }
+  if (field.sourceRefs && field.sourceRefs.length > 0) {
+    for (const s of field.sourceRefs) {
+      inner.push(dumpSourceRefAsRef(s, "", escapeString).trimEnd());
+    }
+  }
   if (field.fieldReferences.length > 0) {
-    inner.push(
-      "references { " + dumpRoleReferences(field.fieldReferences) + " }"
-    );
+    for (const r of field.fieldReferences) {
+      inner.push(
+        "ref " + roleToPredicateForDump(r.role) + ' "' + escapeString(r.urn) + '"'
+      );
+    }
   }
   if (field.refs && field.refs.length > 0) {
     for (const r of field.refs) {
@@ -1908,19 +2049,14 @@ function parseRoleReferences(block) {
   }
   return out;
 }
-function dumpRoleReferences(refs) {
-  const roles = [];
-  const byRole = /* @__PURE__ */ new Map();
-  for (const r of refs) {
-    if (!byRole.has(r.role)) {
-      byRole.set(r.role, []);
-      roles.push(r.role);
-    }
-    byRole.get(r.role).push(r.urn);
+function roleToPredicateForDump(role) {
+  if (role === "source") {
+    return "derives-from";
   }
-  return roles.map(
-    (role) => role + " { " + byRole.get(role).map((u) => '"' + escapeString(u) + '"').join(" ") + " }"
-  ).join(" ");
+  if (role === "reference") {
+    return "cites";
+  }
+  return role;
 }
 
 // src/ser-des/config/quantity.ts
@@ -2220,7 +2356,7 @@ function parseProcessInstances(block) {
         }
       }
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return out;
@@ -2468,7 +2604,7 @@ var parseProcess = function(id, data) {
   }
   forEachEntry(
     data,
-    (keyword, value) => {
+    (keyword, value, peek) => {
       if (keyword === "modality") {
         result.modality = value();
       } else if (keyword === "name") {
@@ -2537,6 +2673,11 @@ var parseProcess = function(id, data) {
           result.source = src;
         }
         (result.sourceRefs ??= []).push(src);
+      } else if (keyword === "ref") {
+        const r = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (!foldRefIntoLegacy(result, r)) {
+          (result.refs ??= []).push(r);
+        }
       } else {
         return false;
       }
@@ -2801,8 +2942,9 @@ var dumpProcess = function(process2, ctx) {
     out += dumpDoes(process2.does);
   }
   for (const src of process2.sourceRefs ?? (process2.source && (process2.source.doc || process2.source.clause) ? [process2.source] : [])) {
-    out += '  source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
+    out += dumpSourceRefAsRef(src, "  ", escapeString);
   }
+  out += dumpRefs(process2.refs, "  ", escapeString);
   if (process2.parent && (process2.children.length === 0 || !ctx?.nested)) {
     out += "  parent " + process2.parent + "\n";
   }
@@ -3544,6 +3686,12 @@ var parseTable = function(id, data) {
         } else if (command === "data") {
           const dataBlock = unwrapBlock(t[i++]);
           result.data = parseTableData(dataBlock);
+        } else if (command === "ref") {
+          const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+          if (!foldRefIntoLegacy(result, rr.ref)) {
+            (result.refs ??= []).push(rr.ref);
+          }
+          i = rr.next;
         } else {
           i++;
         }
@@ -3611,7 +3759,7 @@ var dumpTable = function(t) {
     out += '  display "' + t.display + '"\n';
   }
   for (const src of t.sourceRefs ?? (t.sourceRef && (t.sourceRef.doc || t.sourceRef.clause) ? [t.sourceRef] : [])) {
-    out += '  source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
+    out += dumpSourceRefAsRef(src, "  ", escapeString);
   }
   if (t.sourceDiscrepancy) {
     out += dumpSourceDiscrepancy(t.sourceDiscrepancy, "  ") + "\n";
@@ -4134,7 +4282,9 @@ var parseForm = function(id, data) {
           result.formReferences = parseRoleReferences(unwrapBlock(t[i++]));
         } else if (command === "ref") {
           const r = parseRef(t, i, stripWrapping, unwrapBlock);
-          result.refs = [...result.refs ?? [], r.ref];
+          if (!foldRefIntoLegacy(result, r.ref)) {
+            result.refs = [...result.refs ?? [], r.ref];
+          }
           i = r.next;
         } else if (command === "calculation_context") {
           result.calculationContext = parseCalculationContext(
@@ -4418,7 +4568,10 @@ var dumpForm = function(f) {
     out += "  report_rows { field " + f.reportRows.field + " item_key " + f.reportRows.itemKey + " }\n";
   }
   if (f.formReferences.length > 0) {
-    out += "  references { " + dumpRoleReferences(f.formReferences) + " }\n";
+    for (const r of f.formReferences) {
+      const pred = r.role === "source" ? "derives-from" : r.role === "reference" ? "cites" : r.role;
+      out += "  ref " + pred + ' "' + escapeString(r.urn) + '"\n';
+    }
   }
   if (f.refs && f.refs.length > 0) {
     for (const r of f.refs) {
@@ -4689,7 +4842,14 @@ var parseSymbol = function(id, data) {
   };
   forEachEntry(
     data,
-    (command, value) => {
+    (command, value, peek) => {
+      if (command === "ref") {
+        const r = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (!foldRefIntoLegacy(result, r)) {
+          (result.refs ??= []).push(r);
+        }
+        return true;
+      }
       if (command === "name") {
         result.name = unwrapped(value);
       } else if (command === "definition") {
@@ -4859,7 +5019,11 @@ var parseCalculation = function(id, data) {
     ref: [],
     _relations: {
       ref: []
-    }
+    },
+    // Initialized so the ref fold (docs/primmel/18 §18.4) mirrors the
+    // first derives-from block here — the fold only mirrors slots the
+    // object already carries.
+    sourceRef: null
   };
   if (data !== "") {
     const t = tokenizePackage(data);
@@ -4883,6 +5047,12 @@ var parseCalculation = function(id, data) {
           result.expression = unwrapBlock(t[i++]);
         } else if (command === "reference") {
           result._relations.ref = tokenizePackage(t[i++]);
+        } else if (command === "ref") {
+          const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+          if (!foldRefIntoLegacy(result, rr.ref)) {
+            (result.refs ??= []).push(rr.ref);
+          }
+          i = rr.next;
         } else if (command === "source") {
           const inner = tokenize(unwrapBlock(t[i++]));
           const src = {
@@ -5149,7 +5319,10 @@ var dumpCalculation = function(c) {
     out += "  profile " + c.profile + "\n";
   }
   for (const src of c.sourceRefs ?? (c.sourceRef && (c.sourceRef.doc || c.sourceRef.clause) ? [c.sourceRef] : [])) {
-    out += '  source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
+    out += dumpSourceRefAsRef(src, "  ", escapeString);
+  }
+  for (const r of c.refs ?? []) {
+    out += "  ref " + r.predicate + ' "' + escapeString(r.target) + '"' + (r.note ? ' { note "' + escapeString(r.note) + '" }' : "") + "\n";
   }
   if (c.ref.length > 0) {
     out += "  reference {\n";
@@ -6430,6 +6603,12 @@ var parseCompetenceKind = function(id, data) {
         );
       }
       result.methodStandards.push({ id: stdId, title: readValue(t[i++]) });
+    } else if (keyword === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(result, rr.ref)) {
+        (result.refs ??= []).push(rr.ref);
+      }
+      i = rr.next;
     } else {
       i++;
     }
@@ -6834,11 +7013,15 @@ var parseConformanceTest = function(id, data) {
     inheritsFrom: "",
     resultForms: [],
     derivedValues: [],
-    sourceDiscrepancy: null
+    sourceDiscrepancy: null,
+    // The singular provenance slot is initialized so the ref fold
+    // (docs/primmel/18 §18.4) mirrors the first derives-from block into
+    // it — the fold only mirrors slots the object already carries.
+    sourceRef: null
   };
   forEachEntry(
     data,
-    (keyword, value) => {
+    (keyword, value, peek) => {
       if (keyword === "name") {
         result.name = unwrapped(value);
       } else if (keyword === "purpose") {
@@ -6889,10 +7072,10 @@ var parseConformanceTest = function(id, data) {
       } else if (keyword === "targets") {
         result.targets = tokenizePackage(value());
       } else if (keyword === "ref") {
-        const block = value();
-        const rt = tokenizePackage(block);
-        const rr = parseRef(rt, 0, stripWrapping, unwrapBlock);
-        (result.refs ??= []).push(rr.ref);
+        const rr = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (!foldRefIntoLegacy(result, rr)) {
+          (result.refs ??= []).push(rr);
+        }
       } else if (keyword === "binds_to") {
         result.bindsTo = tokenizePackage(value());
       } else if (keyword === "applicability") {
@@ -7012,10 +7195,10 @@ var dumpConformanceTest = function(ct) {
   }
   if (ct.sourceRefs && ct.sourceRefs.length > 0) {
     for (const src of ct.sourceRefs) {
-      out += '  reference { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
+      out += dumpSourceRefAsRef(src, "  ", escapeString);
     }
   } else if (ct.sourceRef && ct.sourceRef.doc) {
-    out += '  reference { doc "' + escapeString(ct.sourceRef.doc) + '" clause "' + escapeString(ct.sourceRef.clause) + '"' + (ct.sourceRef.fragment ? ' fragment "' + escapeString(ct.sourceRef.fragment) + '"' : "") + " }\n";
+    out += dumpSourceRefAsRef(ct.sourceRef, "  ", escapeString);
   } else if (ct.reference) {
     out += "  reference " + ct.reference + "\n";
   }
@@ -7267,7 +7450,18 @@ var parseTerm = function(id, data) {
   };
   forEachEntry(
     data,
-    (command, value) => {
+    (command, value, peek) => {
+      if (command === "ref") {
+        const r = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (r.predicate === "derives-from" && !result.source) {
+          result.source = r.target;
+        } else if (r.predicate === "cites") {
+          result.referenceIds.push(r.target);
+        } else {
+          (result.refs ??= []).push(r);
+        }
+        return true;
+      }
       if (command === "label") {
         result.label = unwrapped(value);
       } else if (command === "definition") {
@@ -7413,7 +7607,7 @@ var parseVerdict = function(id, data) {
   };
   forEachEntry(
     data,
-    (keyword, value) => {
+    (keyword, value, peek) => {
       if (keyword === "quantity") {
         const qt = tokenize(unwrapBlock(value()));
         let j = 0;
@@ -7451,7 +7645,16 @@ var parseVerdict = function(id, data) {
       } else if (keyword === "acceptance") {
         result.acceptance = parseAcceptance(unwrapBlock(value()));
       } else if (keyword === "source" || keyword === "reference") {
-        result.source = readSource(unwrapBlock(value()));
+        const src = readSource(unwrapBlock(value()));
+        (result.sourceRefs ??= []).push(src);
+        if (!result.source) {
+          result.source = src;
+        }
+      } else if (keyword === "ref") {
+        const r = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (!foldRefIntoLegacy(result, r)) {
+          (result.refs ??= []).push(r);
+        }
       } else {
         return false;
       }
@@ -7491,9 +7694,11 @@ var dumpVerdict = function(v) {
   if (v.acceptance) {
     out += dumpAcceptance(v.acceptance, "  ") + "\n";
   }
-  if (v.source && (v.source.doc || v.source.clause)) {
-    out += '  source { doc "' + escapeString(v.source.doc) + '" clause "' + escapeString(v.source.clause) + '"' + (v.source.fragment ? ' fragment "' + escapeString(v.source.fragment) + '"' : "") + " }\n";
+  const verdictSources = v.sourceRefs && v.sourceRefs.length > 0 ? v.sourceRefs : v.source && (v.source.doc || v.source.clause) ? [v.source] : [];
+  for (const s of verdictSources) {
+    out += dumpSourceRefAsRef(s, "  ", escapeString);
   }
+  out += dumpRefs(v.refs, "  ", escapeString);
   out += "}\n";
   return out;
 };
@@ -7535,7 +7740,7 @@ function parseIdentityFields(block) {
         } else if (fc === "required") {
           field.required = stripWrapping(ft[j++]) === "true";
         } else {
-          unwrapBlock(ft[j++]);
+          j = skipUnknownValue(ft, j, fc);
         }
       }
     }
@@ -7615,8 +7820,17 @@ function parseConstraints(block) {
           c.onViolation = stripWrapping(ct[j++]);
         } else if (cc === "source") {
           c.source = readSource(unwrapBlock(ct[j++]));
+        } else if (cc === "ref") {
+          const rr = parseRef(ct, j, stripWrapping, unwrapBlock);
+          j = rr.next;
+          if (rr.ref.predicate === "derives-from" && !c.source) {
+            const b = refTargetToSourceRef(rr.ref.target);
+            if (b) {
+              c.source = b;
+            }
+          }
         } else {
-          unwrapBlock(ct[j++]);
+          j = skipUnknownValue(ct, j, cc);
         }
       }
     }
@@ -7636,7 +7850,7 @@ var parseReferenceMaterial = function(id, data) {
   };
   forEachEntry(
     data,
-    (keyword, value) => {
+    (keyword, value, peek) => {
       if (keyword === "kind") {
         result.kind = stripWrapping(value());
       } else if (keyword === "name") {
@@ -7644,7 +7858,16 @@ var parseReferenceMaterial = function(id, data) {
       } else if (keyword === "definition") {
         result.definition = unwrapped(value);
       } else if (keyword === "source") {
-        result.source = readSource(unwrapBlock(value()));
+        const src = readSource(unwrapBlock(value()));
+        (result.sourceRefs ??= []).push(src);
+        if (!result.source) {
+          result.source = src;
+        }
+      } else if (keyword === "ref") {
+        const r = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (!foldRefIntoLegacy(result, r)) {
+          (result.refs ??= []).push(r);
+        }
       } else if (keyword === "identity_fields") {
         result.identityFields = parseIdentityFields(unwrapBlock(value()));
       } else if (keyword === "constraints") {
@@ -7661,12 +7884,6 @@ var parseReferenceMaterial = function(id, data) {
     return ctx;
   };
 };
-function dumpSource(src, indent) {
-  if (!src || !src.doc && !src.clause) {
-    return "";
-  }
-  return indent + 'source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
-}
 var dumpReferenceMaterial = function(m) {
   let out = "reference_material " + m.id + " {\n";
   if (m.kind) {
@@ -7678,7 +7895,11 @@ var dumpReferenceMaterial = function(m) {
   if (m.definition) {
     out += '  definition "' + escapeString(m.definition) + '"\n';
   }
-  out += dumpSource(m.source, "  ");
+  const rmSources = m.sourceRefs && m.sourceRefs.length > 0 ? m.sourceRefs : m.source ? [m.source] : [];
+  for (const s of rmSources) {
+    out += dumpSourceRefAsRef(s, "  ", escapeString);
+  }
+  out += dumpRefs(m.refs, "  ", escapeString);
   if (m.identityFields.length > 0) {
     out += "  identity_fields {\n";
     for (const f of m.identityFields) {
@@ -7724,7 +7945,9 @@ var dumpReferenceMaterial = function(m) {
       if (c.onViolation) {
         out += "      on_violation " + c.onViolation + "\n";
       }
-      out += dumpSource(c.source, "      ");
+      if (c.source && (c.source.doc || c.source.clause)) {
+        out += dumpSourceRefAsRef(c.source, "      ", escapeString);
+      }
       out += "    }\n";
     }
     out += "  }\n";
@@ -7859,6 +8082,12 @@ var parseConstraint = function(id, data) {
       result.onViolation = stripWrapping(t[i++]);
     } else if (keyword === "source") {
       result.source = readSource(unwrapBlock(t[i++]));
+    } else if (keyword === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(result, rr.ref)) {
+        (result.refs ??= []).push(rr.ref);
+      }
+      i = rr.next;
     } else {
       i++;
     }
@@ -8057,11 +8286,20 @@ var parseTestPointSet = function(id, data) {
   };
   forEachEntry(
     data,
-    (keyword, value) => {
+    (keyword, value, peek) => {
       if (keyword === "description") {
         result.description = unwrapped(value);
       } else if (keyword === "source") {
-        result.source = readSource(unwrapBlock(value()));
+        const src = readSource(unwrapBlock(value()));
+        (result.sourceRefs ??= []).push(src);
+        if (!result.source) {
+          result.source = src;
+        }
+      } else if (keyword === "ref") {
+        const r = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (!foldRefIntoLegacy(result, r)) {
+          (result.refs ??= []).push(r);
+        }
       } else if (keyword === "cardinality") {
         result.cardinality = parseCardinality(unwrapBlock(value()));
       } else if (keyword === "repetitions_per_point") {
@@ -8085,9 +8323,11 @@ var dumpTestPointSet = function(s) {
   if (s.description) {
     out += '  description "' + escapeString(s.description) + '"\n';
   }
-  if (s.source && (s.source.doc || s.source.clause)) {
-    out += '  source { doc "' + escapeString(s.source.doc) + '" clause "' + escapeString(s.source.clause) + '"' + (s.source.fragment ? ' fragment "' + escapeString(s.source.fragment) + '"' : "") + " }\n";
+  const tpsSources = s.sourceRefs && s.sourceRefs.length > 0 ? s.sourceRefs : s.source && (s.source.doc || s.source.clause) ? [s.source] : [];
+  for (const src of tpsSources) {
+    out += dumpSourceRefAsRef(src, "  ", escapeString);
   }
+  out += dumpRefs(s.refs, "  ", escapeString);
   const ckeys = Object.keys(s.cardinality);
   if (ckeys.length > 0) {
     out += "  cardinality {\n";
@@ -8155,7 +8395,7 @@ function readAccepts(block) {
     } else if (cmd === "source_discrepancy") {
       accepts.sourceDiscrepancy = parseSourceDiscrepancy(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return accepts;
@@ -8195,7 +8435,7 @@ function readLimit(block) {
     } else if (cmd === "source_discrepancy") {
       limit.sourceDiscrepancy = parseSourceDiscrepancy(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return limit;
@@ -8389,10 +8629,12 @@ var parseRequirement = function(id, data) {
       (result.sourceRefs ??= []).push(src);
     } else if (cmd === "ref") {
       const r = parseRef(t, i, stripWrapping, unwrapBlock);
-      (result.refs ??= []).push(r.ref);
+      if (!foldRefIntoLegacy(result, r.ref)) {
+        (result.refs ??= []).push(r.ref);
+      }
       i = r.next;
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -8530,7 +8772,7 @@ var dumpRequirement = function(r) {
     out += dumpSourceDiscrepancy(r.sourceDiscrepancy, "  ") + "\n";
   }
   for (const src of r.sourceRefs ?? (r.source && (r.source.doc || r.source.clause) ? [r.source] : [])) {
-    out += '  source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
+    out += dumpSourceRefAsRef(src, "  ", escapeString);
   }
   for (const ref of r.refs ?? []) {
     out += "  ref " + ref.predicate + ' "' + escapeString(ref.target) + '"' + (ref.note ? ' { note "' + escapeString(ref.note) + '" }' : "") + "\n";
@@ -8571,7 +8813,7 @@ var parseRequirementClass = function(id, data) {
     } else if (cmd === "reference") {
       result.referenceIds = readIdList2(t[i++]);
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -8714,7 +8956,9 @@ var parsePackage = function(data) {
       manifest.mapsTo = readList(t[i++]);
     } else if (cmd === "ref") {
       const r = parseRef(t, i, stripWrapping, unwrapBlock);
-      (manifest.refs ??= []).push(r.ref);
+      if (!foldRefIntoLegacy(manifest, r.ref)) {
+        (manifest.refs ??= []).push(r.ref);
+      }
       i = r.next;
     } else if (cmd === "scheme_type" || cmd === "schemeType") {
       manifest.schemeType = stripWrapping(t[i++]);
@@ -8781,7 +9025,7 @@ var parsePackage = function(data) {
       }
       manifest.source = src;
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -8832,7 +9076,7 @@ var parseConformanceClass = function(id, data) {
     } else if (cmd === "reference") {
       result.referenceIds = tokenize(stripWrapping(t[i++])).map(stripWrapping);
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -9258,7 +9502,7 @@ function dumpComposedOf(decl, indent) {
 }
 
 // src/ser-des/config/subject.ts
-function dumpSource2(keyword, src, indent) {
+function dumpSource(keyword, src, indent) {
   if (!src || !src.doc && !src.clause) {
     return "";
   }
@@ -9294,7 +9538,11 @@ var parseInstrument = function(id, data) {
     referenceIds: [],
     measurand: null,
     components: [],
-    structure: []
+    structure: [],
+    // Initialized so the ref fold (docs/primmel/18 §18.4) mirrors the
+    // first derives-from block here — the fold only mirrors slots the
+    // object already carries.
+    source: null
   };
   const t = tokenizePackage(data);
   let i = 0;
@@ -9322,7 +9570,11 @@ var parseInstrument = function(id, data) {
     } else if (cmd === "note") {
       result.note = stripWrapping(t[i++]);
     } else if (cmd === "source") {
-      result.source = readSource(unwrapBlock(t[i++]));
+      const src = readSource(unwrapBlock(t[i++]));
+      (result.sourceRefs ??= []).push(src);
+      if (!result.source) {
+        result.source = src;
+      }
     } else if (cmd === "variant") {
       const variantId = stripWrapping(t[i++]);
       const vblock = i < t.length ? unwrapBlock(t[i++]) : "";
@@ -9372,6 +9624,15 @@ var parseInstrument = function(id, data) {
           result.familyNote = stripWrapping(ft[j++]);
         } else if (fc === "source") {
           result.familySource = readSource(unwrapBlock(ft[j++]));
+        } else if (fc === "ref") {
+          const rr = parseRef(ft, j, stripWrapping, unwrapBlock);
+          j = rr.next;
+          if (rr.ref.predicate === "derives-from") {
+            const b = refTargetToSourceRef(rr.ref.target);
+            if (b && !result.familySource) {
+              result.familySource = b;
+            }
+          }
         } else {
           unwrapBlock(ft[j++]);
         }
@@ -9397,8 +9658,14 @@ var parseInstrument = function(id, data) {
       result.modelGroup = parseModelGroup(unwrapBlock(t[i++]));
     } else if (cmd === "reference") {
       result.referenceIds = readReference(t[i++]);
+    } else if (cmd === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(result, rr.ref)) {
+        (result.refs ??= []).push(rr.ref);
+      }
+      i = rr.next;
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -9445,7 +9712,7 @@ function parseMeasurand(block) {
     } else if (cmd === "source") {
       m.source = readSource(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return m;
@@ -9471,7 +9738,7 @@ function parseComponent2(id, block) {
     } else if (cmd === "source") {
       c.source = readSource(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return c;
@@ -9515,7 +9782,7 @@ function parseStructure(id, block) {
     } else if (cmd === "source") {
       s.source = readSource(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return s;
@@ -9559,7 +9826,7 @@ function parseDimension(id, block) {
     } else if (cmd === "values") {
       dim.values = parseDimensionValues(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return dim;
@@ -9666,10 +9933,19 @@ function parseModelGroup(block) {
       mg.note = stripWrapping(t[i++]);
     } else if (cmd === "source") {
       mg.sources.push(readSource(unwrapBlock(t[i++])));
+    } else if (cmd === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      i = rr.next;
+      if (rr.ref.predicate === "derives-from") {
+        const b = refTargetToSourceRef(rr.ref.target);
+        if (b) {
+          mg.sources.push(b);
+        }
+      }
     } else if (cmd === "sample_selection") {
       mg.sampleSelection.push(readSource(unwrapBlock(t[i++])));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return mg;
@@ -9704,7 +9980,7 @@ var dumpInstrument = function(inst) {
       }
       out += " }\n";
     }
-    out += dumpSource2("source", m.source, "    ");
+    out += dumpSource("source", m.source, "    ");
     out += "  }\n";
   }
   for (const c of inst.components ?? []) {
@@ -9744,7 +10020,7 @@ var dumpInstrument = function(inst) {
     if (s.note) {
       out += '    note "' + escapeString(s.note) + '"\n';
     }
-    out += dumpSource2("source", s.source, "    ");
+    out += dumpSource("source", s.source, "    ");
     out += "  }\n";
   }
   if (inst.definition) {
@@ -9784,7 +10060,7 @@ var dumpInstrument = function(inst) {
     if (d.description) {
       out += '    description "' + escapeString(d.description) + '"\n';
     }
-    out += dumpSource2("reference", d.source, "    ");
+    out += dumpSource("reference", d.source, "    ");
     if (d.values.length > 0) {
       out += "    values {\n";
       for (const v of d.values) {
@@ -9838,7 +10114,9 @@ var dumpInstrument = function(inst) {
     if (inst.familyNote) {
       out += '    note "' + escapeString(inst.familyNote) + '"\n';
     }
-    out += dumpSource2("source", inst.familySource ?? null, "    ");
+    if (inst.familySource && (inst.familySource.doc || inst.familySource.clause)) {
+      out += dumpSourceRefAsRef(inst.familySource, "    ", escapeString);
+    }
     out += "  }\n";
   }
   if (inst.familyCriteria.length > 0) {
@@ -9876,14 +10154,18 @@ var dumpInstrument = function(inst) {
       "    "
     );
     for (const s of inst.modelGroup.sources ?? []) {
-      out += dumpSource2("source", s, "    ");
+      out += dumpSourceRefAsRef(s, "    ", escapeString);
     }
     for (const s of inst.modelGroup.sampleSelection ?? []) {
-      out += dumpSource2("sample_selection", s, "    ");
+      out += dumpSource("sample_selection", s, "    ");
     }
     out += "  }\n";
   }
-  out += dumpSource2("source", inst.source ?? null, "  ");
+  const instSources = inst.sourceRefs && inst.sourceRefs.length > 0 ? inst.sourceRefs : inst.source ? [inst.source] : [];
+  for (const s of instSources) {
+    out += dumpSourceRefAsRef(s, "  ", escapeString);
+  }
+  out += dumpRefs(inst.refs, "  ", escapeString);
   out += dumpIdList("reference", inst.referenceIds, "  ");
   out += "}\n";
   return out;
@@ -9921,7 +10203,11 @@ var parseAttributeDefinition = function(id, data) {
     } else if (cmd === "definition") {
       result.definition = stripWrapping(t[i++]);
     } else if (cmd === "source" || cmd === "reference") {
-      result.source = readSource(unwrapBlock(t[i++]));
+      const src = readSource(unwrapBlock(t[i++]));
+      (result.sourceRefs ??= []).push(src);
+      if (!result.source) {
+        result.source = src;
+      }
     } else if (cmd === "quantity_kind") {
       result.quantityKind = stripWrapping(t[i++]);
     } else if (cmd === "unit") {
@@ -9946,8 +10232,14 @@ var parseAttributeDefinition = function(id, data) {
       result.irdi = stripWrapping(t[i++]);
     } else if (cmd === "derived") {
       result.derived = stripWrapping(t[i++]);
+    } else if (cmd === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(result, rr.ref)) {
+        (result.refs ??= []).push(rr.ref);
+      }
+      i = rr.next;
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -9966,7 +10258,11 @@ var dumpAttributeDefinition = function(a) {
   if (a.definition) {
     out += '  definition "' + escapeString(a.definition) + '"\n';
   }
-  out += dumpSource2("source", a.source, "  ");
+  const attrSources = a.sourceRefs && a.sourceRefs.length > 0 ? a.sourceRefs : a.source ? [a.source] : [];
+  for (const s of attrSources) {
+    out += dumpSourceRefAsRef(s, "  ", escapeString);
+  }
+  out += dumpRefs(a.refs, "  ", escapeString);
   if (a.quantityKind) {
     out += "  quantity_kind " + a.quantityKind + "\n";
   }
@@ -10038,8 +10334,14 @@ var parseCapability = function(id, data) {
       result.verifiedByTests = readReference(t[i++]);
     } else if (cmd === "reference") {
       result.referenceIds = readReference(t[i++]);
+    } else if (cmd === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(result, rr.ref)) {
+        (result.refs ??= []).push(rr.ref);
+      }
+      i = rr.next;
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -10064,6 +10366,7 @@ var dumpCapability = function(c) {
   out += dumpIdList("satisfies_requirements", c.satisfiesRequirements, "  ");
   out += dumpIdList("verified_by_tests", c.verifiedByTests, "  ");
   out += dumpIdList("reference", c.referenceIds, "  ");
+  out += dumpRefs(c.refs, "  ", escapeString);
   out += "}\n";
   return out;
 };
@@ -10091,11 +10394,21 @@ var parseBehavior = function(id, data) {
     } else if (cmd === "response") {
       result.response = stripWrapping(t[i++]);
     } else if (cmd === "source" || cmd === "reference") {
-      result.source = readSource(unwrapBlock(t[i++]));
+      const src = readSource(unwrapBlock(t[i++]));
+      (result.sourceRefs ??= []).push(src);
+      if (!result.source) {
+        result.source = src;
+      }
     } else if (cmd === "verified_by" || cmd === "verified_by_tests") {
       result.verifiedBy = readReference(t[i++]);
+    } else if (cmd === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(result, rr.ref)) {
+        (result.refs ??= []).push(rr.ref);
+      }
+      i = rr.next;
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -10114,7 +10427,11 @@ var dumpBehavior = function(b) {
   if (b.response) {
     out += '  response "' + escapeString(b.response) + '"\n';
   }
-  out += dumpSource2("source", b.source, "  ");
+  const behaviorSources = b.sourceRefs && b.sourceRefs.length > 0 ? b.sourceRefs : b.source ? [b.source] : [];
+  for (const s of behaviorSources) {
+    out += dumpSourceRefAsRef(s, "  ", escapeString);
+  }
+  out += dumpRefs(b.refs, "  ", escapeString);
   out += dumpIdList("verified_by", b.verifiedBy, "  ");
   out += "}\n";
   return out;
@@ -10149,10 +10466,28 @@ var parseConditionSet = function(id, data) {
       if (!result.source) {
         result.source = src;
       }
+    } else if (cmd === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      i = rr.next;
+      if (rr.ref.predicate === "derives-from") {
+        const b = refTargetToSourceRef(rr.ref.target);
+        if (b) {
+          result.sources.push(b);
+          if (!result.source) {
+            result.source = b;
+          }
+        } else {
+          (result.refs ??= []).push(rr.ref);
+        }
+      } else if (rr.ref.predicate === "cites") {
+        result.referenceIds.push(rr.ref.target);
+      } else {
+        (result.refs ??= []).push(rr.ref);
+      }
     } else if (cmd === "reference") {
       result.referenceIds = readReference(t[i++]);
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -10231,9 +10566,10 @@ var dumpConditionSet = function(cs) {
   }
   const sources = cs.sources && cs.sources.length > 0 ? cs.sources : cs.source ? [cs.source] : [];
   for (const s of sources) {
-    out += dumpSource2("source", s, "  ");
+    out += dumpSourceRefAsRef(s, "  ", escapeString);
   }
   out += dumpIdList("reference", cs.referenceIds, "  ");
+  out += dumpRefs(cs.refs, "  ", escapeString);
   out += "}\n";
   return out;
 };
@@ -10362,7 +10698,7 @@ function readCharacteristicBlock(block) {
     } else if (cmd === "source" || cmd === "reference") {
       c.source = readSource(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return c;
@@ -10626,7 +10962,7 @@ var parseSubject = function(id, data) {
     } else if (cmd === "reference") {
       result.referenceIds = readReference(t[i++]);
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -10778,7 +11114,7 @@ function dumpSubjectPromises(promises) {
       out += '        statement "' + escapeString(p.statement) + '"\n';
     }
     out += dumpIdList("verified_by", p.verifiedBy, "        ");
-    out += dumpSource2("source", p.source ?? null, "        ");
+    out += dumpSource("source", p.source ?? null, "        ");
     out += "      }\n";
   }
   out += "    }\n";
@@ -10810,7 +11146,7 @@ function dumpSubjectCharacteristics(map) {
       if (c.unit) {
         out += '        unit "' + escapeString(c.unit) + '"\n';
       }
-      out += dumpSource2("source", c.source ?? null, "        ");
+      out += dumpSource("source", c.source ?? null, "        ");
       out += "      }\n";
       continue;
     }
@@ -11082,14 +11418,6 @@ var instanceConstruct = {
 };
 
 // src/ser-des/config/artifact.ts
-function dumpSource3(keyword, src, indent) {
-  if (!src || !src.doc && !src.clause) {
-    return "";
-  }
-  const frag = src.fragment ? ` fragment "${escapeString(src.fragment)}"` : "";
-  return `${indent}${keyword} { doc "${escapeString(src.doc)}" clause "${escapeString(src.clause)}"${frag} }
-`;
-}
 function readIdList4(block) {
   return tokenize(stripWrapping(block)).map(stripColon).map(stripWrapping).filter((s) => s.length > 0);
 }
@@ -11183,7 +11511,7 @@ function parseContentContract(block) {
     } else if (cmd === "media") {
       contract.media = readContractMedia(unwrapBlock(t[i++]));
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return contract;
@@ -11224,11 +11552,21 @@ var parseArtifactDefinition = function(id, data) {
     } else if (cmd === "retention") {
       result.retention = stripWrapping(t[i++]);
     } else if (cmd === "source") {
-      result.source = readSource(unwrapBlock(t[i++]));
+      const src = readSource(unwrapBlock(t[i++]));
+      (result.sourceRefs ??= []).push(src);
+      if (!result.source) {
+        result.source = src;
+      }
     } else if (cmd === "reference") {
       result.referenceIds = readReference3(t[i++]);
+    } else if (cmd === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(result, rr.ref)) {
+        (result.refs ??= []).push(rr.ref);
+      }
+      i = rr.next;
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -11289,7 +11627,11 @@ var dumpArtifactDefinition = function(d) {
   if (d.retention) {
     out += '  retention "' + escapeString(d.retention) + '"\n';
   }
-  out += dumpSource3("source", d.source, "  ");
+  const artifactSources = d.sourceRefs && d.sourceRefs.length > 0 ? d.sourceRefs : d.source ? [d.source] : [];
+  for (const s of artifactSources) {
+    out += dumpSourceRefAsRef(s, "  ", escapeString);
+  }
+  out += dumpRefs(d.refs, "  ", escapeString);
   out += dumpIdList2("reference", d.referenceIds, "  ");
   out += "}\n";
   return out;
@@ -11324,7 +11666,7 @@ var parseArtifactInstance = function(id, data) {
     } else if (cmd === "reference") {
       result.referenceIds = readReference3(t[i++]);
     } else {
-      unwrapBlock(t[i++]);
+      i = skipUnknownValue(t, i, cmd);
     }
   }
   return (ctx) => {
@@ -11875,6 +12217,12 @@ var parseTestSequence = function(id, data) {
       sequence.description = stripWrapping(t[i++]);
     } else if (command === "sample_applicability") {
       sequence.sampleApplicability = stripWrapping(t[i++]);
+    } else if (command === "ref") {
+      const rr = parseRef(t, i, stripWrapping, unwrapBlock);
+      if (!foldRefIntoLegacy(sequence, rr.ref)) {
+        sequence.refs = [...sequence.refs ?? [], rr.ref];
+      }
+      i = rr.next;
     } else if (command === "source") {
       sequence.sourceRefs.push(readSource(unwrapBlock(t[i++])));
     } else if (command === "step") {
@@ -11930,8 +12278,11 @@ var dumpTestSequence = function(seq) {
   if (seq.sampleApplicability !== "") {
     out += "  sample_applicability " + dumpBareSafe(seq.sampleApplicability) + "\n";
   }
+  for (const r of seq.refs ?? []) {
+    out += "  ref " + r.predicate + ' "' + escapeString(r.target) + '"' + (r.note ? ' { note "' + escapeString(r.note) + '" }' : "") + "\n";
+  }
   for (const src of seq.sourceRefs) {
-    out += '  source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
+    out += dumpSourceRefAsRef(src, "  ", escapeString);
   }
   out += "}\n";
   return out;
@@ -11955,13 +12306,18 @@ var parseFormulasUsed = function(id, data) {
   };
   forEachEntry(
     data,
-    (command, value) => {
+    (command, value, peek) => {
       if (command === "name") {
         trace.name = stripWrapping(value());
       } else if (command === "description") {
         trace.description = stripWrapping(value());
       } else if (command === "formulas") {
         trace.formulas.push(...readEntryTokens(value()));
+      } else if (command === "ref") {
+        const r = parseRefFromReaders(value, peek, stripWrapping, unwrapBlock);
+        if (!foldRefIntoLegacy(trace, r)) {
+          (trace.refs ??= []).push(r);
+        }
       } else if (command === "source") {
         trace.sourceRefs.push(readSource(unwrapBlock(value())));
       } else {
@@ -11987,8 +12343,11 @@ var dumpFormulasUsed = function(fu) {
   if (fu.formulas.length > 0) {
     out += "  formulas { " + fu.formulas.map(dumpBareSafe).join(" ") + " }\n";
   }
+  for (const r of fu.refs ?? []) {
+    out += "  ref " + r.predicate + ' "' + escapeString(r.target) + '"' + (r.note ? ' { note "' + escapeString(r.note) + '" }' : "") + "\n";
+  }
   for (const src of fu.sourceRefs) {
-    out += '  source { doc "' + escapeString(src.doc) + '" clause "' + escapeString(src.clause) + '"' + (src.fragment ? ' fragment "' + escapeString(src.fragment) + '"' : "") + " }\n";
+    out += dumpSourceRefAsRef(src, "  ", escapeString);
   }
   out += "}\n";
   return out;
@@ -15450,6 +15809,19 @@ var CHECK_RULES = [
     "error",
     "normal",
     "TODO.integration/14, the composed_of construct (TODO.v3/03 Phase 2)"
+  ),
+  // ── the relation registry (docs/primmel/18 §18.6) ──────────────────
+  // C103: every ref predicate resolves against the composed registry —
+  // a typo is an error, not a silent new predicate. The rule only fires
+  // when the package set declares a registry: the predicate vocabulary
+  // is data (the metamodel layer's predicates.prl), never grammar.
+  R(
+    "C103",
+    "declared-predicate",
+    "base",
+    "error",
+    "normal",
+    "docs/primmel/18 \xA718.6 (the unified reference/relation construct)"
   )
 ];
 var byId = new Map(CHECK_RULES.map((r) => [r.id, r]));
@@ -16386,6 +16758,7 @@ function checkPackage(dir, options = {}) {
   }
   issues.push(...checkEditionLifecycle(dir, standard));
   issues.push(...checkSpellingCodes(standard));
+  issues.push(...checkDeclaredPredicates(standard));
   const reqIds = new Set(
     (standard.requirements ?? []).map((r) => r.id)
   );
@@ -19845,6 +20218,81 @@ function checkSpellingCodes(standard) {
   }
   return issues;
 }
+function checkDeclaredPredicates(standard) {
+  const issues = [];
+  const registry = new Set((standard.predicates ?? []).map((p) => p.id));
+  if (registry.size === 0) {
+    return issues;
+  }
+  const visit = (owner, refs) => {
+    for (const r of refs ?? []) {
+      if (!registry.has(r.predicate)) {
+        issues.push({
+          check: "C103",
+          severity: "error",
+          message: `${owner}: ref predicate "${r.predicate}" is not declared in the composed predicate registry (declared-predicate)`
+        });
+      }
+    }
+  };
+  const visitFields = (owner, fields) => {
+    for (const f of fields) {
+      const here = `${owner} field ${f.name}`;
+      visit(here, f.refs);
+      if (f.fields && f.fields.length > 0) {
+        visitFields(here, f.fields);
+      }
+    }
+  };
+  const m = standard.packageManifest;
+  if (m) {
+    visit(`package "${m.id}"`, m.refs);
+  }
+  for (const r of standard.requirements ?? []) {
+    visit(`requirement ${r.id}`, r.refs);
+  }
+  for (const t of standard.conformanceTests ?? []) {
+    visit(`conformance_test ${t.id}`, t.refs);
+  }
+  for (const f of standard.forms ?? []) {
+    visit(`form ${f.id}`, f.refs);
+    visitFields(`form ${f.id}`, f.fields ?? []);
+  }
+  for (const s of standard.subforms ?? []) {
+    visitFields(`subform ${s.id}`, s.fields ?? []);
+  }
+  for (const c of standard.calculations ?? []) {
+    visit(`calculation ${c.id}`, c.refs);
+  }
+  for (const s of standard.symbols ?? []) {
+    visit(`symbol ${s.id}`, s.refs);
+  }
+  for (const t of standard.terms ?? []) {
+    visit(`term ${t.id}`, t.refs);
+  }
+  for (const t of standard.tables ?? []) {
+    visit(`table ${t.id}`, t.refs);
+  }
+  for (const c of standard.constraints ?? []) {
+    visit(`constraint ${c.id}`, c.refs);
+  }
+  for (const k of standard.competenceKinds ?? []) {
+    visit(`competence_kind ${k.id}`, k.refs);
+  }
+  for (const f of standard.formulasUsed ?? []) {
+    visit(`formulas_used ${f.id}`, f.refs);
+  }
+  for (const s of standard.testSequences ?? []) {
+    visit(`test_sequence ${s.id}`, s.refs);
+  }
+  for (const c of standard.conditionSets ?? []) {
+    visit(`condition_set ${c.id}`, c.refs);
+  }
+  for (const i of standard.instruments ?? []) {
+    visit(`instrument ${i.id}`, i.refs);
+  }
+  return issues;
+}
 function checkEditionLifecycle(dir, standard) {
   const issues = [];
   const err = (check, message) => issues.push({ check, severity: "error", message });