@memoarchitect/ontology 0.7.0 → 0.8.24

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/interconnection_view.sysml

@@ -11,87 +11,76 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_intercon
     private import memo_viewpoints_logical_logical_viewpoint::*;
     private import memo_core_enumerations::*;
 
-    part coffeeMachine : LogicalComponent { attribute :>> name = "Coffee Machine"; }
-    part waterSupply : LogicalComponent { attribute :>> name = "Water Supply"; }
-    part waterTank : LogicalComponent { attribute :>> name = "Water Reservoir"; }
-    part heaterAssembly : LogicalComponent { attribute :>> name = "Thermal Control Assembly"; }
-    part heatingElement : LogicalComponent { attribute :>> name = "Water Heating Element"; }
-    part brewGroup : LogicalComponent { attribute :>> name = "Brew Group"; }
-    part cup : LogicalComponent { attribute :>> name = "Cup"; }
+    // Ports are owned by the part whose boundary they are, which is what lets
+    // a delegation be written at all: SysML v2 checks a flow's source for
+    // `out`-ness relative to the owner, so a boundary port only reads as a
+    // source from INSIDE its part. The subassemblies are nested the same way —
+    // real containment, not a port-to-port `Composes` edge, which is what
+    // CR-ONT-065 used to forbid before nesting made the rule unnecessary.
+    part coffeeMachine : LogicalComponent {
+        attribute :>> name = "Coffee Machine";
+        in port mainsWaterIn : DataPort { in item payload : MemoItem; }
+        out port beverageOut : DataPort { out item payload : MemoItem; }
+        inout port serviceInterface : DataPort {
+            inout item payload : MemoItem;
+            out port diagnostics : DataPort { out item payload : MemoItem; }
+        }
 
-    in port mainsWaterIn : DataPort { in item payload : MemoExchangeItem; }
-    out port beverageOut : DataPort { out item payload : MemoExchangeItem; }
-    out port supplyWaterOut : DataPort { out item payload : MemoExchangeItem; }
-    in port cupBeverageIn : DataPort { in item payload : MemoExchangeItem; }
-    inout port serviceInterface : DataPort { inout item payload : MemoExchangeItem; }
-    out port diagnostics : DataPort { out item payload : MemoExchangeItem; }
-    out port tankWaterOut : DataPort { out item payload : MemoExchangeItem; }
-    in port tankWaterIn : DataPort { in item payload : MemoExchangeItem; }
-    in port heaterWaterIn : DataPort { in item payload : MemoExchangeItem; }
-    out port heatedWaterOut : DataPort { out item payload : MemoExchangeItem; }
-    in port brewWaterIn : DataPort { in item payload : MemoExchangeItem; }
-    out port brewedCoffeeOut : DataPort { out item payload : MemoExchangeItem; }
-    out port heaterStatusOut : DataPort { out item payload : MemoExchangeItem; }
+        part waterTank : LogicalComponent {
+            attribute :>> name = "Water Reservoir";
+            out port tankWaterOut : DataPort { out item payload : MemoItem; }
+            in port tankWaterIn : DataPort { in item payload : MemoItem; }
+        }
+        part heaterAssembly : LogicalComponent {
+            attribute :>> name = "Thermal Control Assembly";
+            in port heaterWaterIn : DataPort { in item payload : MemoItem; }
+            out port heatedWaterOut : DataPort { out item payload : MemoItem; }
 
-    connection : Composes connect parent ::> coffeeMachine to child ::> waterTank;
-    connection : Composes connect parent ::> coffeeMachine to child ::> heaterAssembly;
-    connection : Composes connect parent ::> coffeeMachine to child ::> brewGroup;
-    connection : Composes connect parent ::> coffeeMachine to child ::> mainsWaterIn;
-    connection : Composes connect parent ::> coffeeMachine to child ::> beverageOut;
-    connection : Composes connect parent ::> coffeeMachine to child ::> serviceInterface;
-    connection : Composes connect parent ::> serviceInterface to child ::> diagnostics;
-    connection : Composes connect parent ::> waterTank to child ::> tankWaterOut;
-    connection : Composes connect parent ::> waterTank to child ::> tankWaterIn;
-    connection : Composes connect parent ::> heaterAssembly to child ::> heatingElement;
-    connection : Composes connect parent ::> heaterAssembly to child ::> heaterWaterIn;
-    connection : Composes connect parent ::> heaterAssembly to child ::> heatedWaterOut;
-    connection : Composes connect parent ::> brewGroup to child ::> brewWaterIn;
-    connection : Composes connect parent ::> brewGroup to child ::> brewedCoffeeOut;
-    connection : Composes connect parent ::> heatingElement to child ::> heaterStatusOut;
-    connection : Composes connect parent ::> waterSupply to child ::> supplyWaterOut;
-    connection : Composes connect parent ::> cup to child ::> cupBeverageIn;
+            part heatingElement : LogicalComponent {
+                attribute :>> name = "Water Heating Element";
+                out port heaterStatusOut : DataPort { out item payload : MemoItem; }
+            }
+        }
+        part brewGroup : LogicalComponent {
+            attribute :>> name = "Brew Group";
+            in port brewWaterIn : DataPort { in item payload : MemoItem; }
+            out port brewedCoffeeOut : DataPort { out item payload : MemoItem; }
+        }
+    }
+    part waterSupply : LogicalComponent {
+        attribute :>> name = "Water Supply";
+        out port supplyWaterOut : DataPort { out item payload : MemoItem; }
+    }
+    part cup : LogicalComponent {
+        attribute :>> name = "Cup";
+        in port cupBeverageIn : DataPort { in item payload : MemoItem; }
+    }
 
-    connection : ExchangesWith connect source ::> supplyWaterOut to target ::> mainsWaterIn;
-    connection : ExchangesWith connect source ::> mainsWaterIn to target ::> tankWaterIn;
-    connection : ExchangesWith connect source ::> tankWaterOut to target ::> heaterWaterIn;
-    connection : ExchangesWith connect source ::> heatedWaterOut to target ::> brewWaterIn;
-    connection : ExchangesWith connect source ::> brewedCoffeeOut to target ::> beverageOut;
-    connection : ExchangesWith connect source ::> beverageOut to target ::> cupBeverageIn;
-    connection : ExchangesWith connect source ::> heaterStatusOut to target ::> diagnostics;
+    // Transport between two components: `out` to `in`, one item moving.
+    flow from waterSupply.supplyWaterOut to coffeeMachine.mainsWaterIn;
+    flow from coffeeMachine.waterTank.tankWaterOut to coffeeMachine.heaterAssembly.heaterWaterIn;
+    flow from coffeeMachine.heaterAssembly.heatedWaterOut to coffeeMachine.brewGroup.brewWaterIn;
+    flow from coffeeMachine.beverageOut to cup.cupBeverageIn;
+
+    // Delegation between a boundary port and the interior it stands for. These
+    // are `in`-to-`in` and `out`-to-`out`, because nothing travels: the two
+    // features are the same feature. SysML v2 spells that `bind` (training
+    // ch. 12), not `flow` (ch. 13).
+    bind coffeeMachine.mainsWaterIn = coffeeMachine.waterTank.tankWaterIn;
+    bind coffeeMachine.brewGroup.brewedCoffeeOut = coffeeMachine.beverageOut;
+    bind coffeeMachine.heaterAssembly.heatingElement.heaterStatusOut = coffeeMachine.serviceInterface.diagnostics;
 
     view sampleInterconnectionView : MemoDiagramView {
         expose coffeeMachine::**;
         expose waterSupply::**;
         expose cup::**;
         attribute depth = 2;
-        attribute :>> title = "Coffee Machine · Thermal & Fluid IBD";
         attribute :>> shortDescription = "Balanced internal architecture with readable boundary ports, nested service diagnostics, and external water and beverage interfaces.";
         attribute :>> viewKind = DiagramViewKind::interconnection;
         attribute :>> diagramType = "ibd";
-        part :>> viewpointDefinition = logicalArchitectureViewpoint;
+        ref :>> viewpointDefinition = logicalArchitectureViewpoint;
         part :>> selectionQuery {
-            attribute :>> includeRelationshipKinds = ("Composes", "ExchangesWith");
+            attribute :>> includeRelationshipKinds = ("Composes", "flow", "bind");
         }
     }
-
-    connection : IncludedIn connect sourceElement ::> coffeeMachine to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> waterSupply to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> waterTank to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> heaterAssembly to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> heatingElement to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> brewGroup to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> cup to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> mainsWaterIn to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> beverageOut to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> supplyWaterOut to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> cupBeverageIn to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> serviceInterface to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> diagnostics to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> tankWaterOut to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> tankWaterIn to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> heaterWaterIn to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> heatedWaterOut to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> brewWaterIn to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> brewedCoffeeOut to targetView ::> sampleInterconnectionView;
-    connection : IncludedIn connect sourceElement ::> heaterStatusOut to targetView ::> sampleInterconnectionView;
 }

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/operational_behaviour_view.sysml

@@ -18,10 +18,10 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_operatio
         attribute :>> itemKind = InterfaceItemKind::signal;
     }
 
-    action def OpPrescribeTherapy specializes OperationalActivity { out item prescription : OpPrescription; }
-    action def OpVerifyPrescription specializes OperationalActivity { in item prescription : OpPrescription; }
-    action def OpRequestBolus specializes OperationalActivity { out item bolusRequest : OpBolusRequest; }
-    action def OpCheckLockout specializes OperationalActivity { in item bolusRequest : OpBolusRequest; }
+    action def OpPrescribeTherapy specializes OperativeAction { out item prescription : OpPrescription; }
+    action def OpVerifyPrescription specializes OperativeAction { in item prescription : OpPrescription; }
+    action def OpRequestBolus specializes OperativeAction { out item bolusRequest : OpBolusRequest; }
+    action def OpCheckLockout specializes OperativeAction { in item bolusRequest : OpBolusRequest; }
 
     // Use the canonical MEMO operational system type—never a sample-local
     // placeholder—so ontology-driven Explorer grouping remains authoritative.
@@ -29,43 +29,38 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_operatio
         attribute :>> name = "PCA Care System";
         attribute :>> entityKind = OperationalEntityKind::device;
         attribute :>> responsibility = "System of interest for this context view.";
+        part opClinicalTeam : User {
+            attribute :>> actorKind = ActorKind::clinician; attribute :>> name = "Clinical Team";
+            part opRolePhysician : User {
+                attribute :>> actorKind = ActorKind::clinician; attribute :>> name = "Physician"; }
+            part opRoleNurse : User {
+                attribute :>> actorKind = ActorKind::clinician; attribute :>> name = "Nurse"; }
+            part opRoleBiomed : User {
+                attribute :>> actorKind = ActorKind::technician; attribute :>> name = "Biomed Tech"; }
+        }
+        part opPatientGroup : User {
+            attribute :>> actorKind = ActorKind::patient; attribute :>> name = "Patient Interaction";
+            part opRolePatient : User {
+                attribute :>> actorKind = ActorKind::patient; attribute :>> name = "Patient"; }
+        }
     }
-    part opClinicalTeam : User {
-        attribute :>> actorKind = ActorKind::clinician; attribute :>> name = "Clinical Team"; }
-    part opPatientGroup : User {
-        attribute :>> actorKind = ActorKind::patient; attribute :>> name = "Patient Interaction"; }
-    part opRolePhysician : User {
-        attribute :>> actorKind = ActorKind::clinician; attribute :>> name = "Physician"; }
-    part opRoleNurse : User {
-        attribute :>> actorKind = ActorKind::clinician; attribute :>> name = "Nurse"; }
-    part opRoleBiomed : User {
-        attribute :>> actorKind = ActorKind::technician; attribute :>> name = "Biomed Tech"; }
-    part opRolePatient : User {
-        attribute :>> actorKind = ActorKind::patient; attribute :>> name = "Patient"; }
 
-    connection : Composes connect parent ::> opCareSystem to child ::> opClinicalTeam;
-    connection : Composes connect parent ::> opCareSystem to child ::> opPatientGroup;
-    connection : Composes connect parent ::> opClinicalTeam to child ::> opRolePhysician;
-    connection : Composes connect parent ::> opClinicalTeam to child ::> opRoleNurse;
-    connection : Composes connect parent ::> opClinicalTeam to child ::> opRoleBiomed;
-    connection : Composes connect parent ::> opPatientGroup to child ::> opRolePatient;
-
-    action opSetupFlow : OperationalActivity {
+    action opSetupFlow : OperativeAction {
         action opPrescribe : OpPrescribeTherapy { attribute :>> name = "Prescribe Therapy"; }
         action opVerify : OpVerifyPrescription { attribute :>> name = "Verify Prescription"; }
         fork opForkPrep;
-        action opPrime : OperationalActivity { attribute :>> name = "Prime Pump & Load Reservoir"; }
-        action opSelfTest : OperationalActivity { attribute :>> name = "Run Device Self-Test"; }
+        action opPrime : OperativeAction { attribute :>> name = "Prime Pump & Load Reservoir"; }
+        action opSelfTest : OperativeAction { attribute :>> name = "Run Device Self-Test"; }
         join opJoinPrep;
-        action opProgram : OperationalActivity { attribute :>> name = "Program Pump Parameters"; }
-        action opConnect : OperationalActivity { attribute :>> name = "Connect to Patient"; }
-        action opStart : OperationalActivity { attribute :>> name = "Start Infusion"; }
-        action opAdminister : OperationalActivity {
+        action opProgram : OperativeAction { attribute :>> name = "Program Pump Parameters"; }
+        action opConnect : OperativeAction { attribute :>> name = "Connect to Patient"; }
+        action opStart : OperativeAction { attribute :>> name = "Start Infusion"; }
+        action opAdminister : OperativeAction {
             attribute :>> name = "Administer PCA Therapy";
             action opRequestBolus : OpRequestBolus { attribute :>> name = "Request Bolus"; }
             action opCheckLockout : OpCheckLockout { attribute :>> name = "Check Lockout"; }
-            action opDeliverDose : OperationalActivity { attribute :>> name = "Deliver Dose"; }
-            action opLogEvent : OperationalActivity { attribute :>> name = "Log Dose Event"; }
+            action opDeliverDose : OperativeAction { attribute :>> name = "Deliver Dose"; }
+            action opLogEvent : OperativeAction { attribute :>> name = "Log Dose Event"; }
             flow of OpBolusRequest from opRequestBolus.bolusRequest to opCheckLockout.bolusRequest;
             first start then opRequestBolus;
             first opRequestBolus then opCheckLockout;
@@ -88,51 +83,26 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_operatio
         first opAdminister then done;
     }
 
-    allocate opSetupFlow.opPrescribe to opRolePhysician;
-    allocate opSetupFlow.opVerify to opRoleNurse;
-    allocate opSetupFlow.opPrime to opRoleNurse;
-    allocate opSetupFlow.opSelfTest to opRoleBiomed;
-    allocate opSetupFlow.opProgram to opRoleNurse;
-    allocate opSetupFlow.opConnect to opRoleNurse;
-    allocate opSetupFlow.opStart to opRoleNurse;
-    allocate opSetupFlow.opAdminister to opRoleNurse;
-    allocate opSetupFlow.opAdminister.opRequestBolus to opRolePatient;
-    allocate opSetupFlow.opAdminister.opCheckLockout to opRoleNurse;
-    allocate opSetupFlow.opAdminister.opDeliverDose to opRoleNurse;
-    allocate opSetupFlow.opAdminister.opLogEvent to opRoleNurse;
+    allocate opSetupFlow.opPrescribe to opCareSystem.opClinicalTeam.opRolePhysician;
+    allocate opSetupFlow.opVerify to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opPrime to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opSelfTest to opCareSystem.opClinicalTeam.opRoleBiomed;
+    allocate opSetupFlow.opProgram to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opConnect to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opStart to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opAdminister to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opAdminister.opRequestBolus to opCareSystem.opPatientGroup.opRolePatient;
+    allocate opSetupFlow.opAdminister.opCheckLockout to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opAdminister.opDeliverDose to opCareSystem.opClinicalTeam.opRoleNurse;
+    allocate opSetupFlow.opAdminister.opLogEvent to opCareSystem.opClinicalTeam.opRoleNurse;
 
     view opSetupView : MemoDiagramView {
         expose opSetupFlow::**;
         expose opCareSystem::**;
-        expose opClinicalTeam::**;
-        expose opPatientGroup::**;
         attribute depth = 2;
-        attribute :>> title = "Sample · Clinical PCA Setup (Operational)";
         attribute :>> shortDescription = "Operational activity across clinical roles with concurrent preparation and a composite therapy step.";
         attribute :>> viewKind = DiagramViewKind::actionflow;
         attribute :>> diagramType = "ofd";
-        part :>> viewpointDefinition = operationalViewpoint;
+        ref :>> viewpointDefinition = operationalViewpoint;
     }
-
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opPrescribe to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opVerify to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opForkPrep to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opPrime to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opSelfTest to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opJoinPrep to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opProgram to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opConnect to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opStart to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opAdminister to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opAdminister.opRequestBolus to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opAdminister.opCheckLockout to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opAdminister.opDeliverDose to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opSetupFlow.opAdminister.opLogEvent to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opCareSystem to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opClinicalTeam to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opPatientGroup to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opRolePhysician to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opRoleNurse to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opRoleBiomed to targetView ::> opSetupView;
-    connection : IncludedIn connect sourceElement ::> opRolePatient to targetView ::> opSetupView;
 }

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/requirements_view.sysml

@@ -46,20 +46,16 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_requirem
     view sampleRequirementsView : MemoDiagramView {
         expose needSafeTherapy::**;
         expose needTimelyAlarms::**;
+        expose reqDoseLimit;
+        expose reqOcclusionAlarm;
+        expose reqAlarmLoudness;
         attribute depth = 1;
-        attribute :>> title = "Sample · Requirements";
         attribute :>> shortDescription = "Stakeholder needs deriving into system requirements, wired by DerivesFrom trace edges.";
         attribute :>> viewKind = DiagramViewKind::general;
         attribute :>> diagramType = "req";
-        part :>> viewpointDefinition = requirementsViewpoint;
+        ref :>> viewpointDefinition = requirementsViewpoint;
         part :>> selectionQuery {
             attribute :>> includeRelationshipKinds = ("DerivesFrom");
         }
     }
-
-    connection : IncludedIn connect sourceElement ::> needSafeTherapy to targetView ::> sampleRequirementsView;
-    connection : IncludedIn connect sourceElement ::> needTimelyAlarms to targetView ::> sampleRequirementsView;
-    connection : IncludedIn connect sourceElement ::> reqDoseLimit to targetView ::> sampleRequirementsView;
-    connection : IncludedIn connect sourceElement ::> reqOcclusionAlarm to targetView ::> sampleRequirementsView;
-    connection : IncludedIn connect sourceElement ::> reqAlarmLoudness to targetView ::> sampleRequirementsView;
 }

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/standard_activity_view.sysml

@@ -24,28 +24,9 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_standard
     view standardActivityView : MemoDiagramView {
         expose CustomerProcess::**;
         attribute depth = 2;
-        attribute :>> title = "Sample · Customer Purchase Process";
         attribute :>> shortDescription = "Customer login, guarded validation, shopping loop, checkout, credit approval, and explicit completion outcomes.";
         attribute :>> viewKind = DiagramViewKind::actionflow;
         attribute :>> diagramType = "afd";
-        part :>> viewpointDefinition = functionalViewpoint;
+        ref :>> viewpointDefinition = functionalViewpoint;
     }
-
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::customerLogsIn to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::validUserDecision to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::rejected to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::browseCatalog to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::viewBookStore to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::selectBookForPurchase to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::addToShoppingBasket to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::viewShoppingBasket to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::shoppingDecision to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::commitOrder to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::supplyCreditCardDetails to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::creditDecision to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::rejectCreditCard to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::closeOrder to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::confirmPurchase to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::itemsDelivered to targetView ::> standardActivityView;
-    connection : IncludedIn connect sourceElement ::> CustomerProcess::orderComplete to targetView ::> standardActivityView;
 }

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/state_transition_view.sysml

@@ -1,6 +1,6 @@
 // State transition sample (statetransition view kind, `stm` diagram type). A
-// behaviour machine owns its mode states; each Transition carries `sourceState`
-// / `targetState` naming the states it connects, and renders as a labelled edge.
+// behaviour machine owns its mode states by containing them, and each native
+// transition lives inside the state whose substates it connects.
 package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_state_transition_view {
     private import ScalarValues::*;
 
@@ -9,103 +9,71 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_state_tr
     private import memo_viewpoints_definitions::*;
     private import memo_viewpoints_functional_functional_viewpoint::*;
     private import memo_core_enumerations::*;
+    private import memo_core_common::*;
 
-    state pumpModes : StateMachine { attribute :>> name = "Pump Operating Modes"; }
+    state pumpModes : StateMachine {
+        attribute :>> name = "Pump Operating Modes";
 
-    state idle : ModeState { attribute :>> name = "Idle"; }
-    state infusing : ModeState { attribute :>> name = "Infusing"; }
-    state paused : ModeState { attribute :>> name = "Paused"; }
-    state alarm : ModeState { attribute :>> name = "Alarm"; }
+        state idle : MemoState { attribute :>> stateKind = StateKind::mode; attribute :>> name = "Idle"; }
 
-    // Infusing is a composite state: its substates show what the pump is doing
-    // while it is infusing, and the machine renders them nested inside it.
-    state priming : ModeState { attribute :>> name = "Priming"; }
-    state delivering : ModeState { attribute :>> name = "Delivering"; }
-    state holding : ModeState { attribute :>> name = "Holding (KVO)"; }
+        // Infusing is a composite state: its substates show what the pump is
+        // doing while it is infusing, and containment is the nesting itself —
+        // not a parallel set of Composes edges.
+        state infusing : MemoState {
+            attribute :>> stateKind = StateKind::mode;
+            attribute :>> name = "Infusing";
 
-    part tStart : Transition {
-        attribute :>> name = "start";
-        attribute :>> trigger = "startInfusion";
-        attribute :>> sourceState = "Idle"; attribute :>> targetState = "Infusing";
-    }
-    part tPause : Transition {
-        attribute :>> name = "pause";
-        attribute :>> trigger = "pauseRequested";
-        attribute :>> sourceState = "Infusing"; attribute :>> targetState = "Paused";
-    }
-    part tResume : Transition {
-        attribute :>> name = "resume";
-        attribute :>> trigger = "resumeRequested";
-        attribute :>> sourceState = "Paused"; attribute :>> targetState = "Infusing";
-    }
-    part tFault : Transition {
-        attribute :>> name = "fault";
-        attribute :>> trigger = "occlusionDetected";
-        attribute :>> sourceState = "Infusing"; attribute :>> targetState = "Alarm";
-    }
-    part tRecover : Transition {
-        attribute :>> name = "acknowledge";
-        attribute :>> trigger = "alarmCleared";
-        attribute :>> sourceState = "Alarm"; attribute :>> targetState = "Idle";
-    }
-    part tStop : Transition {
-        attribute :>> name = "stop";
-        attribute :>> trigger = "stopInfusion";
-        attribute :>> sourceState = "Infusing"; attribute :>> targetState = "Idle";
-    }
+            state priming : MemoState { attribute :>> stateKind = StateKind::mode; attribute :>> name = "Priming"; }
+            state delivering : MemoState { attribute :>> stateKind = StateKind::mode; attribute :>> name = "Delivering"; }
+            state holding : MemoState { attribute :>> stateKind = StateKind::mode; attribute :>> name = "Holding (KVO)"; }
 
-    part tPrimed : Transition {
-        attribute :>> name = "primed";
-        attribute :>> trigger = "primeComplete";
-        attribute :>> sourceState = "Priming"; attribute :>> targetState = "Delivering";
-    }
-    part tKvo : Transition {
-        attribute :>> name = "keepVeinOpen";
-        attribute :>> trigger = "doseComplete";
-        attribute :>> sourceState = "Delivering"; attribute :>> targetState = "Holding (KVO)";
-    }
-    part tResumeDose : Transition {
-        attribute :>> name = "resumeDose";
-        attribute :>> trigger = "doseScheduled";
-        attribute :>> sourceState = "Holding (KVO)"; attribute :>> targetState = "Delivering";
-    }
+            transition tPrimed first priming then delivering {
+                @TransitionRecord { :>> name = "primed"; :>> trigger = "primeComplete"; }
+            }
+            transition tKvo first delivering then holding {
+                @TransitionRecord { :>> name = "keepVeinOpen"; :>> trigger = "doseComplete"; }
+            }
+            transition tResumeDose first holding then delivering {
+                @TransitionRecord { :>> name = "resumeDose"; :>> trigger = "doseScheduled"; }
+            }
+        }
+
+        state paused : MemoState { attribute :>> stateKind = StateKind::mode; attribute :>> name = "Paused"; }
+        state alarm : MemoState { attribute :>> stateKind = StateKind::mode; attribute :>> name = "Alarm"; }
 
-    connection : Composes connect parent ::> pumpModes to child ::> idle;
-    connection : Composes connect parent ::> pumpModes to child ::> infusing;
-    connection : Composes connect parent ::> pumpModes to child ::> paused;
-    connection : Composes connect parent ::> pumpModes to child ::> alarm;
-    connection : Composes connect parent ::> infusing to child ::> priming;
-    connection : Composes connect parent ::> infusing to child ::> delivering;
-    connection : Composes connect parent ::> infusing to child ::> holding;
+        transition tStart first idle then infusing {
+            @TransitionRecord { :>> name = "start"; :>> trigger = "startInfusion"; }
+        }
+        transition tPause first infusing then paused {
+            @TransitionRecord { :>> name = "pause"; :>> trigger = "pauseRequested"; }
+        }
+        transition tResume first paused then infusing {
+            @TransitionRecord { :>> name = "resume"; :>> trigger = "resumeRequested"; }
+        }
+        transition tFault first infusing then alarm {
+            @TransitionRecord { :>> name = "fault"; :>> trigger = "occlusionDetected"; }
+        }
+        transition tRecover first alarm then idle {
+            @TransitionRecord { :>> name = "acknowledge"; :>> trigger = "alarmCleared"; }
+        }
+        transition tStop first infusing then idle {
+            @TransitionRecord { :>> name = "stop"; :>> trigger = "stopInfusion"; }
+        }
+    }
 
     view sampleStateTransitionView : MemoDiagramView {
         expose pumpModes::**;
         attribute depth = 2;
-        attribute :>> title = "Sample · State Transition";
         attribute :>> shortDescription = "A pump-mode state machine — Idle, Infusing, Paused, Alarm — where Infusing is a composite state nesting Priming, Delivering and Holding.";
         attribute :>> viewKind = DiagramViewKind::statetransition;
         attribute :>> diagramType = "stm";
-        part :>> viewpointDefinition = functionalViewpoint;
+        ref :>> viewpointDefinition = functionalViewpoint;
         part :>> selectionQuery {
-            attribute :>> includeElementKinds = ("StateMachine", "ModeState", "Transition");
+            attribute :>> includeElementKinds = ("StateMachine", "MemoState");
         }
     }
 
-    connection : IncludedIn connect sourceElement ::> pumpModes to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> idle to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> infusing to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> paused to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> alarm to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tStart to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tPause to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tResume to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tFault to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tRecover to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tStop to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> priming to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> delivering to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> holding to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tPrimed to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tKvo to targetView ::> sampleStateTransitionView;
-    connection : IncludedIn connect sourceElement ::> tResumeDose to targetView ::> sampleStateTransitionView;
+    // The machine is one containment tree, so exposing its root reaches every
+    // state and transition; the former per-element IncludedIn list restated
+    // that tree a second time and is gone with it.
 }

package/examples/sysml-diagram-samples/model/catalog/viewpoints/unassigned/views/tree_view.sysml

@@ -8,51 +8,40 @@ package memo_examples_sysml_diagram_samples_viewpoints_unassigned_views_tree_vie
     private import memo_viewpoints_physical_physical_viewpoint::*;
     private import memo_core_enumerations::*;
 
-    part rootA : HardwareAssembly { attribute :>> name = "Root A"; }
-    part rootB : HardwareAssembly { attribute :>> name = "Root B"; }
-    part branchA1 : HardwareAssembly { attribute :>> name = "Branch A.1"; }
-    part branchA2 : HardwareAssembly { attribute :>> name = "Branch A.2 With A Deliberately Long Label"; }
-    part branchB1 : HardwareAssembly { attribute :>> name = "Branch B.1"; }
-    part leafA11 : HardwareAssembly {
-        attribute :>> name = "Leaf A.1.1";
-        attribute :>> partNumber = "PN-001";
+    part rootA : HardwareAssembly {
+        attribute :>> name = "Root A";
+        part branchA1 : HardwareAssembly {
+            attribute :>> name = "Branch A.1";
+            part leafA11 : HardwareAssembly {
+                attribute :>> name = "Leaf A.1.1";
+                attribute :>> partNumber = "PN-001";
+            }
+            part leafA12 : HardwareAssembly { attribute :>> name = "Leaf A.1.2"; }
+        }
+        part branchA2 : HardwareAssembly {
+            attribute :>> name = "Branch A.2 With A Deliberately Long Label";
+            part leafA21 : HardwareAssembly { attribute :>> name = "Leaf A.2.1"; }
+        }
+        part rootB : HardwareAssembly {
+            attribute :>> name = "Root B";
+            part branchB1 : HardwareAssembly {
+                attribute :>> name = "Branch B.1";
+                part leafB11 : HardwareAssembly { attribute :>> name = "Leaf B.1.1"; }
+            }
+        }
     }
-    part leafA12 : HardwareAssembly { attribute :>> name = "Leaf A.1.2"; }
-    part leafA21 : HardwareAssembly { attribute :>> name = "Leaf A.2.1"; }
-    part leafB11 : HardwareAssembly { attribute :>> name = "Leaf B.1.1"; }
-
-    connection : Composes connect parent ::> rootA to child ::> branchA1;
-    connection : Composes connect parent ::> rootA to child ::> branchA2;
-    connection : Composes connect parent ::> rootA to child ::> rootB;
-    connection : Composes connect parent ::> branchA1 to child ::> leafA11;
-    connection : Composes connect parent ::> branchA1 to child ::> leafA12;
-    connection : Composes connect parent ::> branchA2 to child ::> leafA21;
-    connection : Composes connect parent ::> rootB to child ::> branchB1;
-    connection : Composes connect parent ::> branchB1 to child ::> leafB11;
 
     view sampleTreeView : MemoDiagramView {
         expose rootA::**;
-        expose rootB::**;
         attribute depth = 2;
-        attribute :>> title = "Sample · Tree";
         attribute :>> shortDescription = "One connected dummy hierarchy with varied branch depths for tree layout development.";
         attribute :>> viewKind = DiagramViewKind::general;
         attribute :>> diagramType = "bdd";
-        part :>> viewpointDefinition = physicalViewpoint;
+        ref :>> viewpointDefinition = physicalViewpoint;
         attribute :>> layoutHint = "tree";
         attribute :>> styleHint = "expanded:rootA,rootB,branchA1,branchB1";
         part :>> selectionQuery {
             attribute :>> includeRelationshipKinds = ("Composes");
         }
     }
-
-    connection : IncludedIn connect sourceElement ::> rootA to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> rootB to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> branchA1 to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> branchA2 to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> branchB1 to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> leafA11 to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> leafA12 to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> leafA21 to targetView ::> sampleTreeView;
-    connection : IncludedIn connect sourceElement ::> leafB11 to targetView ::> sampleTreeView;
 }