@matter/types 0.12.6-alpha.0-20250304-03716637c → 0.13.0-alpha.0-20250307-ebf84a05a

package/src/clusters/operational-credentials.ts

@@ -86,6 +86,9 @@ export namespace OperationalCredentials {
          * The intent is to provide some measure of user transparency about which entities have Administer privileges
          * on the Node.
          *
+         * 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.
+         *
          * @see {@link MatterSpecification.v13.Core} § 11.18.4.5.2
          */
         vendorId: TlvField(2, TlvVendorId),
@@ -342,8 +345,8 @@ export namespace OperationalCredentials {
          *
          * ### Effect When Received
          *
-         * 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.
          *
          * 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.
@@ -357,10 +360,9 @@ export namespace OperationalCredentials {
          * provides the root of trust certificate within the same Fail- Safe context as the rest of the new fabric’s
          * operational credentials, even if some other fabric already uses the exact same root of trust certificate.
          *
-         * If the NOC provided in the NOCValue encodes an Operational Identifier for a <Root Public Key, Fab
-         *
-         * ricID> 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”.
+         * 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”.
          *
          * If the device already has the CommissionedFabrics attribute equal to the SupportedFabrics attribute, then
          * the device’s operational credentials table is considered full and the device shall process the error by
@@ -405,11 +407,14 @@ export namespace OperationalCredentials {
          *       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.
          *
+         *     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.
+         *
          *   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.
          *
-         *   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.
          *
          *   10. If the current secure session was established with PASE, the receiver shall:
          *
@@ -619,39 +624,40 @@ export namespace OperationalCredentials {
          * Effect on Receipt
          *
          * 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.
+         * NOCResponse with a StatusCode of InvalidFabricIndex shall be returned for the command and
          *
-         * 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:
          *
          *   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
+         *      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.
          *
-         * 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.
+         *   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.
          *
-         * 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.
-         *
-         * 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.
+         *   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.
          *
          * @see {@link MatterSpecification.v13.Core} § 11.18.6.12.1
          */
@@ -750,8 +756,8 @@ export namespace OperationalCredentials {
             commissionedFabrics: Attribute(0x3, TlvUInt8, { persistent: true }),
 
             /**
-             * 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.
+             * 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.
              *
              * These certificates are installed through the AddTrustedRootCertificate command.
              *
@@ -831,8 +837,8 @@ export namespace OperationalCredentials {
              * shall be tagged as being for a subsequent UpdateNOC, otherwise the internal state of the CSR shall be
              * tagged as being for a subsequent AddNOC. See AddNOC and UpdateNOC for details about the processing.
              *
-             * 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.
              *
              * 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.
@@ -872,8 +878,8 @@ export namespace OperationalCredentials {
              *
              * Effect When Received
              *
-             * 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.
              *
              * 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.
@@ -886,7 +892,6 @@ export namespace OperationalCredentials {
              * then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.
              *
              * 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”:
              *
              *   • The NOC provided in the NOCValue does not refer in its subject to the FabricID associated with the
@@ -981,12 +986,14 @@ export namespace OperationalCredentials {
              * 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.
              *
-             * 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.
              *
              * 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- safe timer
-             * period, then this command shall fail with a CONSTRAINT_ERROR status code sent back to the initiator.
+             * 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.
              *
              * 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/clusters/operational-state.ts

@@ -18,7 +18,7 @@ import {
 import { TlvArray } from "../tlv/TlvArray.js";
 import { TlvString } from "../tlv/TlvString.js";
 import { TlvNullable } from "../tlv/TlvNullable.js";
-import { TlvUInt8, TlvUInt32 } from "../tlv/TlvNumber.js";
+import { TlvUInt8, TlvUInt32, TlvEnum } from "../tlv/TlvNumber.js";
 import { TlvField, TlvOptionalField, TlvObject } from "../tlv/TlvObject.js";
 import { TypeFromSchema } from "../tlv/TlvSchema.js";
 import { TlvNoArguments } from "../tlv/TlvNoArguments.js";
@@ -26,6 +26,48 @@ import { Identity } from "#general";
 import { ClusterRegistry } from "../cluster/ClusterRegistry.js";
 
 export namespace OperationalState {
+    /**
+     * This type defines the set of known operational state values, and is derived from enum8. The following table
+     * defines the applicable ranges for values that are defined within this type. All values that are undefined shall
+     * be treated as reserved. As shown by the table, states that may be specific to a certain Device Type or other
+     * modality shall be defined in a derived cluster of this cluster.
+     *
+     * The derived cluster-specific state definitions shall NOT duplicate any general state definitions. That is, a
+     * derived cluster specification of this cluster cannot define states with the same semantics as the general states
+     * defined below.
+     *
+     * A manufacturer-specific state definition shall NOT duplicate the general state definitions or derived cluster
+     * state definitions. That is, a manufacturer-defined state defined for this cluster or a derived cluster thereof
+     * cannot define a state with the same semantics as the general states defined below or states defined in a derived
+     * cluster. Such manufacturer-specific state definitions shall be scoped in the context of the Vendor ID present in
+     * the Basic Information cluster.
+     *
+     * The following table defines the generally applicable states.
+     *
+     * @see {@link MatterSpecification.v13.Cluster} § 1.14.4.1
+     */
+    export enum OperationalStateEnum {
+        /**
+         * The device is stopped
+         */
+        Stopped = 0,
+
+        /**
+         * The device is operating
+         */
+        Running = 1,
+
+        /**
+         * The device is paused during an operation
+         */
+        Paused = 2,
+
+        /**
+         * The device is in an error state
+         */
+        Error = 3
+    }
+
     /**
      * The OperationalStateStruct is used to indicate a possible state of the device.
      *
@@ -37,7 +79,7 @@ export namespace OperationalState {
          *
          * @see {@link MatterSpecification.v13.Cluster} § 1.14.4.2.1
          */
-        operationalStateId: TlvField(0, TlvUInt8),
+        operationalStateId: TlvField(0, TlvEnum<OperationalStateEnum>()),
 
         /**
          * This field shall be present if the OperationalStateID is from the set reserved for Manufacturer Specific
@@ -56,16 +98,60 @@ export namespace OperationalState {
      */
     export interface OperationalStateStruct extends TypeFromSchema<typeof TlvOperationalStateStruct> {}
 
+    /**
+     * This type defines the set of known operational error values, and is derived from enum8. The following table
+     * defines the applicable ranges for values that are defined within this type. All values that are undefined shall
+     * be treated as reserved. As shown by the table, errors that may be specific to a certain Device Type or other
+     * modality shall be defined in a derived cluster of this cluster.
+     *
+     * 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.
+     *
+     * The manufacturer-specific error definitions shall NOT duplicate the general error definitions or derived
+     * cluster-specific error definitions. That is, a manufacturer-defined error defined for this cluster or a derived
+     * cluster thereof cannot define errors with the same semantics as the general errors defined below or errors
+     * defined in a derived cluster. Such manufacturer-specific error definitions shall be scoped in the context of the
+     * Vendor ID present in the Basic Information cluster.
+     *
+     * The set of ErrorStateID field values defined in each of the generic or derived Operational State cluster
+     * specifications is called ErrorState.
+     *
+     * @see {@link MatterSpecification.v13.Cluster} § 1.14.4.3
+     */
+    export enum ErrorState {
+        /**
+         * The device is not in an error state
+         */
+        NoError = 0,
+
+        /**
+         * The device is unable to start or resume operation
+         */
+        UnableToStartOrResume = 1,
+
+        /**
+         * The device was unable to complete the current operation
+         */
+        UnableToCompleteOperation = 2,
+
+        /**
+         * The device cannot process the command in its current state
+         */
+        CommandInvalidInState = 3
+    }
+
     /**
      * @see {@link MatterSpecification.v13.Cluster} § 1.14.4.4
      */
-    export const TlvErrorState = TlvObject({
+    export const TlvErrorStateStruct = TlvObject({
         /**
          * This shall be populated with a value from the ErrorStateEnum.
          *
          * @see {@link MatterSpecification.v13.Cluster} § 1.14.4.4.1
          */
-        errorStateId: TlvField(0, TlvUInt8),
+        errorStateId: TlvField(0, TlvEnum<ErrorState>()),
 
         /**
          * This field shall be present if the ErrorStateID is from the set reserved for Manufacturer Specific Errors,
@@ -90,7 +176,7 @@ export namespace OperationalState {
     /**
      * @see {@link MatterSpecification.v13.Cluster} § 1.14.4.4
      */
-    export interface ErrorState extends TypeFromSchema<typeof TlvErrorState> {}
+    export interface ErrorStateStruct extends TypeFromSchema<typeof TlvErrorStateStruct> {}
 
     /**
      * This command shall be supported by an implementation if any of the other commands defined by this cluster are
@@ -109,7 +195,7 @@ export namespace OperationalState {
          *
          * @see {@link MatterSpecification.v13.Cluster} § 1.14.6.5.1
          */
-        commandResponseState: TlvField(0, TlvErrorState)
+        commandResponseState: TlvField(0, TlvErrorStateStruct)
     });
 
     /**
@@ -128,7 +214,7 @@ export namespace OperationalState {
      *
      * @see {@link MatterSpecification.v13.Cluster} § 1.14.7.1
      */
-    export const TlvOperationalErrorEvent = TlvObject({ errorState: TlvField(0, TlvErrorState) });
+    export const TlvOperationalErrorEvent = TlvObject({ errorState: TlvField(0, TlvErrorStateStruct) });
 
     /**
      * Body of the OperationalState operationalError event
@@ -153,9 +239,10 @@ export namespace OperationalState {
 
         /**
          * The total operational time, in seconds, from when the operation was started via an initial Start command or
-         * manual 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.
+         * 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.
          *
          * @see {@link MatterSpecification.v13.Cluster} § 1.14.7.2.2
          */
@@ -178,40 +265,13 @@ export namespace OperationalState {
      */
     export interface OperationCompletionEvent extends TypeFromSchema<typeof TlvOperationCompletionEvent> {}
 
-    /**
-     * The following table defines the generally applicable ErrorState values.
-     *
-     * @see {@link MatterSpecification.v13.Cluster} § 1.14.4.3.1
-     */
-    export enum GeneralErrorState {
-        /**
-         * The device is not in an error state
-         */
-        NoError = 0,
-
-        /**
-         * The device is unable to start or resume operation
-         */
-        UnableToStartOrResume = 1,
-
-        /**
-         * The device was unable to complete the current operation
-         */
-        UnableToCompleteOperation = 2,
-
-        /**
-         * The device cannot process the command in its current state
-         */
-        CommandInvalidInState = 3
-    }
-
     /**
      * @see {@link Cluster}
      */
     export const ClusterInstance = MutableCluster({
         id: 0x60,
         name: "OperationalState",
-        revision: 2,
+        revision: 3,
 
         attributes: {
             /**
@@ -229,9 +289,10 @@ export namespace OperationalState {
 
             /**
              * 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, 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".
+             * 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".
              *
              * Null if the PhaseList attribute is null or if the PhaseList attribute is an empty list.
              *
@@ -240,24 +301,37 @@ export namespace OperationalState {
             currentPhase: Attribute(0x1, TlvNullable(TlvUInt8)),
 
             /**
-             * Indicates the estimated time left before the operation is completed, in seconds. Changes to this value
-             * shall NOT be reported in a subscription (note the C Quality). A Client implementation may periodically
-             * poll this value to ensure alignment of any local rendering of the CountdownTime with the device provided
-             * value.
+             * Indicates the estimated time left before the operation is completed, in seconds.
              *
-             * A value of 0 means that the operation has completed.
+             * A value of 0 (zero) means that the operation has completed.
              *
-             * When this attribute is null, that represents that there is no time currently defined until operation
-             * completion. This may happen, for example, because no operation is in progress or because the completion
-             * time is unknown.
+             * A value of null represents that there is no time currently defined until operation completion. This may
+             * happen, for example, because no operation is in progress or because the completion time is unknown.
+             *
+             * Changes to this attribute shall only be marked as reportable in the following cases:
+             *
+             *   • If it has changed due to a change in the CurrentPhase or OperationalState attributes, or
+             *
+             *   • When it changes from 0 to any other value and vice versa, or
+             *
+             *   • When it changes from null to any other value and vice versa, or
+             *
+             *   • When it increases, or
+             *
+             *   • When there is any increase or decrease in the estimated time remaining that was due to progressing
+             *     insight of the server’s control logic, or
+             *
+             *   • When it changes at a rate significantly different from one unit per second.
+             *
+             * Changes to this attribute merely due to the normal passage of time with no other dynamic change of
+             * device state shall NOT be reported.
+             *
+             * As this attribute is not being reported during a regular countdown, clients SHOULD NOT rely on the
+             * reporting of this attribute in order to keep track of the remaining duration.
              *
              * @see {@link MatterSpecification.v13.Cluster} § 1.14.5.3
              */
-            countdownTime: OptionalAttribute(
-                0x2,
-                TlvNullable(TlvUInt32.bound({ max: 259200 })),
-                { omitChanges: true, default: null }
-            ),
+            countdownTime: OptionalAttribute(0x2, TlvNullable(TlvUInt32.bound({ max: 259200 })), { default: null }),
 
             /**
              * This attribute describes the set of possible operational states that the device exposes. An operational
@@ -279,7 +353,7 @@ export namespace OperationalState {
              *
              * @see {@link MatterSpecification.v13.Cluster} § 1.14.5.5
              */
-            operationalState: Attribute(0x4, TlvUInt8),
+            operationalState: Attribute(0x4, TlvEnum<OperationalStateEnum>()),
 
             /**
              * This attribute shall specify the details of any current error condition being experienced on the device
@@ -290,7 +364,7 @@ export namespace OperationalState {
              *
              * @see {@link MatterSpecification.v13.Cluster} § 1.14.5.6
              */
-            operationalError: Attribute(0x5, TlvErrorState)
+            operationalError: Attribute(0x5, TlvErrorStateStruct)
         },
 
         commands: {
@@ -443,10 +517,14 @@ export namespace OperationalState {
             operationalError: Event(0x0, EventPriority.Critical, TlvOperationalErrorEvent),
 
             /**
-             * This event is generated when the overall operation ends, successfully or otherwise. For example, the
-             * completion of a cleaning operation in a Robot Vacuum Cleaner, or the completion of a wash cycle in a
+             * This event SHOULD be generated when the overall operation ends, successfully or otherwise. For example,
+             * the completion of a cleaning operation in a Robot Vacuum Cleaner, or the completion of a wash cycle in a
              * Washing Machine.
              *
+             * It is highly recommended that appliances device types employing the Operational State cluster support
+             * this event, even if it is optional. This assists clients in executing automations or issuing
+             * notifications at critical points in the device operation cycles.
+             *
              * This event shall contain the following fields:
              *
              * @see {@link MatterSpecification.v13.Cluster} § 1.14.7.2

package/src/clusters/ota-software-update-provider.ts

@@ -20,9 +20,8 @@ import { ClusterRegistry } from "../cluster/ClusterRegistry.js";
 
 export namespace OtaSoftwareUpdateProvider {
     /**
-     * Note that only HTTP over TLS (HTTPS) is supported (see RFC 7230). Using HTTP without TLS shall
-     *
-     * NOT be supported, as there is no way to authenticate the involved participants.
+     * Note that only HTTP over TLS (HTTPS) is supported (see RFC 7230). Using HTTP without TLS shall NOT be supported,
+     * as there is no way to authenticate the involved participants.
      *
      * @see {@link MatterSpecification.v13.Core} § 11.20.6.4.3
      */
@@ -107,9 +106,10 @@ export namespace OtaSoftwareUpdateProvider {
         hardwareVersion: TlvOptionalField(4, TlvUInt16),
 
         /**
-         * 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.
+         * 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.
          *
          * @see {@link MatterSpecification.v13.Core} § 11.20.6.5.1.6
          */
@@ -244,27 +244,27 @@ export namespace OtaSoftwareUpdateProvider {
          *
          *     a. The Operational Node ID in the host field shall match the NodeID of the OTA Provider responding with
          *        the QueryImageResponse. The usage of a different Node ID than that of the provider is reserved for
-         *        future use. This constraint reduces the number of independent
-         *
-         * CASE secure channel sessions that have to be maintained to proceed with OTA software updates, thus reducing
-         * energy and resource utilization for the software update process.
+         *        future use. This constraint reduces the number of independent CASE secure channel sessions that have
+         *        to be maintained to proceed with OTA software updates, thus reducing energy and resource utilization
+         *        for the software update process.
          *
-         * 4. The user section of the authority field shall be absent, as there are no "users" to be considered.
+         *   4. The user section of the authority field shall be absent, as there are no "users" to be considered.
          *
-         * 5. The port section of the authority field shall be absent, as the port for transport shall be determined
-         * through Operational Discovery of the target Node.
+         *   5. The port section of the authority field shall be absent, as the port for transport shall be determined
+         *      through Operational Discovery of the target Node.
          *
-         * 6. The URI shall not contain a query field.
+         *   6. The URI shall NOT contain a query field.
          *
-         * 7. The URI shall not contain a fragment field.
+         *   7. The URI shall NOT contain a fragment field.
          *
-         * 8. The path field shall employ absolute path representation and shall contain the file designator of the
-         * software image to download at the BDX server. When used with the BDX server, the leading / separating the
-         * URI authority from the path shall be omitted. When contacting the BDX server, further processing of the file
-         * designator shall NOT be done, including handling of URL-encoded escape sequences. Rather, the exact octets
-         * of the path, as received shall be the values used by both client and server in handling the file designator.
+         *   8. The path field shall employ absolute path representation and shall contain the file designator of the
+         *      software image to download at the BDX server. When used with the BDX server, the leading / separating
+         *      the URI authority from the path shall be omitted. When contacting the BDX server, further processing of
+         *      the file designator shall NOT be done, including handling of URL-encoded escape sequences. Rather, the
+         *      exact octets of the path, as received shall be the values used by both client and server in handling
+         *      the file designator.
          *
-         *   a. The path shall only contain valid URI characters.
+         *     a. The path shall only contain valid URI characters.
          *
          * These rules above for BDX URIs simplify parsing for OTA Requestors receiving Image URIs. The following
          * example procedure shows how the format constraints simplify the extraction of the necessary data to reach
@@ -450,7 +450,7 @@ export namespace OtaSoftwareUpdateProvider {
 
     /**
      * See Section 11.20.3.6, “Applying a software update” for the semantics of the values. This enumeration is used in
-     * the Action field of the ApplyUpdateResponse command. See (Section 11.20.6.5.4.1, “Action Field”).
+     * the Action field of the ApplyUpdateResponse command. See (Action).
      *
      * @see {@link MatterSpecification.v13.Core} § 11.20.6.4.2
      */
@@ -533,7 +533,7 @@ export namespace OtaSoftwareUpdateProvider {
          * may never come back (e.g. device removed from Fabric altogether, or a critical malfunction), an OTA Provider
          * shall NOT expect every OTA Requestor to invoke this command for correct operation of the OTA Provider.
          *
-         * This command shall be considered optional and shall not result in reduced availability of the OTA Provider
+         * 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.
          *
          * Effect on Receipt

package/src/clusters/ota-software-update-requestor.ts

@@ -46,11 +46,9 @@ export namespace OtaSoftwareUpdateRequestor {
         providerNodeId: TlvField(1, TlvNodeId),
 
         /**
-         * This field shall contain the endpoint number which has the OTA Provider device type and OTA
-         *
-         * Software Update Provider cluster server on the ProviderNodeID. This is provided to avoid having to do
-         * discovery of the location of that endpoint by walking over all endpoints and checking their Descriptor
-         * Cluster.
+         * This field shall contain the endpoint number which has the OTA Provider device type and OTA Software Update
+         * Provider cluster server on the ProviderNodeID. This is provided to avoid having to do discovery of the
+         * location of that endpoint by walking over all endpoints and checking their Descriptor Cluster.
          *
          * @see {@link MatterSpecification.v13.Core} § 11.20.7.4.4.2
          */
@@ -496,7 +494,7 @@ export namespace OtaSoftwareUpdateRequestor {
             defaultOtaProviders: WritableFabricScopedAttribute(
                 0x0,
                 TlvArray(TlvProviderLocation),
-                { default: [], writeAcl: AccessLevel.Administer }
+                { persistent: true, default: [], writeAcl: AccessLevel.Administer }
             ),
 
             /**