@matter/model 0.13.1-alpha.0-20250508-047aa0277 → 0.13.1-alpha.0-20250509-28e1567e1

package/src/standard/elements/NetworkCommissioning.ts

@@ -103,14 +103,10 @@ export const NetworkCommissioning = Cluster(
     Attribute({
         name: "ConnectMaxTimeSeconds", id: 0x3, type: "uint8", access: "R V", conformance: "WI | TH",
         constraint: "desc", quality: "F",
-
         details: "Indicates the maximum duration taken, in seconds, by the network interface on this cluster server " +
             "instance to report a successful or failed network connection indication. This maximum time shall " +
-            "account for all operations needed until a successful network connection is" +
-            "\n" +
-            "deemed to have occurred, including, for example, obtaining IP addresses, or the execution of " +
-            "necessary internal retries.",
-
+            "account for all operations needed until a successful network connection is deemed to have occurred, " +
+            "including, for example, obtaining IP addresses, or the execution of necessary internal retries.",
         xref: { document: "core", section: "11.9.6.4" }
     }),
 
@@ -417,7 +413,7 @@ export const NetworkCommissioning = Cluster(
 
             details: "Credentials is the passphrase or PSK for the network (if any is needed)." +
                 "\n" +
-                "Security type, cipher and credential format (passphrase or PSK) shall be contextually auto- selected " +
+                "Security type, cipher and credential format (passphrase or PSK) shall be contextually auto-selected " +
                 "during execution of the ConnectNetwork Command and during subsequent operational state network " +
                 "connections, based on the most secure Wi-Fi security type available within beacons and probe " +
                 "responses for the set of all discovered BSSIDs for the configured SSID. The type of PSK or " +
@@ -438,10 +434,8 @@ export const NetworkCommissioning = Cluster(
                 "\n" +
                 "  • 8..63 bytes: WPA/WPA2/WPA3 passphrase" +
                 "\n" +
-                "  • 64 bytes: WPA/WPA2/WPA3 raw hex PSK" +
-                "\n" +
-                "These lengths shall be contextually interpreted based on the security type of the BSSID where " +
-                "connection will occur." +
+                "  • 64 bytes: WPA/WPA2/WPA3 raw hex PSK These lengths shall be contextually interpreted based on the " +
+                "    security type of the BSSID where connection will occur." +
                 "\n" +
                 "When the length of Credentials and available set of BSSID admits more than one option, such as the " +
                 "presence of both WPA2 and WPA security type within the result set, WPA2 shall be considered more " +
@@ -507,9 +501,8 @@ export const NetworkCommissioning = Cluster(
             response: "NetworkConfigResponse",
 
             details: "This command shall remove the network configuration from the Cluster if there was already a network " +
-                "configuration with the same NetworkID. The relative order of the entries in the Networks" +
-                "\n" +
-                "attribute shall remain unchanged, except for the removal of the requested network configuration." +
+                "configuration with the same NetworkID. The relative order of the entries in the Networks attribute " +
+                "shall remain unchanged, except for the removal of the requested network configuration." +
                 "\n" +
                 "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." +
@@ -643,9 +636,8 @@ export const NetworkCommissioning = Cluster(
                 "of configuration if the CommissioningComplete command (see CommissioningComplete) is not " +
                 "successfully invoked before expiry of the Fail-Safe timer." +
                 "\n" +
-                "When non-concurrent commissioning is being used by a Commissioner or Administrator, the Con" +
-                "\n" +
-                "nectNetworkResponse shall be sent with the NetworkingStatus field set to Success prior to closing " +
+                "When non-concurrent commissioning is being used by a Commissioner or Administrator, the " +
+                "ConnectNetworkResponse shall be sent with the NetworkingStatus field set to Success prior to closing " +
                 "the commissioning channel, even if not yet connected to the operational network, unless the device " +
                 "would be incapable of joining that network, in which case the usual failure path described in the " +
                 "prior paragraphs shall be followed. Once the commissioning channel is closed, the operational " +
@@ -797,7 +789,7 @@ export const NetworkCommissioning = Cluster(
 
                 details: "See Breadcrumb for usage." +
                     "\n" +
-                    "Effect when received" +
+                    "### Effect when received" +
                     "\n" +
                     "If the Networks attribute does not contain a matching entry, the command shall immediately respond " +
                     "with NetworkConfigResponse having NetworkingStatus status field set to NetworkIdNotFound." +
@@ -817,7 +809,7 @@ export const NetworkCommissioning = Cluster(
                     "Re-ordering to the same NetworkIndex as the current location shall be considered as a success and " +
                     "yield no visible changes of the Networks attribute." +
                     "\n" +
-                    "Examples of re-ordering" +
+                    "### Examples of re-ordering" +
                     "\n" +
                     "To better illustrate the re-ordering operation, consider this initial state, exemplary of a Wi-Fi " +
                     "device:" +
@@ -868,12 +860,12 @@ export const NetworkCommissioning = Cluster(
         {
             name: "ThreadCapabilitiesBitmap", type: "map16",
 
-            details: "The ThreadCapabilitiesBitmap encodes the supported Thread features and capabilities of a Thread- " +
-                "enabled network interface." +
+            details: "The ThreadCapabilitiesBitmap encodes the supported Thread features and capabilities of a " +
+                "Thread-enabled network interface." +
                 "\n" +
-                "NOTE" +
+                "> [!NOTE]" +
                 "\n" +
-                "The valid combinations of capabilities are restricted and dependent on Thread version.",
+                "> The valid combinations of capabilities are restricted and dependent on Thread version.",
 
             xref: { document: "core", section: "11.9.5.2" }
         },
@@ -929,7 +921,7 @@ export const NetworkCommissioning = Cluster(
         Field({ name: "NetworkNotFound", id: 0x5, conformance: "M", description: "Cannot find AP: SSID Not found" }),
         Field({
             name: "RegulatoryError", id: 0x6, conformance: "M",
-            description: "Cannot find AP: Mismatch on band/channels/regulatory domain/ 2.4GHz vs 5GHz"
+            description: "Cannot find AP: Mismatch on band/channels/regulato ry domain / 2.4GHz vs 5GHz"
         }),
         Field({
             name: "AuthFailure", id: 0x7, conformance: "M",
@@ -969,14 +961,14 @@ export const NetworkCommissioning = Cluster(
                 "SSID for Wi-Fi networks, Extended PAN ID (XPAN ID) for Thread networks and netif name for Ethernet " +
                 "networks." +
                 "\n" +
-                "NOTE" +
+                "> [!NOTE]" +
                 "\n" +
-                "SSID in Wi-Fi is a collection of 1-32 bytes, the text encoding of which is not specified. " +
-                "Implementations must be careful to support reporting byte strings without requiring a particular " +
-                "encoding for transfer. Only the commissioner should try to potentially decode the bytes. The most " +
-                "common encoding is UTF-8, however this is just a convention. Some configurations may use Latin-1 or " +
-                "other character sets. A commissioner may decode using UTF-8, replacing encoding errors with \"?\" at " +
-                "the application level while retaining the underlying representation." +
+                "> SSID in Wi-Fi is a collection of 1-32 bytes, the text encoding of which is not specified. " +
+                "  Implementations must be careful to support reporting byte strings without requiring a particular " +
+                "  encoding for transfer. Only the commissioner should try to potentially decode the bytes. The most " +
+                "  common encoding is UTF-8, however this is just a convention. Some configurations may use Latin-1 " +
+                "  or other character sets. A commissioner may decode using UTF-8, replacing encoding errors with \"?\" " +
+                "  at the application level while retaining the underlying representation." +
                 "\n" +
                 "XPAN ID is a big-endian 64-bit unsigned number, represented on the first 8 octets of the octet " +
                 "string.",

package/src/standard/elements/OccupancySensing.ts

@@ -45,7 +45,7 @@ export const OccupancySensing = Cluster(
         }),
         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 " +
+            details: "Supports sensing using Active InfraRed measurement (e.g. time-of-flight or transflective/reflec tive " +
                 "IR sensing)"
         }),
         Field({
@@ -87,14 +87,13 @@ export const OccupancySensing = Cluster(
         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 " +
+            "state after the last detection of occupancy in the sensed area. This is equivalent to the legacy" +
+            "\n" +
             "*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." +
+            "HoldTimeMin <= HoldTime <= HoldTimeMax 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 " +
@@ -108,9 +107,7 @@ export const OccupancySensing = Cluster(
             "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",
+            "exceeded the threshold.",
 
         xref: { document: "cluster", section: "2.7.6.3" }
     }),
@@ -228,11 +225,11 @@ export const OccupancySensing = Cluster(
     Datatype(
         {
             name: "OccupancySensorTypeBitmap", type: "map8",
-            details: "NOTE" +
+            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.",
+                "> 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" }
         },
 
@@ -244,14 +241,11 @@ export const OccupancySensing = Cluster(
     Datatype(
         {
             name: "OccupancySensorTypeEnum", type: "enum8",
-
-            details: "NOTE" +
-                "\n" +
-                "This enum is as defined in ClusterRevision 4 and its definition shall NOT be" +
+            details: "> [!NOTE]" +
                 "\n" +
-                "extended; the feature flags provide the sensor modality (or modalities) for later cluster revisions. " +
-                "See Backward Compatibility section.",
-
+                "> 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.3" }
         },
 

package/src/standard/elements/OperationalCredentials.ts

@@ -311,17 +311,17 @@ export const OperationalCredentials = Cluster(
                 "\n" +
                 "The format of the new Access Control Entry, created from this, shall be:" +
                 "\n" +
-                "NOTE" +
-                "\n" +
-                "Unless such an Access Control Entry is added atomically as described here, there would be no way for " +
-                "the caller on its given Fabric to eventually add another Access Control Entry for CASE " +
-                "authentication mode, to enable the new Administrator to administer the device, since the Fabric " +
-                "Scoping of the Access Control List prevents the current Node from being able to write new entries " +
-                "scoped to that Fabric, if the session is established from CASE. While a session established from " +
-                "PASE does gain Fabric Scope of a newly-joined Fabric, this argument is made mandatory to provide " +
-                "symmetry between both types of session establishment, both of which need to eventually add an " +
-                "\"Administer Node over CASE\" Access Control Entry to finalize new Fabric configuration and " +
-                "subsequently be able to call the CommissioningComplete command.",
+                "> [!NOTE]" +
+                "\n" +
+                "> Unless such an Access Control Entry is added atomically as described here, there would be no way " +
+                "  for the caller on its given Fabric to eventually add another Access Control Entry for CASE " +
+                "  authentication mode, to enable the new Administrator to administer the device, since the Fabric " +
+                "  Scoping of the Access Control List prevents the current Node from being able to write new entries " +
+                "  scoped to that Fabric, if the session is established from CASE. While a session established from " +
+                "  PASE does gain Fabric Scope of a newly-joined Fabric, this argument is made mandatory to provide " +
+                "  symmetry between both types of session establishment, both of which need to eventually add an " +
+                "  \"Administer Node over CASE\" Access Control Entry to finalize new Fabric configuration and " +
+                "  subsequently be able to call the CommissioningComplete command.",
 
             xref: { document: "core", section: "11.18.6.8.2" }
         }),
@@ -368,46 +368,46 @@ export const OperationalCredentials = Cluster(
                 "and the following shall apply:" +
                 "\n" +
                 "  1. A new FabricIndex shall be allocated, taking the next valid fabric-index value in monotonically " +
-                "      incrementing order, wrapping around from 254 (0xFE) to 1, since value 0 is reserved and using " +
-                "      255 (0xFF) would prevent cluster specifications from using nullable fabric-idx fields." +
+                "     incrementing order, wrapping around from 254 (0xFE) to 1, since value 0 is reserved and using " +
+                "     255 (0xFF) would prevent cluster specifications from using nullable fabric-idx fields." +
                 "\n" +
                 "  2. An entry within the Fabrics attribute table shall be added, reflecting the matter-fabric-id RDN " +
-                "      within the NOC’s subject, along with the public key of the trusted root of the chain and the " +
-                "      AdminVendorID field." +
+                "     within the NOC’s subject, along with the public key of the trusted root of the chain and the " +
+                "     AdminVendorID field." +
                 "\n" +
                 "  3. The operational key pair associated with the incoming NOC from the NOCValue, and generated by " +
-                "      the prior CSRRequest command, shall be recorded for subsequent use during CASE within the " +
-                "      fail-safe timer period (see Section 5.5, “Commissioning Flows”)." +
+                "     the prior CSRRequest command, shall be recorded for subsequent use during CASE within the " +
+                "     fail-safe timer period (see Section 5.5, “Commissioning Flows”)." +
                 "\n" +
                 "  4. The incoming NOCValue and ICACValue (if present) shall be stored under the FabricIndex " +
-                "      associated with the new Fabric Scope, along with the RootCACertificate provided with the prior " +
-                "      successful AddTrustedRootCertificate command invoked in the same fail-safe period." +
+                "     associated with the new Fabric Scope, along with the RootCACertificate provided with the prior " +
+                "     successful AddTrustedRootCertificate command invoked in the same fail-safe period." +
                 "\n" +
                 "    a. Implementation of certificate chain storage may separate or otherwise encode the components " +
                 "       of the array in implementation-specific ways, as long as they follow the correct format when " +
                 "       being read from the NOCs list or used within other protocols such as CASE." +
                 "\n" +
                 "  5. The NOCs list shall reflect the incoming NOC from the NOCValue field and ICAC from the " +
-                "      ICACValue field (if present)." +
+                "     ICACValue field (if present)." +
                 "\n" +
                 "  6. The operational discovery service record shall immediately reflect the new Operational " +
-                "      Identifier, such that the Node immediately begins to exist within the Fabric and becomes " +
-                "      reachable over CASE under the new operational identity." +
+                "     Identifier, such that the Node immediately begins to exist within the Fabric and becomes " +
+                "     reachable over CASE under the new operational identity." +
                 "\n" +
                 "  7. The receiver shall create and add a new Access Control Entry using the CaseAdminSubject field " +
-                "      to grant subsequent Administer access to an Administrator member of the new Fabric. It is " +
-                "      recommended that the Administrator presented in CaseAdminSubject exist within the same entity " +
-                "      that is currently invoking the AddNOC command, within another of the Fabrics of which it is a " +
-                "      member." +
+                "     to grant subsequent Administer access to an Administrator member of the new Fabric. It is " +
+                "     recommended that the Administrator presented in CaseAdminSubject exist within the same entity " +
+                "     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." +
+                "     cluster (see KeySetWrite), for subsequent use during CASE." +
                 "\n" +
                 "  9. The Fabric Index associated with the armed fail-safe context (see ArmFailSafe) shall be updated " +
-                "      to match the Fabric Index just allocated." +
+                "     to match the Fabric Index just allocated." +
                 "\n" +
                 "  10. If the current secure session was established with PASE, the receiver shall:" +
                 "\n" +
@@ -440,7 +440,7 @@ export const OperationalCredentials = Cluster(
                 "A Commissioner or Administrator SHOULD issue this command after performing the Attestation " +
                 "Procedure." +
                 "\n" +
-                "Effect When Received" +
+                "### Effect When Received" +
                 "\n" +
                 "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." +
@@ -562,7 +562,7 @@ export const OperationalCredentials = Cluster(
 
             details: "This field shall contain the label to set for the fabric associated with the current secure session." +
                 "\n" +
-                "Effect on Receipt" +
+                "### Effect on Receipt" +
                 "\n" +
                 "If the Label field is identical to a Label already in use by a Fabric within the Fabrics list that " +
                 "is not the accessing fabric, then an NOCResponse with a StatusCode of LabelConflict shall be " +
@@ -595,8 +595,6 @@ export const OperationalCredentials = Cluster(
                 "If the given Fabric being removed is the last one to reference a given Trusted Root CA Certificate " +
                 "stored in the Trusted Root Certificates list, then that Trusted Root Certificate shall be removed." +
                 "\n" +
-                "WARNING" +
-                "\n" +
                 "This command, if referring to an already existing Fabric not under the control of the invoking " +
                 "Administrator, shall ONLY be invoked after obtaining some form of explicit user consent through some " +
                 "method executed by the Administrator or Commissioner. This method of obtaining consent SHOULD employ " +
@@ -616,13 +614,13 @@ export const OperationalCredentials = Cluster(
             details: "This field shall contain the Fabric Index reference (see fabric-index) associated with the Fabric " +
                 "which is to be removed from the device." +
                 "\n" +
-                "Effect on Receipt" +
+                "### 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" +
+                "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." +
                 "\n" +
-                "there shall NOT be any permanent changes to any device data. Otherwise, one of the following " +
-                "outcomes shall occur:" +
+                "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 " +
@@ -676,10 +674,9 @@ export const OperationalCredentials = Cluster(
                 "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-" +
-                "\n" +
-                "safe timer period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the " +
-                "initiator." +
+                "period, which would cause the new invocation to add a second root certificate within a given " +
+                "fail-safe timer period, then this command shall fail with a CONSTRAINT_ERROR 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." +

package/src/standard/elements/OperationalState.ts

@@ -69,8 +69,7 @@ export const OperationalState = Cluster(
         quality: "X",
 
         details: "This attribute represents the current phase of operation being performed by the server. This shall " +
-            "be the positional index representing the value from the set provided in the PhaseList Attribute," +
-            "\n" +
+            "be the positional index representing the value from the set provided in the PhaseList Attribute, " +
             "where the first item in that list is an index of 0. Thus, this attribute shall have a maximum value " +
             "that is \"length(PhaseList) - 1\"." +
             "\n" +
@@ -193,14 +192,11 @@ export const OperationalState = Cluster(
 
         Field({
             name: "TotalOperationalTime", id: 0x1, type: "elapsed-s", conformance: "O", quality: "X",
-
             details: "The total operational time, in seconds, from when the operation was started via an initial Start " +
-                "command or autonomous/manual starting action, until the operation completed. This includes any time" +
-                "\n" +
+                "command or autonomous/manual starting action, until the operation completed. This includes any time " +
                 "spent while paused. There may be cases whereby the total operational time exceeds the maximum value " +
                 "that can be conveyed by this attribute, in such instances, this attribute shall be populated with " +
                 "null.",
-
             xref: { document: "cluster", section: "1.14.7.2.2" }
         }),
 
@@ -227,10 +223,9 @@ export const OperationalState = Cluster(
             "If this command is received when already in the Paused state the device shall respond with an " +
             "OperationalCommandResponse command with an ErrorStateID of NoError but take no further action." +
             "\n" +
-            "A device that receives this command in any state which is not Pause-compatible shall respond" +
-            "\n" +
-            "with an OperationalCommandResponse command with an ErrorStateID of CommandInvalidInState and shall " +
-            "take no further action." +
+            "A device that receives this command in any state which is not Pause-compatible shall respond with an " +
+            "OperationalCommandResponse command with an ErrorStateID of CommandInvalidInState and shall take no " +
+            "further action." +
             "\n" +
             "States are defined as Pause-compatible as follows:" +
             "\n" +
@@ -297,7 +292,7 @@ export const OperationalState = Cluster(
             "device is in an operational state from which it can be started. There may be either regulatory or " +
             "manufacturer-imposed safety and security requirements that first necessitate some specific action at " +
             "the device before a Start command can be honored. In such instances, a device shall respond with a " +
-            "status code of CommandInvalidInState if a Start command is received prior to the required on- device " +
+            "status code of CommandInvalidInState if a Start command is received prior to the required on-device " +
             "action." +
             "\n" +
             "If this command is received when already in the Running state the device shall respond with an " +
@@ -448,8 +443,7 @@ export const OperationalState = Cluster(
                 "specific to a certain Device Type or other modality shall be defined in a derived cluster of this " +
                 "cluster." +
                 "\n" +
-                "The derived cluster-specific error definitions shall NOT duplicate the general error definitions." +
-                "\n" +
+                "The derived cluster-specific error definitions shall NOT duplicate the general error definitions. " +
                 "That is, a derived cluster specification of this cluster cannot define errors with the same " +
                 "semantics as the general errors defined below." +
                 "\n" +
@@ -484,7 +478,7 @@ export const OperationalState = Cluster(
     Datatype(
         { name: "ErrorStateStruct", type: "struct", xref: { document: "cluster", section: "1.14.4.4" } },
         Field({
-            name: "ErrorStateID", id: 0x0, type: "ErrorStateEnum", conformance: "M", default: 0,
+            name: "ErrorStateId", id: 0x0, type: "ErrorStateEnum", conformance: "M", default: 0,
             details: "This shall be populated with a value from the ErrorStateEnum.",
             xref: { document: "cluster", section: "1.14.4.4.1" }
         }),

package/src/standard/elements/OtaSoftwareUpdateProvider.ts

@@ -86,8 +86,7 @@ export const OtaSoftwareUpdateProvider = Cluster(
 
         Field({
             name: "Location", id: 0x5, type: "string", conformance: "O", constraint: "2",
-            details: "The location, if present, shall provide the same value as the Basic Information Cluster Location" +
-                "\n" +
+            details: "The location, if present, shall provide the same value as the Basic Information Cluster Location " +
                 "attribute for the OTA Requestor as configured. This may be used by the OTA Provider logic to allow " +
                 "per-region selection of the Software Image.",
             xref: { document: "core", section: "11.20.6.5.1.6" }
@@ -128,8 +127,6 @@ export const OtaSoftwareUpdateProvider = Cluster(
                 "externally agreed-upon policy whereby strictly correct additional MetadataForProvider is expected to " +
                 "fulfill the OTA Software Update process." +
                 "\n" +
-                "Usage of the QueryImage Command" +
-                "\n" +
                 "OTA Requestors shall send a QueryImage command to the OTA Provider to determine the availability of " +
                 "a new Software Image." +
                 "\n" +
@@ -369,13 +366,9 @@ export const OtaSoftwareUpdateProvider = Cluster(
                 "new Software Image which the OTA Requestor is ready to start applying. The OTA Provider may use this " +
                 "new version to track or record Software Image application by OTA Requestors." +
                 "\n" +
-                "When Generated" +
-                "\n" +
                 "The ApplyUpdateRequest Command shall be invoked by an OTA Requestor once it is ready to apply a " +
                 "previously downloaded Software Image." +
                 "\n" +
-                "Effect on Receipt" +
-                "\n" +
                 "Upon receipt of this command the OTA Provider shall respond with an Action field consistent with the " +
                 "next action the OTA Requestor should take, including any possible time delay." +
                 "\n" +
@@ -386,8 +379,6 @@ export const OtaSoftwareUpdateProvider = Cluster(
                 "See Section 11.20.3.6, “Applying a software update” for a description of the flow in response to an " +
                 "OTA Provider receiving an invocation of this command." +
                 "\n" +
-                "Handling Error Cases" +
-                "\n" +
                 "See Section 11.20.3.6, “Applying a software update” for all error-handling information.",
 
             xref: { document: "core", section: "11.20.6.5.3.2" }
@@ -438,8 +429,6 @@ export const OtaSoftwareUpdateProvider = Cluster(
                 "SoftwareVersion attribute in the invoking OTA Requestor’s Basic Information Cluster, and SHOULD be " +
                 "consistent with the value representing a new version running on the Node invoking the command." +
                 "\n" +
-                "When Generated" +
-                "\n" +
                 "The NotifyUpdateApplied command SHOULD be invoked in the following two circumstances:" +
                 "\n" +
                 "  1. An OTA Requestor has just successfully applied a Software Image it had obtained from a previous " +
@@ -457,8 +446,6 @@ export const OtaSoftwareUpdateProvider = Cluster(
                 "This command shall be considered optional and shall NOT result in reduced availability of the OTA " +
                 "Provider functionality if OTA Requestors never invoke this command." +
                 "\n" +
-                "Effect on Receipt" +
-                "\n" +
                 "An OTA Provider receiving an invocation of this command may log it internally." +
                 "\n" +
                 "On receiving this command, an OTA Provider may use the information to update its bookkeeping of " +

package/src/standard/elements/OtaSoftwareUpdateRequestor.ts

@@ -74,7 +74,7 @@ export const OtaSoftwareUpdateRequestor = Cluster(
             "A value of 0 shall indicate that the beginning has occurred. A value of 100 shall indicate " +
             "completion." +
             "\n" +
-            "This field may be updated infrequently. Some care SHOULD be taken by Nodes to avoid over- reporting " +
+            "This field may be updated infrequently. Some care SHOULD be taken by Nodes to avoid over-reporting " +
             "progress when this attribute is part of a subscription.",
 
         xref: { document: "core", section: "11.20.7.5.4" }
@@ -240,8 +240,6 @@ export const OtaSoftwareUpdateRequestor = Cluster(
                 "discovery of the location of that endpoint by walking over all endpoints and checking their " +
                 "Descriptor Cluster." +
                 "\n" +
-                "When Generated" +
-                "\n" +
                 "An OTA Provider may invoke this command directly to an OTA Requestor, to announce its presence as an " +
                 "OTA Provider on the Fabric." +
                 "\n" +
@@ -250,12 +248,12 @@ export const OtaSoftwareUpdateRequestor = Cluster(
                 "AnnouncementReason is UrgentUpdateAvailable, in which case this command may be more frequent." +
                 "\n" +
                 "Any invocation shall be made with a delay of at least 1 second between invocations from a given OTA " +
-                "Provider, to reduce burden on the networking infrastructure and affect a form of serialized jitter. " +
-                "It is recommended to offset the first announcement of a round (i.e. new set of announcements after a " +
-                "previous complete set) by a random delay time with a distribution span of >= 60 seconds to jitter " +
-                "announcement schedules over time." +
+                "Provider, to reduce burden on the networking infrastructure and affect a form of serialized" +
+                "\n" +
+                "jitter. It is recommended to offset the first announcement of a round (i.e. new set of announcements " +
+                "after a previous complete set) by a random delay time with a distribution span of" +
                 "\n" +
-                "Effect on Receipt" +
+                ">= 60 seconds to jitter announcement schedules over time." +
                 "\n" +
                 "On receipt of this command, an OTA Requestor SHOULD consider the new ProviderNodeID and " +
                 "AnnouncementReason to possibly query for new software sooner than it would have with its default " +

package/src/standard/elements/OvenMode.ts

@@ -43,12 +43,18 @@ export const OvenMode = Cluster(
     Attribute({ name: "StartUpMode", id: 0x2, conformance: "X", xref: { document: "cluster", section: "8.11.6" } }),
     Attribute({ name: "OnMode", id: 0x3, conformance: "X", xref: { document: "cluster", section: "8.11.6" } }),
 
-    Datatype({
-        name: "ModeOptionStruct", type: "ModeOptionStruct",
-        details: "The table below lists the changes relative to the Mode Base cluster for the fields of the " +
-            "ModeOptionStruct type. A blank field indicates no change.",
-        xref: { document: "cluster", section: "8.11.5.1" }
-    }),
+    Datatype(
+        {
+            name: "ModeOptionStruct", type: "struct",
+            details: "The table below lists the changes relative to the Mode Base cluster for the fields of the " +
+                "ModeOptionStruct type. A blank field indicates no change.",
+            xref: { document: "cluster", section: "8.11.5.1" }
+        },
+
+        Field({ name: "Label", id: 0x0, conformance: "M" }),
+        Field({ name: "Mode", id: 0x1, conformance: "M" }),
+        Field({ name: "ModeTags", id: 0x2, conformance: "M", constraint: "1 to 8" })
+    ),
 
     Datatype(
         { name: "ModeTag", type: "enum16" },

package/src/standard/elements/PowerSource.ts

@@ -94,7 +94,7 @@ export const PowerSource = Cluster(
     Attribute({
         name: "WiredCurrentType", id: 0x5, type: "WiredCurrentTypeEnum", access: "R V",
         conformance: "WIRED", constraint: "desc", quality: "F",
-        details: "Indicates the type of current the Node expects to be provided by the hard- wired source as specified " +
+        details: "Indicates the type of current the Node expects to be provided by the hard-wired source as specified " +
             "in WiredCurrentTypeEnum.",
         xref: { document: "core", section: "11.7.7.6" }
     }),
@@ -102,7 +102,7 @@ export const PowerSource = Cluster(
     Attribute({
         name: "WiredAssessedCurrent", id: 0x6, type: "uint32", access: "R V", conformance: "[WIRED]",
         quality: "X C",
-        details: "Indicates the assessed instantaneous current draw of the Node on the hard- wired source, in mA " +
+        details: "Indicates the assessed instantaneous current draw of the Node on the hard-wired source, in mA " +
             "(milliamps). A value of NULL shall indicate the Node is currently unable to assess the value. If the " +
             "wired source is not connected, but the Node is still able to assess a value, then the assessed value " +
             "may be reported.",
@@ -215,7 +215,8 @@ export const PowerSource = Cluster(
     Attribute({
         name: "BatReplaceability", id: 0x10, type: "BatReplaceabilityEnum", access: "R V",
         conformance: "BAT", quality: "F",
-        details: "Indicates the replaceability of the battery as specified in BatReplaceabilityEnum.",
+        details: "This attribute shall indicate the replaceability of the battery as specified in " +
+            "BatReplaceabilityEnum.",
         xref: { document: "core", section: "11.7.7.17" }
     }),
 
@@ -237,9 +238,7 @@ export const PowerSource = Cluster(
                 "detects all conditions contributing to a fault have been cleared, the corresponding BatFaultEnum " +
                 "value shall be removed from this list. An empty list shall indicate there are currently no active " +
                 "faults. The order of this list SHOULD have no significance. Clients interested in monitoring changes " +
-                "in active faults may subscribe to this attribute, or they may subscribe to Bat" +
-                "\n" +
-                "FaultChange.",
+                "in active faults may subscribe to this attribute, or they may subscribe to BatFaultChange.",
 
             xref: { document: "core", section: "11.7.7.19" }
         },
@@ -381,14 +380,10 @@ export const PowerSource = Cluster(
                 "The above rules allow that some endpoints can have an unknown power source, and therefore would not " +
                 "be indicated by any instance of this cluster." +
                 "\n" +
-                "Empty list examples" +
-                "\n" +
                 "Typically, there is one power source for the node. Also common is mains power for the node with " +
                 "battery backup power for the node. In both these common cases, for each cluster instance described, " +
                 "the list is empty." +
                 "\n" +
-                "Populated list example" +
-                "\n" +
                 "A node has a mains power source with Order as 0 (zero), but some application endpoints (not all) " +
                 "have a battery back up source with Order as 1, which means this list is empty for the Power Source " +
                 "cluster associated with the mains power, because it indicates the entire node, but the Power Source " +

package/src/standard/elements/PowerSourceNS.ts

@@ -47,7 +47,7 @@ export const PowerSourceNs = SemanticNamespace(
     }),
 
     SemanticTag({
-        name: "EV", id: 0x4,
+        name: "Ev", id: 0x4,
         description: "The Power Source cluster is related to power provided from an electric vehicle",
         details: "Power Source clusters with this tag shall implement the BAT feature.",
         xref: { document: "namespace", section: "15.4" }