@memoarchitect/ontology 0.6.2 → 0.6.4

package/examples/gpca-pump/model/catalog/gpca_trace.sysml

@@ -51,15 +51,15 @@ package memo_examples_gpca_pump_model_catalog_gpca_trace {
     connection : ConnectsPhysically connect source ::> entityNeedle to target ::> actorPatient;
     connection : ConnectsPhysically connect source ::> entityPowerInfrastructure to target ::> entityGpcaPump;
     // Intended use and use context anchoring (no floating context nodes)
-    connection : Governs { attribute :>> governKind = GovernKind::use; connect governor ::> gpcaIntendedUse to governedElement ::> entityGpcaPump; }
+    connection : Governs { attribute :>> governKind = GovernKind::'use'; connect governor ::> gpcaIntendedUse to governedElement ::> entityGpcaPump; }
     connection : AppliesInContext connect useContext ::> hospitalWardContext to subjectElement ::> entityGpcaPump;
     connection : AppliesInContext connect useContext ::> hospitalWardContext to subjectElement ::> entityHospital;
 
     // ── Actor participation (use case view) ─────────────────────
     connection : Initiates connect initiatingUser ::> actorNurse to initiatedUseCase ::> ucDeliverPcaTherapy;
-    connection : ParticipatesIn connect participant ::> actorPatient to useCase ::> ucDeliverPcaTherapy;
-    connection : ParticipatesIn connect participant ::> actorPrescriber to useCase ::> ucDeliverPcaTherapy;
-    connection : ParticipatesIn connect participant ::> actorPharmacist to useCase ::> ucDeliverPcaTherapy;
+    connection : ParticipatesIn connect participatingActor ::> actorPatient to useCase ::> ucDeliverPcaTherapy;
+    connection : ParticipatesIn connect participatingActor ::> actorPrescriber to useCase ::> ucDeliverPcaTherapy;
+    connection : ParticipatesIn connect participatingActor ::> actorPharmacist to useCase ::> ucDeliverPcaTherapy;
     connection : Performs connect performer ::> actorPrescriber to performed ::> oaPrescribe;
     connection : Performs connect performer ::> actorPharmacist to performed ::> oaLoadReservoir;
     connection : Performs connect performer ::> actorNurse to performed ::> oaProgram;

package/examples/gpca-pump/model/views/document_architecture_description_view.sysml

@@ -2,6 +2,9 @@ package memo_examples_gpca_pump_model_views_document_architecture_description_vi
     private import ScalarValues::*;
 
     private import memo_viewpoints_definitions::*;
+    private import memo_viewpoints_logical_logical_viewpoint::*;
+    private import memo_viewpoints_software_software_viewpoint::*;
+    private import memo_viewpoints_physical_physical_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view architectureDescriptionView : MemoDocumentView {
@@ -18,6 +21,9 @@ package memo_examples_gpca_pump_model_views_document_architecture_description_vi
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("Architecture Description", "DHF");
         attribute :>> sectionIdentifier = "AD";
+        part :>> viewpointDefinition = logicalArchitectureViewpoint;
+        part :>> viewpointDefinition = softwareViewpoint;
+        part :>> viewpointDefinition = physicalViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-005";
             attribute :>> name = "architectureDescriptionViewQuery";

package/examples/gpca-pump/model/views/document_cyber_assessment_view.sysml

@@ -3,6 +3,7 @@ package memo_examples_gpca_pump_model_views_document_cyber_assessment_view {
 
     private import memo_viewpoints_definitions::*;
     private import memo_viewpoints_cybersecurity_cybersecurity_assessment_view::*;
+    private import memo_viewpoints_cybersecurity_cybersecurity_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view cyberAssessmentView : MemoCybersecurityAssessmentView {
@@ -17,6 +18,7 @@ package memo_examples_gpca_pump_model_views_document_cyber_assessment_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("Cybersecurity Risk Assessment", "RMF", "QMSR");
         attribute :>> sectionIdentifier = "CYB-RA";
+        part :>> viewpointDefinition = cybersecurityViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-009";
             attribute :>> name = "cyberAssessmentViewQuery";

package/examples/gpca-pump/model/views/document_dhf_index_view.sysml

@@ -2,6 +2,9 @@ package memo_examples_gpca_pump_model_views_document_dhf_index_view {
     private import ScalarValues::*;
 
     private import memo_viewpoints_definitions::*;
+    private import memo_viewpoints_requirements_requirements_viewpoint::*;
+    private import memo_viewpoints_risk_risk_viewpoint::*;
+    private import memo_viewpoints_verification_verification_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view dhfIndexView : MemoDocumentView {
@@ -18,6 +21,9 @@ package memo_examples_gpca_pump_model_views_document_dhf_index_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("DHF");
         attribute :>> sectionIdentifier = "DHF";
+        part :>> viewpointDefinition = requirementsViewpoint;
+        part :>> viewpointDefinition = riskViewpoint;
+        part :>> viewpointDefinition = verificationViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-007";
             attribute :>> name = "dhfIndexViewQuery";

package/examples/gpca-pump/model/views/document_hazard_analysis_view.sysml

@@ -2,6 +2,7 @@ package memo_examples_gpca_pump_model_views_document_hazard_analysis_view {
     private import ScalarValues::*;
 
     private import memo_viewpoints_definitions::*;
+    private import memo_viewpoints_risk_risk_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view hazardAnalysisView : MemoDocumentView {
@@ -18,6 +19,7 @@ package memo_examples_gpca_pump_model_views_document_hazard_analysis_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("Hazard Analysis Report", "RMF");
         attribute :>> sectionIdentifier = "HAZ";
+        part :>> viewpointDefinition = riskViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-003";
             attribute :>> name = "hazardAnalysisViewQuery";

package/examples/gpca-pump/model/views/document_rmf_view.sysml

@@ -2,6 +2,7 @@ package memo_examples_gpca_pump_model_views_document_rmf_view {
     private import ScalarValues::*;
 
     private import memo_viewpoints_definitions::*;
+    private import memo_viewpoints_risk_risk_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view rmfView : MemoDocumentView {
@@ -18,6 +19,7 @@ package memo_examples_gpca_pump_model_views_document_rmf_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("RMF", "QMSR");
         attribute :>> sectionIdentifier = "RMF";
+        part :>> viewpointDefinition = riskViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-001";
             attribute :>> name = "rmfViewQuery";

package/examples/gpca-pump/model/views/document_sdd_view.sysml

@@ -2,6 +2,7 @@ package memo_examples_gpca_pump_model_views_document_sdd_view {
     private import ScalarValues::*;
 
     private import memo_viewpoints_definitions::*;
+    private import memo_viewpoints_software_software_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view sddView : MemoDocumentView {
@@ -18,6 +19,7 @@ package memo_examples_gpca_pump_model_views_document_sdd_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("SDD", "QMSR");
         attribute :>> sectionIdentifier = "SDD";
+        part :>> viewpointDefinition = softwareViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-004";
             attribute :>> name = "sddViewQuery";

package/examples/gpca-pump/model/views/document_threat_model_view.sysml

@@ -3,6 +3,7 @@ package memo_examples_gpca_pump_model_views_document_threat_model_view {
 
     private import memo_viewpoints_definitions::*;
     private import memo_viewpoints_cybersecurity_threat_model_view::*;
+    private import memo_viewpoints_cybersecurity_cybersecurity_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view threatModelView : MemoCybersecurityThreatModelView {
@@ -17,6 +18,7 @@ package memo_examples_gpca_pump_model_views_document_threat_model_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("Threat Model", "QMSR");
         attribute :>> sectionIdentifier = "CYB-TM";
+        part :>> viewpointDefinition = cybersecurityViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-008";
             attribute :>> name = "threatModelViewQuery";

package/examples/gpca-pump/model/views/document_usability_view.sysml

@@ -3,6 +3,7 @@ package memo_examples_gpca_pump_model_views_document_usability_view {
 
     private import memo_viewpoints_definitions::*;
     private import memo_viewpoints_usability_usability_engineering_view::*;
+    private import memo_viewpoints_usability_usability_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view usabilityView : MemoUsabilityEngineeringView {
@@ -17,6 +18,7 @@ package memo_examples_gpca_pump_model_views_document_usability_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("Usability Engineering File", "DHF");
         attribute :>> sectionIdentifier = "UEF";
+        part :>> viewpointDefinition = usabilityViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-002";
             attribute :>> name = "usabilityViewQuery";

package/examples/gpca-pump/model/views/document_vv_view.sysml

@@ -2,6 +2,7 @@ package memo_examples_gpca_pump_model_views_document_vv_view {
     private import ScalarValues::*;
 
     private import memo_viewpoints_definitions::*;
+    private import memo_viewpoints_verification_verification_viewpoint::*;
     private import memo_core_enumerations::*;
 
     view vvView : MemoDocumentView {
@@ -18,6 +19,7 @@ package memo_examples_gpca_pump_model_views_document_vv_view {
         attribute :>> marketScope = "generic";
         attribute :>> documentUsage = ("VV", "DHF", "QMSR");
         attribute :>> sectionIdentifier = "VV";
+        part :>> viewpointDefinition = verificationViewpoint;
         part :>> selectionQuery {
             attribute :>> id = "QRY-DOC-006";
             attribute :>> name = "vvViewQuery";

package/examples/sysml-diagram-samples/model/samples/requirements_view.sysml

@@ -11,12 +11,12 @@ package memo_examples_sysml_diagram_samples_model_samples_requirements_view {
     private import memo_core_enumerations::*;
 
     requirement needSafeTherapy : Need {
-        attribute :>> needKind = NeedKind::stakeholder;
+        attribute :>> needKind = NeedKind::'stakeholder';
         attribute :>> id = "NEED-001"; attribute :>> name = "SafeTherapy";
         attribute :>> statement = "The device shall support safe patient-controlled infusion therapy.";
     }
     requirement needTimelyAlarms : Need {
-        attribute :>> needKind = NeedKind::stakeholder;
+        attribute :>> needKind = NeedKind::'stakeholder';
         attribute :>> id = "NEED-002"; attribute :>> name = "TimelyAlarms";
         attribute :>> statement = "Clinicians shall be notified promptly of any condition that endangers therapy.";
     }

package/examples/sysml-diagram-samples/model/samples/use_case_view.sysml

@@ -50,10 +50,10 @@ package memo_examples_sysml_diagram_samples_model_samples_use_case_view {
     }
 
     connection : Initiates connect initiatingUser ::> clinician to initiatedUseCase ::> configureTherapy;
-    connection : ParticipatesIn connect participant ::> patient to useCase ::> reviewStatus;
-    connection : ParticipatesIn connect participant ::> patient to useCase ::> configureTherapy;
-    connection : ParticipatesIn connect participant ::> serviceTechnician to useCase ::> maintainDevice;
-    connection : ParticipatesIn connect participant ::> clinician to useCase ::> validateTherapySettings;
+    connection : ParticipatesIn connect participatingActor ::> patient to useCase ::> reviewStatus;
+    connection : ParticipatesIn connect participatingActor ::> patient to useCase ::> configureTherapy;
+    connection : ParticipatesIn connect participatingActor ::> serviceTechnician to useCase ::> maintainDevice;
+    connection : ParticipatesIn connect participatingActor ::> clinician to useCase ::> validateTherapySettings;
     connection : Includes connect includingUseCase ::> configureTherapy to includedUseCase ::> reviewStatus;
     connection : Includes connect includingUseCase ::> reviewStatus to includedUseCase ::> validateTherapySettings;
     connection : Extends connect extendingUseCase ::> documentTreatment to extendedUseCase ::> reviewStatus;

package/methodologies/default/memo.package.yaml

@@ -1,5 +1,5 @@
 name: "@memoarchitect/methodology-default"
-version: "0.6.2"
+version: "0.6.4"
 type: methodology
 extends: "@memoarchitect/ontology"
 sysmlDir: "../../src/methodology"

package/methodologies/gpca/memo.package.yaml

@@ -1,5 +1,5 @@
 name: "@memoarchitect/methodology-gpca"
-version: "0.6.2"
+version: "0.6.4"
 type: methodology
 extends: "@memoarchitect/methodology-default"
 sysmlDir: "../../examples/gpca-pump/methodology"

package/ontology/memo.package.yaml

@@ -1,5 +1,5 @@
 name: "@memoarchitect/ontology"
-version: "0.6.2"
+version: "0.6.4"
 type: ontology
 description: "MEMO — the single canonical medical-device ontology: core semantics, the Arcadia-inspired architecture layers (context, requirements, behavior, structure, interfaces, risk, cybersecurity, assurance, …), compliance, viewpoints, views, and invariant rules. One namespace (memo::), one src/ tree."
 license: "MIT"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memoarchitect/ontology",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "packageManager": "pnpm@9.15.0",
   "description": "MEMO \u2014 Medical Engineering Modelling Ontology. Pure SysML v2 medical-device ontology with native constraints, portable to any conformant SysML v2 tool (SysIDE, SysON, sysand).",
   "scripts": {
@@ -11,7 +11,9 @@
     "docs:diagrams": "node scripts/generate-reference-diagrams.mjs",
     "docs:serve": "node scripts/generate-reference-diagrams.mjs && node scripts/generate-sysml-api.mjs && node scripts/check-reference-coverage.mjs && python3 -m mkdocs serve",
     "docs:build": "node scripts/generate-reference-diagrams.mjs && node scripts/generate-sysml-api.mjs && node scripts/check-reference-coverage.mjs && python3 -m mkdocs build --strict",
-    "docs:check-reference": "node scripts/check-reference-coverage.mjs"
+    "docs:check-reference": "node scripts/check-reference-coverage.mjs",
+    "version:sync": "node scripts/sync-version.mjs",
+    "version:check": "node scripts/sync-version.mjs --check"
   },
   "engines": {
     "node": ">=26.0.0"

package/profile/memo.package.yaml

@@ -1,5 +1,5 @@
 name: "@memoarchitect/medical-modeling-profile"
-version: "0.6.2"
+version: "0.6.4"
 type: profile
 extends:
   - "@memoarchitect/ontology"

package/src/architecture/implementation/software/structure/memo_software_structure.sysml

@@ -20,10 +20,10 @@ package memo_architecture_implementation_software_structure {
     // (period, WCET, scheduling) moved to SoftwareComponent.
     // item / unit / package / library / code / firmware / soup (IEC 62304).
     enum def ModuleKind {
-        enum item;
+        enum 'item';
         enum unit;
-        enum package;
-        enum library;
+        enum 'package';
+        enum 'library';
         enum code;
         enum firmware;
         enum soup;

package/src/architecture/implementation/ui/memo_ui.sysml

@@ -127,7 +127,7 @@ package memo_architecture_implementation_ui {
     }
     connection def PresentsState :> MemoRelationship {
         end userInterface : UserInterface;
-        end state : UIState;
+        end uiState : UIState;
     }
 
     // ── §18 traceability ─────────────────────────────────────────

package/src/architecture/operational/context/stakeholders/memo_stakeholders.sysml

@@ -40,7 +40,7 @@ package memo_architecture_operational_context_stakeholders {
 
     connection def HasConcern :> MemoRelationship {
         end interestedStakeholder : Stakeholder;
-        end concern : Concern;
+        end stakeholderConcern : Concern;
     }
     connection def FramesConcern :> MemoRelationship {
         end framingViewpoint : MemoPart;
@@ -54,7 +54,7 @@ package memo_architecture_operational_context_stakeholders {
     // Governs unifies GovernsCorrespondence / GovernsUse, keyed by governKind.
     enum def GovernKind {
         enum correspondence;
-        enum use;
+        enum 'use';
     }
     connection def Governs :> MemoRelationship {
         attribute governKind : GovernKind;

package/src/architecture/operational/context/use_context/memo_use_context.sysml

@@ -28,9 +28,34 @@ package memo_architecture_operational_context_use_context {
         attribute mobility : String;
     }
 
+    // The single relation a system context view draws.
+    //
+    // A context diagram labels its edges with open-ended verbs — "directs
+    // procedure", "electrical power", "fluid supply", "environmental
+    // conditions". Enumerating those as relation kinds never terminates, so the
+    // ontology fixes the *role* an edge plays and leaves the verb to the
+    // project: a project declares `connection def SuppliesFluid :>
+    // InteractsInContext` and the view picks it up through the specialization
+    // closure, exactly as a FirmwareComponent is recognised as a
+    // SoftwareComponent.
+    //
+    // Keeping it separate from InteractsWith is the point: a context view draws
+    // this relation and nothing else, so a model's general-purpose edges cannot
+    // leak into the boundary picture.
+    connection def InteractsInContext :> MemoRelationship {
+        // Which side of the boundary picture the participant belongs on.
+        attribute contextSide : ContextSideKind;
+        // The verb, as it should read on the edge ("Directs procedure").
+        attribute interactionLabel : String[0..1];
+        end contextParticipant : MemoPart;
+        // Untyped: the system of interest may be a part or an operational activity.
+        end systemOfInterest;
+    }
+
     connection def InteractsWith :> MemoRelationship {
         end contextParticipant : Actor;
-        end target : MemoPart;
+        // Untyped so operational activities (action def) can be targets as well as parts.
+        end target;
     }
     // Directional context-level data flow between boundary entities.
     connection def ExchangesWith :> MemoRelationship {

package/src/architecture/operational/scenarios/memo_scenarios.sysml

@@ -98,7 +98,7 @@ package memo_architecture_operational_scenarios {
     // element), keyed by selectsKind.
     enum def SelectsKind {
         enum step;
-        enum flow;
+        enum 'flow';
     }
     connection def Selects :> MemoRelationship {
         attribute selectsKind : SelectsKind;

package/src/architecture/operational/use_cases/memo_use_cases.sysml

@@ -51,7 +51,7 @@ package memo_architecture_operational_use_cases {
         end initiatedUseCase : UseCase;
     }
     connection def ParticipatesIn :> MemoRelationship {
-        end participant : Actor;
+        end participatingActor : Actor;
         end useCase : UseCase;
     }
     // UML use-case relationships. Includes establishes a decomposition level;

package/src/architecture/operational/workflows/memo_workflows.sysml

@@ -54,8 +54,8 @@ package memo_architecture_operational_workflows {
     // decision / fork / join / handoff.
     enum def ControlNodeKind {
         enum decision;
-        enum fork;
-        enum join;
+        enum 'fork';
+        enum 'join';
         enum handoff;
     }
 

package/src/architecture/realization/deployment/memo_deployment.sysml

@@ -79,12 +79,12 @@ package memo_architecture_realization_deployment {
     // segment per traversed component boundary (AADL flow-spec → end-to-end).
     connection def FlowComprisesSpec :> MemoRelationship {
         attribute segmentOrder : Integer;
-        end flow : EndToEndFlow;
+        end endToEndFlow : EndToEndFlow;
         end spec : FlowSpecification;
     }
     // The flow traverses a software→hardware binding; latency accrues here.
     connection def FlowTraversesBinding :> MemoRelationship {
-        end flow : EndToEndFlow;
+        end endToEndFlow : EndToEndFlow;
         end deploymentUnit : DeploymentUnit;
     }
 }

package/src/assurance/cybersecurity/memo_cybersecurity.sysml

@@ -86,7 +86,6 @@ package memo_assurance_cybersecurity {
         attribute derivedFromThreat : String;
         attribute derivedFromRisk : String;
         attribute defaultConcern : ConcernKind;
-        attribute safetyClass : SafetyClassKind;
     }
 
     item def TrustBoundary specializes InterfaceElement {

package/src/assurance/requirements/memo_requirements.sysml

@@ -45,7 +45,7 @@ package memo_assurance_requirements {
         attribute statement : String;
         attribute sourceKind : RequirementSourceKind;
         attribute concernKind : ConcernKind;
-        attribute status : RequirementStatusKind;
+        attribute requirementStatus : RequirementStatusKind;
         attribute acceptanceCriteria : String;
         attribute subjectDescription : String;
         attribute actorDescription : String;

package/src/assurance/requirements/needs/memo_needs.sysml

@@ -16,7 +16,7 @@ package memo_assurance_requirements_needs {
     // (ISO 13485 §7.3.3, IEC 62366-1 user needs) is unchanged — it is simply
     // an attribute of the one Need type rather than a class the modeler picks.
     enum def NeedKind {
-        enum stakeholder;
+        enum 'stakeholder';
         enum user;
         enum clinicalUser;
         enum patientUser;

package/src/compliance/artifacts/memo_artifacts.sysml

@@ -5,7 +5,6 @@ package memo_compliance_artifacts {
     private import memo_core_enumerations::*;
     item def ControlledArtifact specializes MemoPart {
         attribute version : String;
-        attribute lifecycleState : LifecycleStateKind;
         attribute artifactKind : ArtifactKind;
         attribute owner : String;
         attribute approvalStatus : String;

package/src/core/common/memo_common.sysml

@@ -81,7 +81,9 @@ package memo_core_common {
     }
 
     // Interaction-contract foundation for interface definitions between ports.
-    interface def MemoInterface {
+    abstract interface def MemoInterface {
+        end source;
+        end target;
         attribute id : String;
         attribute name : String;
         attribute description : String;

package/src/core/enumerations/memo_enumerations.sysml

@@ -225,7 +225,7 @@ package memo_core_enumerations {
         enum data;
         enum command;
         enum signal;
-        enum event;
+        enum 'event';
         enum material;
         enum energy;
         enum fluid;
@@ -346,6 +346,22 @@ package memo_core_enumerations {
         enum embedded;
         enum partitioned;
     }
+    // Which side of a system context diagram a participant belongs on.
+    // Animate and inanimate are kept apart because they are governed
+    // differently: a human participant carries training and use-error
+    // considerations (IEC 62366-1), an external system carries interface and
+    // interoperability ones.
+    enum def ContextSideKind {
+        // A human who interacts with the device (IEC 62366-1 intended user).
+        enum 'actor';
+        // An inanimate external system, device, or supply the device exchanges with.
+        enum externalSystem;
+        // The setting the device sits inside (IEC 62366-1 3.20 use environment).
+        enum environment;
+        // A condition the context imposes rather than a thing it connects to —
+        // regulatory, clinical, or operational limits on use.
+        enum 'constraint';
+    }
     enum def ActorKind {
         enum patient;
         enum clinician;

package/src/core/relationships/memo_relationships.sysml

@@ -45,12 +45,15 @@ package memo_core_relationships {
 
     connection def DerivesFrom :> MemoRelationship {
         // Drivers include needs and hazards (ISO 14971: hazards drive
-        // requirements), so the source stays at MemoPart
+        // requirements). targetRequirement is untyped: Need is a requirement def
+        // (MemoNeed + RequirementDriver) and does not conform to VerifiableElement
+        // under SysIDE related-feature-conformance.
         end sourceDriver : MemoPart;
-        end targetRequirement : VerifiableElement;
+        end targetRequirement;
     }
     connection def SatisfiedBy :> MemoRelationship {
-        end requiredElement : VerifiableElement;
+        // Untyped: Need (requirement) instances must participate alongside Requirement.
+        end requiredElement;
         end satisfyingElement : ArchitectureElement;
     }
     // Mitigates unifies the control/action → risk-element edges of the
@@ -67,8 +70,9 @@ package memo_core_relationships {
     }
     connection def Mitigates :> MemoRelationship {
         attribute mitigationKind : MitigationKind;
-        end control : VerifiableElement;
-        end mitigatedElement : MemoPart;
+        // Untyped: controls/hazards may be item defs (RiskControlMeasure, Hazard, …).
+        end control;
+        end mitigatedElement;
     }
     connection def AllocatedTo :> MemoRelationship {
         end function : ArchitectureElement;

package/src/memo_namespaces.sysml

@@ -102,7 +102,7 @@ package memo_namespace_assurance {
     package safety_risk {
         public import memo_assurance_safety_risk::*;
         public import memo_assurance_safety_risk_arch_risk::*;
-        alias analysis for memo_namespace_assurance_safety_risk_analysis;
+        alias 'analysis' for memo_namespace_assurance_safety_risk_analysis;
     }
     alias cybersecurity for memo_namespace_assurance_cybersecurity;
     alias human_factors for memo_namespace_assurance_human_factors;
@@ -291,7 +291,7 @@ package memo_namespace_viewpoints {
     alias risk for memo_namespace_viewpoints_risk;
     alias software for memo_namespace_viewpoints_software;
     alias usability for memo_namespace_viewpoints_usability;
-    alias verification for memo_namespace_viewpoints_verification;
+    alias 'verification' for memo_namespace_viewpoints_verification;
 }
 
 package memo_namespace_assurance_safety_risk_analysis {

package/src/methodology/profiles/memo_profiles.sysml

@@ -24,24 +24,16 @@ package memo_methodology_profiles {
         attribute :>> domain = "medical device modeling";
         attribute :>> description = "Light default methodology around the ontology for smaller or early project use.";
         attribute :>> baseMethodName = "";
-        attribute :>> includedLayer = "memo::architecture::operational";
-        attribute :>> includedLayer = "memo::architecture::functional";
-        attribute :>> includedLayer = "memo::architecture::logical";
-        attribute :>> includedModule = "memo::assurance::requirements";
-        attribute :>> includedModule = "memo::assurance::safety_risk";
-        attribute :>> includedModule = "memo::assurance::verification_validation";
+        attribute :>> includedLayer = ("memo::architecture::operational", "memo::architecture::functional", "memo::architecture::logical");
+        attribute :>> includedModule = ("memo::assurance::requirements", "memo::assurance::safety_risk", "memo::assurance::verification_validation");
     }
 
     part mdLightDefaultResolved : ResolvedMethodology {
         attribute :>> id = "RMETH-001";
         attribute :>> name = "MedicalDeviceLightDefaultResolved";
         attribute :>> version = "0.1";
-        attribute :>> includedLayer = "memo::architecture::operational";
-        attribute :>> includedLayer = "memo::architecture::functional";
-        attribute :>> includedLayer = "memo::architecture::logical";
-        attribute :>> includedModule = "memo::assurance::requirements";
-        attribute :>> includedModule = "memo::assurance::safety_risk";
-        attribute :>> includedModule = "memo::assurance::verification_validation";
+        attribute :>> includedLayer = ("memo::architecture::operational", "memo::architecture::functional", "memo::architecture::logical");
+        attribute :>> includedModule = ("memo::assurance::requirements", "memo::assurance::safety_risk", "memo::assurance::verification_validation");
     }
 
     part useRiskAndResidualRule : ElementUsageRule {
@@ -128,16 +120,8 @@ package memo_methodology_profiles {
         attribute :>> name = "MedicalDeviceCoverageScope";
         attribute :>> scopeName = "coverage";
 
-        attribute :>> includedArchLayer = "memo::architecture::operational";
-        attribute :>> includedArchLayer = "memo::architecture::functional";
-        attribute :>> includedArchLayer = "memo::architecture::logical";
-        attribute :>> includedArchLayer = "memo::architecture::implementation";
-        attribute :>> includedArchLayer = "memo::architecture::realization";
-        attribute :>> includedModule = "memo::assurance::requirements";
-        attribute :>> includedModule = "memo::assurance::safety_risk";
-        attribute :>> includedModule = "memo::assurance::cybersecurity";
-        attribute :>> includedModule = "memo::assurance::human_factors";
-        attribute :>> includedModule = "memo::assurance::verification_validation";
+        attribute :>> includedArchLayer = ("memo::architecture::operational", "memo::architecture::functional", "memo::architecture::logical", "memo::architecture::implementation", "memo::architecture::realization");
+        attribute :>> includedModule = ("memo::assurance::requirements", "memo::assurance::safety_risk", "memo::assurance::cybersecurity", "memo::assurance::human_factors", "memo::assurance::verification_validation");
         attribute :>> description = "Comprehensive default MEMO layer and module selection.";
     }
 

package/src/viewpoints/context/context_viewpoint.sysml

@@ -18,7 +18,16 @@ package memo_viewpoints_context_context_viewpoint {
         attribute :>> presentationKind = (PresentationKind::blockDiagram);
         attribute :>> concernKinds = (ConcernKind::safety, ConcernKind::interoperability);
         attribute :>> includedLayers = ("context");
-        attribute :>> allowedElementKinds = ("Actor", "UseContext", "IntendedUse", "ReasonablyForeseeableMisuse", "OperationalEntity", "TrustBoundary", "LogicalComponent");
+        // UseEnvironment (IEC 62366-1 3.20) is what the device sits inside —
+        // facility, procedure area, ambient conditions. A context view that
+        // cannot show it is missing half of "where is this used".
+        attribute :>> allowedElementKinds = ("Actor", "UseContext", "UseEnvironment", "IntendedUse", "ReasonablyForeseeableMisuse", "OperationalEntity", "TrustBoundary", "LogicalComponent");
+        // InteractsInContext is the context relation: a context view draws it
+        // and nothing else, so general-purpose model edges cannot leak into the
+        // boundary picture. Projects derive their own verbs from it and are
+        // picked up through the specialization closure. The three older
+        // relations remain for models authored before it existed.
+        attribute :>> allowedRelationshipKinds = ("InteractsInContext", "InteractsWith", "ExchangesWith", "ConnectsPhysically");
         attribute :>> userExtensible = true;
     }
 }

package/src/viewpoints/definitions/memo_viewpoint_definitions.sysml

@@ -19,6 +19,8 @@ package memo_viewpoints_definitions {
         attribute filterExpression : String;
         attribute extendsViewpointIds : String[*];
         attribute userExtensible : Boolean;
+        // Optional navigation grouping interpreted by Memo Architect.
+        attribute group : String;
         // default diagram kind for a catalog viewpoint (optional)
         attribute defaultViewKind : DiagramViewKind[0..1];
     }
@@ -47,7 +49,11 @@ package memo_viewpoints_definitions {
         attribute queryDescription : String;
         attribute dataSourceDescription : String;
         attribute autoPopulate : Boolean;
-        part viewpointDefinition : Viewpoint;
+        // ISO 42010 conformance is many-to-many: every view has one or more
+        // viewpoints, and a viewpoint may be realized by many reusable views.
+        part viewpointDefinition : Viewpoint[1..*];
+        // Optional grouping within each viewpoint, interpreted by Architect.
+        attribute group : String;
         ref subjectElement : MemoPart[*];
         ref exposesElement : MemoPart[*];
         ref exposesRelationship : MemoRelationship[*];