@matter/model 0.16.0-alpha.0-20251023-bb23617e5 → 0.16.0-alpha.0-20251027-17770fb28

package/src/standard/resources/group-key-management.resource.ts

@@ -20,7 +20,8 @@ Resource.add({
         "\n" +
         "Each group entry includes a membership list of zero of more endpoints that are members of the group " +
         "on the node. Modification of this membership list is done via the Groups cluster, which is scoped to " +
-        "an endpoint. Please see the System Model specification for more information on groups.",
+        "an endpoint. See the Chapter 9, System Model Specification specification for more information on " +
+        "groups.",
 
     children: [
         {
@@ -40,7 +41,8 @@ Resource.add({
             tag: "attribute", name: "GroupTable", xref: "core§11.2.6.2",
 
             details: "This attribute is a list of GroupInfoMapStruct entries. Each entry provides read-only information " +
-                "about how a given logical Group ID maps to a particular set of endpoints, and a name for the group. " +
+                "about how a given logical Group ID maps to a particular set of endpoints, and a name for the group." +
+                "\n" +
                 "The content of this attribute reflects data managed via the Groups cluster (see AppClusters), and is " +
                 "in general terms referred to as the 'node-wide Group Table'." +
                 "\n" +
@@ -53,15 +55,16 @@ Resource.add({
             tag: "attribute", name: "MaxGroupsPerFabric", xref: "core§11.2.6.3",
             details: "Indicates the maximum number of groups that this node supports per fabric. The value of this " +
                 "attribute shall be set to be no less than the required minimum supported groups as specified in " +
-                "Group Limits. The length of the GroupKeyMap and GroupTable list attributes shall NOT exceed the " +
-                "value of the MaxGroupsPerFabric attribute multiplied by the number of supported fabrics."
+                "Section 2.11.1.2, “Group Limits”. The length of the GroupKeyMap and GroupTable list attributes shall " +
+                "NOT exceed the value of the MaxGroupsPerFabric attribute multiplied by the number of supported " +
+                "fabrics."
         },
 
         {
             tag: "attribute", name: "MaxGroupKeysPerFabric", xref: "core§11.2.6.4",
             details: "Indicates the maximum number of group key sets this node supports per fabric. The value of this " +
                 "attribute shall be set according to the minimum number of group key sets to support as specified in " +
-                "Group Limits."
+                "Section 2.11.1.2, “Group Limits”."
         },
 
         {
@@ -83,7 +86,8 @@ Resource.add({
                 "  • If the EpochStartTime0 is set to 0, then this command shall fail with an INVALID_COMMAND status " +
                 "    code responded to the client. Note that internally, a GroupKeySetStruct’s EpochStartTime0 may be " +
                 "    set to zero, due to the behavior of the AddNOC command which synthesizes a GroupKeySetStruct " +
-                "    (see IPKValue). However, the value 0 is illegal in the GroupKeySet field sent by a client." +
+                "    (see Section 11.18.6.8.1, “IPKValue Field”). However, the value 0 is illegal in the GroupKeySet " +
+                "    field sent by a client." +
                 "\n" +
                 "  • If the EpochKey1 field is not null, then the EpochKey0 field shall NOT be null. Otherwise this " +
                 "    command shall fail with an INVALID_COMMAND status code responded to the client." +
@@ -129,7 +133,7 @@ Resource.add({
                 "    to SUCCESS." +
                 "\n" +
                 "  • If there are insufficient resources on the receiver to store an additional Group Key Set, the " +
-                "    status code shall be set to RESOURCE_EXHAUSTED (see group key limits);" +
+                "    status code shall be set to RESOURCE_EXHAUSTED (see Section 2.11.1.2, “Group Limits”);" +
                 "\n" +
                 "  • Otherwise, this status code shall be set to FAILURE."
         },

package/src/standard/resources/heat-pump.resource.ts

@@ -20,7 +20,7 @@ Resource.add({
         "requirements, but that cannot be used for space heating.",
 
     children: [
-        { tag: "requirement", name: "Identify", xref: "device§14.5.6" },
-        { tag: "requirement", name: "Thermostat", xref: "device§14.5.6" }
+        { tag: "requirement", name: "Identify", xref: "device§14.5.7" },
+        { tag: "requirement", name: "Thermostat", xref: "device§14.5.7" }
     ]
 });

package/src/standard/resources/icd-management.resource.ts

@@ -9,7 +9,7 @@
 import { Resource } from "#models/Resource.js";
 
 Resource.add({
-    tag: "cluster", name: "IcdManagement", classification: "node", pics: "ICDM", xref: "core§9.17",
+    tag: "cluster", name: "IcdManagement", classification: "node", pics: "ICDM", xref: "core§9.16",
     details: "ICD Management Cluster enables configuration of the ICD’s behavior and ensuring that listed clients " +
         "can be notified when an intermittently connected device, ICD, is available for communication." +
         "\n" +
@@ -18,25 +18,25 @@ Resource.add({
 
     children: [
         {
-            tag: "attribute", name: "FeatureMap", xref: "core§9.17.4",
+            tag: "attribute", name: "FeatureMap", xref: "core§9.16.4",
 
             children: [
                 {
-                    tag: "field", name: "CIP", xref: "core§9.17.4.1",
+                    tag: "field", name: "CIP", xref: "core§9.16.4.1",
                     details: "When this feature is supported, the device shall support all the associated commands and attributes " +
                         "to properly support the Check-In Protocol."
                 },
                 {
-                    tag: "field", name: "UAT", xref: "core§9.17.4.2",
+                    tag: "field", name: "UAT", xref: "core§9.16.4.2",
                     details: "This feature is supported if and only if the device has a user active mode trigger."
                 },
                 {
-                    tag: "field", name: "LITS", xref: "core§9.17.4.3",
+                    tag: "field", name: "LITS", xref: "core§9.16.4.3",
                     details: "This feature is supported if and only the device is a Long Idle Time ICD."
                 },
 
                 {
-                    tag: "field", name: "DSLS", xref: "core§9.17.4.4",
+                    tag: "field", name: "DSLS", xref: "core§9.16.4.4",
                     details: "This feature is supported if and only if the device can switch between SIT and LIT operating modes " +
                         "even if it has a valid registered client. See the dynamic SIT / LIT operating mode switching for " +
                         "more details."
@@ -45,26 +45,26 @@ Resource.add({
         },
 
         {
-            tag: "attribute", name: "IdleModeDuration", xref: "core§9.17.6.1",
+            tag: "attribute", name: "IdleModeDuration", xref: "core§9.16.6.1",
             details: "Indicates the maximum interval in seconds the server can stay in idle mode. The IdleModeDuration " +
                 "shall NOT be smaller than the ActiveModeDuration."
         },
 
         {
-            tag: "attribute", name: "ActiveModeDuration", xref: "core§9.17.6.2",
+            tag: "attribute", name: "ActiveModeDuration", xref: "core§9.16.6.2",
             details: "Indicates the minimum interval in milliseconds the server typically will stay in active mode after " +
                 "initial transition out of idle mode. The ActiveModeDuration does not include the " +
                 "ActiveModeThreshold."
         },
 
         {
-            tag: "attribute", name: "ActiveModeThreshold", xref: "core§9.17.6.3",
+            tag: "attribute", name: "ActiveModeThreshold", xref: "core§9.16.6.3",
             details: "Indicates the minimum amount of time in milliseconds the server typically will stay active after " +
                 "network activity when in active mode."
         },
 
         {
-            tag: "attribute", name: "RegisteredClients", xref: "core§9.17.6.4",
+            tag: "attribute", name: "RegisteredClients", xref: "core§9.16.6.4",
             details: "This attribute shall contain all clients registered to receive notification if their subscription is " +
                 "lost. The maximum number of entries that can be in the list shall be ClientsSupportedPerFabric for " +
                 "each fabric supported on the server, as indicated by the value of the SupportedFabrics attribute in " +
@@ -72,17 +72,17 @@ Resource.add({
         },
 
         {
-            tag: "attribute", name: "IcdCounter", xref: "core§9.17.6.5",
+            tag: "attribute", name: "IcdCounter", xref: "core§9.16.6.5",
             details: "This attribute returns the value of the ICD Counter."
         },
         {
-            tag: "attribute", name: "ClientsSupportedPerFabric", xref: "core§9.17.6.6",
+            tag: "attribute", name: "ClientsSupportedPerFabric", xref: "core§9.16.6.6",
             details: "Indicates the maximum number of entries that the server is able to store for each fabric in the " +
                 "RegisteredClients attribute."
         },
 
         {
-            tag: "attribute", name: "UserActiveModeTriggerHint", xref: "core§9.17.6.7",
+            tag: "attribute", name: "UserActiveModeTriggerHint", xref: "core§9.16.6.7",
 
             details: "Indicates which user action(s) will trigger the ICD to switch to Active mode. If the attribute " +
                 "indicates support for a trigger that is dependent on the UserActiveModeTriggerInstruction in the " +
@@ -100,7 +100,7 @@ Resource.add({
         },
 
         {
-            tag: "attribute", name: "UserActiveModeTriggerInstruction", xref: "core§9.17.6.8",
+            tag: "attribute", name: "UserActiveModeTriggerInstruction", xref: "core§9.16.6.8",
 
             details: "The meaning of the attribute is dependent upon the UserActiveModeTriggerHint attribute value, and " +
                 "the conformance is in indicated in the \"dependency\" column in UserActiveModeTriggerHint table. The " +
@@ -111,9 +111,9 @@ Resource.add({
                 "or SetupButtonTimes set, the string shall consist solely of an encoding of N as a decimal unsigned " +
                 "integer using the ASCII digits 0-9, and without leading zeros." +
                 "\n" +
-                "For example, given UserActiveModeTriggerHint=\"2048\", ResetButtonTimes is set which indicates \"Press " +
-                "Reset Button for N seconds\". Therefore, a value of UserActiveModeTriggerInstruction=\"10\" would " +
-                "indicate that N is 10 in that context." +
+                "For example, given UserActiveModeTriggerHint=\"1024\", ResetButtonSeconds is set which indicates " +
+                "\"Press Reset Button for N seconds\". Therefore, a value of UserActiveModeTriggerInstruction=\"6\" would " +
+                "indicate that N is 6 in that context." +
                 "\n" +
                 "When CustomInstruction is set by the UserActiveModeTriggerHint attribute, indicating presence of a " +
                 "custom string, the ICD SHOULD perform localization (translation to user’s preferred language, as " +
@@ -128,8 +128,8 @@ Resource.add({
         },
 
         {
-            tag: "attribute", name: "OperatingMode", xref: "core§9.17.6.9",
-            details: "This attribute shall indicate the operating mode of the ICD as specified in the OperatingModeEnum." +
+            tag: "attribute", name: "OperatingMode", xref: "core§9.16.6.9",
+            details: "Indicates the operating mode of the ICD as specified in the OperatingModeEnum." +
                 "\n" +
                 "  • If the ICD is operating as a LIT ICD, OperatingMode shall be LIT." +
                 "\n" +
@@ -137,7 +137,7 @@ Resource.add({
         },
 
         {
-            tag: "attribute", name: "MaximumCheckInBackoff", xref: "core§9.17.6.10",
+            tag: "attribute", name: "MaximumCheckInBackoff", xref: "core§9.16.6.10",
             details: "Indicates the maximum time in seconds between two Check-In messages when back-off is active. The " +
                 "MaximumCheckInBackoff shall NOT be smaller than the IdleModeDuration." +
                 "\n" +
@@ -145,28 +145,28 @@ Resource.add({
         },
 
         {
-            tag: "command", name: "RegisterClient", xref: "core§9.17.7.1",
+            tag: "command", name: "RegisterClient", xref: "core§9.16.7.1",
             details: "This command allows a client to register itself with the ICD to be notified when the device is " +
                 "available for communication.",
 
             children: [
                 {
-                    tag: "field", name: "CheckInNodeId", xref: "core§9.17.7.1.1",
+                    tag: "field", name: "CheckInNodeId", xref: "core§9.16.7.1.1",
                     details: "This field shall provide the node ID to which a Check-In message will be sent if there are no active " +
                         "subscriptions matching MonitoredSubject."
                 },
                 {
-                    tag: "field", name: "MonitoredSubject", xref: "core§9.17.7.1.2",
+                    tag: "field", name: "MonitoredSubject", xref: "core§9.16.7.1.2",
                     details: "This field shall provide the monitored subject ID."
                 },
                 {
-                    tag: "field", name: "Key", xref: "core§9.17.7.1.3",
-                    details: "This field shall provide the shared secret between the client and the ICD to encrypt the Check-In " +
-                        "message."
+                    tag: "field", name: "Key", xref: "core§9.16.7.1.3",
+                    details: "This field shall contain the ICDToken, a 128-bit symmetric key shared by the ICD and the ICD Client, " +
+                        "used to encrypt Check-In messages from this ICD to the MonitoredSubject."
                 },
 
                 {
-                    tag: "field", name: "VerificationKey", xref: "core§9.17.7.1.4",
+                    tag: "field", name: "VerificationKey", xref: "core§9.16.7.1.4",
 
                     details: "This field shall provide the verification key. The verification key represents the key already " +
                         "stored on the server. The verification key provided in this field shall be used by the server to " +
@@ -178,20 +178,86 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "ClientType", xref: "core§9.17.7.1.5",
-                    details: "This field shall provide the client type of the client registering."
+                    tag: "field", name: "ClientType", xref: "core§9.16.7.1.5",
+
+                    details: "This field shall provide the client type of the client registering." +
+                        "\n" +
+                        "### Effect on Receipt" +
+                        "\n" +
+                        "On receipt of the RegisterClient command, the server shall perform the following procedure:" +
+                        "\n" +
+                        "  1. The server verifies that an entry for the fabric is available in the server’s list of " +
+                        "     registered clients." +
+                        "\n" +
+                        "    a. If one of the entries in storage for the fabric has the same CheckInNodeID as the received " +
+                        "       CheckInNodeID, the server shall continue from step 2." +
+                        "\n" +
+                        "    b. If there is an available entry for the fabric, an entry is created for the fabric and the " +
+                        "       received CheckInNodeID, MonitoredSubject, Key and ClientType are stored. The server shall " +
+                        "       continue from step 5." +
+                        "\n" +
+                        "    c. If there are no available entries for the fabric, the status shall be RESOURCE_EXHAUSTED and " +
+                        "       the server shall continue from step 6." +
+                        "\n" +
+                        "  2. The server shall verify the privileges of the command’s ISD." +
+                        "\n" +
+                        "    a. If the ISD of the command has administrator privileges for the server cluster, the server " +
+                        "       shall continue from step 4." +
+                        "\n" +
+                        "    b. If the ISD of the command does not have administrator privileges for the server cluster, the " +
+                        "       server shall continue from step 3." +
+                        "\n" +
+                        "  3. The server shall verify that the received verification key is equal to the key previously " +
+                        "     stored in the list of registered clients with the matching CheckInNodeID." +
+                        "\n" +
+                        "    a. If the verification key does not have a valid value, the status shall be FAILURE. the server " +
+                        "       shall continue from step 6." +
+                        "\n" +
+                        "    b. If the verification key is not equal to the Key value stored in the entry, the status shall " +
+                        "       be FAILURE. The server shall continue from step 6." +
+                        "\n" +
+                        "    c. If the verification key is equal to the Key value stored in the entry, the server shall " +
+                        "       continue from step 4." +
+                        "\n" +
+                        "  4. The entry shall be updated with the received CheckInNodeID, MonitoredSubject, Key and " +
+                        "     ClientType." +
+                        "\n" +
+                        "    a. If the update fails, the status shall be FAILURE. The server shall continue from step 6." +
+                        "\n" +
+                        "    b. If the update succeeds, the server shall continue from step 5." +
+                        "\n" +
+                        "  5. The server shall persist the client information." +
+                        "\n" +
+                        "    a. If the persistence fails, the status shall be FAILURE and the server shall continue from step " +
+                        "       6." +
+                        "\n" +
+                        "    b. If the persistence succeeds, the status shall be SUCCESS and the server shall continue from " +
+                        "       step 6." +
+                        "\n" +
+                        "  6. The server shall generate a response." +
+                        "\n" +
+                        "    a. If the status is SUCCESS, the server shall generate a RegisterClientResponse command." +
+                        "\n" +
+                        "    b. If the status is not SUCCESS, the server shall generate a default response with the Status " +
+                        "       field set to the evaluated error status."
                 }
             ]
         },
 
         {
-            tag: "command", name: "RegisterClientResponse", xref: "core§9.17.7.2",
+            tag: "command", name: "RegisterClientResponse", xref: "core§9.16.7.2",
+
             details: "This command shall be sent by the ICD Management Cluster server in response to a successful " +
-                "RegisterClient command."
+                "RegisterClient command." +
+                "\n" +
+                "### When Generated" +
+                "\n" +
+                "This command shall be generated in response to a successful RegisterClient command. The ICDCounter " +
+                "field shall be set to the ICDCounter attribute of the server."
         },
 
         {
-            tag: "command", name: "UnregisterClient", xref: "core§9.17.7.3",
+            tag: "command", name: "UnregisterClient", xref: "core§9.16.7.3",
             details: "This command allows a client to unregister itself with the ICD. Example: a client that is leaving " +
                 "the network (e.g. running on a phone which is leaving the home) can (and should) remove its " +
                 "subscriptions and send this UnregisterClient command before leaving to prevent the burden on the ICD " +
@@ -199,12 +265,12 @@ Resource.add({
 
             children: [
                 {
-                    tag: "field", name: "CheckInNodeId", xref: "core§9.17.7.3.1",
+                    tag: "field", name: "CheckInNodeId", xref: "core§9.16.7.3.1",
                     details: "This field shall provide the registered client node ID to remove from storage."
                 },
 
                 {
-                    tag: "field", name: "VerificationKey", xref: "core§9.17.7.3.2",
+                    tag: "field", name: "VerificationKey", xref: "core§9.16.7.3.2",
 
                     details: "This field shall provide the verification key associated with the CheckInNodeID to remove from " +
                         "storage. The verification key represents the key already stored on the server. The verification key " +
@@ -213,13 +279,68 @@ Resource.add({
                         "shall be provided for clients with manage permissions. The verification key SHOULD NOT be provided " +
                         "by clients with administrator permissions for the server cluster. The verification key shall be " +
                         "ignored by the server if it is provided by a client with administrator permissions for the server " +
-                        "cluster."
+                        "cluster." +
+                        "\n" +
+                        "### Effect on Receipt" +
+                        "\n" +
+                        "On receipt of the UnregisterClient command, the server shall perform the following procedure:" +
+                        "\n" +
+                        "  1. The server shall check whether there is a entry stored on the device for the fabric with the " +
+                        "     same CheckInNodeID." +
+                        "\n" +
+                        "    a. If there are no entries stored for the fabric, the status shall be NOT_FOUND. The server " +
+                        "       shall continue from step 6." +
+                        "\n" +
+                        "    b. If there is an error when reading from storage, the status shall be FAILURE. The server shall " +
+                        "       continue from step 6." +
+                        "\n" +
+                        "    c. If there is at least one entry stored on the server for the fabric, the server shall continue " +
+                        "       from step 2." +
+                        "\n" +
+                        "  2. The server shall verify if one of the entries for the fabric has the corresponding " +
+                        "     CheckInNodeID received in the command." +
+                        "\n" +
+                        "    a. If no entries have the corresponding CheckInNodeID, the status shall be NOT_FOUND. The server " +
+                        "       shall continue from step 6." +
+                        "\n" +
+                        "    b. If an entry has the corresponding CheckInNodeID, the server shall continue to step 3." +
+                        "\n" +
+                        "  3. The server shall check whether the ISD of the command has administrator permissions for the " +
+                        "     server cluster." +
+                        "\n" +
+                        "    a. If the ISD of the command has administrator privileges for the server cluster, the server " +
+                        "       shall continue from step 5." +
+                        "\n" +
+                        "    b. If the ISD of the command does not have administrator privileges for the server cluster, the " +
+                        "       server shall continue from step 4." +
+                        "\n" +
+                        "  4. The server shall verify that the received verification key is equal to the key previously " +
+                        "     stored in the list of registered clients with the matching CheckInNodeID." +
+                        "\n" +
+                        "    a. If the verification key does not have a valid value, the status shall be FAILURE. the server " +
+                        "       shall continue from step 6." +
+                        "\n" +
+                        "    b. If the verification key is not equal to the Key value stored in the entry, the status shall " +
+                        "       be FAILURE. The server shall continue from step 6." +
+                        "\n" +
+                        "    c. If the verification key is equal to the Key value stored in the entry, the server shall " +
+                        "       continue from step 5." +
+                        "\n" +
+                        "  5. The server shall delete the entry with the matching CheckInNodeID from storage and will persist " +
+                        "     the change." +
+                        "\n" +
+                        "    a. If the removal of the entry fails, the status shall be FAILURE. The server shall continue " +
+                        "       from step 6." +
+                        "\n" +
+                        "    b. If the removal succeeds, the status shall be SUCCESS and the server shall continue to step 6." +
+                        "\n" +
+                        "  6. The server shall generate a response with the Status field set to the evaluated status."
                 }
             ]
         },
 
         {
-            tag: "command", name: "StayActiveRequest", xref: "core§9.17.7.4",
+            tag: "command", name: "StayActiveRequest", xref: "core§9.16.7.4",
 
             details: "This command allows a client to request that the server stays in active mode for at least a given " +
                 "time duration (in milliseconds) from when this command is received." +
@@ -227,26 +348,47 @@ Resource.add({
                 "This StayActiveDuration may be longer than the ActiveModeThreshold value and would, typically, be " +
                 "used by the client to request the server to stay active and responsive for this period to allow a " +
                 "sequence of message exchanges during that period. The client may slightly overestimate the duration " +
-                "it wants the ICD to be active for, in order to account for network delays."
+                "it wants the ICD to be active for, in order to account for network delays." +
+                "\n" +
+                "### Effect on Receipt" +
+                "\n" +
+                "When receiving a StayActiveRequest command, the server shall calculate the maximum " +
+                "PromisedActiveDuration it can remain active as the greater of the following two values:" +
+                "\n" +
+                "  • StayActiveDuration: Specified in the received command by the client." +
+                "\n" +
+                "  • Remaining Active Time: The server’s planned remaining active time based on the " +
+                "    ActiveModeThreshold and its internal resources and power budget." +
+                "\n" +
+                "A server may replace StayActiveDuration with Minimum Active Duration in the above calculation." +
+                "\n" +
+                "PromisedActiveDuration represents the guaranteed minimum time the server will remain active, taking " +
+                "into account both the requested duration and the server’s capabilities." +
+                "\n" +
+                "The ICD shall report the calculated PromisedActiveDuration in a StayActiveResponse message back to " +
+                "the client."
         },
 
         {
-            tag: "command", name: "StayActiveResponse", xref: "core§9.17.7.5",
+            tag: "command", name: "StayActiveResponse", xref: "core§9.16.7.5",
             details: "This message shall be sent by the ICD in response to the StayActiveRequest command and shall contain " +
                 "the computed duration (in milliseconds) that the ICD intends to stay active for.",
 
             children: [{
-                tag: "field", name: "PromisedActiveDuration", xref: "core§9.17.7.5.1",
+                tag: "field", name: "PromisedActiveDuration", xref: "core§9.16.7.5.1",
+
                 details: "This field shall provide the actual duration that the ICD server can stay active from the time it " +
                     "receives the StayActiveRequest command." +
                     "\n" +
+                    "### Minimum Value for PromisedActiveDuration" +
+                    "\n" +
                     "The minimum value of the PromisedActiveDuration field shall be equal to either 30000 milliseconds or " +
                     "StayActiveDuration (from the received StayActiveRequest command), whichever is smaller."
             }]
         },
 
         {
-            tag: "datatype", name: "UserActiveModeTriggerBitmap", xref: "core§9.17.5.1",
+            tag: "datatype", name: "UserActiveModeTriggerBitmap", xref: "core§9.16.5.1",
             details: "See the UserActiveModeTriggerHint table for requirements associated to each bit.",
 
             children: [
@@ -319,7 +461,7 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "ClientTypeEnum", xref: "core§9.17.5.1.1",
+            tag: "datatype", name: "ClientTypeEnum", xref: "core§9.16.5.1.1",
 
             children: [
                 {
@@ -334,7 +476,7 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "OperatingModeEnum", xref: "core§9.17.5.2",
+            tag: "datatype", name: "OperatingModeEnum", xref: "core§9.16.5.2",
             children: [
                 { tag: "field", name: "Sit", description: "ICD is operating as a Short Idle Time ICD." },
                 { tag: "field", name: "Lit", description: "ICD is operating as a Long Idle Time ICD." }
@@ -342,17 +484,17 @@ Resource.add({
         },
 
         {
-            tag: "datatype", name: "MonitoringRegistrationStruct", xref: "core§9.17.5.3",
+            tag: "datatype", name: "MonitoringRegistrationStruct", xref: "core§9.16.5.3",
 
             children: [
                 {
-                    tag: "field", name: "CheckInNodeId", xref: "core§9.17.5.3.1",
+                    tag: "field", name: "CheckInNodeId", xref: "core§9.16.5.3.1",
                     details: "This field shall indicate the NodeID of the Node to which Check-In messages will be sent when the " +
                         "MonitoredSubject is not subscribed."
                 },
 
                 {
-                    tag: "field", name: "MonitoredSubject", xref: "core§9.17.5.3.2",
+                    tag: "field", name: "MonitoredSubject", xref: "core§9.16.5.3.2",
 
                     details: "This field shall indicate the monitored Subject ID. This field shall be used to determine if a " +
                         "particular client has an active subscription for the given entry. The MonitoredSubject, when it is a " +
@@ -375,7 +517,11 @@ Resource.add({
                 },
 
                 {
-                    tag: "field", name: "ClientType", xref: "core§9.17.5.4",
+                    tag: "field", name: "Key", xref: "core§9.16.5.3.3",
+                    details: "This field is deprecated. Use the RegisterClient command to set the ICDToken."
+                },
+                {
+                    tag: "field", name: "ClientType", xref: "core§9.16.5.3.4",
                     details: "This field shall indicate the client’s type to inform the ICD of the availability for communication " +
                         "of the client."
                 }

package/src/standard/resources/identify.resource.ts

@@ -34,7 +34,18 @@ Resource.add({
                 "IdentifyTime attribute shall be decremented every second while in this state." +
                 "\n" +
                 "If this attribute reaches or is set to the value 0 then the device shall terminate its " +
-                "identification state."
+                "identification state." +
+                "\n" +
+                "Changes to this attribute shall only be marked as reportable in the following cases:" +
+                "\n" +
+                "  • When it changes from 0 to any other value and vice versa, or" +
+                "\n" +
+                "  • When it is written by a client, or" +
+                "\n" +
+                "  • When the value is set by an Identify command." +
+                "\n" +
+                "Since 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."
         },
 
         {

package/src/standard/resources/index.ts

@@ -49,7 +49,6 @@ import "./smoke-co-alarm-cluster.resource.js";
 import "./electrical-energy-measurement.resource.js";
 import "./electrical-power-measurement.resource.js";
 import "./color-control.resource.js";
-import "./ballast-configuration.resource.js";
 import "./pump-configuration-and-control.resource.js";
 import "./thermostat-cluster.resource.js";
 import "./fan-control.resource.js";
@@ -102,9 +101,6 @@ import "./user-label.resource.js";
 import "./access-control.resource.js";
 import "./bridged-device-basic-information.resource.js";
 import "./actions.resource.js";
-import "./proxy-discovery.resource.js";
-import "./proxy-configuration.resource.js";
-import "./valid-proxies.resource.js";
 import "./icd-management.resource.js";
 import "./ecosystem-information.resource.js";
 import "./basic-information.resource.js";
@@ -129,7 +125,7 @@ import "./administrator-commissioning.resource.js";
 import "./ota-software-update-provider.resource.js";
 import "./ota-software-update-requestor.resource.js";
 import "./joint-fabric-datastore.resource.js";
-import "./joint-fabric-pki.resource.js";
+import "./joint-fabric-administrator-cluster.resource.js";
 import "./commissioner-control.resource.js";
 import "./measurement-type-enum.resource.js";
 import "./measurement-accuracy-range-struct.resource.js";
@@ -164,8 +160,6 @@ import "./list.resource.js";
 import "./struct.resource.js";
 import "./percent.resource.js";
 import "./percent100ths.resource.js";
-import "./tod.resource.js";
-import "./date.resource.js";
 import "./epoch-us.resource.js";
 import "./epoch-s.resource.js";
 import "./posix-ms.resource.js";
@@ -177,6 +171,11 @@ import "./power-m-w.resource.js";
 import "./amperage-m-a.resource.js";
 import "./voltage-m-v.resource.js";
 import "./energy-m-wh.resource.js";
+import "./power-m-va.resource.js";
+import "./energy-m-vah.resource.js";
+import "./power-m-var.resource.js";
+import "./energy-m-varh.resource.js";
+import "./money.resource.js";
 import "./enum8.resource.js";
 import "./enum16.resource.js";
 import "./priority.resource.js";
@@ -195,9 +194,13 @@ import "./command-id.resource.js";
 import "./action-id.resource.js";
 import "./trans-id.resource.js";
 import "./node-id.resource.js";
+import "./subject-id.resource.js";
 import "./entry-idx.resource.js";
 import "./data-ver.resource.js";
 import "./event-no.resource.js";
+import "./namespace.resource.js";
+import "./tag.resource.js";
+import "./three-level-auto-enum.resource.js";
 import "./string.resource.js";
 import "./ipadr.resource.js";
 import "./ipv4adr.resource.js";
@@ -205,14 +208,13 @@ import "./ipv6adr.resource.js";
 import "./ipv6pre.resource.js";
 import "./hwadr.resource.js";
 import "./semtag.resource.js";
-import "./namespace.resource.js";
-import "./tag.resource.js";
 import "./locationdesc.resource.js";
+import "./currency.resource.js";
+import "./price.resource.js";
 import "./wildcard-path-flags-bitmap.resource.js";
 import "./software-version-certification-status-enum.resource.js";
 import "./any.resource.js";
-import "./interval.resource.js";
-import "./subject-id.resource.js";
+import "./duration.resource.js";
 import "./cluster-revision.resource.js";
 import "./feature-map.resource.js";
 import "./attribute-list.resource.js";
@@ -229,7 +231,7 @@ import "./bridged-node.resource.js";
 import "./electrical-sensor.resource.js";
 import "./device-energy-management-device.resource.js";
 import "./secondary-network-interface.resource.js";
-import "./joint-fabric-administrator.resource.js";
+import "./joint-fabric-administrator-device.resource.js";
 import "./on-off-light.resource.js";
 import "./dimmable-light.resource.js";
 import "./color-temperature-light.resource.js";
@@ -266,6 +268,7 @@ import "./window-covering-controller.resource.js";
 import "./thermostat-device.resource.js";
 import "./fan.resource.js";
 import "./air-purifier.resource.js";
+import "./thermostat-controller.resource.js";
 import "./basic-video-player.resource.js";
 import "./casting-video-player.resource.js";
 import "./speaker.resource.js";