@matter/model 0.13.0-alpha.0-20250304-d4a7592a4 → 0.13.0-alpha.0-20250307-ebf84a05a

package/src/standard/elements/OccupancySensing.ts

@@ -10,138 +10,251 @@ import { MatterDefinition } from "../MatterDefinition.js";
 import {
     ClusterElement as Cluster,
     AttributeElement as Attribute,
-    DatatypeElement as Datatype,
-    FieldElement as Field
+    FieldElement as Field,
+    EventElement as Event,
+    DatatypeElement as Datatype
 } from "../../elements/index.js";
 
 export const OccupancySensing = Cluster(
     {
         name: "OccupancySensing", id: 0x406, classification: "application", pics: "OCC",
-        details: "The server cluster provides an interface to occupancy sensing functionality, including " +
-            "configuration and provision of notifications of occupancy status.",
+        details: "The server cluster provides an interface to occupancy sensing functionality based on one or more " +
+            "sensing modalities, including configuration and provision of notifications of occupancy status.",
         xref: { document: "cluster", section: "2.7" }
     },
 
-    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 4 }),
+    Attribute({ name: "ClusterRevision", id: 0xfffd, type: "ClusterRevision", default: 5 }),
+
+    Attribute(
+        { name: "FeatureMap", id: 0xfffc, type: "FeatureMap", xref: { document: "cluster", section: "2.7.4" } },
+        Field({
+            name: "OTHER", conformance: "O.a+", constraint: "0", description: "Other",
+            details: "Supports sensing using a modality not listed in the other bits"
+        }),
+        Field({
+            name: "PIR", conformance: "O.a+", constraint: "1", description: "PassiveInfrared",
+            details: "Supports sensing using PIR (Passive InfraRed)"
+        }),
+        Field({
+            name: "US", conformance: "O.a+", constraint: "2", description: "Ultrasonic",
+            details: "Supports sensing using UltraSound"
+        }),
+        Field({
+            name: "PHY", conformance: "O.a+", constraint: "3", description: "PhysicalContact",
+            details: "Supports sensing using a physical contact"
+        }),
+        Field({
+            name: "AIR", conformance: "O.a+", constraint: "4", description: "ActiveInfrared",
+            details: "Supports sensing using Active InfraRed measurement (e.g. time-of- flight or " +
+                "transflective/reflective IR sensing)"
+        }),
+        Field({
+            name: "RAD", conformance: "O.a+", constraint: "5", description: "Radar",
+            details: "Supports sensing using radar waves (microwave)"
+        }),
+        Field({
+            name: "RFS", conformance: "O.a+", constraint: "6", description: "RfSensing",
+            details: "Supports sensing based on RF signal analysis"
+        }),
+        Field({
+            name: "VIS", conformance: "O.a+", constraint: "7", description: "Vision",
+            details: "Supports sensing based on analyzing images"
+        })
+    ),
 
     Attribute({
         name: "Occupancy", id: 0x0, type: "OccupancyBitmap", access: "R V", conformance: "M",
         constraint: "0 to 1", quality: "P",
-        details: "This attribute indicates the sensed (processed) status of occupancy.",
-        xref: { document: "cluster", section: "2.7.5.1" }
+        details: "Indicates the sensed (processed) status of occupancy. For compatibility reasons this is expressed " +
+            "as a bitmap where the status is indicated in bit 0: a value of 1 means occupied, and 0 means " +
+            "unoccupied, with the other bits set to 0; this can be considered equivalent to a boolean.",
+        xref: { document: "cluster", section: "2.7.6.1" }
     }),
 
     Attribute({
         name: "OccupancySensorType", id: 0x1, type: "OccupancySensorTypeEnum", access: "R V",
-        conformance: "M", constraint: "desc",
-        details: "This attribute specifies the type of the occupancy sensor.",
-        xref: { document: "cluster", section: "2.7.5.2" }
+        conformance: "M, D", constraint: "desc", quality: "F",
+        xref: { document: "cluster", section: "2.7.6" }
     }),
-
     Attribute({
         name: "OccupancySensorTypeBitmap", id: 0x2, type: "OccupancySensorTypeBitmap", access: "R V",
-        conformance: "M", constraint: "0 to 7",
-        details: "This attribute specifies the types of the occupancy sensor. Each bit position, if set, indicates " +
-            "the corresponding sensing capability is implemented." +
+        conformance: "M, D", constraint: "0 to 7", quality: "F",
+        xref: { document: "cluster", section: "2.7.6" }
+    }),
+
+    Attribute({
+        name: "HoldTime", id: 0x3, type: "uint16", access: "RW VM", conformance: "O", constraint: "desc",
+        quality: "N",
+
+        details: "This attribute shall specify the time delay, in seconds, before the sensor changes to its " +
+            "unoccupied state after the last detection of occupancy in the sensed area. This is equivalent to " +
+            "the legacy *OccupiedToUnoccupiedDelay attributes." +
+            "\n" +
+            "The value of HoldTime shall be within the limits provided in the HoldTimeLimits attribute, i.e. " +
+            "HoldTimeMin <= HoldTime <= HoldTimeMax" +
+            "\n" +
+            "Low values of HoldTime SHOULD be avoided since they could lead to many reporting messages. A value " +
+            "0 for HoldTime shall NOT be used." +
+            "\n" +
+            "The figure below illustrates this with an example of how this attribute is used for a PIR sensor. " +
+            "It uses threshold detection to generate an \"internal detection\" signal, which needs post-processing " +
+            "to become usable for transmission (traffic shaping). The bit in the Occupancy attribute will be set " +
+            "to 1 when the internal detection signal goes high, and will stay at 1 for HoldTime after the (last) " +
+            "instance where the internal detection signal goes low." +
             "\n" +
-            "The value of the OccupancySensorType shall be aligned to the value of the OccupancySensorTypeBitmap " +
-            "attribute as defined below.",
-        xref: { document: "cluster", section: "2.7.5.3" }
+            "The top half of the figure shows the case of a single trigger: the bit in the Occupancy attribute " +
+            "will be 1 for the duration of the PIR signal exceeding the threshold plus HoldTime. The bottom half " +
+            "of the figure shows the case of multiple triggers: the second trigger starts before the HoldTime of " +
+            "the first trigger has expired; this results in a single period of the bit in the Occupancy " +
+            "attribute being 1. The bit in the Occupancy attribute will be set to 1 from the start of the first " +
+            "period where the PIR signal exceeds the threshold until HoldTime after the last moment where the " +
+            "PIR exceeded the threshold." +
+            "\n" +
+            "Figure 13. Processing of PIR signal towards Occupancy attribute using HoldTime",
+
+        xref: { document: "cluster", section: "2.7.6.3" }
     }),
 
     Attribute({
-        name: "PirOccupiedToUnoccupiedDelay", id: 0x10, type: "uint16", access: "RW VM", conformance: "O",
-        default: 0,
-        details: "This attribute specifies the time delay, in seconds, before the PIR sensor changes to its " +
-            "unoccupied state after the last detection of movement in the sensed area.",
-        xref: { document: "cluster", section: "2.7.5.4" }
+        name: "HoldTimeLimits", id: 0x4, type: "HoldTimeLimitsStruct", access: "R V",
+        conformance: "HoldTime", quality: "F",
+        details: "Indicates the server’s limits, and default value, for the HoldTime attribute.",
+        xref: { document: "cluster", section: "2.7.6.4" }
+    }),
+
+    Attribute({
+        name: "PirOccupiedToUnoccupiedDelay", id: 0x10, type: "uint16", access: "RW VM",
+        conformance: "[HoldTime & (PIR | !PIR & !US & !PHY)], D", default: 0, quality: "N",
+        details: "This attribute shall specify the time delay, in seconds, before the PIR sensor changes to its " +
+            "unoccupied state after the last detection of occupancy in the sensed area.",
+        xref: { document: "cluster", section: "2.7.6.6" }
     }),
 
     Attribute({
         name: "PirUnoccupiedToOccupiedDelay", id: 0x11, type: "uint16", access: "RW VM",
-        conformance: "PirUnoccupiedToOccupiedThreshold, O", default: 0,
-        details: "This attribute specifies the time delay, in seconds, before the PIR sensor changes to its occupied " +
-            "state after the detection of movement in the sensed area.",
-        xref: { document: "cluster", section: "2.7.5.5" }
+        conformance: "HoldTime & (PIR | !PIR & !US & !PHY) & PirUnoccupiedToOccupiedThreshold, [HoldTime & (PIR | !PIR & !US & !PHY)], D",
+        default: 0, quality: "N",
+        details: "This attribute shall specify the time delay, in seconds, before the PIR sensor changes to its " +
+            "occupied state after the first detection of occupancy in the sensed area.",
+        xref: { document: "cluster", section: "2.7.6.7" }
     }),
 
     Attribute({
         name: "PirUnoccupiedToOccupiedThreshold", id: 0x12, type: "uint8", access: "RW VM",
-        conformance: "PirUnoccupiedToOccupiedDelay, O", constraint: "1 to 254", default: 1,
-        details: "This attribute specifies the number of movement detection events that must occur in the period " +
+        conformance: "HoldTime & (PIR | !PIR & !US & !PHY) & PirUnoccupiedToOccupiedDelay, [HoldTime & (PIR | !PIR & !US & !PHY)], D",
+        constraint: "1 to 254", default: 1, quality: "N",
+        details: "This attribute shall specify the number of occupancy detection events that must occur in the period " +
             "PIRUnoccupiedToOccupiedDelay, before the PIR sensor changes to its occupied state.",
-        xref: { document: "cluster", section: "2.7.5.6" }
+        xref: { document: "cluster", section: "2.7.6.8" }
     }),
 
     Attribute({
         name: "UltrasonicOccupiedToUnoccupiedDelay", id: 0x20, type: "uint16", access: "RW VM",
-        conformance: "O", default: 0,
-        details: "This attribute specifies the time delay, in seconds, before the Ultrasonic sensor changes to its " +
-            "unoccupied state after the last detection of movement in the sensed area.",
-        xref: { document: "cluster", section: "2.7.5.7" }
+        conformance: "[HoldTime & US], D", default: 0, quality: "N",
+        details: "This attribute shall specify the time delay, in seconds, before the Ultrasonic sensor changes to " +
+            "its unoccupied state after the last detection of occupancy in the sensed area.",
+        xref: { document: "cluster", section: "2.7.6.9" }
     }),
 
     Attribute({
         name: "UltrasonicUnoccupiedToOccupiedDelay", id: 0x21, type: "uint16", access: "RW VM",
-        conformance: "UltrasonicUnoccupiedToOccupiedThreshold, O", default: 0,
-        details: "This attribute specifies the time delay, in seconds, before the Ultrasonic sensor changes to its " +
-            "occupied state after the detection of movement in the sensed area.",
-        xref: { document: "cluster", section: "2.7.5.8" }
+        conformance: "HoldTime & US & UltrasonicUnoccupiedToOccupiedThreshold, [HoldTime & US], D",
+        default: 0, quality: "N",
+        details: "This attribute shall specify the time delay, in seconds, before the Ultrasonic sensor changes to " +
+            "its occupied state after the first detection of occupancy in the sensed area.",
+        xref: { document: "cluster", section: "2.7.6.10" }
     }),
 
     Attribute({
         name: "UltrasonicUnoccupiedToOccupiedThreshold", id: 0x22, type: "uint8", access: "RW VM",
-        conformance: "UltrasonicUnoccupiedToOccupiedDelay, O", constraint: "1 to 254", default: 1,
-        details: "This attribute specifies the number of movement detection events that must occur in the period " +
+        conformance: "HoldTime & US & UltrasonicUnoccupiedToOccupiedDelay, [HoldTime & US], D",
+        constraint: "1 to 254", default: 1, quality: "N",
+        details: "This attribute shall specify the number of occupancy detection events that must occur in the period " +
             "UltrasonicUnoccupiedToOccupiedDelay, before the Ultrasonic sensor changes to its occupied state.",
-        xref: { document: "cluster", section: "2.7.5.9" }
+        xref: { document: "cluster", section: "2.7.6.11" }
     }),
 
     Attribute({
         name: "PhysicalContactOccupiedToUnoccupiedDelay", id: 0x30, type: "uint16", access: "RW VM",
-        conformance: "O", default: 0,
-        details: "This attribute specifies the time delay, in seconds, before the physical contact occupancy sensor " +
-            "changes to its unoccupied state after detecting the unoccupied event.",
-        xref: { document: "cluster", section: "2.7.5.10" }
+        conformance: "[HoldTime & PHY], D", default: 0, quality: "N",
+        details: "This attribute shall specify the time delay, in seconds, before the physical contact occupancy " +
+            "sensor changes to its unoccupied state after detecting the unoccupied event.",
+        xref: { document: "cluster", section: "2.7.6.12" }
     }),
 
     Attribute({
         name: "PhysicalContactUnoccupiedToOccupiedDelay", id: 0x31, type: "uint16", access: "RW VM",
-        conformance: "O", default: 0,
-        details: "This attribute specifies the time delay, in seconds, before the physical contact sensor changes to " +
-            "its occupied state after the detection of the occupied event.",
-        xref: { document: "cluster", section: "2.7.5.11" }
+        conformance: "HoldTime & PHY & PhysicalContactUnoccupiedToOccupiedThreshold, [HoldTime & PHY], D",
+        default: 0, quality: "N",
+        details: "This attribute shall specify the time delay, in seconds, before the physical contact sensor changes " +
+            "to its occupied state after the first detection of the occupied event.",
+        xref: { document: "cluster", section: "2.7.6.13" }
     }),
 
     Attribute({
         name: "PhysicalContactUnoccupiedToOccupiedThreshold", id: 0x32, type: "uint8", access: "RW VM",
-        conformance: "PhysicalContactUnoccupiedToOccupiedDelay, O", constraint: "1 to 254", default: 1,
-        details: "This attribute specifies the number of movement detection events that must occur in the period " +
+        conformance: "HoldTime & PHY & PhysicalContactUnoccupiedToOccupiedDelay, [HoldTime & PHY], D",
+        constraint: "1 to 254", default: 1, quality: "N",
+        details: "This attribute shall specify the number of occupancy detection events that must occur in the period " +
             "PhysicalContactUnoccupiedToOccupiedDelay, before the PhysicalContact sensor changes to its occupied " +
             "state.",
-        xref: { document: "cluster", section: "2.7.5.12" }
+        xref: { document: "cluster", section: "2.7.6.14" }
     }),
 
+    Event(
+        {
+            name: "OccupancyChanged", id: 0x0, access: "V", conformance: "O", priority: "info",
+            details: "If this event is supported, it shall be generated when the Occupancy attribute changes.",
+            xref: { document: "cluster", section: "2.7.7.1" }
+        },
+        Field({
+            name: "Occupancy", id: 0x0, type: "OccupancyBitmap", conformance: "M",
+            details: "This field shall indicate the new value of the Occupancy attribute.",
+            xref: { document: "cluster", section: "2.7.7.1.1" }
+        })
+    ),
+
     Datatype(
-        { name: "OccupancyBitmap", type: "map8", xref: { document: "cluster", section: "2.7.4.1" } },
+        { name: "OccupancyBitmap", type: "map8", xref: { document: "cluster", section: "2.7.5.1" } },
 
         Field({
             name: "Occupied", constraint: "0", description: "Indicates the sensed occupancy state",
             details: "If this bit is set, it shall indicate the occupied state else if the bit if not set, it shall " +
                 "indicate the unoccupied state.",
-            xref: { document: "cluster", section: "2.7.4.1.1" }
+            xref: { document: "cluster", section: "2.7.5.1.1" }
         })
     ),
 
     Datatype(
-        { name: "OccupancySensorTypeBitmap", type: "map8", xref: { document: "cluster", section: "2.7.4.2" } },
+        {
+            name: "OccupancySensorTypeBitmap", type: "map8",
+            details: "NOTE" +
+                "\n" +
+                "This enum is as defined in ClusterRevision 4 and its definition shall NOT be extended; the feature " +
+                "flags provide the sensor modality (or modalities) for later cluster revisions. See Backward " +
+                "Compatibility section.",
+            xref: { document: "cluster", section: "2.7.5.2" }
+        },
+
         Field({ name: "Pir", constraint: "0", description: "Indicates a passive infrared sensor." }),
         Field({ name: "Ultrasonic", constraint: "1", description: "Indicates a ultrasonic sensor." }),
         Field({ name: "PhysicalContact", constraint: "2", description: "Indicates a physical contact sensor." })
     ),
 
     Datatype(
-        { name: "OccupancySensorTypeEnum", type: "enum8", xref: { document: "cluster", section: "2.7.4.3" } },
+        {
+            name: "OccupancySensorTypeEnum", type: "enum8",
+
+            details: "NOTE" +
+                "\n" +
+                "This enum is as defined in ClusterRevision 4 and its definition shall NOT be" +
+                "\n" +
+                "extended; the feature flags provide the sensor modality (or modalities) for later cluster " +
+                "revisions. See Backward Compatibility section.",
+
+            xref: { document: "cluster", section: "2.7.5.3" }
+        },
+
         Field({ name: "Pir", id: 0x0, conformance: "M", description: "Indicates a passive infrared sensor." }),
         Field({ name: "Ultrasonic", id: 0x1, conformance: "M", description: "Indicates a ultrasonic sensor." }),
         Field({
@@ -149,6 +262,38 @@ export const OccupancySensing = Cluster(
             description: "Indicates a passive infrared and ultrasonic sensor."
         }),
         Field({ name: "PhysicalContact", id: 0x3, conformance: "M", description: "Indicates a physical contact sensor." })
+    ),
+
+    Datatype(
+        {
+            name: "HoldTimeLimitsStruct", type: "struct",
+            details: "This structure provides information on the server’s supported values for the HoldTime attribute.",
+            xref: { document: "cluster", section: "2.7.5.4" }
+        },
+
+        Field({
+            name: "HoldTimeMin", id: 0x0, type: "uint16", conformance: "M", constraint: "min 1",
+            details: "This field shall specify the minimum value of the server’s supported value for the HoldTime " +
+                "attribute, in seconds.",
+            xref: { document: "cluster", section: "2.7.5.4.1" }
+        }),
+
+        Field({
+            name: "HoldTimeMax", id: 0x1, type: "uint16", conformance: "M",
+            constraint: "min holdTimeMin, min 10",
+            details: "This field shall specify the maximum value of the server’s supported value for the HoldTime " +
+                "attribute, in seconds.",
+            xref: { document: "cluster", section: "2.7.5.4.2" }
+        }),
+
+        Field({
+            name: "HoldTimeDefault", id: 0x2, type: "uint16", conformance: "M",
+            constraint: "holdTimeMin to holdTimeMax",
+            details: "This field shall specify the (manufacturer-determined) default value of the server’s HoldTime " +
+                "attribute, in seconds. This is the value that a client who wants to reset the settings to a valid " +
+                "default SHOULD use.",
+            xref: { document: "cluster", section: "2.7.5.4.3" }
+        })
     )
 );
 

package/src/standard/elements/OccupancySensorDT.ts

@@ -19,12 +19,16 @@ export const OccupancySensorDt = DeviceType(
 
     Requirement(
         { name: "Descriptor", id: 0x1d, element: "serverCluster" },
-        Requirement({ name: "DeviceTypeList", default: [ { deviceType: 263, revision: 3 } ], element: "attribute" })
+        Requirement({ name: "DeviceTypeList", default: [ { deviceType: 263, revision: 4 } ], element: "attribute" })
     ),
     Requirement({
         name: "Identify", id: 0x3, conformance: "M", element: "serverCluster",
         xref: { document: "device", section: "7.3.4" }
     }),
+    Requirement({
+        name: "BooleanStateConfiguration", id: 0x80, conformance: "O", element: "serverCluster",
+        xref: { document: "device", section: "7.3.4" }
+    }),
     Requirement({
         name: "OccupancySensing", id: 0x406, conformance: "M", element: "serverCluster",
         xref: { document: "device", section: "7.3.4" }

package/src/standard/elements/OnOff.ts

@@ -72,8 +72,7 @@ export const OnOff = Cluster(
                 "\n" +
                 "When this feature is supported, and any change of the \"dead front\" state leads to changes in " +
                 "attributes of other clusters due to the \"dead front\" feature, these attribute changes shall NOT be " +
-                "skipped or omitted from the usual processing associated with attribute changes. For example, if an" +
-                "\n" +
+                "skipped or omitted from the usual processing associated with attribute changes. For example, if an " +
                 "attribute changes from value 4 to null on \"dead front\" behavior due to an Off command being " +
                 "received, this change shall be processed for reporting and subscriptions.",
 

package/src/standard/elements/OperationalCredentials.ts

@@ -92,8 +92,8 @@ export const OperationalCredentials = Cluster(
             name: "TrustedRootCertificates", id: 0x4, type: "list", access: "R V", conformance: "M",
             constraint: "max supportedFabrics[max 400]", quality: "N C",
 
-            details: "This attribute shall contain a read-only list of Trusted Root CA Certificates installed on the " +
-                "Node, as octet strings containing their Matter Certificate Encoding representation." +
+            details: "This attribute shall contain a read-only list of Trusted Root CA Certificates (RCAC) installed on " +
+                "the Node, as octet strings containing their Matter Certificate Encoding representation." +
                 "\n" +
                 "These certificates are installed through the AddTrustedRootCertificate command." +
                 "\n" +
@@ -215,9 +215,8 @@ export const OperationalCredentials = Cluster(
                 "CSR shall be tagged as being for a subsequent AddNOC. See AddNOC and UpdateNOC for details about " +
                 "the processing." +
                 "\n" +
-                "If this command is received without an armed fail-safe context (see Section 11.10.6.2, “ArmFailSafe " +
-                "Command”), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the " +
-                "initiator." +
+                "If this command is received without an armed fail-safe context (see ArmFailSafe), then this command " +
+                "shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator." +
                 "\n" +
                 "If a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, " +
                 "then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
@@ -335,9 +334,8 @@ export const OperationalCredentials = Cluster(
                 "\n" +
                 "### Effect When Received" +
                 "\n" +
-                "If this command is received without an armed fail-safe context (see Section 11.10.6.2, “ArmFailSafe " +
-                "Command”), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the " +
-                "initiator." +
+                "If this command is received without an armed fail-safe context (see ArmFailSafe), then this command " +
+                "shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator." +
                 "\n" +
                 "If a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, " +
                 "then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
@@ -352,9 +350,8 @@ export const OperationalCredentials = Cluster(
                 "as the rest of the new fabric’s operational credentials, even if some other fabric already uses the " +
                 "exact same root of trust certificate." +
                 "\n" +
-                "If the NOC provided in the NOCValue encodes an Operational Identifier for a <Root Public Key, Fab" +
-                "\n" +
-                "ricID> pair already present on the device, then the device shall process the error by responding " +
+                "If the NOC provided in the NOCValue encodes an Operational Identifier for a <Root Public Key, " +
+                "FabricID> pair already present on the device, then the device shall process the error by responding " +
                 "with a StatusCode of FabricConflict as described in Section 11.18.6.7.2, “Handling Errors”." +
                 "\n" +
                 "If the device already has the CommissionedFabrics attribute equal to the SupportedFabrics " +
@@ -404,11 +401,14 @@ export const OperationalCredentials = Cluster(
                 "      that is currently invoking the AddNOC command, within another of the Fabrics of which it is a " +
                 "      member." +
                 "\n" +
+                "    a. If the Managed Device Feature is implemented by the ACL cluster, then one or more ARL " +
+                "       entries with the new FabricIndex may be added to the ARL attribute." +
+                "\n" +
                 "  8. The incoming IPKValue shall be stored in the Fabric-scoped slot within the Group Key " +
                 "      Management cluster (see KeySetWrite), for subsequent use during CASE." +
                 "\n" +
-                "  9. The Fabric Index associated with the armed fail-safe context (see Section 11.10.6.2, " +
-                "      “ArmFailSafe Command”) shall be updated to match the Fabric Index just allocated." +
+                "  9. The Fabric Index associated with the armed fail-safe context (see ArmFailSafe) shall be " +
+                "      updated to match the Fabric Index just allocated." +
                 "\n" +
                 "  10. If the current secure session was established with PASE, the receiver shall:" +
                 "\n" +
@@ -444,9 +444,8 @@ export const OperationalCredentials = Cluster(
                 "\n" +
                 "Effect When Received" +
                 "\n" +
-                "If this command is received without an armed fail-safe context (see Section 11.10.6.2, “ArmFailSafe " +
-                "Command”), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the " +
-                "initiator." +
+                "If this command is received without an armed fail-safe context (see ArmFailSafe), then this command " +
+                "shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator." +
                 "\n" +
                 "If a prior UpdateNOC or AddNOC command was successfully executed within the fail-safe timer period, " +
                 "then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
@@ -458,8 +457,7 @@ export const OperationalCredentials = Cluster(
                 "If the prior CSRRequest state that preceded UpdateNOC had the IsForUpdateNOC field indicated as " +
                 "false, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator." +
                 "\n" +
-                "If any of the following conditions arise, the Node shall process an error by responding with an" +
-                "\n" +
+                "If any of the following conditions arise, the Node shall process an error by responding with an " +
                 "NOCResponse with a StatusCode of InvalidNOC as described in Section 11.18.6.7.2, “Handling Errors”:" +
                 "\n" +
                 "  • The NOC provided in the NOCValue does not refer in its subject to the FabricID associated with " +
@@ -623,41 +621,42 @@ export const OperationalCredentials = Cluster(
                 "Effect on Receipt" +
                 "\n" +
                 "If the FabricIndex field does not match the FabricIndex of any entry within the Fabrics list, then " +
-                "an NOCResponse with a StatusCode of InvalidFabricIndex shall be returned for the command and there " +
-                "shall NOT be any permanent changes to any device data." +
+                "an NOCResponse with a StatusCode of InvalidFabricIndex shall be returned for the command and" +
                 "\n" +
-                "Otherwise, one of the following outcomes shall occur:" +
+                "there shall NOT be any permanent changes to any device data. Otherwise, one of the following " +
+                "outcomes shall occur:" +
                 "\n" +
                 "  1. If the FabricIndex matches the last remaining entry in the Fabrics list, then the device shall " +
-                "     delete all Matter related data on the node which was created since it was commissioned. This" +
-                "\n" +
-                "includes all Fabric-Scoped data, including Access Control List, bindings, scenes, group keys, " +
-                "operational certificates, etc. All Trusted Roots shall also be removed. If a time synchronization " +
-                "cluster is present on the Node, the TrustedTimeSource and DefaultNtp shall be set to null. Any " +
-                "Matter related data including logs, secure sessions, exchanges and interaction model constructs " +
-                "shall also be removed. Since this operation involves the removal of the secure session data that " +
-                "may underpin the current set of exchanges, the Node invoking the command SHOULD NOT expect a " +
-                "response before terminating its secure session with the target." +
-                "\n" +
-                "2. If the FabricIndex does not equal the accessing fabric index, then the device shall begin the " +
-                "process of irrevocably deleting all associated Fabric-Scoped data, including Access Control List, " +
-                "bindings, group keys, operational certificates, etc. Any remaining Trusted Roots no longer " +
-                "referenced by any operational certificate shall also be removed. If a time synchronization cluster " +
-                "is present on the Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the " +
-                "TrustedTimeSource shall be set to null. All secure sessions, exchanges and interaction model " +
-                "constructs related to the Operational Identity under the given Fabric shall also be removed. " +
-                "Following the removal, an NOCResponse with a StatusCode of OK shall be returned." +
-                "\n" +
-                "3. If the FabricIndex equals the accessing fabric index, then the device shall begin the process of " +
-                "irrevocably deleting all associated Fabric-Scoped data, including Access Control Entries, bindings, " +
-                "group keys, operational certificates, etc. Any remaining Trusted Roots no longer referenced by any " +
-                "operational certificate shall also be removed. If a time synchronization cluster is present on the " +
-                "Node, and the TrustedTimeSource FabricIndex matches the given FabricIndex, the TrustedTimeSource " +
-                "shall be set to null. All secure sessions, exchanges and interaction model constructs related to " +
-                "the Operational Identity under the given Fabric shall also be removed. Since this operation " +
-                "involves the removal of the secure session data that may underpin the current set of exchanges, the " +
-                "Node invoking the command SHOULD NOT expect a response before terminating its secure session with " +
-                "the target.",
+                "     delete all Matter related data on the node which was created since it was commissioned. This " +
+                "     includes all Fabric-Scoped data, including Access Control List, Access Restriction List, " +
+                "     bindings, scenes, group keys, operational certificates, etc. All Trusted Roots shall also be " +
+                "     removed. If a time synchronization cluster is present on the Node, the TrustedTimeSource and " +
+                "     DefaultNtp shall be set to null. Any Matter related data including logs, secure sessions, " +
+                "     exchanges and interaction model constructs shall also be removed. Since this operation " +
+                "     involves the removal of the secure session data that may underpin the current set of " +
+                "     exchanges, the Node invoking the command SHOULD NOT expect a response before terminating its " +
+                "     secure session with the target." +
+                "\n" +
+                "  2. If the FabricIndex does not equal the accessing fabric index, then the device shall begin the " +
+                "     process of irrevocably deleting all associated Fabric-Scoped data, including Access Control " +
+                "     Entries, Access Restriction Entries, bindings, group keys, operational certificates, etc. Any " +
+                "     remaining Trusted Roots no longer referenced by any operational certificate shall also be " +
+                "     removed. If a time synchronization cluster is present on the Node, and the TrustedTimeSource " +
+                "     FabricIndex matches the given FabricIndex, the TrustedTimeSource shall be set to null. All " +
+                "     secure sessions, exchanges and interaction model constructs related to the Operational " +
+                "     Identity under the given Fabric shall also be removed. Following the removal, an NOCResponse " +
+                "     with a StatusCode of OK shall be returned." +
+                "\n" +
+                "  3. If the FabricIndex equals the accessing fabric index, then the device shall begin the process " +
+                "     of irrevocably deleting all associated Fabric-Scoped data, including Access Control Entries, " +
+                "     Access Restriction Entries, bindings, group keys, operational certificates, etc. Any remaining " +
+                "     Trusted Roots no longer referenced by any operational certificate shall also be removed. If a " +
+                "     time synchronization cluster is present on the Node, and the TrustedTimeSource FabricIndex " +
+                "     matches the given FabricIndex, the TrustedTimeSource shall be set to null. All secure " +
+                "     sessions, exchanges and interaction model constructs related to the Operational Identity under " +
+                "     the given Fabric shall also be removed. Since this operation involves the removal of the " +
+                "     secure session data that may underpin the current set of exchanges, the Node invoking the " +
+                "     command SHOULD NOT expect a response before terminating its secure session with the target.",
 
             xref: { document: "core", section: "11.18.6.12.1" }
         })
@@ -675,12 +674,12 @@ export const OperationalCredentials = Cluster(
                 "If the certificate from the RootCACertificate field is already installed, based on exact " +
                 "byte-for-byte equality, then this command shall succeed with no change to the list." +
                 "\n" +
-                "If this command is received without an armed fail-safe context (see Section 11.10.6.2, “ArmFailSafe " +
-                "Command”), then this command shall fail with a FAILSAFE_REQUIRED status code sent back to the " +
-                "initiator." +
+                "If this command is received without an armed fail-safe context (see ArmFailSafe), then this command " +
+                "shall fail with a FAILSAFE_REQUIRED status code sent back to the initiator." +
                 "\n" +
                 "If a prior AddTrustedRootCertificate command was successfully invoked within the fail-safe timer " +
-                "period, which would cause the new invocation to add a second root certificate within a given fail- " +
+                "period, which would cause the new invocation to add a second root certificate within a given fail-" +
+                "\n" +
                 "safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to " +
                 "the initiator." +
                 "\n" +
@@ -796,11 +795,16 @@ export const OperationalCredentials = Cluster(
 
         Field({
             name: "VendorId", id: 0x2, type: "vendor-id", access: "F", conformance: "M", constraint: "desc",
+
             details: "This field shall contain the value of AdminVendorID provided in the AddNOC command that led to the " +
                 "creation of this FabricDescriptorStruct. The set of allowed values is defined in AdminVendorID." +
                 "\n" +
                 "The intent is to provide some measure of user transparency about which entities have Administer " +
-                "privileges on the Node.",
+                "privileges on the Node." +
+                "\n" +
+                "Clients shall consider the VendorID field value to be untrustworthy until the NOC chain associated " +
+                "with the fabric has passed the Vendor ID Validation Procedure against the associated RCAC.",
+
             xref: { document: "core", section: "11.18.4.5.2" }
         }),