@memoarchitect/tools 0.7.2 → 0.8.8

package/packages/tools/lib/model/builder.js

@@ -21,14 +21,26 @@
 //   - ActionUsage supports composite actions with nested actions
 //   - FlowConnectionUsage → MemoRelationship of type "flow" with flowItem
 //   - SuccessionUsage → MemoRelationship pairs of type "succession"
-//   - AllocateUsage → MemoRelationship of type "allocateTo"
 //   - ItemDefinition → MemoElement with construct "item"
+//
+// Language-native trace relations:
+//   - AllocateUsage              → MemoRelationship "allocatedTo"
+//   - SatisfyRequirementUsage    → MemoRelationship "satisfiedBy"
+//   - RequirementVerificationMember → MemoRelationship "verifiedBy"
+//   Each is the SAME edge the corresponding MEMO `connection def` produces —
+//   see LANGUAGE_NATIVE_RELATIONS. A model may use either spelling and the
+//   graph is identical, which is what makes the migration off the private
+//   connection defs reversible one file at a time.
 // ─────────────────────────────────────────────────────────────────────────────
 import { createHash } from 'node:crypto';
+import { AstUtils } from 'langium';
+import { isRequirementVerificationMember, isSatisfyRequirementUsage, isPerformActionUsage, isIncludeUseCaseUsage, isExhibitStateUsage, isFramedConcernMember, isSubjectMember, isDependency, isVariantMember, isActorMember, } from '../language/generated/ast.js';
 import { PackageRegistry } from './package-registry.js';
 import { assignSequentialShortIds, kindToPrefix } from './short-id.js';
+import { LANGUAGE_NATIVE_RELATIONS, REFINEMENT_METADATA, pascalToCamelCase } from './relationship-registry.js';
 import { indexKinds, kindConformsTo } from './relationship-legality.js';
 import { CONTROL_KIND_METACLASS } from './activity-notation.js';
+import { toModelType } from './naming.js';
 let relationshipCounter = 0;
 /**
  * Resolve a kind definition using registry-first, config-fallback strategy.
@@ -86,13 +98,14 @@ export function buildMemoModel(documents, config, parseErrors = [], registries)
     const deferredFlows = [];
     const deferredSuccessions = [];
     const deferredAllocates = [];
+    const deferredBindings = [];
     // Phase 1: Build package registry from all documents
     const registry = new PackageRegistry();
     registry.buildFromDocuments(documents);
     // Phase 2: Extract elements from all documents (populates registry)
     for (const { document, filePath } of documents) {
         const model = document.parseResult.value;
-        extractFromModel(model, filePath, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, errors, registry, registries);
+        extractFromModel(model, filePath, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, deferredBindings, errors, registry, registries);
     }
     // Phase 3: Resolve connections using the registry (all elements now known)
     const allElementIds = new Set(elements.keys());
@@ -101,7 +114,11 @@ export function buildMemoModel(documents, config, parseErrors = [], registries)
     }
     // Phase 3b: Resolve flow connections
     for (const { flow, filePath, packageName, parentActionId } of deferredFlows) {
-        resolveFlowConnection(flow, filePath, packageName, parentActionId, relationships, allElementIds);
+        resolveFlowConnection(flow, filePath, packageName, parentActionId, relationships, allElementIds, elements);
+    }
+    // Phase 3b2: Resolve port delegations
+    for (const { binding, filePath, packageName } of deferredBindings) {
+        resolveBinding(binding, filePath, packageName, relationships, allElementIds, elements);
     }
     // Phase 3c: Resolve successions
     for (const { succession, filePath, packageName, parentActionId } of deferredSuccessions) {
@@ -109,7 +126,70 @@ export function buildMemoModel(documents, config, parseErrors = [], registries)
     }
     // Phase 3d: Resolve allocations
     for (const { allocate, filePath, packageName } of deferredAllocates) {
-        resolveAllocate(allocate, filePath, packageName, elements, relationships, registry, allElementIds);
+        resolveAllocate(allocate, filePath, packageName, elements, relationships, registry, allElementIds, registries?.relationshipRegistry);
+    }
+    // Phase 3e: Resolve the native requirement relations. Unlike connections
+    // these are not package members — a `satisfy` sits in the body of the part
+    // that is the design context, and a `verify` in the body of the case that
+    // does the verifying — so they are found by walking containment rather than
+    // by the package-member switch, and their context comes from their owner.
+    for (const { document, filePath } of documents) {
+        resolveNativeTraceUsages(document.parseResult.value, filePath, relationships, registry, allElementIds);
+    }
+    // Phase 3f: Synthesize containment edges from native nesting. A natively
+    // nested part carries its parent in `owner` (set during extraction); MEMO's
+    // consumers read containment as a `composes` relationship (parent → child),
+    // so emit one per nesting. A model that nests natively then looks identical
+    // to one that wrote `Composes`, which is what lets R10-S7 delete the
+    // relationship without the containment vanishing. Ports carry `owner` too,
+    // so this is confined to part-to-part nesting.
+    for (const el of elements.values()) {
+        if (el.construct !== 'part' || !el.owner)
+            continue;
+        const parent = elements.get(el.owner);
+        if (!parent || parent.construct !== 'part')
+            continue;
+        relationships.push({
+            id: `rel-${++relationshipCounter}`,
+            type: 'composes',
+            sourceId: el.owner,
+            sourceEnd: 'parent',
+            targetId: el.id,
+            targetEnd: 'child',
+            file: el.file,
+            named: false,
+        });
+    }
+    // A nested action carries its parent in `parentAction` rather than
+    // `owner` (the two are set by separate extraction paths), and
+    // CR-ONT-065/066 already treat an action-typed end as a legitimate
+    // composes participant alongside parts — a functional decomposition
+    // (`action fnParent { action fnChild : SystemFunction { ... } }`) needs
+    // the same synthesis or a natively nested function tree loses the
+    // `composes` edges DSM and traceability consumers read, the exact
+    // silent-drop shape R10-S7 exists to close, not open. Every action
+    // usage nests some way — a flow step under its flow, a control node
+    // under its action — so this is not confined to decomposition the way
+    // the part path is; a nested action's owner IS its containing action
+    // for every shape the grammar produces, so there is no narrower
+    // predicate to gate this on without re-deriving one from AST shape
+    // that `parentAction` already erased.
+    for (const el of elements.values()) {
+        if (el.construct !== 'action' || !el.parentAction)
+            continue;
+        const parent = elements.get(el.parentAction);
+        if (!parent || parent.construct !== 'action')
+            continue;
+        relationships.push({
+            id: `rel-${++relationshipCounter}`,
+            type: 'composes',
+            sourceId: el.parentAction,
+            sourceEnd: 'parent',
+            targetId: el.id,
+            targetEnd: 'child',
+            file: el.file,
+            named: false,
+        });
     }
     // Keep ownership of a declaration separate from ownership of the type that
     // classifies it.  A project usage of `Hazard` is editable project content;
@@ -139,12 +219,16 @@ export function buildMemoModel(documents, config, parseErrors = [], registries)
         const idToShortId = assignSequentialShortIds(prefix, prefixElements.map(e => e.id));
         for (const el of prefixElements) {
             el.shortId = idToShortId.get(el.id);
-            el.uuid = stableElementUuid(el);
+            // `uuid` is part of the ontology's identification core, so a model
+            // may author it. An authored value wins: it is the whole point of
+            // writing one — the element keeps its identity across a file move
+            // or an id change, which the derived hash cannot survive.
+            el.uuid = el.attributes.uuid?.trim() || stableElementUuid(el);
         }
     }
     // Phase 4: Validate relationship end types (warnings only).
     // A kind conforms to an end type if it equals it or specializes it
-    // (transitively) — e.g. HardwareAssembly conforms to ArchitectureElement.
+    // (transitively) — e.g. HardwareAssembly conforms to MemoPart.
     if (registries?.relationshipRegistry) {
         // Same resolver the authoring UI and the server persistence path use,
         // so a link the panel offers is a link the builder accepts.
@@ -197,6 +281,7 @@ export function buildMemoModel(documents, config, parseErrors = [], registries)
         elements,
         relationships,
         errors,
+        packages: collectPackages(registry),
         elementsByKind,
         elementsByLayer,
         relationshipsByType,
@@ -204,6 +289,26 @@ export function buildMemoModel(documents, config, parseErrors = [], registries)
         incoming,
     };
 }
+/**
+ * The declared packages, in the shape the model carries them.
+ *
+ * Read from the registry rather than from element membership so a package that
+ * declares nothing is still reported: an explorer builds its containment tree
+ * from this list, and a newly created package has no members yet by definition.
+ */
+function collectPackages(registry) {
+    const packages = [];
+    for (const entry of registry.getPackages().values()) {
+        const separator = entry.qualifiedName.lastIndexOf('::');
+        packages.push({
+            qualifiedName: entry.qualifiedName,
+            name: separator === -1 ? entry.qualifiedName : entry.qualifiedName.slice(separator + 2),
+            ...(separator === -1 ? {} : { parent: entry.qualifiedName.slice(0, separator) }),
+            file: entry.file,
+        });
+    }
+    return packages.sort((a, b) => a.qualifiedName.localeCompare(b.qualifiedName));
+}
 function applySemanticProvenance(elements, relationships, registries) {
     const table = registries?.provenance;
     if (!table)
@@ -263,19 +368,19 @@ function stableElementUuid(element) {
     return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
 }
 // ─── AST Walking ────────────────────────────────────────────────────────────
-function extractFromModel(model, filePath, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, errors, registry, registries) {
+function extractFromModel(model, filePath, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, deferredBindings, errors, registry, registries) {
     for (const member of model.members) {
         if (member.$type === 'PackageDeclaration') {
-            extractFromPackage(member, filePath, '', config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, errors, registry, registries);
+            extractFromPackage(member, filePath, '', config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, deferredBindings, errors, registry, registries);
         }
     }
 }
-function extractFromPackage(pkg, filePath, parentPackage, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, errors, registry, registries) {
+function extractFromPackage(pkg, filePath, parentPackage, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, deferredBindings, errors, registry, registries) {
     const packageName = parentPackage ? `${parentPackage}::${pkg.name}` : pkg.name;
     for (const member of pkg.members) {
         switch (member.$type) {
             case 'PackageDeclaration':
-                extractFromPackage(member, filePath, packageName, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, errors, registry, registries);
+                extractFromPackage(member, filePath, packageName, config, elements, deferredConnections, deferredFlows, deferredSuccessions, deferredAllocates, deferredBindings, errors, registry, registries);
                 break;
             case 'PartUsage':
                 extractUsage(member, 'part', filePath, packageName, config, elements, registry, registries);
@@ -319,6 +424,16 @@ function extractFromPackage(pkg, filePath, parentPackage, config, elements, defe
                     packageName,
                 });
                 break;
+            case 'BindingUsage':
+                // Port delegation. Deferred for the same reason as flows: both
+                // ends are dotted paths that only resolve once every nested
+                // port is an element.
+                deferredBindings.push({
+                    binding: member,
+                    filePath,
+                    packageName,
+                });
+                break;
             case 'FlowConnectionUsage':
                 // A flow between two action usages declared side by side in a
                 // package has no enclosing action, so parentActionId is unset
@@ -329,6 +444,16 @@ function extractFromPackage(pkg, filePath, parentPackage, config, elements, defe
                     packageName,
                 });
                 break;
+            case 'MessageUsage':
+                // `Message : FlowUsage`: native messages deliberately lower
+                // through the same path as MEMO's flow-shaped compatibility
+                // vocabulary, so consumers retain one trace-edge spelling.
+                deferredFlows.push({
+                    flow: member,
+                    filePath,
+                    packageName,
+                });
+                break;
             case 'SuccessionUsage':
                 deferredSuccessions.push({
                     succession: member,
@@ -343,6 +468,27 @@ function extractFromPackage(pkg, filePath, parentPackage, config, elements, defe
                     packageName,
                 });
                 break;
+            // ─── Native declarations (plan §8) ──────────────────────────
+            //
+            // `actor u : User;`, `stakeholder s : Stakeholder;` and
+            // `concern c : Concern;` declare the same elements `part u : User;`
+            // declares — same id, same kind, same attributes, same doc. Only
+            // the metaclass differs, and the metaclass is what makes them
+            // legible to a conforming tool. Routing them through extractUsage
+            // is what keeps the migration in step 3 a spelling change rather
+            // than a content change.
+            case 'ActorMember':
+                extractUsage(member, 'actor', filePath, packageName, config, elements, registry, registries);
+                break;
+            case 'StakeholderMember':
+                extractUsage(member, 'stakeholder', filePath, packageName, config, elements, registry, registries);
+                break;
+            case 'ConcernUsage':
+                extractUsage(member, 'concern', filePath, packageName, config, elements, registry, registries);
+                break;
+            case 'TransitionUsage':
+                extractTransition(member, filePath, packageName, config, elements, registry, registries);
+                break;
             // ─── Definition members ─────────────────────────────────────
             case 'ActionDefinition':
                 extractActionDefinition(member, filePath, packageName, config, elements, deferredFlows, deferredSuccessions, registry, registries);
@@ -370,19 +516,35 @@ function extractUsage(usage, construct, filePath, packageName, config, elements,
         : { kindDef: undefined, resolvedKind: 'Unknown' };
     const attributes = extractAttributes(usage.body);
     const doc = extractDocComment(usage.body);
-    // Nested part members: capture reference bindings (`part viewpoint :> vp;`)
-    // and one level of nested part bodies (`part selectionQuery { ... }`) as
-    // plain / prefixed attributes, so SysML-modelled views expose their
-    // viewpoint binding and selection-query metadata to consumers.
+    // A view's `expose <path>;` members declare its element membership
+    // natively — SysML v2's own visibility mechanism, in place of the MEMO
+    // `IncludedIn` relationship. Collected as a comma-separated attribute so
+    // `resolveViewElementIds` in view-deriver.ts can resolve each path
+    // against the model the same way it resolves `selectionQuery.*`.
+    if (construct === 'view') {
+        const exposePaths = (usage.body || [])
+            .filter(member => member.$type === 'ExposeMember')
+            .map(member => member.path);
+        if (exposePaths.length > 0) {
+            attributes['expose'] = exposePaths.join(',');
+        }
+    }
+    // Nested part/reference members that are view METADATA, not containment:
+    // bindings (`part/ref viewpoint :> vp;`) and the `:>>` redefinition of an
+    // inherited feature whose body is attributes (`part :>> selectionQuery
+    // { ... }`). These are flattened onto the owner as plain / prefixed
+    // attributes so SysML-modelled views expose their viewpoint binding and
+    // selection-query metadata to consumers. A typed nested part is NOT metadata
+    // — it is real containment and is extracted as its own element below.
     for (const member of usage.body || []) {
-        if (member.$type !== 'PartMember')
+        if (member.$type !== 'PartMember' && member.$type !== 'RefMember')
             continue;
         const pm = member;
         if (pm.boundRef && pm.name) {
-            // Two shapes land here. `part viewpointDefinition :> vp;` names the
-            // feature in `name` and the value in `boundRef`. The subsetting
+            // Two shapes land here. `part/ref viewpointDefinition :> vp;` names
+            // the feature in `name` and the value in `boundRef`. The subsetting
             // form for a multi-valued feature —
-            // `part vpLogical :> viewpointDefinition = someViewpoint;` — puts
+            // `part/ref vpLogical :> viewpointDefinition = someViewpoint;` — puts
             // the FEATURE in `boundRef` and the value in `subsetValue`, and its
             // member name is arbitrary. Attribute it to the feature it subsets,
             // or a view governed by three viewpoints would surface as three
@@ -395,7 +557,13 @@ function extractUsage(usage, construct, filePath, packageName, config, elements,
             const previous = attributes[key];
             attributes[key] = previous ? `${previous},${value}` : value;
         }
-        else if (pm.body && pm.name) {
+        else if (!pm.type && pm.body && pm.name) {
+            // R10-S3 guard: an UNTYPED nested part with an attribute body is
+            // view metadata — the `part :>> selectionQuery { ... }` (or the
+            // un-redefined `part selectionQuery { ... }`) that view derivation
+            // reads as `selectionQuery.*` attributes. It carries no kind, so it
+            // is not a contained element. Flatten it; a TYPED nested part
+            // (`part valve : Valve`) is real containment and is extracted below.
             const nested = extractAttributes(pm.body);
             for (const [k, v] of Object.entries(nested)) {
                 attributes[`${pm.name}.${k}`] = v;
@@ -438,6 +606,88 @@ function extractUsage(usage, construct, filePath, packageName, config, elements,
     }
     elements.set(id, element);
     registry.registerElement(id, packageName);
+    // A port's body may declare further ports. Recurse only after the parent is
+    // in the map, so the child's `owner` points at an element that exists.
+    if (construct === 'port') {
+        extractDefinitionPorts(usage, filePath, packageName, config, elements, registry, registries);
+    }
+    // A part's body may nest further parts. SysML v2 expresses containment by
+    // nesting; MEMO historically expressed it with a `Composes` connection, and
+    // the two must yield the same model. Extract each nested part as its own
+    // element with `owner` set — exactly as a nested port is — only after the
+    // parent is in the map. buildMemoModel synthesizes the `composes` edge from
+    // the resulting `owner` chain.
+    //
+    // A part usage may also declare its OWN boundary ports directly in its
+    // body (`part x : T { in port p : DataPort; }`), distinct from a nested
+    // part's ports and from any ports the type `T` declares at the def level
+    // (that path is `extractDefinitionPorts` at package scope, line ~668).
+    // Without this, an inline-authored port silently has no element: it
+    // parses, every relationship endpoint referencing it resolves to a
+    // dangling id, and nothing downstream reports why.
+    if (construct === 'part') {
+        extractNestedParts(usage, filePath, packageName, config, elements, registry, registries);
+        extractDefinitionPorts(usage, filePath, packageName, config, elements, registry, registries);
+    }
+    // A native `transition` lives inside the state machine that owns it, which
+    // is where the language puts it and where MEMO's `part def Transition`
+    // never could. Extract it from the state usage's body so the two spellings
+    // yield the same element set.
+    for (const member of usage.body || []) {
+        if (member.$type === 'TransitionUsage') {
+            extractTransition(member, filePath, packageName, config, elements, registry, registries);
+        }
+    }
+}
+/**
+ * Extract a native `transition` as a MemoElement.
+ *
+ * MEMO models a transition as `part def Transition` with `sourceState` and
+ * `targetState` as **Strings** (§13.3) — and in the shipped content those
+ * strings hold display names ("Idle"), not element ids, so nothing can follow
+ * them to the states they name. The native form's source and target are real
+ * references, so they are resolved to element ids here.
+ *
+ * Both are still written into the attribute map under the same keys the part
+ * def declares. That is deliberate: it keeps every existing consumer of
+ * `sourceState` / `targetState` working while the two spellings coexist, and it
+ * is what makes the eventual migration a change of value (display name →
+ * element id) that a diff can show, rather than a change of shape that it
+ * cannot.
+ *
+ * An anonymous transition (`transition initial then off;`) declares no element.
+ * It is a control statement, not a named thing the model traces to.
+ */
+function extractTransition(transition, filePath, packageName, config, elements, registry, registries) {
+    if (!transition.name)
+        return;
+    const attributes = {
+        ...extractAttributes(transition.body),
+        sourceState: transition.source,
+        targetState: transition.target,
+    };
+    if (transition.trigger)
+        attributes.trigger = transition.trigger;
+    if (transition.effect)
+        attributes.effectSummary = transition.effect;
+    const guard = renderGuardExpression(transition.guard);
+    if (guard !== undefined)
+        attributes.guardSummary = guard;
+    const { kindDef, resolvedKind } = transition.type
+        ? resolveKindDef(transition.type, config, registries)
+        : { kindDef: undefined, resolvedKind: 'Unknown' };
+    elements.set(transition.name, {
+        id: transition.name,
+        name: attributes.name || transition.name,
+        kind: resolvedKind,
+        construct: 'transition',
+        layer: kindDef?.layer || 'unknown',
+        file: filePath,
+        package: packageName || undefined,
+        attributes,
+        doc: extractDocComment(transition.body),
+    });
+    registry.registerElement(transition.name, packageName);
 }
 /**
  * Extract an ActionDefinition as a MemoElement with parameters.
@@ -562,8 +812,19 @@ function extractItemDefinition(itemDef, filePath, packageName, config, elements,
     registry.registerElement(id, packageName);
 }
 /**
- * Walk a definition body to extract port usages as owned port elements.
- * Sets owner on ports and ownedPorts on the definition.
+ * Walk an owner's body to extract port usages as owned port elements.
+ * Sets owner on ports and ownedPorts on the owner.
+ *
+ * The owner may be a definition (`part def Board { port p : DataPort; }`) or a
+ * USAGE — including another port. SysML v2 nests ports inside ports, which is
+ * how a panel cluster says "this one boundary feature carries these three
+ * connectors". Without the usage case a model that nests natively simply loses
+ * the children: they are declared, they resolve, and they never become
+ * elements, so they vanish from every diagram and every count. The only
+ * alternative spelling is a `Composes` connection from a port to a port, which
+ * CR-ONT-065 forbids — a whole in a decomposition has to be a part, an action
+ * or a state. So the native form was the only correct one, and it was the one
+ * that did not work.
  */
 function extractDefinitionPorts(def, filePath, packageName, config, elements, registry, registries) {
     const ownerId = def.name;
@@ -587,6 +848,37 @@ function extractDefinitionPorts(def, filePath, packageName, config, elements, re
         }
     }
 }
+/**
+ * Walk a part usage's body to extract nested parts as owned elements, setting
+ * `owner` on each child.
+ *
+ * `extractUsage` flattens the `PartMember` shapes that are view metadata — a
+ * reference binding (`part viewpoint :> vp;`) and an untyped body
+ * (`part :>> selectionQuery { ... }`). A TYPED nested part
+ * (`part valve : Valve { ... }`) is real containment: without this it is
+ * declared, resolves, and never becomes an element — the same silent drop
+ * nested ports had before `extractDefinitionPorts` walked port usages. The
+ * `composes` edge that makes containment legible to consumers is synthesized
+ * from the `owner` chain in buildMemoModel.
+ */
+function extractNestedParts(owner, filePath, packageName, config, elements, registry, registries) {
+    const ownerId = owner.name;
+    for (const member of owner.body || []) {
+        if (member.$type !== 'PartMember')
+            continue;
+        const pm = member;
+        // Only a TYPED nested part is containment. Untyped bodies (view
+        // selectionQuery) and reference bindings are view metadata, flattened
+        // to attributes in extractUsage — skip them here or a view's metadata
+        // becomes a phantom element and its selection query is lost.
+        if (!pm.type || pm.boundRef || !pm.name)
+            continue;
+        extractUsage({ name: pm.name, type: pm.type, body: pm.body }, 'part', filePath, packageName, config, elements, registry, registries);
+        const childEl = elements.get(pm.name);
+        if (childEl)
+            childEl.owner = ownerId;
+    }
+}
 /**
  * Extract an ActionUsage, including nested actions, flows, and successions.
  * Supports both typed (action name : Type;) and composite (action name { ... }) forms.
@@ -693,12 +985,15 @@ function extractControlNode(node, filePath, packageName, elements, registry, par
 }
 function resolveConnection(conn, filePath, packageName, config, elements, relationships, registry, allElementIds) {
     const typeName = conn.type; // e.g. "Mitigates", "TraceTo"
-    if (!typeName)
-        return;
     if (!conn.source || !conn.target)
         return;
-    // Normalize: "Mitigates" → "mitigates", "TraceTo" → "traceTo"
-    const normalizedType = normalizeRelType(typeName);
+    // An untyped connection (`connection connect a to b;`, no `: SomeDef`) is
+    // the native binary connection with nothing further classifying it — the
+    // keyword IS the type, `connect`, the same as `flow`/`bind` (R10-S6,
+    // `ConnectsPhysically`'s migration). Before this it built to nothing at
+    // all: the same silent-drop shape as `BindingUsage`/`ExposeMember`.
+    // A typed connection normalizes its definition name: "Mitigates" → "mitigates".
+    const normalizedType = typeName ? normalizeRelType(typeName) : 'connect';
     // Resolve source and target using registry for cross-file resolution
     const sourceId = resolveEndpointId(conn.source.ref, packageName, registry, allElementIds);
     const targetId = resolveEndpointId(conn.target.ref, packageName, registry, allElementIds);
@@ -706,7 +1001,7 @@ function resolveConnection(conn, filePath, packageName, config, elements, relati
         return;
     // A named connection usage carries its own stable ID; anonymous ones fall
     // back to a positional counter that shifts whenever the file changes.
-    const attributes = extractAttributes(conn.body);
+    const attributes = { ...extractAttributes(conn.body), ...extractRelationshipMetadata(conn.body) };
     const rel = {
         id: conn.name || `rel-${++relationshipCounter}`,
         type: normalizedType,
@@ -715,6 +1010,9 @@ function resolveConnection(conn, filePath, packageName, config, elements, relati
         targetId,
         targetEnd: conn.target.endName,
         file: filePath,
+        sourceRange: conn.$cstNode
+            ? { offset: conn.$cstNode.offset, length: conn.$cstNode.length }
+            : undefined,
         named: conn.name ? true : undefined,
         attributes,
         flowItem: attributes.transportedItem || attributes.flowItem || undefined,
@@ -730,33 +1028,97 @@ function resolveConnection(conn, filePath, packageName, config, elements, relati
     }
     relationships.push(rel);
 }
+/**
+ * Resolve a dotted endpoint path to the deepest element it names.
+ *
+ * A dotted endpoint has two shapes and they resolve differently.
+ *
+ * `receive.prescription` names an action and one of its PARAMETERS. The
+ * parameter is not an element, so the endpoint is the action and the parameter
+ * is the end label.
+ *
+ * `touchscreen.touchUsbIo` names a port and a port NESTED inside it, and
+ * `coffeeMachine.serviceInterface.diagnostics` nests one level deeper again.
+ * The nested port IS an element in its own right, so the endpoint is the child.
+ * Reading it the first way silently retargets the edge at the parent, which is
+ * not a resolution failure anyone sees: it produces a plausible relationship
+ * pointing at the wrong feature, and it only surfaces later as a payload
+ * mismatch on whichever edge happened to carry a different item from its
+ * parent's.
+ *
+ * Walk the path through `owner` and take the deepest real element.
+ */
+function resolveEndpoint(ref, elements) {
+    const parts = ref.split('.');
+    let id = parts[0];
+    let i = 1;
+    while (i < parts.length) {
+        const child = elements.get(parts[i]);
+        if (!child || child.owner !== id)
+            break;
+        id = parts[i];
+        i++;
+    }
+    return { id, end: parts.slice(i).join('.') };
+}
+/**
+ * Resolve a `bind outer = inner;` port delegation into a MemoRelationship.
+ *
+ * Unlike a flow this carries no item: delegation is identity, so there is
+ * nothing travelling and nothing to label the edge with. Consumers that render
+ * an itemless edge already suppress the label.
+ */
+function resolveBinding(binding, filePath, _packageName, relationships, allElementIds, elements) {
+    const sourceRef = binding.source;
+    const targetRef = binding.target;
+    if (!sourceRef || !targetRef)
+        return;
+    const { id: sourceId, end: sourceEnd } = resolveEndpoint(sourceRef, elements);
+    const { id: targetId, end: targetEnd } = resolveEndpoint(targetRef, elements);
+    if (!allElementIds.has(sourceId) || !allElementIds.has(targetId))
+        return;
+    relationships.push({
+        id: `rel-${++relationshipCounter}`,
+        type: 'bind',
+        sourceId,
+        sourceEnd,
+        targetId,
+        targetEnd,
+        file: filePath,
+    });
+}
 /**
  * Resolve a flow connection usage into a MemoRelationship.
  * Flow endpoints use dot notation: "actionName.paramName"
  */
-function resolveFlowConnection(flow, filePath, packageName, parentActionId, relationships, allElementIds) {
+function resolveFlowConnection(flow, filePath, packageName, parentActionId, relationships, allElementIds, elements) {
     const sourceRef = flow.source?.ref;
     const targetRef = flow.target?.ref;
     if (!sourceRef || !targetRef)
         return;
-    // Parse dot notation: "receive.prescription" → actionId="receive", port="prescription"
-    const sourceParts = sourceRef.split('.');
-    const targetParts = targetRef.split('.');
-    const sourceActionId = sourceParts[0];
-    const sourcePort = sourceParts.length > 1 ? sourceParts.slice(1).join('.') : '';
-    const targetActionId = targetParts[0];
-    const targetPort = targetParts.length > 1 ? targetParts.slice(1).join('.') : '';
+    const { id: sourceActionId, end: sourcePort } = resolveEndpoint(sourceRef, elements);
+    const { id: targetActionId, end: targetPort } = resolveEndpoint(targetRef, elements);
     // Only create relationship if both endpoints reference known elements
     if (!allElementIds.has(sourceActionId) || !allElementIds.has(targetActionId))
         return;
+    // A NAMED flow carries a stable ID that survives rebuilds; an anonymous one
+    // falls back to a positional counter that shifts whenever the file changes.
+    // Same rule `resolveConnection` applies to connection usages, and the same
+    // reason: authoring needs to inspect, delete, and deep-link a flow, and a
+    // positional id makes every one of those wrong after the next edit.
     const rel = {
-        id: `rel-${++relationshipCounter}`,
+        id: flow.name || `rel-${++relationshipCounter}`,
         type: 'flow',
         sourceId: sourceActionId,
         sourceEnd: sourcePort,
         targetId: targetActionId,
         targetEnd: targetPort,
         file: filePath,
+        sourceRange: flow.$cstNode
+            ? { offset: flow.$cstNode.offset, length: flow.$cstNode.length }
+            : undefined,
+        named: flow.name ? true : undefined,
+        attributes: extractAttributes(flow.body),
         flowItem: flow.itemType || undefined,
     };
     relationships.push(rel);
@@ -838,7 +1200,7 @@ function renderGuardExpression(expr) {
 /**
  * Resolve an allocate usage into a MemoRelationship and set allocatedTo on the element.
  */
-function resolveAllocate(allocate, filePath, packageName, elements, relationships, registry, allElementIds) {
+function resolveAllocate(allocate, filePath, packageName, elements, relationships, registry, allElementIds, relationshipRegistry) {
     const sourceRef = allocate.source;
     const targetRef = allocate.target;
     if (!sourceRef || !targetRef)
@@ -853,16 +1215,310 @@ function resolveAllocate(allocate, filePath, packageName, elements, relationship
     if (sourceEl) {
         sourceEl.allocatedTo = targetId;
     }
-    const rel = {
+    // `allocate a to b;` and `connection : AllocatedTo connect …` are the same
+    // statement, so they produce the same edge. They did not: the native form
+    // emitted `allocateTo` with invented ends while the connection emitted
+    // `allocatedTo` with the ontology's, and consumers keyed on one silently
+    // missed the other — the DHF allocation queries ask for `allocatedTo`.
+    //
+    // A TYPED allocation — `allocation d : DeploysTo allocate m to node;` —
+    // carries which allocation it is, and that distinction has to survive.
+    // `DeploysTo` and `BuildsInto` are not `AllocatedTo` under another name:
+    // they are separate edges the deployment views and the DHF read by name.
+    // The `allocation def` naming them is what the typed form points at, so the
+    // edge is its camelCase name whenever the registry knows it; an unknown or
+    // absent type falls back to the base allocation, which is what bare
+    // `allocate` has always meant.
+    const typed = allocate.type ? pascalToCamelCase(allocate.type.split('::').pop()) : undefined;
+    const edge = typed && relationshipRegistry?.has(typed) ? typed : 'allocatedTo';
+    relationships.push(edge === 'allocatedTo'
+        ? nativeTraceEdge('allocatedTo', sourceId, targetId, filePath)
+        : typedAllocationEdge(edge, sourceId, targetId, filePath, relationshipRegistry));
+}
+/**
+ * The trace edge for an `allocation x : SomeAllocationDef allocate a to b;`.
+ *
+ * Ends come from the registry entry for the named definition, so a typed
+ * allocation and the equivalent `connection : SomeAllocationDef connect …`
+ * produce byte-identical links — the same guarantee the three
+ * LANGUAGE_NATIVE_RELATIONS rows carry, extended to every allocation def the
+ * ontology declares rather than to a fixed list of three.
+ */
+function typedAllocationEdge(type, sourceId, targetId, filePath, relationshipRegistry) {
+    const ends = relationshipRegistry?.getRelType(type)?.ends ?? [];
+    return {
         id: `rel-${++relationshipCounter}`,
-        type: 'allocateTo',
+        type,
         sourceId,
-        sourceEnd: 'action',
+        sourceEnd: ends[0]?.name ?? 'source',
         targetId,
-        targetEnd: 'part',
+        targetEnd: ends[1]?.name ?? 'target',
         file: filePath,
     };
-    relationships.push(rel);
+}
+/** Build the trace edge for a language-native relation, typed from the registry. */
+function nativeTraceEdge(name, sourceId, targetId, filePath) {
+    const [sourceEnd, targetEnd] = LANGUAGE_NATIVE_RELATIONS[name].ends;
+    return {
+        id: `rel-${++relationshipCounter}`,
+        type: name,
+        sourceId,
+        sourceEnd: sourceEnd.name,
+        targetId,
+        targetEnd: targetEnd.name,
+        file: filePath,
+    };
+}
+/**
+ * The owner context of a native trace usage: the package it is declared in, and
+ * the nearest enclosing named element.
+ *
+ * `verify` needs the second one — the case that does the verifying is the owner
+ * of the member, never a written end — and `satisfy` needs the first to resolve
+ * its references the way every other endpoint is resolved.
+ */
+function nativeUsageContext(node) {
+    const packages = [];
+    let ownerId;
+    for (let current = node.$container; current; current = current.$container) {
+        if (current.$type === 'PackageDeclaration') {
+            if (current.name)
+                packages.unshift(current.name);
+            continue;
+        }
+        // An `objective` is a MEMBERSHIP, not the element that does the
+        // verifying — the standard writes `objective { verify r; }` inside the
+        // case, and the case is the verifier. A named objective would otherwise
+        // capture `ownerId` and the `verifiedBy` edge would point at a wrapper
+        // that is not an extracted element, silently dropping the link.
+        if (current.$type === 'ObjectiveMember')
+            continue;
+        if (ownerId === undefined && typeof current.name === 'string' && current.name) {
+            ownerId = current.name;
+        }
+    }
+    return { packageName: packages.join('::'), ownerId };
+}
+/**
+ * Project a native usage that names ONE end and takes the other from its owner.
+ *
+ * `perform`, `include`, `exhibit` and `frame` all have this shape, and it is
+ * `verify`'s shape with the ends swapped: `verify` names its source and owns
+ * its target, these four own their source and name their target. Sharing the
+ * resolution keeps the four from drifting apart, and keeps the rule that the
+ * owner supplies the unwritten end stated in exactly one place.
+ */
+function resolveOwnerRootedUsage(node, written, name, filePath, relationships, registry, allElementIds) {
+    if (!written)
+        return;
+    const { packageName, ownerId } = nativeUsageContext(node);
+    const sourceId = ownerId
+        ? resolveEndpointId(ownerId, packageName, registry, allElementIds)
+        : undefined;
+    const targetId = resolveEndpointId(written, packageName, registry, allElementIds);
+    if (!sourceId || !targetId)
+        return;
+    relationships.push(nativeTraceEdge(name, sourceId, targetId, filePath));
+}
+/**
+ * Project a verification case's `subject` onto the `verifiedBy` edge.
+ *
+ * This is the standard's answer to verifying something that is not a
+ * requirement: the verified element becomes the case's SUBJECT and the
+ * requirement its `objective { verify … }`. 61 of MEMO's 99 `VerifiedBy` links
+ * target a SystemFunction, a RiskControlMeasure, a SoftwareModule, a
+ * BehaviorProperty or a TimingConstraint — none of which native `verify`
+ * admits, because `verify` takes a RequirementUsage.
+ *
+ * The edge direction matches `VerifiedBy`: the subject is the source
+ * (verificationTarget) and the owning case the target (verificationCase).
+ *
+ * A `subject` that declares a fresh feature rather than pointing at an existing
+ * element — `subject testVehicle : Vehicle;` — binds nothing and contributes no
+ * edge. Only the referring forms (`subject v :> vehicleTestConfig;`,
+ * `subject v = vehicleTestConfig;`) name something already in the model. A
+ * multi-valued subject is one parameter whose binding is a parenthesized list;
+ * each bound element is one `verifiedBy` fact for the owning case.
+ */
+function resolveSubject(subject, filePath, relationships, registry, allElementIds) {
+    if (!subject.boundRefs?.length)
+        return;
+    const { packageName, ownerId } = nativeUsageContext(subject);
+    const targetId = ownerId
+        ? resolveEndpointId(ownerId, packageName, registry, allElementIds)
+        : undefined;
+    if (!targetId)
+        return;
+    for (const boundRef of subject.boundRefs) {
+        const sourceId = resolveEndpointId(boundRef, packageName, registry, allElementIds);
+        if (sourceId)
+            relationships.push(nativeTraceEdge('verifiedBy', sourceId, targetId, filePath));
+    }
+}
+/**
+ * Project a native `actor` onto the `participatesIn` edge (R10-S6).
+ *
+ * Same shape as `resolveSubject`: only the REFERRING form —
+ * `actor driver = existingPart;` — names something already in the model, so
+ * only that form produces an edge. A fresh declaration (`actor x : Person;`,
+ * no `boundRef`) introduces a locally-scoped actor the model does not yet
+ * have an element for; collapsing `MemoRelationship`'s `Initiates` and
+ * `ParticipatesIn` onto the single native `actor` keyword means the
+ * initiating/participating distinction is no longer a typed relationship —
+ * it lives in how the actor is named, the same way `Composes` gave up its
+ * whole/part distinction to plain nesting.
+ *
+ * The owner is the TARGET and the written reference the SOURCE — `verify`'s
+ * shape, not `perform`'s: the use case is what the actor participates IN.
+ */
+function resolveActorParticipation(actor, filePath, relationships, registry, allElementIds) {
+    if (!actor.boundRef)
+        return;
+    const { packageName, ownerId } = nativeUsageContext(actor);
+    const sourceId = resolveEndpointId(actor.boundRef, packageName, registry, allElementIds);
+    const targetId = ownerId ? resolveEndpointId(ownerId, packageName, registry, allElementIds) : undefined;
+    if (!sourceId || !targetId)
+        return;
+    relationships.push(nativeTraceEdge('participatesIn', sourceId, targetId, filePath));
+}
+/**
+ * Project every `dependency a to b;` onto the generic `dependency` edge, and
+ * additionally onto `realizes` when it carries `#refinement` (R10-S6).
+ *
+ * The only native relation here that is not a connection. A Dependency takes n
+ * clients and n suppliers rather than a source and a target, so one written
+ * dependency can produce several edges — `dependency Schemata from s to a, b;`
+ * is two statements sharing a name, and it lowers to two links, which is what
+ * `Realizes` would have needed two connection usages to say.
+ *
+ * A dependency WITHOUT `#refinement` is an unclassified dependency: it means
+ * strictly less than `Realizes` does, so it contributes only the generic
+ * `dependency` edge, never `realizes` — inferring realization from a bare
+ * dependency would put a claim in the traceability matrix that the model
+ * never made. `#refinement` adds `realizes` on top; it does not replace the
+ * generic edge, because a refinement dependency IS a dependency.
+ *
+ * Before R10-S6 a bare (non-`#refinement`) dependency built to nothing at
+ * all — the same silent-drop shape as `BindingUsage`/`ExposeMember` — which
+ * is what `ModuleUses`/`MonitorsChannel`'s migration to plain `dependency`
+ * would otherwise have hit. Both collapse onto this one generic edge; native
+ * `dependency` does not distinguish "uses a module" from "monitors a
+ * channel" any more than `actor` distinguished an initiating actor from a
+ * participating one, so that distinction now lives in the dependency's own
+ * name/doc, not in a relationship type.
+ */
+function resolveDependency(dependency, filePath, relationships, registry, allElementIds) {
+    const isRefinement = (dependency.prefixMetadata ?? [])
+        .some(annotation => annotation.type?.split('::').pop() === REFINEMENT_METADATA);
+    const { packageName } = nativeUsageContext(dependency);
+    for (const client of dependency.clients ?? []) {
+        const sourceId = resolveEndpointId(client, packageName, registry, allElementIds);
+        if (!sourceId)
+            continue;
+        for (const supplier of dependency.suppliers ?? []) {
+            const targetId = resolveEndpointId(supplier, packageName, registry, allElementIds);
+            if (!targetId)
+                continue;
+            relationships.push(nativeTraceEdge('dependency', sourceId, targetId, filePath));
+            if (isRefinement)
+                relationships.push(nativeTraceEdge('realizes', sourceId, targetId, filePath));
+        }
+    }
+}
+/**
+ * Project every `satisfy` and `verify` in a document onto the trace edge its
+ * MEMO connection-def equivalent produces.
+ */
+function resolveNativeTraceUsages(model, filePath, relationships, registry, allElementIds) {
+    for (const node of AstUtils.streamAllContents(model)) {
+        if (isSatisfyRequirementUsage(node)) {
+            resolveSatisfy(node, filePath, relationships, registry, allElementIds);
+        }
+        else if (isRequirementVerificationMember(node)) {
+            resolveVerify(node, filePath, relationships, registry, allElementIds);
+        }
+        else if (isPerformActionUsage(node)) {
+            resolveOwnerRootedUsage(node, node.performed, 'performs', filePath, relationships, registry, allElementIds);
+        }
+        else if (isIncludeUseCaseUsage(node)) {
+            resolveOwnerRootedUsage(node, node.included, 'includesStep', filePath, relationships, registry, allElementIds);
+        }
+        else if (isExhibitStateUsage(node)) {
+            resolveOwnerRootedUsage(node, node.exhibited, 'exhibitsMode', filePath, relationships, registry, allElementIds);
+        }
+        else if (isFramedConcernMember(node)) {
+            resolveOwnerRootedUsage(node, node.framed, 'framesConcern', filePath, relationships, registry, allElementIds);
+        }
+        else if (isSubjectMember(node)) {
+            resolveSubject(node, filePath, relationships, registry, allElementIds);
+        }
+        else if (isActorMember(node)) {
+            resolveActorParticipation(node, filePath, relationships, registry, allElementIds);
+        }
+        else if (isDependency(node)) {
+            resolveDependency(node, filePath, relationships, registry, allElementIds);
+        }
+        else if (isVariantMember(node)) {
+            resolveVariant(node, filePath, relationships, registry, allElementIds);
+        }
+    }
+}
+/**
+ * Project `variant x;` onto a navigable choice-point edge.
+ *
+ * A variation's alternatives are memberships rather than connection usages,
+ * so they would otherwise disappear from the consumer model entirely.  The
+ * nearest owner is the variation point and the written member names the
+ * selected configuration.  Keeping this as a first-class edge lets DSMs and
+ * views distinguish a real choice from four unrelated parts.
+ */
+function resolveVariant(variant, filePath, relationships, registry, allElementIds) {
+    const { packageName, ownerId } = nativeUsageContext(variant);
+    const sourceId = ownerId
+        ? resolveEndpointId(ownerId, packageName, registry, allElementIds)
+        : undefined;
+    const targetId = resolveEndpointId(variant.name, packageName, registry, allElementIds);
+    if (!sourceId || !targetId)
+        return;
+    relationships.push({
+        id: `rel-${++relationshipCounter}`,
+        type: 'variant',
+        sourceId,
+        sourceEnd: 'variationPoint',
+        targetId,
+        targetEnd: 'variant',
+        file: filePath,
+    });
+}
+function resolveSatisfy(satisfy, filePath, relationships, registry, allElementIds) {
+    // A negated claim — `assert not satisfy r by p;` — states that the
+    // requirement is NOT satisfied. There is no MEMO connection for it, and
+    // emitting a `satisfiedBy` edge would make a design review's rejection read
+    // as coverage in the traceability matrix. It parses; it contributes no
+    // trace edge until the model has somewhere honest to put it.
+    if (satisfy.isNegated)
+        return;
+    const { packageName } = nativeUsageContext(satisfy);
+    const sourceId = resolveEndpointId(satisfy.requirement, packageName, registry, allElementIds);
+    // Without `by`, the satisfying subject is inherited from the enclosing
+    // requirement rather than written. Nothing to bind, so no edge.
+    const targetId = satisfy.satisfyingFeature
+        ? resolveEndpointId(satisfy.satisfyingFeature, packageName, registry, allElementIds)
+        : undefined;
+    if (!sourceId || !targetId)
+        return;
+    relationships.push(nativeTraceEdge('satisfiedBy', sourceId, targetId, filePath));
+}
+function resolveVerify(verify, filePath, relationships, registry, allElementIds) {
+    const { packageName, ownerId } = nativeUsageContext(verify);
+    const sourceId = resolveEndpointId(verify.requirement, packageName, registry, allElementIds);
+    // The verifying case is the owner. A `verify` whose owner is not an
+    // extracted element — a bare `verification def`, say — has no second end
+    // to bind, so it stays a parse fact and not a graph fact.
+    const targetId = ownerId ? resolveEndpointId(ownerId, packageName, registry, allElementIds) : undefined;
+    if (!sourceId || !targetId)
+        return;
+    relationships.push(nativeTraceEdge('verifiedBy', sourceId, targetId, filePath));
 }
 // ─── Helpers ────────────────────────────────────────────────────────────────
 function extractAttributes(body) {
@@ -870,7 +1526,7 @@ function extractAttributes(body) {
         return {};
     const attrs = {};
     for (const member of body) {
-        if (member.$type === 'AttributeMember' || member.$type === 'RefMember') {
+        if (member.$type === 'AttributeMember' || member.$type === 'RefMember' || member.$type === 'MetadataFeatureMember') {
             const attr = member;
             if (attr.value) {
                 attrs[attr.name] = extractAttributeValue(attr.value);
@@ -893,6 +1549,35 @@ function extractAttributes(body) {
     }
     return attrs;
 }
+/**
+ * Read the standard `Rationale`/`StatusInfo` metadata (ModelingMetadata.sysml)
+ * off a connection usage's body into the same flat attribute keys the deleted
+ * `MemoRelationship.rationale`/`.status` used to occupy (R10-S5, 2026-08-13).
+ *
+ * `extractAttributes` only walks `AttributeMember`/`RefMember`/
+ * `MetadataFeatureMember`; a `MetadataApplication` in a usage body (the `@Foo
+ * {...}` form) is invisible to it, so without this a `@Rationale`/`@StatusInfo`
+ * annotation would parse and silently vanish from the model — the same
+ * BindingUsage/ExposeMember shape this epic exists to stop repeating.
+ */
+function extractRelationshipMetadata(body) {
+    if (!body)
+        return {};
+    const attrs = {};
+    for (const member of body) {
+        if (member.$type !== 'MetadataApplication')
+            continue;
+        const metadataType = member.type?.split('::').pop();
+        const fields = extractAttributes(member.body);
+        if (metadataType === 'Rationale' && fields.text) {
+            attrs.rationale = fields.text;
+        }
+        else if (metadataType === 'StatusInfo' && fields.status) {
+            attrs.status = fields.status;
+        }
+    }
+    return attrs;
+}
 function extractAttributeValue(value) {
     if (!value)
         return '';
@@ -967,11 +1652,8 @@ ref, packageName, registry, allElementIds) {
     return direct;
 }
 /**
- * Normalize relationship type name:
- *   PascalCase → camelCase for matching against config.relationshipTypes[].name
- *   "Mitigates" → "mitigates", "TraceTo" → "traceTo", "AllocateTo" → "allocateTo"
+ * Relationship type names are normalized by the shared helper in `naming.ts`,
+ * which is the single definition of the source-name → model-key rule.
  */
-function normalizeRelType(name) {
-    return name.charAt(0).toLowerCase() + name.slice(1);
-}
+const normalizeRelType = toModelType;
 //# sourceMappingURL=builder.js.map