@matter/types 0.13.0-alpha.0-20250304-d4a7592a4 → 0.13.0-alpha.0-20250311-3eb0af5f2

package/src/clusters/general-commissioning.ts

@@ -7,22 +7,158 @@
 /*** THIS FILE IS GENERATED, DO NOT EDIT ***/
 
 import { MutableCluster } from "../cluster/mutation/MutableCluster.js";
-import { WritableAttribute, FixedAttribute, Attribute, Command } from "../cluster/Cluster.js";
-import { TlvUInt64, TlvUInt16, TlvEnum } from "../tlv/TlvNumber.js";
+import { Attribute, Command, WritableAttribute, FixedAttribute } from "../cluster/Cluster.js";
+import { TlvUInt16, TlvUInt32, TlvEnum, TlvUInt64 } from "../tlv/TlvNumber.js";
 import { AccessLevel } from "#model";
+import { TlvBoolean } from "../tlv/TlvBoolean.js";
+import { TlvNullable } from "../tlv/TlvNullable.js";
 import { TlvField, TlvObject } from "../tlv/TlvObject.js";
 import { TypeFromSchema } from "../tlv/TlvSchema.js";
-import { TlvBoolean } from "../tlv/TlvBoolean.js";
+import { BitFlag } from "../schema/BitmapSchema.js";
 import { TlvString } from "../tlv/TlvString.js";
 import { TlvNoArguments } from "../tlv/TlvNoArguments.js";
 import { Identity } from "#general";
 import { ClusterRegistry } from "../cluster/ClusterRegistry.js";
 
 export namespace GeneralCommissioning {
+    /**
+     * These are optional features supported by GeneralCommissioningCluster.
+     *
+     * @see {@link MatterSpecification.v13.Core} § 11.10.4
+     */
+    export enum Feature {
+        /**
+         * TermsAndConditions (TC)
+         *
+         * Supports Terms & Conditions acknowledgement
+         */
+        TermsAndConditions = "TermsAndConditions"
+    }
+
+    /**
+     * Input to the GeneralCommissioning setTcAcknowledgements command
+     *
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.8
+     */
+    export const TlvSetTcAcknowledgementsRequest = TlvObject({
+        /**
+         * This field shall contain the version of the Enhanced Setup Flow Terms & Conditions that were presented to
+         * the user.
+         *
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.8.1
+         */
+        tcVersion: TlvField(0, TlvUInt16),
+
+        /**
+         * This field shall contain the user responses to the Enhanced Setup Flow Terms & Conditions as a map where
+         * each bit set in the bitmap corresponds to an accepted term in the file located at EnhancedSetupFlowTCUrl.
+         *
+         * ### Effect on Receipt
+         *
+         * This command shall copy the user responses and accepted version to the presented Enhanced Setup Flow Terms &
+         * Conditions from the values provided in the TCUserResponse and TCVersion fields to the TCAcknowledgements
+         * Attribute and the TCAcceptedVersion Attribute fields respectively.
+         *
+         * This command shall result in success with an ErrorCode value of OK in the SetTCAcknowledgementsResponse if
+         * all required terms were accepted by the user. Specifically, all bits have a value of 1 in TCAcknowledgements
+         * whose ordinal is marked as required in the file located at EnhancedSe
+         *
+         * tupFlowTCUrl.
+         *
+         * If the TCVersion field is less than the TCMinRequiredVersion, then the ErrorCode of TCMinVersionNotMet shall
+         * be returned and TCAcknowledgements shall remain unchanged.
+         *
+         * If TCVersion is greater than or equal to TCMinRequiredVersion, but the TCUserResponse value indicates that
+         * not all required terms were accepted by the user, then the ErrorCode of RequiredTCNotAccepted shall be
+         * returned and TCAcknowledgements shall remain unchanged.
+         *
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.8.2
+         */
+        tcUserResponse: TlvField(1, TlvUInt16)
+    });
+
+    /**
+     * Input to the GeneralCommissioning setTcAcknowledgements command
+     *
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.8
+     */
+    export interface SetTcAcknowledgementsRequest extends TypeFromSchema<typeof TlvSetTcAcknowledgementsRequest> {}
+
+    /**
+     * This enumeration is used by several response commands in this cluster to indicate particular errors.
+     *
+     * @see {@link MatterSpecification.v13.Core} § 11.10.5.1
+     */
+    export enum CommissioningError {
+        /**
+         * No error
+         */
+        Ok = 0,
+
+        /**
+         * Attempting to set regulatory configuration to a region or indoor/outdoor mode for which the server does not
+         * have proper configuration.
+         */
+        ValueOutsideRange = 1,
+
+        /**
+         * Executed CommissioningComplete outside CASE session.
+         */
+        InvalidAuthentication = 2,
+
+        /**
+         * Executed CommissioningComplete when there was no active Fail-Safe context.
+         */
+        NoFailSafe = 3,
+
+        /**
+         * Attempting to arm fail- safe or execute CommissioningComplete from a fabric different than the one
+         * associated with the current fail- safe context.
+         */
+        BusyWithOtherAdmin = 4,
+
+        /**
+         * One or more required TC features from the Enhanced Setup Flow were not accepted.
+         */
+        RequiredTcNotAccepted = 5,
+
+        /**
+         * No acknowledgements from the user for the TC features were received.
+         */
+        TcAcknowledgementsNotReceived = 6,
+
+        /**
+         * The version of the TC features acknowledged by the user did not meet the minimum required version.
+         */
+        TcMinVersionNotMet = 7
+    }
+
+    /**
+     * This command is used to convey the result from SetTCAcknowledgements.
+     *
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.9
+     */
+    export const TlvSetTcAcknowledgementsResponse = TlvObject({
+        /**
+         * This field shall contain the result of the operation, based on the behavior specified in the functional
+         * description of the SetTCAcknowledgements command.
+         *
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.9.1
+         */
+        errorCode: TlvField(0, TlvEnum<CommissioningError>())
+    });
+
+    /**
+     * This command is used to convey the result from SetTCAcknowledgements.
+     *
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.9
+     */
+    export interface SetTcAcknowledgementsResponse extends TypeFromSchema<typeof TlvSetTcAcknowledgementsResponse> {}
+
     /**
      * This structure provides some constant values that may be of use to all commissioners.
      *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.4.3
+     * @see {@link MatterSpecification.v13.Core} § 11.10.5.3
      */
     export const TlvBasicCommissioningInfo = TlvObject({
         /**
@@ -31,19 +167,19 @@ export namespace GeneralCommissioning {
          * Commissionee. This value, if used in the ArmFailSafe command’s ExpiryLengthSeconds field SHOULD allow a
          * Commissioner to proceed with a nominal commissioning without having to-rearm the fail-safe, with some margin.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.4.3.1
+         * @see {@link MatterSpecification.v13.Core} § 11.10.5.3.1
          */
         failSafeExpiryLengthSeconds: TlvField(0, TlvUInt16),
 
         /**
          * This field shall contain a conservative value in seconds denoting the maximum total duration for which a
-         * fail safe timer can be re-armed. See Section 11.10.6.2.1, “Fail Safe Context”.
+         * fail safe timer can be re-armed. See Section 11.10.7.2.1, “Fail Safe Context”.
          *
          * The value of this field shall be greater than or equal to the FailSafeExpiryLengthSeconds. Absent additional
          * guidelines, it is recommended that the value of this field be aligned with the initial Announcement Duration
          * and default to 900 seconds.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.4.3.2
+         * @see {@link MatterSpecification.v13.Core} § 11.10.5.3.2
          */
         maxCumulativeFailsafeSeconds: TlvField(1, TlvUInt16)
     });
@@ -51,7 +187,7 @@ export namespace GeneralCommissioning {
     /**
      * This structure provides some constant values that may be of use to all commissioners.
      *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.4.3
+     * @see {@link MatterSpecification.v13.Core} § 11.10.5.3
      */
     export interface BasicCommissioningInfo extends TypeFromSchema<typeof TlvBasicCommissioningInfo> {}
 
@@ -59,7 +195,7 @@ export namespace GeneralCommissioning {
      * This enumeration is used by the RegulatoryConfig and LocationCapability attributes to indicate possible radio
      * usage.
      *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.4.2
+     * @see {@link MatterSpecification.v13.Core} § 11.10.5.2
      */
     export enum RegulatoryLocationType {
         /**
@@ -81,7 +217,7 @@ export namespace GeneralCommissioning {
     /**
      * Input to the GeneralCommissioning armFailSafe command
      *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.2
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.2
      */
     export const TlvArmFailSafeRequest = TlvObject({
         expiryLengthSeconds: TlvField(0, TlvUInt16),
@@ -91,73 +227,39 @@ export namespace GeneralCommissioning {
     /**
      * Input to the GeneralCommissioning armFailSafe command
      *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.2
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.2
      */
     export interface ArmFailSafeRequest extends TypeFromSchema<typeof TlvArmFailSafeRequest> {}
 
     /**
-     * This enumeration is used by several response commands in this cluster to indicate particular errors.
-     *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.4.1
-     */
-    export enum CommissioningError {
-        /**
-         * No error
-         */
-        Ok = 0,
-
-        /**
-         * Attempting to set regulatory configuration to a region or indoor/outdoor mode for which the server does not
-         * have proper configuration.
-         */
-        ValueOutsideRange = 1,
-
-        /**
-         * Executed CommissioningComplete outside CASE session.
-         */
-        InvalidAuthentication = 2,
-
-        /**
-         * Executed CommissioningComplete when there was no active Fail-Safe context.
-         */
-        NoFailSafe = 3,
-
-        /**
-         * Attempting to arm fail- safe or execute CommissioningComplete from a fabric different than the one
-         * associated with the current fail- safe context.
-         */
-        BusyWithOtherAdmin = 4
-    }
-
-    /**
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.3
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.3
      */
     export const TlvArmFailSafeResponse = TlvObject({
         /**
          * This field shall contain the result of the operation, based on the behavior specified in the functional
          * description of the ArmFailSafe command.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.6.3.1
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.3.1
          */
         errorCode: TlvField(0, TlvEnum<CommissioningError>()),
 
         /**
-         * See Section 11.10.6.1, “Common fields in General Commissioning cluster responses”.
+         * See Section 11.10.7.1, “Common fields in General Commissioning cluster responses”.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.6.3.2
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.3.2
          */
         debugText: TlvField(1, TlvString.bound({ maxLength: 128 }))
     });
 
     /**
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.3
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.3
      */
     export interface ArmFailSafeResponse extends TypeFromSchema<typeof TlvArmFailSafeResponse> {}
 
     /**
      * Input to the GeneralCommissioning setRegulatoryConfig command
      *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.4
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.4
      */
     export const TlvSetRegulatoryConfigRequest = TlvObject({
         newRegulatoryConfig: TlvField(0, TlvEnum<RegulatoryLocationType>()),
@@ -168,67 +270,192 @@ export namespace GeneralCommissioning {
     /**
      * Input to the GeneralCommissioning setRegulatoryConfig command
      *
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.4
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.4
      */
     export interface SetRegulatoryConfigRequest extends TypeFromSchema<typeof TlvSetRegulatoryConfigRequest> {}
 
     /**
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.5
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.5
      */
     export const TlvSetRegulatoryConfigResponse = TlvObject({
         /**
          * This field shall contain the result of the operation, based on the behavior specified in the functional
          * description of the SetRegulatoryConfig command.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.6.5.1
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.5.1
          */
         errorCode: TlvField(0, TlvEnum<CommissioningError>()),
 
         /**
-         * See Section 11.10.6.1, “Common fields in General Commissioning cluster responses”.
+         * See Section 11.10.7.1, “Common fields in General Commissioning cluster responses”.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.6.5.2
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.5.2
          */
         debugText: TlvField(1, TlvString)
     });
 
     /**
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.5
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.5
      */
     export interface SetRegulatoryConfigResponse extends TypeFromSchema<typeof TlvSetRegulatoryConfigResponse> {}
 
     /**
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.7
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.7
      */
     export const TlvCommissioningCompleteResponse = TlvObject({
         /**
          * This field shall contain the result of the operation, based on the behavior specified in the functional
          * description of the CommissioningComplete command.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.6.7.1
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.7.1
          */
         errorCode: TlvField(0, TlvEnum<CommissioningError>()),
 
         /**
-         * See Section 11.10.6.1, “Common fields in General Commissioning cluster responses”.
+         * See Section 11.10.7.1, “Common fields in General Commissioning cluster responses”.
          *
-         * @see {@link MatterSpecification.v13.Core} § 11.10.6.7.2
+         * @see {@link MatterSpecification.v13.Core} § 11.10.7.7.2
          */
         debugText: TlvField(1, TlvString)
     });
 
     /**
-     * @see {@link MatterSpecification.v13.Core} § 11.10.6.7
+     * @see {@link MatterSpecification.v13.Core} § 11.10.7.7
      */
     export interface CommissioningCompleteResponse extends TypeFromSchema<typeof TlvCommissioningCompleteResponse> {}
 
     /**
-     * @see {@link Cluster}
+     * A GeneralCommissioningCluster supports these elements if it supports feature TermsAndConditions.
      */
-    export const ClusterInstance = MutableCluster({
+    export const TermsAndConditionsComponent = MutableCluster.Component({
+        attributes: {
+            /**
+             * Indicates the last version of the T&Cs for which the device received user acknowledgements. On factory
+             * reset this field shall be reset to 0.
+             *
+             * When Custom Commissioning Flow is used to obtain user consent (e. g. because the Commissioner does not
+             * support the TC feature), the manufacturer-provided means for obtaining user consent shall ensure that
+             * this attribute is set to a value which is greater than or equal to TCMinRequiredVersion before returning
+             * the user back to the originating Commissioner (see Enhanced Setup Flow).
+             *
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.6
+             */
+            tcAcceptedVersion: Attribute(
+                0x5,
+                TlvUInt16,
+                { persistent: true, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            ),
+
+            /**
+             * Indicates the minimum version of the texts presented by the Enhanced Setup Flow that need to be accepted
+             * by the user for this device. This attribute may change as the result of an OTA update.
+             *
+             * If an event such as a software update causes TCAcceptedVersion to become less than TCMinRequiredVersion,
+             * then the device shall update TCAcknowledgementsRequired to True so that an administrator can detect that
+             * a newer version of the texts needs to be presented to the user.
+             *
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.7
+             */
+            tcMinRequiredVersion: Attribute(
+                0x6,
+                TlvUInt16,
+                { persistent: true, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            ),
+
+            /**
+             * Indicates the user’s response to the presented terms. Each bit position corresponds to a user response
+             * for the associated index of matching text, such that bit 0 (bit value 1) is for text index 0. Bit 15
+             * (bit value 0x8000) is for text index 15. A bit value of 1 indicates acceptance and a value of 0
+             * indicates non-acceptance. For example, if there are two texts that were presented where the first (bit
+             * 0, value 1) was declined and the second accepted (bit 1, value 2), we would expect the resulting value
+             * of the map to be 2.
+             *
+             * Whenever a user provides responses to newly presented terms and conditions, this attribute shall be
+             * updated with the latest responses. This may happen in response to updated terms that were presented to
+             * the user. On a factory reset this field shall be reset with all bits set to 0.
+             *
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.8
+             */
+            tcAcknowledgements: Attribute(
+                0x7,
+                TlvUInt16,
+                { persistent: true, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            ),
+
+            /**
+             * Indicates whether SetTCAcknowledgements is currently required to be called with the inclusion of
+             * mandatory terms accepted.
+             *
+             * This attribute may be present and False in the case where no terms and conditions are currently
+             * mandatory to accept for CommissioningComplete to succeed.
+             *
+             * This attribute may appear, or become True after commissioning (e.g. due to a firmware update) to
+             * indicate that new Terms & Conditions are available that the user must accept.
+             *
+             * Upon Factory Data Reset, this attribute shall be set to a value of True.
+             *
+             * When Custom Commissioning Flow is used to obtain user consent (e.g. because the Commissioner does not
+             * support the TC feature), the manufacturer-provided means for obtaining user consent shall ensure that
+             * this attribute is set to False before returning the user back to the original Commissioner (see Enhanced
+             * Setup Flow).
+             *
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.9
+             */
+            tcAcknowledgementsRequired: Attribute(
+                0x8,
+                TlvBoolean,
+                { persistent: true, default: true, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            ),
+
+            /**
+             * Indicates the System Time in seconds when any functionality limitations will begin due to a lack of
+             * acceptance of updated Terms and Conditions, as described in Section 5.7.4.5, “Presenting Updated Terms
+             * and Conditions”.
+             *
+             * A null value indicates that there is no pending deadline for updated TC acceptance.
+             *
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.10
+             */
+            tcUpdateDeadline: Attribute(
+                0x9,
+                TlvNullable(TlvUInt32),
+                { persistent: true, readAcl: AccessLevel.Administer, writeAcl: AccessLevel.Administer }
+            )
+        },
+
+        commands: {
+            /**
+             * This command sets the user acknowledgements received in the Enhanced Setup Flow Terms & Conditions into
+             * the node.
+             *
+             * @see {@link MatterSpecification.v13.Core} § 11.10.7.8
+             */
+            setTcAcknowledgements: Command(
+                0x6,
+                TlvSetTcAcknowledgementsRequest,
+                0x7,
+                TlvSetTcAcknowledgementsResponse,
+                { invokeAcl: AccessLevel.Administer }
+            )
+        }
+    });
+
+    /**
+     * These elements and properties are present in all GeneralCommissioning clusters.
+     */
+    export const Base = MutableCluster.Component({
         id: 0x30,
         name: "GeneralCommissioning",
-        revision: 1,
+        revision: 2,
+
+        features: {
+            /**
+             * TermsAndConditions
+             *
+             * Supports Terms & Conditions acknowledgement
+             */
+            termsAndConditions: BitFlag(0)
+        },
 
         attributes: {
             /**
@@ -247,7 +474,7 @@ export namespace GeneralCommissioning {
              * functioning of any cluster, other than being set as a side-effect of commands where this behavior is
              * described.
              *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.5.1
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.1
              */
             breadcrumb: WritableAttribute(0x0, TlvUInt64, { default: 0, writeAcl: AccessLevel.Administer }),
 
@@ -255,7 +482,7 @@ export namespace GeneralCommissioning {
              * This attribute shall describe critical parameters needed at the beginning of commissioning flow. See
              * BasicCommissioningInfo for more information.
              *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.5.2
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.2
              */
             basicCommissioningInfo: FixedAttribute(0x1, TlvBasicCommissioningInfo),
 
@@ -265,7 +492,7 @@ export namespace GeneralCommissioning {
              * Note that the country code is part of Basic Information Cluster and therefore NOT listed on the
              * RegulatoryConfig attribute.
              *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.5.3
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.3
              */
             regulatoryConfig: Attribute(0x2, TlvEnum<RegulatoryLocationType>()),
 
@@ -273,8 +500,9 @@ export namespace GeneralCommissioning {
              * LocationCapability is statically set by the manufacturer and indicates if this Node needs to be told an
              * exact RegulatoryLocation. For example a Node which is "Indoor Only" would not be certified for outdoor
              * use at all, and thus there is no need for a commissioner to set or ask the user about whether the device
-             * will be used inside or outside. However a device which states its capability is "Indoor/Outdoor" means
-             * it would like clarification if possible.
+             * will be used inside or outside. However a device which states its capability is
+             *
+             * "Indoor/Outdoor" means it would like clarification if possible.
              *
              * For Nodes without radio network interfaces (e.g. Ethernet-only devices), the value IndoorOutdoor shall
              * always be used.
@@ -283,7 +511,7 @@ export namespace GeneralCommissioning {
              * means devices always have a safe default value, and Commissioners which choose to implement smarter
              * handling can.
              *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.5.4
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.4
              */
             locationCapability: FixedAttribute(
                 0x3,
@@ -295,7 +523,7 @@ export namespace GeneralCommissioning {
              * Indicates whether this device supports "concurrent connection flow" commissioning mode (see Section 5.5,
              * “Commissioning Flows”). If false, the device only supports "non-concurrent connection flow" mode.
              *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.5.5
+             * @see {@link MatterSpecification.v13.Core} § 11.10.6.5
              */
             supportsConcurrentConnection: FixedAttribute(0x4, TlvBoolean, { default: true })
         },
@@ -315,9 +543,8 @@ export namespace GeneralCommissioning {
              * of ExpiryLengthSeconds, or disarm it, depending on the situation:
              *
              *   • If ExpiryLengthSeconds is 0 and the fail-safe timer was already armed and the accessing fabric
-             *     matches the Fabric currently associated with the fail-safe context, then the fail-safe timer
-             *
-             * shall be immediately expired (see further below for side-effects of expiration).
+             *     matches the Fabric currently associated with the fail-safe context, then the fail-safe timer shall
+             *     be immediately expired (see further below for side-effects of expiration).
              *
              *   • If ExpiryLengthSeconds is 0 and the fail-safe timer was not armed, then this command invocation
              *     shall lead to a success response with no side-effects against the fail-safe context.
@@ -333,8 +560,8 @@ export namespace GeneralCommissioning {
              *     with ArmFailSafeResponse containing an ErrorCode value of BusyWithOtherAdmin, indicating a likely
              *     conflict between commissioners.
              *
-             * The value of the Breadcrumb field shall be written to the Breadcrumb Attribute on successful execution
-             * of the command.
+             * The value of the Breadcrumb field shall be written to the Breadcrumb on successful execution of the
+             * command.
              *
              * If the receiver restarts unexpectedly (e.g., power interruption, software crash, or other reset) the
              * receiver shall behave as if the fail-safe timer expired and perform the sequence of clean-up steps
@@ -379,7 +606,7 @@ export namespace GeneralCommissioning {
              * timer (CFSC timer) serves to limit the lifetime of any particular Fail Safe Context; it shall NOT be
              * extended or modified on subsequent invocations of ArmFailSafe associated with this Fail Safe Context.
              * Upon expiry of the CFSC timer, the receiver shall execute cleanup behavior equivalent to that of
-             * fail-safe timer expiration as detailed in Section 11.10.6.2.2, “Behavior on expiry of Fail-Safe timer”.
+             * fail-safe timer expiration as detailed in Section 11.10.7.2.2, “Behavior on expiry of Fail-Safe timer”.
              * Termination of the session prior to the expiration of that timer for any reason (including a successful
              * end of commissioning or an expiry of a fail-safe timer) shall also delete the CFSC timer.
              *
@@ -392,11 +619,11 @@ export namespace GeneralCommissioning {
              *       Server.
              *
              *   2. Revoke the temporary administrative privileges granted to any open PASE session (see Section
-             *       6.6.2.8, “Bootstrapping of the Access Control Cluster”) at the Server.
+             *       6.6.2.9, “Bootstrapping of the Access Control Cluster”) at the Server.
              *
              *   3. If an AddNOC or UpdateNOC command has been successfully invoked, terminate all CASE sessions
-             *       associated with the Fabric whose Fabric Index is recorded in the Fail-Safe context (see Section
-             *       11.10.6.2, “ArmFailSafe Command”) by clearing any associated Secure Session Context at the Server.
+             *       associated with the Fabric whose Fabric Index is recorded in the Fail-Safe context (see
+             *       ArmFailSafe) by clearing any associated Secure Session Context at the Server.
              *
              *   4. Reset the configuration of all Network Commissioning Networks attribute to their state prior to the
              *       Fail-Safe being armed.
@@ -422,11 +649,10 @@ export namespace GeneralCommissioning {
              *
              *   9. Reset the Breadcrumb attribute to zero.
              *
-             *   10. Optionally: if no factory-reset resulted from the previous steps, it is recommended that the
+             *   10. Optionally: if no factory-reset resulted from the previous steps, it is recommended that the Node
+             *       rollback the state of all non fabric-scoped data present in the Fail-Safe context.
              *
-             * Node rollback the state of all non fabric-scoped data present in the Fail-Safe context.
-             *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.6.2
+             * @see {@link MatterSpecification.v13.Core} § 11.10.7.2
              */
             armFailSafe: Command(
                 0x0,
@@ -452,8 +678,9 @@ export namespace GeneralCommissioning {
              * Location attribute reflected by the Basic Information Cluster configuration, but the
              * SetRegulatoryConfigResponse replied shall have the ErrorCode field set to ValueOutsideRange error.
              *
-             * If the LocationCapability attribute is not Indoor/Outdoor and the NewRegulatoryConfig value received
-             * does not match either the Indoor or Outdoor fixed value in LocationCapability, then the
+             * If the LocationCapability attribute is not Indoor/Outdoor and the NewRegulatoryConfig value
+             *
+             * received does not match either the Indoor or Outdoor fixed value in LocationCapability, then the
              * SetRegulatoryConfigResponse replied shall have the ErrorCode field set to ValueOutsideRange error and
              * the RegulatoryConfig attribute and associated internal radio configuration shall remain unchanged.
              *
@@ -467,7 +694,7 @@ export namespace GeneralCommissioning {
              * command, when SetRegulatoryConfigResponse has the ErrorCode field set to OK. If the command fails, the
              * Breadcrumb attribute shall be left unchanged.
              *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.6.4
+             * @see {@link MatterSpecification.v13.Core} § 11.10.7.4
              */
             setRegulatoryConfig: Command(
                 0x2,
@@ -488,15 +715,20 @@ export namespace GeneralCommissioning {
              * steps needed during the Fail-Safe period, such as commissioning (see Section 5.5, “Commissioning Flows”)
              * or other Administrator operations requiring usage of the Fail Safe timer. It ensures that the Server is
              * configured in a state such that it still has all necessary elements to be fully operable within a
-             * Fabric, such as ACL entries (see Access Control Cluster) and operational credentials (see Section 6.4,
-             * “Node Operational Credentials Specification”), and that the Node is reach
+             * Fabric, such as ACL entries (see Section 9.10, “Access Control Cluster”) and operational credentials
+             * (see Section 6.4, “Node Operational Credentials Specification”), and that the Node is reachable using
+             * CASE
              *
-             * able using CASE (see Section 4.14.2, “Certificate Authenticated Session Establishment (CASE)”) over an
-             * operational network.
+             * (CASE)”) over an operational network.
              *
              * An ErrorCode of NoFailSafe shall be responded to the invoker if the CommissioningComplete command was
              * received when no Fail-Safe context exists.
              *
+             * If Terms and Conditions are required, then an ErrorCode of TCAcknowledgementsNotReceived shall be
+             * responded to the invoker if the user acknowledgements to the required Terms and Conditions have not been
+             * provided. If the TCAcceptedVersion for the provided acknowledgements is less than TCMinRequiredVersion,
+             * then an ErrorCode of TCMinVersionNotMet shall be responded to the invoker.
+             *
              * This command is fabric-scoped, so cannot be issued over a session that does not have an associated
              * fabric, i.e. over PASE session prior to an AddNOC command. In addition, this command is only permitted
              * over CASE and must be issued by a node associated with the ongoing Fail-Safe context. An ErrorCode of
@@ -523,7 +755,7 @@ export namespace GeneralCommissioning {
              *   2. The commissioning window at the Server shall be closed.
              *
              *   3. Any temporary administrative privileges automatically granted to any open PASE session shall be
-             *      revoked (see Section 6.6.2.8, “Bootstrapping of the Access Control Cluster”).
+             *      revoked (see Section 6.6.2.9, “Bootstrapping of the Access Control Cluster”).
              *
              *   4. The Secure Session Context of any PASE session still established at the Server shall be cleared.
              *
@@ -533,7 +765,7 @@ export namespace GeneralCommissioning {
              * any previously established PASE session to still be usable, due to the server having cleared such
              * sessions.
              *
-             * @see {@link MatterSpecification.v13.Core} § 11.10.6.6
+             * @see {@link MatterSpecification.v13.Core} § 11.10.7.6
              */
             commissioningComplete: Command(
                 0x4,
@@ -542,9 +774,22 @@ export namespace GeneralCommissioning {
                 TlvCommissioningCompleteResponse,
                 { invokeAcl: AccessLevel.Administer }
             )
-        }
+        },
+
+        /**
+         * This metadata controls which GeneralCommissioningCluster elements matter.js activates for specific feature
+         * combinations.
+         */
+        extensions: MutableCluster.Extensions(
+            { flags: { termsAndConditions: true }, component: TermsAndConditionsComponent }
+        )
     });
 
+    /**
+     * @see {@link Cluster}
+     */
+    export const ClusterInstance = MutableCluster(Base);
+
     /**
      * This cluster is used to manage basic commissioning lifecycle.
      *
@@ -552,12 +797,67 @@ export namespace GeneralCommissioning {
      * clusters, like Section 11.9, “Network Commissioning Cluster”. It also hosts functionalities those other clusters
      * may depend on.
      *
+     * GeneralCommissioningCluster supports optional features that you can enable with the
+     * GeneralCommissioningCluster.with() factory method.
+     *
      * @see {@link MatterSpecification.v13.Core} § 11.10
      */
     export interface Cluster extends Identity<typeof ClusterInstance> {}
 
     export const Cluster: Cluster = ClusterInstance;
-    export const Complete = Cluster;
+    const TC = { termsAndConditions: true };
+
+    /**
+     * @see {@link Complete}
+     */
+    export const CompleteInstance = MutableCluster({
+        id: Cluster.id,
+        name: Cluster.name,
+        revision: Cluster.revision,
+        features: Cluster.features,
+
+        attributes: {
+            ...Cluster.attributes,
+            tcAcceptedVersion: MutableCluster.AsConditional(
+                TermsAndConditionsComponent.attributes.tcAcceptedVersion,
+                { mandatoryIf: [TC] }
+            ),
+            tcMinRequiredVersion: MutableCluster.AsConditional(
+                TermsAndConditionsComponent.attributes.tcMinRequiredVersion,
+                { mandatoryIf: [TC] }
+            ),
+            tcAcknowledgements: MutableCluster.AsConditional(
+                TermsAndConditionsComponent.attributes.tcAcknowledgements,
+                { mandatoryIf: [TC] }
+            ),
+            tcAcknowledgementsRequired: MutableCluster.AsConditional(
+                TermsAndConditionsComponent.attributes.tcAcknowledgementsRequired,
+                { mandatoryIf: [TC] }
+            ),
+            tcUpdateDeadline: MutableCluster.AsConditional(
+                TermsAndConditionsComponent.attributes.tcUpdateDeadline,
+                { mandatoryIf: [TC] }
+            )
+        },
+
+        commands: {
+            ...Cluster.commands,
+            setTcAcknowledgements: MutableCluster.AsConditional(
+                TermsAndConditionsComponent.commands.setTcAcknowledgements,
+                { mandatoryIf: [TC] }
+            )
+        }
+    });
+
+    /**
+     * This cluster supports all GeneralCommissioning features. It may support illegal feature combinations.
+     *
+     * If you use this cluster you must manually specify which features are active and ensure the set of active
+     * features is legal per the Matter specification.
+     */
+    export interface Complete extends Identity<typeof CompleteInstance> {}
+
+    export const Complete: Complete = CompleteInstance;
 }
 
 export type GeneralCommissioningCluster = GeneralCommissioning.Cluster;