From 0d403991af102d6d0a2aa0c17e8a4296d9f25d76 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Mon, 27 Jul 2026 16:57:59 +0200
Subject: [PATCH 1/2] chore(deprecation): move removal notices to 0.19 and mark
 the legacy controller API

Deprecation notices that announced removal in 0.18 now announce 0.19, and the
surfaces that were deprecated without a removal version get one where the
decision is settled.

- @project-chip/matter.js: every exported class, type, enum and function of the
  legacy controller API is now marked deprecated for 0.19 (CommissioningController,
  PairedNode, MatterController, PaseCommissioner, the controller stores, cluster
  clients, InteractionClient and the device layer). Only the DecodedDataReport
  adapters are excluded - they are the canonical target of the @matter/protocol
  decoder notices.
- @matter/types: the ClusterType() factory compat layer (RetiredClusterType,
  RetiredElements, the TLV element reverse mapping) and the generated Cluster /
  Complete / <Name>Cluster aliases are marked for 0.19. Cluster definitions
  regenerated accordingly.
- @matter/protocol: the legacy ClusterType command request surface and
  SessionManager.owner are marked for 0.19.
- @matter/node: StructManager.assertDirectReadAuthorized() and the direct-read
  authorization mechanism behind it are removed - the export had no callers and
  AUTHORIZE_READ plus propertyAccessControls existed only to serve it.

Also fixes a mistyped @deprected tag on a PeerConnectionOptions member, so that
member is now actually flagged, and refreshes the 0.8 migration guide intro,
which still claimed the legacy device API was pending removal (it went in 0.13)
and that the controller API was unchanged.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 CHANGELOG.md                                  | 19 +++++-
 docs/MIGRATION_GUIDE_08.md                    | 11 ++--
 .../matter.js/src/CommissioningController.ts  | 33 +++++++++--
 packages/matter.js/src/ControllerStore.ts     |  5 ++
 .../matter.js/src/LegacyControllerStore.ts    |  2 +
 packages/matter.js/src/MatterController.ts    | 14 ++++-
 packages/matter.js/src/PaseCommissioner.ts    |  2 +
 .../src/cluster/client/AttributeClient.ts     |  8 +++
 .../src/cluster/client/ClusterClient.ts       | 12 ++++
 .../src/cluster/client/ClusterClientTypes.ts  | 13 +++++
 .../src/cluster/client/EventClient.ts         |  4 ++
 .../src/cluster/client/InteractionClient.ts   | 27 +++++++--
 packages/matter.js/src/device/Aggregator.ts   |  2 +
 .../matter.js/src/device/ComposedDevice.ts    |  2 +
 packages/matter.js/src/device/Device.ts       |  6 ++
 .../matter.js/src/device/DeviceInformation.ts |  6 ++
 packages/matter.js/src/device/DeviceTypes.ts  | 15 ++++-
 packages/matter.js/src/device/Endpoint.ts     |  6 ++
 packages/matter.js/src/device/PairedNode.ts   | 24 ++++++--
 packages/matter.js/src/device/TypeHelpers.ts  |  3 +
 .../state/managed/values/StructManager.ts     | 46 +--------------
 .../src/node/client/ClientNodeInteraction.ts  |  4 +-
 packages/nodejs-shell/README.md               |  2 +-
 .../protocol/src/action/request/Invoke.ts     |  8 +--
 .../protocol/src/action/request/Specifier.ts  |  2 +-
 .../src/interaction/AttributeDataDecoder.ts   | 14 ++---
 .../src/interaction/DecodedDataReport.ts      |  4 +-
 .../src/interaction/EventDataDecoder.ts       | 16 ++---
 .../protocol/src/session/SessionManager.ts    |  4 +-
 packages/types/src/cluster/ClusterType.ts     | 14 ++---
 .../types/src/cluster/RetiredClusterType.ts   |  8 +--
 packages/types/src/cluster/RetiredElements.ts | 58 +++++++++----------
 .../types/src/clusters/access-control.d.ts    |  6 +-
 .../types/src/clusters/account-login.d.ts     |  6 +-
 packages/types/src/clusters/actions.d.ts      |  6 +-
 .../activated-carbon-filter-monitoring.d.ts   |  6 +-
 .../clusters/administrator-commissioning.d.ts |  6 +-
 packages/types/src/clusters/air-quality.d.ts  |  6 +-
 packages/types/src/clusters/alarm-base.d.ts   |  2 +-
 .../src/clusters/ambient-context-sensing.d.ts |  6 +-
 .../types/src/clusters/application-basic.d.ts |  6 +-
 .../src/clusters/application-launcher.d.ts    |  6 +-
 packages/types/src/clusters/audio-output.d.ts |  6 +-
 .../types/src/clusters/basic-information.d.ts |  6 +-
 packages/types/src/clusters/binding.d.ts      |  6 +-
 .../clusters/boolean-state-configuration.d.ts |  6 +-
 .../types/src/clusters/boolean-state.d.ts     |  6 +-
 .../bridged-device-basic-information.d.ts     |  6 +-
 ...era-av-settings-user-level-management.d.ts |  6 +-
 .../clusters/camera-av-stream-management.d.ts |  6 +-
 ...bon-dioxide-concentration-measurement.d.ts |  6 +-
 ...on-monoxide-concentration-measurement.d.ts |  6 +-
 packages/types/src/clusters/channel.d.ts      |  6 +-
 packages/types/src/clusters/chime.d.ts        |  6 +-
 .../types/src/clusters/closure-control.d.ts   |  6 +-
 .../types/src/clusters/closure-dimension.d.ts |  6 +-
 .../types/src/clusters/color-control.d.ts     |  6 +-
 .../src/clusters/commissioner-control.d.ts    |  6 +-
 .../src/clusters/commodity-metering.d.ts      |  6 +-
 .../types/src/clusters/commodity-price.d.ts   |  6 +-
 .../types/src/clusters/commodity-tariff.d.ts  |  6 +-
 .../clusters/concentration-measurement.d.ts   |  2 +-
 .../src/clusters/content-app-observer.d.ts    |  6 +-
 .../types/src/clusters/content-control.d.ts   |  6 +-
 .../types/src/clusters/content-launcher.d.ts  |  6 +-
 packages/types/src/clusters/descriptor.d.ts   |  6 +-
 .../device-energy-management-mode.d.ts        |  6 +-
 .../clusters/device-energy-management.d.ts    |  6 +-
 .../types/src/clusters/diagnostic-logs.d.ts   |  6 +-
 .../types/src/clusters/dishwasher-alarm.d.ts  |  6 +-
 .../types/src/clusters/dishwasher-mode.d.ts   |  6 +-
 packages/types/src/clusters/door-lock.d.ts    |  6 +-
 .../src/clusters/ecosystem-information.d.ts   |  6 +-
 .../electrical-energy-measurement.d.ts        |  6 +-
 .../clusters/electrical-grid-conditions.d.ts  |  6 +-
 .../electrical-power-measurement.d.ts         |  6 +-
 .../types/src/clusters/energy-evse-mode.d.ts  |  6 +-
 packages/types/src/clusters/energy-evse.d.ts  |  6 +-
 .../types/src/clusters/energy-preference.d.ts |  6 +-
 .../ethernet-network-diagnostics.d.ts         |  6 +-
 packages/types/src/clusters/fan-control.d.ts  |  6 +-
 packages/types/src/clusters/fixed-label.d.ts  |  6 +-
 .../types/src/clusters/flow-measurement.d.ts  |  6 +-
 ...ormaldehyde-concentration-measurement.d.ts |  6 +-
 .../src/clusters/general-commissioning.d.ts   |  6 +-
 .../src/clusters/general-diagnostics.d.ts     |  6 +-
 .../src/clusters/group-key-management.d.ts    |  6 +-
 packages/types/src/clusters/groupcast.d.ts    |  6 +-
 packages/types/src/clusters/groups.d.ts       |  6 +-
 .../src/clusters/hepa-filter-monitoring.d.ts  |  6 +-
 .../types/src/clusters/icd-management.d.ts    |  6 +-
 packages/types/src/clusters/identify.d.ts     |  6 +-
 .../src/clusters/illuminance-measurement.d.ts |  6 +-
 .../clusters/joint-fabric-administrator.d.ts  |  6 +-
 .../src/clusters/joint-fabric-datastore.d.ts  |  6 +-
 packages/types/src/clusters/keypad-input.d.ts |  6 +-
 packages/types/src/clusters/label.d.ts        |  2 +-
 .../src/clusters/laundry-dryer-controls.d.ts  |  6 +-
 .../src/clusters/laundry-washer-controls.d.ts |  6 +-
 .../src/clusters/laundry-washer-mode.d.ts     |  6 +-
 .../types/src/clusters/level-control.d.ts     |  6 +-
 .../clusters/localization-configuration.d.ts  |  6 +-
 packages/types/src/clusters/low-power.d.ts    |  6 +-
 packages/types/src/clusters/media-input.d.ts  |  6 +-
 .../types/src/clusters/media-playback.d.ts    |  6 +-
 packages/types/src/clusters/messages.d.ts     |  6 +-
 .../src/clusters/meter-identification.d.ts    |  6 +-
 .../src/clusters/microwave-oven-control.d.ts  |  6 +-
 .../src/clusters/microwave-oven-mode.d.ts     |  6 +-
 packages/types/src/clusters/mode-base.d.ts    |  2 +-
 packages/types/src/clusters/mode-select.d.ts  |  6 +-
 .../src/clusters/network-commissioning.d.ts   |  6 +-
 ...gen-dioxide-concentration-measurement.d.ts |  6 +-
 .../types/src/clusters/occupancy-sensing.d.ts |  6 +-
 packages/types/src/clusters/on-off.d.ts       |  6 +-
 .../src/clusters/operational-credentials.d.ts |  6 +-
 .../types/src/clusters/operational-state.d.ts |  6 +-
 .../ota-software-update-provider.d.ts         |  6 +-
 .../ota-software-update-requestor.d.ts        |  6 +-
 .../oven-cavity-operational-state.d.ts        |  6 +-
 packages/types/src/clusters/oven-mode.d.ts    |  6 +-
 .../ozone-concentration-measurement.d.ts      |  6 +-
 .../pm1-concentration-measurement.d.ts        |  6 +-
 .../pm10-concentration-measurement.d.ts       |  6 +-
 .../pm25-concentration-measurement.d.ts       |  6 +-
 .../clusters/power-source-configuration.d.ts  |  6 +-
 packages/types/src/clusters/power-source.d.ts |  6 +-
 .../types/src/clusters/power-topology.d.ts    |  6 +-
 .../src/clusters/pressure-measurement.d.ts    |  6 +-
 .../pump-configuration-and-control.d.ts       |  6 +-
 .../clusters/push-av-stream-transport.d.ts    |  6 +-
 .../radon-concentration-measurement.d.ts      |  6 +-
 .../src/clusters/refrigerator-alarm.d.ts      |  6 +-
 ...d-temperature-controlled-cabinet-mode.d.ts |  6 +-
 .../relative-humidity-measurement.d.ts        |  6 +-
 .../src/clusters/resource-monitoring.d.ts     |  2 +-
 .../types/src/clusters/rvc-clean-mode.d.ts    |  6 +-
 .../src/clusters/rvc-operational-state.d.ts   |  6 +-
 packages/types/src/clusters/rvc-run-mode.d.ts |  6 +-
 .../types/src/clusters/scenes-management.d.ts |  6 +-
 packages/types/src/clusters/service-area.d.ts |  6 +-
 .../types/src/clusters/smoke-co-alarm.d.ts    |  6 +-
 .../src/clusters/software-diagnostics.d.ts    |  6 +-
 .../types/src/clusters/soil-measurement.d.ts  |  6 +-
 packages/types/src/clusters/switch.d.ts       |  6 +-
 .../types/src/clusters/target-navigator.d.ts  |  6 +-
 .../types/src/clusters/temperature-alarm.d.ts |  6 +-
 .../src/clusters/temperature-control.d.ts     |  6 +-
 .../src/clusters/temperature-measurement.d.ts |  6 +-
 ...ermostat-user-interface-configuration.d.ts |  6 +-
 packages/types/src/clusters/thermostat.d.ts   |  6 +-
 .../thread-border-router-management.d.ts      |  6 +-
 .../clusters/thread-network-diagnostics.d.ts  |  6 +-
 .../clusters/thread-network-directory.d.ts    |  6 +-
 .../clusters/time-format-localization.d.ts    |  6 +-
 .../src/clusters/time-synchronization.d.ts    |  6 +-
 .../clusters/tls-certificate-management.d.ts  |  6 +-
 .../src/clusters/tls-client-management.d.ts   |  6 +-
 ...c-compounds-concentration-measurement.d.ts |  6 +-
 .../types/src/clusters/unit-localization.d.ts |  6 +-
 packages/types/src/clusters/user-label.d.ts   |  6 +-
 .../valve-configuration-and-control.d.ts      |  6 +-
 packages/types/src/clusters/wake-on-lan.d.ts  |  6 +-
 .../src/clusters/water-heater-management.d.ts |  6 +-
 .../types/src/clusters/water-heater-mode.d.ts |  6 +-
 .../clusters/water-tank-level-monitoring.d.ts |  6 +-
 .../web-rtc-transport-definitions.d.ts        |  2 +-
 .../clusters/web-rtc-transport-provider.d.ts  |  6 +-
 .../clusters/web-rtc-transport-requestor.d.ts |  6 +-
 .../clusters/wi-fi-network-diagnostics.d.ts   |  6 +-
 .../clusters/wi-fi-network-management.d.ts    |  6 +-
 .../types/src/clusters/window-covering.d.ts   |  6 +-
 .../types/src/clusters/zone-management.d.ts   |  6 +-
 packages/types/src/tlv/TlvArray.ts            |  2 +-
 packages/types/src/tlv/TlvBoolean.ts          |  2 +-
 packages/types/src/tlv/TlvNullable.ts         |  2 +-
 packages/types/src/tlv/TlvNumber.ts           |  2 +-
 packages/types/src/tlv/TlvObject.ts           |  2 +-
 packages/types/src/tlv/TlvSchema.ts           |  5 +-
 packages/types/src/tlv/TlvString.ts           |  2 +-
 packages/types/src/tlv/TlvWrapper.ts          |  2 +-
 .../codegen/src/clusters/generate-cluster.ts  | 12 ++--
 182 files changed, 686 insertions(+), 561 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1eba19eab..980e48269d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,23 @@ The main work (all changes without a GitHub username in brackets in the below li
 	## __WORK IN PROGRESS__
 -->
 
+## __WORK IN PROGRESS__
+
+- @matter/node
+    - Deprecation: `ClientNodeInteraction.localStateFor()` is scheduled for removal in 0.19 together with the legacy controller API
+    - Removed: `StructManager.assertDirectReadAuthorized()` and the direct-read authorization it backed, unused since the legacy cluster API was dropped
+
+- @matter/protocol
+    - Deprecation: The legacy `DecodedDataReport` / `Decoded{Attribute,Event}Report*` types and the `normalize*` / `normalizeAndDecode*` helpers now announce removal in 0.19 instead of 0.18
+    - Deprecation: The legacy `ClusterType` command request surface (`Invoke.LegacyCommandRequest`, `Specifier.ClusterTypeCommand`) and `SessionManager.owner` are scheduled for removal in 0.19
+
+- @matter/types
+    - Deprecation: The `ClusterType()` factory compat layer (`RetiredClusterType`, `RetiredElements`, the TLV `element` reverse mapping) is scheduled for removal in 0.19
+    - Deprecation: The generated `Cluster`, `Complete` and `<Name>Cluster` aliases and the `ClusterType.WithCompat` `with()` shim are scheduled for removal in 0.19
+
+- @project-chip/matter.js
+    - Deprecation: Every class, type and function of the legacy controller API is now marked deprecated and scheduled for removal in 0.19; use the `ServerNode.peers` / `ClientNode` API of `@matter/node` instead
+
 ## 0.17.7 (2026-07-27)
 
 - @matter/general
@@ -305,7 +322,7 @@ The main work (all changes without a GitHub username in brackets in the below li
     - Feature: New `TrustedAsTestCertificate` attestation finding lets `onAttestationFailure` decide whether to accept devices whose PAA is only in the trust store as a test certificate; previously these failed with `PaaNotTrusted`. Adds per-call `considerTestCertificates` and a separate `acceptTestCertificates` trust policy on `DclCertificateService`
     - Feature: `OnAttestationFailure` callback may return a `string` (wraps the underlying error as `cause` of a new `CommissioningError`) or throw to propagate verbatim
     - Adjustment: Default-accept policies (`onAttestationFailure === true`/`undefined`) now commission test-PAA-only devices that previously failed; upgrade the policy to keep rejecting
-    - Deprecation: Internally used `DecodedDataReport`, `DecodedAttributeReport{Value,Status,Entry}`, `DecodedEventReport{Value,Status,Entry}`, `DecodedEventData`, and the `normalize*` / `normalizeAndDecode*` helpers moved to `@project-chip/matter.js/cluster`. Scheduled for removal in 0.18
+    - Deprecation: Internally used `DecodedDataReport`, `DecodedAttributeReport{Value,Status,Entry}`, `DecodedEventReport{Value,Status,Entry}`, `DecodedEventData`, and the `normalize*` / `normalizeAndDecode*` helpers moved to `@project-chip/matter.js/cluster`. Scheduled for removal in 0.19
     - Enhancement: `ReadResult.EventValue` exposes the four wire timestamp variants (`epochTimestamp`, `systemTimestamp`, `deltaEpochTimestamp`, `deltaSystemTimestamp`) alongside the existing collapsed `timestamp: number`
     - Adjustment: `ReadResult.Chunk` may now be an async iterable (`InputChunk` is an async generator); consumers iterate chunk contents with `for await … of chunk`. Mainly internal
     - Fix: Fixes message counter rollover logic
diff --git a/docs/MIGRATION_GUIDE_08.md b/docs/MIGRATION_GUIDE_08.md
index 42af2a0bff..cf9cc10a1e 100644
--- a/docs/MIGRATION_GUIDE_08.md
+++ b/docs/MIGRATION_GUIDE_08.md
@@ -6,11 +6,12 @@ cluster definitions and this has now been enhanced for all device types. Additio
 implemented also needed to be adjusted and was enhanced with a very flexible way to choose the wanted cluster features.
 
 This means that developers need to adjust their code to use the new classes and concepts introduced by this change. The
-former API (pre 0.8, called "Legacy" for of now) is still 100% functional, but will be deprecated and removed in upcoming
-releases and might not get cluster specific adjustments or new features if they are not part of the core library
-functionality!
-The Controller API is still the same as before, but will be also adjusted in the future to the new concepts where
-applicable.
+former Device building API (pre 0.8, called "Legacy") was deprecated with 0.8 and removed in 0.13, so this document is
+only relevant when migrating code that still targets a matter.js version before 0.13.
+
+The legacy Controller API (`CommissioningController`, `PairedNode` and the surrounding classes of the
+`@project-chip/matter.js` package) is deprecated as well and scheduled for removal in 0.19. Migrate to the
+`ServerNode.peers` / `ClientNode` controller API of `@matter/node`.
 
 This document tries to give an overview how the commonly used components and classes from the legacy API need to be
 adjusted for the new API. Please also check out the FAQ at the end of this document.
diff --git a/packages/matter.js/src/CommissioningController.ts b/packages/matter.js/src/CommissioningController.ts
index 58e8b2aad1..5348f6b62a 100644
--- a/packages/matter.js/src/CommissioningController.ts
+++ b/packages/matter.js/src/CommissioningController.ts
@@ -77,6 +77,9 @@ function discoveryKey(
     return JSON.stringify({ id: identifierData, caps: discoveryCapabilities });
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export async function runDiscoverCommissionableDevices(
     node: ServerNode,
     identifierData: CommissionableDeviceIdentifiers,
@@ -113,6 +116,9 @@ export async function runDiscoverCommissionableDevices(
     }
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export function cancelDiscoverCommissionableDevices(
     identifierData: CommissionableDeviceIdentifiers,
     discoveryCapabilities: TypeFromPartialBitSchema<typeof DiscoveryCapabilitiesBitmap> | undefined,
@@ -125,6 +131,9 @@ export function cancelDiscoverCommissionableDevices(
 // TODO decline using setRoot*Cluster
 // TODO Decline cluster access after announced/paired
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type ControllerEnvironmentOptions = {
     /**
      * Environment to register the node with on start()
@@ -139,6 +148,8 @@ export type ControllerEnvironmentOptions = {
 
 /**
  * Constructor options for the CommissioningController class
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export type CommissioningControllerOptions = CommissioningControllerNodeOptions & {
     /**
@@ -238,6 +249,8 @@ export type CommissioningControllerOptions = CommissioningControllerNodeOptions
 /**
  * Configuration for performing discovery + commissioning in one step.
  * Kept in the legacy matter.js package; new code uses {@link CommissioningDiscovery.Options} directly.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export interface DiscoveryAndCommissioningOptions extends CommissioningOptions {
     /** Discovery related options. */
@@ -275,14 +288,22 @@ export interface DiscoveryAndCommissioningOptions extends CommissioningOptions {
     };
 }
 
-/** Options needed to commission a new node */
+/**
+ * Options needed to commission a new node
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type NodeCommissioningOptions = CommissioningControllerNodeOptions & {
     commissioning: Omit<DiscoveryAndCommissioningOptions, "fabric" | "discovery" | "passcode">;
     discovery: DiscoveryAndCommissioningOptions["discovery"];
     passcode: number;
 };
 
-/** Controller class to commission and connect multiple nodes into one fabric. */
+/**
+ * Controller class to commission and connect multiple nodes into one fabric.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export class CommissioningController {
     #crypto: Crypto;
     #started = false;
@@ -557,7 +578,7 @@ export class CommissioningController {
         }
     }
 
-    /** @deprecated Use PairedNode.disconnect() instead */
+    /** @deprecated Scheduled for removal in 0.19.  Use PairedNode.disconnect() instead */
     async disconnectNode(nodeId: NodeId, force = false) {
         const node = this.#pairedNodeForNodeId(nodeId);
         if (node === undefined && !force) {
@@ -592,7 +613,7 @@ export class CommissioningController {
      * This call is not blocking and returns an initialized PairedNode instance. The connection or reconnection
      * happens in the background. Please monitor the state of the node to see if the connection was successful.
      *
-     * @deprecated Use getNode() instead and call PairedNode.connect() or PairedNode.disconnect() as needed.
+     * @deprecated Scheduled for removal in 0.19.  Use getNode() instead and call PairedNode.connect() or PairedNode.disconnect() as needed.
      */
     connectNode(nodeId: NodeId, connectOptions?: CommissioningControllerNodeOptions, allowUnknownNode = false) {
         return this.#createPairedNode(nodeId, connectOptions, allowUnknownNode);
@@ -683,7 +704,7 @@ export class CommissioningController {
      * Connects to all paired nodes.
      * After connection the endpoint data of the device is analyzed and an object structure is created.
      *
-     * @deprecated Use getCommissionedNodes() to get the list of nodes and getNode(nodeId) instead and call PairedNode.connect() or PairedNode.disconnect() as needed.
+     * @deprecated Scheduled for removal in 0.19.  Use getCommissionedNodes() to get the list of nodes and getNode(nodeId) instead and call PairedNode.connect() or PairedNode.disconnect() as needed.
      */
     async connect(connectOptions?: CommissioningControllerNodeOptions) {
         const controller = this.#assertControllerIsStarted();
@@ -741,7 +762,7 @@ export class CommissioningController {
 
     /**
      * Returns the PairedNode instance for a given node id, if this node is connected.
-     * @deprecated Use getNode() instead
+     * @deprecated Scheduled for removal in 0.19.  Use getNode() instead
      */
     getPairedNode(nodeId: NodeId) {
         return this.#pairedNodeForNodeId(nodeId);
diff --git a/packages/matter.js/src/ControllerStore.ts b/packages/matter.js/src/ControllerStore.ts
index c79286e210..0b85c83fda 100644
--- a/packages/matter.js/src/ControllerStore.ts
+++ b/packages/matter.js/src/ControllerStore.ts
@@ -8,6 +8,8 @@ import { ImplementationError, MaybePromise, StorageContext, StorageManager } fro
 
 /**
  * Non-volatile state management for a {@link ControllerNode}.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class ControllerStore implements ControllerStoreInterface {
     #storageManager?: StorageManager;
@@ -75,6 +77,9 @@ export class ControllerStore implements ControllerStoreInterface {
     }
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export abstract class ControllerStoreInterface {
     abstract erase(): Promise<void>;
     abstract close(): Promise<void>;
diff --git a/packages/matter.js/src/LegacyControllerStore.ts b/packages/matter.js/src/LegacyControllerStore.ts
index d4e8e98efc..a7467671cd 100644
--- a/packages/matter.js/src/LegacyControllerStore.ts
+++ b/packages/matter.js/src/LegacyControllerStore.ts
@@ -13,6 +13,8 @@ import { ControllerStoreInterface } from "./ControllerStore.js";
  * The default implementation for matter.js uses synchronous APIs for storage.
  * However, this will change in the future, and other implementations may be
  * backed by asynchronous storage.  So the public API is asynchronous.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class LegacyControllerStore implements ControllerStoreInterface {
     #rootStorage: StorageContext;
diff --git a/packages/matter.js/src/MatterController.ts b/packages/matter.js/src/MatterController.ts
index 28db34bb63..5ecb06ee4d 100644
--- a/packages/matter.js/src/MatterController.ts
+++ b/packages/matter.js/src/MatterController.ts
@@ -7,7 +7,7 @@
 /**
  * Important note: This file is part of the legacy matter-node (internal) API and should not be used anymore directly!
  * Please use the new API classes!
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 
 import { ClusterClient } from "#cluster/client/ClusterClient.js";
@@ -94,6 +94,9 @@ import {
 import { BasicInformation } from "@matter/types/clusters/basic-information";
 import { GeneralCommissioning } from "@matter/types/clusters/general-commissioning";
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type CommissionedNodeDetails = {
     operationalServerAddress?: OperationalAddress;
     discoveryData?: DiscoveryData;
@@ -110,6 +113,9 @@ type CommissionedPeer = PeerDescriptor & { deviceData?: DeviceInformationData };
 // Backward-compatible persistence record for nodes
 type StoredOperationalPeer = [NodeId, CommissionedNodeDetails];
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type PairedNodeDetails = {
     nodeId: NodeId;
     operationalAddress?: string;
@@ -121,6 +127,9 @@ export type PairedNodeDetails = {
     };
 };
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export class MatterController {
     public static async create(options: {
         id: string;
@@ -888,6 +897,9 @@ export class MatterController {
     }
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export namespace MatterController {
     export interface ConnectOptions extends PeerConnectionOptions {
         allowUnknownPeer?: boolean;
diff --git a/packages/matter.js/src/PaseCommissioner.ts b/packages/matter.js/src/PaseCommissioner.ts
index 73c82dc174..18c88112cd 100644
--- a/packages/matter.js/src/PaseCommissioner.ts
+++ b/packages/matter.js/src/PaseCommissioner.ts
@@ -40,6 +40,8 @@ type PaseCommissionerOptions = Omit<CommissioningControllerOptions, "environment
  * This represents a lightweight commissioner that can be used to start the commissioning process to commission
  * devices into an existing controller fabric. Once the initial commissioning process is completed, it uses a callback
  * to all to complete the commissioning process.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class PaseCommissioner {
     readonly #environment: Environment;
diff --git a/packages/matter.js/src/cluster/client/AttributeClient.ts b/packages/matter.js/src/cluster/client/AttributeClient.ts
index c2f9bd8592..6800bbcee3 100644
--- a/packages/matter.js/src/cluster/client/AttributeClient.ts
+++ b/packages/matter.js/src/cluster/client/AttributeClient.ts
@@ -12,6 +12,8 @@ import { InteractionClient } from "./InteractionClient.js";
 
 /**
  * Factory function to create an AttributeClient for a given attribute.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export function createAttributeClient<T>(
     attribute: ClusterType.Attribute<T>,
@@ -33,6 +35,8 @@ export function createAttributeClient<T>(
 
 /**
  * General class for AttributeClients
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class AttributeClient<T = any> {
     readonly #isWritable: boolean;
@@ -198,11 +202,15 @@ export class AttributeClient<T = any> {
 
 /**
  * Special AttributeClient class to allow identifying attributes that are supported because reported by the Devices.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class SupportedAttributeClient<T> extends AttributeClient<T> {}
 
 /**
  * Special AttributeClient class to allow identifying attributes that are supported because reported by the Devices,
  * but the contained attribute is unknown.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class UnknownSupportedAttributeClient extends SupportedAttributeClient<any> {}
diff --git a/packages/matter.js/src/cluster/client/ClusterClient.ts b/packages/matter.js/src/cluster/client/ClusterClient.ts
index 29ad3b4c8f..0250440018 100644
--- a/packages/matter.js/src/cluster/client/ClusterClient.ts
+++ b/packages/matter.js/src/cluster/client/ClusterClient.ts
@@ -28,12 +28,18 @@ import { InteractionClient } from "./InteractionClient.js";
 
 const logger = Logger.get("ClusterClient");
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export function GroupClusterClient<const N extends ClusterType.Concrete>(
     clusterDef: N,
     interactionClient: InteractionClient,
     globalAttributeValues?: Record<string, unknown>,
 ): ClusterClientObj<N["Typing"]>;
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export function GroupClusterClient(
     clusterDef: ClusterType.Concrete,
     interactionClient: InteractionClient,
@@ -46,6 +52,9 @@ export function GroupClusterClient(
     return ClusterClient(clusterDef as any, undefined, interactionClient, globalAttributeValues) as any;
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export function ClusterClient<const N extends ClusterType.Concrete>(
     clusterDef: N,
     endpointId: EndpointNumber | undefined,
@@ -53,6 +62,9 @@ export function ClusterClient<const N extends ClusterType.Concrete>(
     globalAttributeValues?: Record<string, unknown>,
 ): ClusterClientObj<N["Typing"]>;
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export function ClusterClient(
     clusterDef: ClusterType.Concrete,
     endpointId: EndpointNumber | undefined,
diff --git a/packages/matter.js/src/cluster/client/ClusterClientTypes.ts b/packages/matter.js/src/cluster/client/ClusterClientTypes.ts
index 53a2808576..9f29dbbdb0 100644
--- a/packages/matter.js/src/cluster/client/ClusterClientTypes.ts
+++ b/packages/matter.js/src/cluster/client/ClusterClientTypes.ts
@@ -18,6 +18,9 @@ import {
 } from "@matter/types";
 import { DecodedEventData } from "./DecodedDataReport.js";
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export interface AttributeClientObj<T = any> {
     readonly id: AttributeId;
     readonly attribute: ClusterType.Attribute<T>;
@@ -39,6 +42,9 @@ export interface AttributeClientObj<T = any> {
     removeListener(listener: (newValue: T) => void): void;
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export interface EventClientObj<T> {
     readonly id: EventId;
     readonly event: ClusterType.Event<T>;
@@ -62,6 +68,8 @@ export interface EventClientObj<T> {
 
 /**
  * Command options shared by all client command invocations.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export interface ClientCommandOptions {
     /** Send this command as a timed request also when not required. Default timeout are 10 seconds. */
@@ -175,6 +183,8 @@ type ClientCommandsRecord<C> = ClientCommands<C> & Record<string, (...args: any[
 
 /**
  * Strongly typed interface of a cluster client.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export type ClusterClientObj<N extends ClusterTyping = ClusterTyping> = {
     id: ClusterId;
@@ -209,6 +219,9 @@ export type ClusterClientObj<N extends ClusterTyping = ClusterTyping> = {
     ClientEventSubscribers<N["Events"]> &
     ClientEventListeners<N["Events"]>;
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type ClusterClientObjInternal = ClusterClientObj & {
     /**
      * Trigger an attribute update. This is mainly used internally and not needed to be called by the user.
diff --git a/packages/matter.js/src/cluster/client/EventClient.ts b/packages/matter.js/src/cluster/client/EventClient.ts
index 9dbd177ae5..ebfe17f63f 100644
--- a/packages/matter.js/src/cluster/client/EventClient.ts
+++ b/packages/matter.js/src/cluster/client/EventClient.ts
@@ -11,6 +11,8 @@ import { InteractionClient } from "./InteractionClient.js";
 
 /**
  * Factory function to create an EventClient for a given event.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export function createEventClient<T>(
     event: ClusterType.Event<T>,
@@ -24,6 +26,8 @@ export function createEventClient<T>(
 
 /**
  * General class for EventClients
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class EventClient<T = any> {
     readonly #listeners = new Array<(event: DecodedEventData<T>) => void>();
diff --git a/packages/matter.js/src/cluster/client/InteractionClient.ts b/packages/matter.js/src/cluster/client/InteractionClient.ts
index 76733fc571..1d6ab62a43 100644
--- a/packages/matter.js/src/cluster/client/InteractionClient.ts
+++ b/packages/matter.js/src/cluster/client/InteractionClient.ts
@@ -80,7 +80,7 @@ const AclExtensionAttributeId = AccessControl.attributes.extension.id;
 /**
  * Types of discovery that may be performed when connecting operationally.
  *
- * @deprecated node discovery is now continuous with MDNS queries sent as needed
+ * @deprecated Scheduled for removal in 0.19.  Node discovery is now continuous with MDNS queries sent as needed
  */
 export enum NodeDiscoveryType {
     /** No discovery is done, in calls means that only known addresses are tried. */
@@ -98,13 +98,15 @@ export enum NodeDiscoveryType {
 
 /**
  * Error when an unknown node is tried to be connected or any other action done with it.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class UnknownNodeError extends MatterError {}
 
 /**
  * Configuration for discovering when establishing a peer connection.
  *
- * @deprecated discovery occurs automatically based on node state
+ * @deprecated Scheduled for removal in 0.19.  Discovery occurs automatically based on node state
  */
 export interface DiscoveryOptions {
     discoveryType?: NodeDiscoveryType;
@@ -115,18 +117,18 @@ export interface DiscoveryOptions {
 /**
  * Extended discovery options that include case authenticated tags for peer connections.
  *
- * @deprecated these options are ignored
+ * @deprecated Scheduled for removal in 0.19.  These options are ignored
  */
 export interface PeerConnectionOptions {
     discoveryOptions?: DiscoveryOptions;
 
     /**
-     * @deprecated set CATs on CommissioningBehavior#state
+     * @deprecated Scheduled for removal in 0.19.  Set CATs on CommissioningBehavior#state
      */
     caseAuthenticatedTags?: CaseAuthenticatedTag[];
 
     /**
-     * @deprected configure queuing using the NetworkProfiles environmental service
+     * @deprecated Scheduled for removal in 0.19.  Configure queuing using the NetworkProfiles environmental service
      */
     queue?: Semaphore;
 }
@@ -136,11 +138,17 @@ function isAclOrExtensionPath(path: { clusterId: ClusterId; attributeId: Attribu
     return clusterId === AclClusterId && (attributeId === AclAttributeId || attributeId === AclExtensionAttributeId);
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type ResponseDataReport = Omit<
     DecodedDataReport,
     "isNormalized" | "subscriptionId" | "interactionModelRevision"
 >;
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export interface AttributeStatus {
     path: {
         nodeId?: NodeId;
@@ -161,6 +169,9 @@ type CommandRequest<C extends ClusterType.Command> =
 type CommandResponse<C extends ClusterType.Command> =
     C extends ClusterType.Command<infer F> ? Awaited<ReturnType<F>> : unknown;
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type InvokeOptions<C extends ClusterType.Command = ClusterType.Command> = {
     endpointId?: EndpointNumber;
     clusterId: ClusterId;
@@ -186,6 +197,9 @@ export type InvokeOptions<C extends ClusterType.Command = ClusterType.Command> =
     skipValidation?: boolean;
 };
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export class InteractionClientProvider {
     readonly #owner: ServerNode;
     readonly #peers: PeerSet;
@@ -265,6 +279,9 @@ export class InteractionClientProvider {
     }
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export class InteractionClient {
     readonly #address?: PeerAddress;
     readonly isGroupAddress: boolean;
diff --git a/packages/matter.js/src/device/Aggregator.ts b/packages/matter.js/src/device/Aggregator.ts
index 3fe9eb04ed..dadbd820ca 100644
--- a/packages/matter.js/src/device/Aggregator.ts
+++ b/packages/matter.js/src/device/Aggregator.ts
@@ -13,6 +13,8 @@ import { Endpoint, EndpointOptions } from "./Endpoint.js";
 /**
  * An Aggregator is a special endpoint that exposes multiple devices as a "bridge" into the matter ecosystem.
  * Devices added must already have the BridgedDeviceBasicInformationCluster configured.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class Aggregator extends Endpoint {
     /**
diff --git a/packages/matter.js/src/device/ComposedDevice.ts b/packages/matter.js/src/device/ComposedDevice.ts
index 29dd3d4921..6bac77ef3a 100644
--- a/packages/matter.js/src/device/ComposedDevice.ts
+++ b/packages/matter.js/src/device/ComposedDevice.ts
@@ -11,6 +11,8 @@ import { Endpoint, EndpointOptions } from "./Endpoint.js";
 /**
  * A ComposedDevice is a special endpoint that allows to combine multiple sub devices and expose this as one device
  * (e.g. a fan and a light).
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class ComposedDevice extends Endpoint {
     /**
diff --git a/packages/matter.js/src/device/Device.ts b/packages/matter.js/src/device/Device.ts
index cb2ef7af92..07fa32f322 100644
--- a/packages/matter.js/src/device/Device.ts
+++ b/packages/matter.js/src/device/Device.ts
@@ -15,6 +15,8 @@ import { Endpoint, EndpointOptions } from "./Endpoint.js";
 /**
  * Temporary used device class for paired devices until we added a layer to choose the right specialized device class
  * based on the device classes and features of the paired device
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class PairedDevice extends Endpoint {
     /**
@@ -40,6 +42,8 @@ export class PairedDevice extends Endpoint {
 
 /**
  * Root endpoint of a device. This is used internally and not needed to be instanced by the user.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class RootEndpoint extends Endpoint {
     /**
@@ -75,6 +79,8 @@ export class RootEndpoint extends Endpoint {
 
 /**
  * Base class for all devices. This class should be extended by all devices.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class Device extends Endpoint {
     protected commandHandler = new NamedHandler<any>();
diff --git a/packages/matter.js/src/device/DeviceInformation.ts b/packages/matter.js/src/device/DeviceInformation.ts
index 17da17d22b..161a9ad095 100644
--- a/packages/matter.js/src/device/DeviceInformation.ts
+++ b/packages/matter.js/src/device/DeviceInformation.ts
@@ -9,11 +9,17 @@ import { ClientNode, ClientNodePhysicalProperties } from "@matter/node";
 import { BasicInformationClient } from "@matter/node/behaviors/basic-information";
 import { PhysicalDeviceProperties } from "@matter/protocol";
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type DeviceInformationData = {
     basicInformation?: Record<string, SupportedStorageTypes>;
     deviceMeta?: PhysicalDeviceProperties;
 };
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export class DeviceInformation {
     readonly #node: ClientNode;
 
diff --git a/packages/matter.js/src/device/DeviceTypes.ts b/packages/matter.js/src/device/DeviceTypes.ts
index 234e426074..d87be01804 100644
--- a/packages/matter.js/src/device/DeviceTypes.ts
+++ b/packages/matter.js/src/device/DeviceTypes.ts
@@ -10,6 +10,8 @@ import { ClusterId, DeviceTypeId } from "@matter/types";
 
 /**
  * General device classification categories.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export enum DeviceClasses {
     /** Node device type. */
@@ -66,6 +68,9 @@ export enum DeviceClasses {
     BridgedPowerSourceInfo = "BridgedPowerSourceInfo",
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export interface DeviceTypeDefinition {
     name: string;
     code: DeviceTypeId;
@@ -79,6 +84,9 @@ export interface DeviceTypeDefinition {
     unknown: boolean;
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export const DeviceTypeDefinition = ({
     name,
     code,
@@ -115,11 +123,14 @@ export const DeviceTypeDefinition = ({
 });
 
 /**
- * @deprecated These definitions will not be updated beyond Matter 1.1, use getDeviceTypeDefinitionFromModelByCode
+ * @deprecated Scheduled for removal in 0.19.  These definitions will not be updated beyond Matter 1.1, use getDeviceTypeDefinitionFromModelByCode
  *   instead.
  */
 export const DeviceTypes: { [key: string]: DeviceTypeDefinition } = {};
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export const UnknownDeviceType = (code: number, revision: number) =>
     DeviceTypeDefinition({
         code,
@@ -129,7 +140,7 @@ export const UnknownDeviceType = (code: number, revision: number) =>
         unknown: true,
     });
 
-/** @deprecated Use getDeviceTypeDefinitionFromModelByCode instead. */
+/** @deprecated Scheduled for removal in 0.19.  Use getDeviceTypeDefinitionFromModelByCode instead. */
 export function getDeviceTypeDefinitionByCode(code: number): DeviceTypeDefinition | undefined {
     return getDeviceTypeDefinitionFromModelByCode(code);
 }
diff --git a/packages/matter.js/src/device/Endpoint.ts b/packages/matter.js/src/device/Endpoint.ts
index 2853019ef9..dd0ed4a1aa 100644
--- a/packages/matter.js/src/device/Endpoint.ts
+++ b/packages/matter.js/src/device/Endpoint.ts
@@ -27,11 +27,17 @@ import { Val } from "@matter/protocol";
 import { ClusterId, ClusterType, DeviceTypeId, EndpointNumber, getClusterNameById } from "@matter/types";
 import { DeviceTypeDefinition } from "./DeviceTypes.js";
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export interface EndpointOptions {
     endpointId?: EndpointNumber;
     uniqueStorageKey?: string;
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export class Endpoint {
     private readonly clusterClients = new Map<ClusterId, ClusterClientObj>();
     private readonly childEndpoints = new Map<number, Endpoint>();
diff --git a/packages/matter.js/src/device/PairedNode.ts b/packages/matter.js/src/device/PairedNode.ts
index 2e88fbc1c1..63dd9b9784 100644
--- a/packages/matter.js/src/device/PairedNode.ts
+++ b/packages/matter.js/src/device/PairedNode.ts
@@ -82,6 +82,9 @@ const logger = Logger.get("PairedNode");
 /** Delay after receiving a changed partList  from a device to update the device structure */
 const STRUCTURE_UPDATE_TIMEOUT = Seconds(5);
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export enum NodeStates {
     /**
      * Node seems active nd last communications were successful and subscription updates were received and all data is
@@ -108,7 +111,7 @@ export enum NodeStates {
     WaitingForDeviceDiscovery = 3,
 }
 
-/** @deprecated */
+/** @deprecated Scheduled for removal in 0.19. */
 export enum NodeStateInformation {
     /**
      * Node seems active nd last communications were successful and subscription updates were received and all data is
@@ -146,6 +149,9 @@ export enum NodeStateInformation {
     Decommissioned = 5,
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export type CommissioningControllerNodeOptions = {
     /**
      * Unless set to false the node will be automatically connected when initialized. When set to false use
@@ -177,21 +183,21 @@ export type CommissioningControllerNodeOptions = {
     /**
      * Optional additional callback method which is called for each Attribute change reported by the device. Use this
      * if subscribing to all relevant attributes is too much effort.
-     * @deprecated Please use the events.attributeChanged observable instead.
+     * @deprecated Scheduled for removal in 0.19.  Please use the events.attributeChanged observable instead.
      */
     readonly attributeChangedCallback?: (nodeId: NodeId, data: DecodedAttributeReportValue<any>) => void;
 
     /**
      * Optional additional callback method which is called for each Event reported by the device. Use this if
      * subscribing to all relevant events is too much effort.
-     * @deprecated Please use the events.eventTriggered observable instead.
+     * @deprecated Scheduled for removal in 0.19.  Please use the events.eventTriggered observable instead.
      */
     readonly eventTriggeredCallback?: (nodeId: NodeId, data: DecodedEventReportValue<any>) => void;
 
     /**
      * Optional callback method which is called when the state of the node changes. This can be used to detect when
      * the node goes offline or comes back online.
-     * @deprecated Please use the events.stateChanged observable and the extra events for structureChanged and
+     * @deprecated Scheduled for removal in 0.19.  Please use the events.stateChanged observable and the extra events for structureChanged and
      *  decommissioned instead.
      */
     readonly stateInformationCallback?: (nodeId: NodeId, state: NodeStateInformation) => void;
@@ -203,6 +209,9 @@ export type CommissioningControllerNodeOptions = {
     readonly caseAuthenticatedTags?: CaseAuthenticatedTag[];
 };
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export class NodeNotConnectedError extends MatterError {}
 
 /**
@@ -222,6 +231,8 @@ function areNumberListsSame(list1: Immutable<number[]>, list2: Immutable<number[
 /**
  * Class to represents one node that is paired/commissioned with the matter.js Controller. Instances are returned by
  * the CommissioningController on commissioning or when connecting.
+ *
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
  */
 export class PairedNode {
     readonly #clientNode: ClientNode;
@@ -842,7 +853,7 @@ export class PairedNode {
      * Subscribe to all attributes and events of the device. Unless setting the Controller property autoSubscribe to
      * false, this is executed automatically. Alternatively, you can manually subscribe by calling this method.
      *
-     * @deprecated Subscription is now managed by NetworkClient on the ClientNode. Use connect() to activate.
+     * @deprecated Scheduled for removal in 0.19.  Subscription is now managed by NetworkClient on the ClientNode. Use connect() to activate.
      */
     async subscribeAllAttributesAndEvents(_options?: {
         ignoreInitialTriggers?: boolean;
@@ -1668,6 +1679,9 @@ export class PairedNode {
     }
 }
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export namespace PairedNode {
     export interface NodeStructureEvents {
         /** Emitted when endpoints are added. */
diff --git a/packages/matter.js/src/device/TypeHelpers.ts b/packages/matter.js/src/device/TypeHelpers.ts
index 3d37c7562d..3e78532691 100644
--- a/packages/matter.js/src/device/TypeHelpers.ts
+++ b/packages/matter.js/src/device/TypeHelpers.ts
@@ -6,6 +6,9 @@
 
 import { ClusterClientObj, ClusterClientObjInternal } from "#cluster/client/ClusterClientTypes.js";
 
+/**
+ * @deprecated Scheduled for removal in 0.19.  Part of the legacy controller API superseded by `ClientNode` in `@matter/node`.
+ */
 export function asClusterClientInternal(obj: ClusterClientObj): ClusterClientObjInternal {
     if (obj._type !== "ClusterClient") {
         throw new Error("Object is not a ClusterClientObj instance.");
diff --git a/packages/node/src/behavior/state/managed/values/StructManager.ts b/packages/node/src/behavior/state/managed/values/StructManager.ts
index 05f2b2e8be..04ccf85b29 100644
--- a/packages/node/src/behavior/state/managed/values/StructManager.ts
+++ b/packages/node/src/behavior/state/managed/values/StructManager.ts
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { camelize, GeneratedClass, ImplementationError, isObject } from "@matter/general";
+import { camelize, GeneratedClass, isObject } from "@matter/general";
 import type { Schema } from "@matter/model";
 import { Access, ElementTag, FieldValue, Metatype, ValueModel } from "@matter/model";
 import { AccessControl, PhantomReferenceError, SchemaImplementationError, Val } from "@matter/protocol";
@@ -18,19 +18,12 @@ import { NameResolver } from "../NameResolver.js";
 import type { ValReference } from "../ValReference.js";
 import { PrimitiveManager } from "./PrimitiveManager.js";
 
-const AUTHORIZE_READ = Symbol("authorize-read");
-
 /**
  * Internal view of struct.
  */
 interface Struct extends Val.Struct {
     [Internal.session]: ValueSupervisor.Session;
     [Internal.reference]: ValReference<Val.Struct>;
-
-    /**
-     * Direct read authorization.
-     */
-    [AUTHORIZE_READ](attributeId: number): void;
 }
 
 /**
@@ -47,26 +40,12 @@ export function StructManager(owner: RootSupervisor, schema: Schema): ValueSuper
         // [Symbol.toStringTag]: {
         //     value: name,
         // },
-
         // TODO - makes Mocha diffs pretty useless.  Best fix is probably customized diff but leaving out for now
         // toString: {
         //     value() {
         //         return serialize(this);
         //     }
         // },
-
-        // AUTHORIZE_READ is effectively a protected method, see StructManager.assertDirectReadAuthorized below
-        [AUTHORIZE_READ]: {
-            value(this: Struct, attributeId: number) {
-                const access = propertyAccessControls[attributeId];
-
-                if (access === undefined) {
-                    throw new ImplementationError(`Direct read of unknown property ${attributeId}`);
-                }
-
-                access.authorizeRead(this[Internal.session], this[Internal.reference].location);
-            },
-        },
     } as PropertyDescriptorMap;
 
     /**
@@ -74,7 +53,6 @@ export function StructManager(owner: RootSupervisor, schema: Schema): ValueSuper
      */
     const instanceDescriptors = {} as PropertyDescriptorMap;
 
-    const propertyAccessControls = {} as Record<number, AccessControl>;
     let hasFabricIndex = false;
     const isCluster = schema.tag === ElementTag.Cluster;
 
@@ -82,12 +60,11 @@ export function StructManager(owner: RootSupervisor, schema: Schema): ValueSuper
     for (const member of owner.membersOf(schema)) {
         const name = member.propertyName;
 
-        const { access, descriptor } = configureProperty(owner, member);
+        const { descriptor } = configureProperty(owner, member);
 
         instanceDescriptors[name] = descriptor;
         if (member.id !== undefined) {
             prototypeDescriptors[member.id] = { ...descriptor, enumerable: false };
-            propertyAccessControls[member.id] = access;
         }
 
         if (member.name === "FabricIndex") {
@@ -149,25 +126,6 @@ export function StructManager(owner: RootSupervisor, schema: Schema): ValueSuper
     };
 }
 
-export namespace StructManager {
-    /**
-     * If a struct is referenced as a whole, fields for which the session are unauthorized are simply omitted.
-     *
-     * This function instead throws an error for unauthorized access.  It must be invoked before direct property reads.
-     *
-     * @deprecated remove with old API
-     *
-     * @param struct a managed struct
-     * @param attributeId the AttributeId to read
-     */
-    export function assertDirectReadAuthorized(struct: Val.Struct, attributeId: number) {
-        if (!(struct as Struct)?.[AUTHORIZE_READ]) {
-            throw new ImplementationError("Cannot authorize read of unmanaged value");
-        }
-        return (struct as Struct)[AUTHORIZE_READ](attributeId);
-    }
-}
-
 function configureProperty(supervisor: RootSupervisor, schema: ValueModel) {
     const name = schema.propertyName;
     const id = schema.id;
diff --git a/packages/node/src/node/client/ClientNodeInteraction.ts b/packages/node/src/node/client/ClientNodeInteraction.ts
index d35301215e..04349b05d7 100644
--- a/packages/node/src/node/client/ClientNodeInteraction.ts
+++ b/packages/node/src/node/client/ClientNodeInteraction.ts
@@ -392,8 +392,8 @@ export class ClientNodeInteraction implements Interactable<ActionContext> {
      * Temporary accessor of cached data, if any are stored. This will be implemented by the ClientNodeInteraction and
      * point to the node state of the relevant endpoint and is needed to support the old API behavior for
      * AttributeClient.
-     * TODO Remove when we remove the legacy controller API
-     * @deprecated
+     *
+     * @deprecated Scheduled for removal in 0.19 with the legacy controller API.
      */
     localStateFor(endpointId: EndpointNumber): Record<string, Record<string, Val.Struct> | undefined> | undefined {
         if (!this.#node.endpoints.has(endpointId)) {
diff --git a/packages/nodejs-shell/README.md b/packages/nodejs-shell/README.md
index 49cb2d69e5..4a4a6b27ba 100644
--- a/packages/nodejs-shell/README.md
+++ b/packages/nodejs-shell/README.md
@@ -37,7 +37,7 @@ Please note the extra `--` to separate the npm parameters from the shell paramet
 ## matter.js v0.11 Storage adjustment!
 In matter.js 0.11 we adjusted the storage to the new environment based one. This means that by default the storage is in the user directory in .matter/shell-XX where XX is the nodeNum you provided as parameter. You can adjust the storage base location with "--storage-path=..." as parameter.
 
-Before matter.js 0.13 it was possible to use a former storage with "--legacyStorage" and the storage will be in the .matter-shell-XX directory in the local directory as before. This option was removed in matter,js 0.13.
+Before matter.js 0.13 it was possible to use a former storage with "--legacyStorage" and the storage will be in the .matter-shell-XX directory in the local directory as before. This option was removed in matter.js 0.13.
 To manually convert a storage you can follow the following steps. The described steps assume ./.matter-shell-XX is the old storage and ~/.matter/shell-XX is the new storage location.
 
 * Stop the shell
diff --git a/packages/protocol/src/action/request/Invoke.ts b/packages/protocol/src/action/request/Invoke.ts
index f35d767658..5b65e2d722 100644
--- a/packages/protocol/src/action/request/Invoke.ts
+++ b/packages/protocol/src/action/request/Invoke.ts
@@ -192,7 +192,7 @@ export namespace Invoke {
     ): InvokeCommandData;
 
     /**
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19.
      * Use {@link CommandRequest} with {@link ClusterType.Command}.
      */
     export function Command(request: Invoke.LegacyCommandRequest, skipValidation?: boolean): InvokeCommandData;
@@ -256,7 +256,7 @@ export namespace Invoke {
     }
 
     /**
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19.
      * Legacy command request using ClusterType commands.  Use {@link CommandRequest} with
      * {@link ClusterType.Command}.
      */
@@ -292,7 +292,7 @@ export namespace Invoke {
     > = WildcardCommandRequest<C, CMD> & { endpoint: Specifier.Endpoint };
 
     /**
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19.
      * Use the overload accepting {@link ConcreteCommandRequest}.
      */
     export function ConcreteCommandRequest(data: Invoke.LegacyCommandRequest): Invoke.LegacyCommandRequest;
@@ -321,7 +321,7 @@ export namespace Invoke {
     } & Fields<Specifier.CommandFor<Specifier.ClusterFor<C>, CMD>>;
 
     /**
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19.
      * Use the overload accepting {@link WildcardCommandRequest}.
      */
     export function WildcardCommandRequest(data: Invoke.LegacyCommandRequest): Invoke.LegacyCommandRequest;
diff --git a/packages/protocol/src/action/request/Specifier.ts b/packages/protocol/src/action/request/Specifier.ts
index 454a09d8ed..e97a6187f6 100644
--- a/packages/protocol/src/action/request/Specifier.ts
+++ b/packages/protocol/src/action/request/Specifier.ts
@@ -51,7 +51,7 @@ export namespace Specifier {
         ClusterType.Command | (string & keyof NonNullable<C["commands"]>);
 
     /**
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19.
      * Legacy command specifier from ClusterType.  Use {@link ClusterType.Command}.
      */
     export interface ClusterTypeCommand {
diff --git a/packages/protocol/src/interaction/AttributeDataDecoder.ts b/packages/protocol/src/interaction/AttributeDataDecoder.ts
index e72d293105..ed87b99da8 100644
--- a/packages/protocol/src/interaction/AttributeDataDecoder.ts
+++ b/packages/protocol/src/interaction/AttributeDataDecoder.ts
@@ -26,7 +26,7 @@ import {
 
 const logger = Logger.get("AttributeDataDecoder");
 
-/** @deprecated since 0.17 — will be removed in 0.18. Import from `@project-chip/matter.js/cluster` instead. */
+/** @deprecated since 0.17 — will be removed in 0.19. Import from `@project-chip/matter.js/cluster` instead. */
 export type DecodedAttributeReportEntry = {
     path: {
         nodeId?: NodeId;
@@ -40,7 +40,7 @@ export type DecodedAttributeReportEntry = {
 /**
  * Represents a fully qualified and decoded attribute value from a received DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Import from `@project-chip/matter.js/cluster` instead.
+ * @deprecated since 0.17 — will be removed in 0.19. Import from `@project-chip/matter.js/cluster` instead.
  */
 export type DecodedAttributeReportValue<T> = DecodedAttributeReportEntry & {
     version: number;
@@ -50,7 +50,7 @@ export type DecodedAttributeReportValue<T> = DecodedAttributeReportEntry & {
 /**
  * Represents a fully qualified and decoded attribute status from a received DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Import from `@project-chip/matter.js/cluster` instead.
+ * @deprecated since 0.17 — will be removed in 0.19. Import from `@project-chip/matter.js/cluster` instead.
  */
 export type DecodedAttributeReportStatus = DecodedAttributeReportEntry & {
     status?: Status;
@@ -66,7 +66,7 @@ type DecodedAttributeValue<T> = Omit<DecodedAttributeReportValue<T>, "version">
  * Parses, normalizes (e.g. un-chunk arrays and resolve Tag compression if used) and decodes the attribute data from
  * a received DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API or `decodeDataReport` from
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API or `decodeDataReport` from
  *   `@project-chip/matter.js/cluster`.
  */
 export function normalizeAndDecodeReadAttributeReport(
@@ -157,7 +157,7 @@ export function expandPathsInAttributeData(
  * Normalizes (e.g. prepare data for array un-chunking and resolve Tag compression if used) the attribute details from
  * a received DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
  */
 export function normalizeAttributeData(
     data: TypeFromSchema<typeof TlvAttributeData>[],
@@ -184,7 +184,7 @@ export function normalizeAttributeData(
  * Normalizes (e.g. un-chunk arrays and resolve Tag compression if used) and decodes the attribute data from a received
  * DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
  */
 export function normalizeAttributeStatus(
     data: TypeFromSchema<typeof TlvAttributeStatus>[],
@@ -229,7 +229,7 @@ export function normalizeAttributeStatus(
  * Normalizes (e.g. un-chunk arrays and resolve Tag compression if used) and decodes the attribute data from a received
  * DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
  */
 export function normalizeAndDecodeAttributeData(
     data: TypeFromSchema<typeof TlvAttributeData>[],
diff --git a/packages/protocol/src/interaction/DecodedDataReport.ts b/packages/protocol/src/interaction/DecodedDataReport.ts
index 747e95be11..f46f2a9119 100644
--- a/packages/protocol/src/interaction/DecodedDataReport.ts
+++ b/packages/protocol/src/interaction/DecodedDataReport.ts
@@ -17,7 +17,7 @@ import {
 } from "./EventDataDecoder.js";
 
 /**
- * @deprecated since 0.17 — will be removed in 0.18. Import `DecodedDataReport` from `@project-chip/matter.js/cluster` instead.
+ * @deprecated since 0.17 — will be removed in 0.19. Import `DecodedDataReport` from `@project-chip/matter.js/cluster` instead.
  */
 export interface DecodedDataReport extends DataReport {
     isNormalized: true;
@@ -29,7 +29,7 @@ export interface DecodedDataReport extends DataReport {
 }
 
 /**
- * @deprecated since 0.17 — will be removed in 0.18. Use `decodeDataReport` from `@project-chip/matter.js/cluster`, or consume the
+ * @deprecated since 0.17 — will be removed in 0.19. Use `decodeDataReport` from `@project-chip/matter.js/cluster`, or consume the
  *   streaming `InputChunk` API directly.
  */
 export function DecodedDataReport(
diff --git a/packages/protocol/src/interaction/EventDataDecoder.ts b/packages/protocol/src/interaction/EventDataDecoder.ts
index 1146d963ce..be6d161c3d 100644
--- a/packages/protocol/src/interaction/EventDataDecoder.ts
+++ b/packages/protocol/src/interaction/EventDataDecoder.ts
@@ -25,7 +25,7 @@ import {
 
 const logger = Logger.get("EventDataDecoder");
 
-/** @deprecated since 0.17 — will be removed in 0.18. Import from `@project-chip/matter.js/cluster` instead. */
+/** @deprecated since 0.17 — will be removed in 0.19. Import from `@project-chip/matter.js/cluster` instead. */
 export type DecodedEventData<T> = {
     eventNumber: EventNumber;
     priority: Priority;
@@ -36,7 +36,7 @@ export type DecodedEventData<T> = {
     data?: T;
 };
 
-/** @deprecated since 0.17 — will be removed in 0.18. Import from `@project-chip/matter.js/cluster` instead. */
+/** @deprecated since 0.17 — will be removed in 0.19. Import from `@project-chip/matter.js/cluster` instead. */
 export type DecodedEventReportEntry = {
     path: {
         nodeId?: NodeId;
@@ -50,7 +50,7 @@ export type DecodedEventReportEntry = {
 /**
  * Represents a fully qualified and decoded event value from a received DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Import from `@project-chip/matter.js/cluster` instead.
+ * @deprecated since 0.17 — will be removed in 0.19. Import from `@project-chip/matter.js/cluster` instead.
  */
 export type DecodedEventReportValue<T> = DecodedEventReportEntry & {
     events: DecodedEventData<T>[];
@@ -59,7 +59,7 @@ export type DecodedEventReportValue<T> = DecodedEventReportEntry & {
 /**
  * Represents a fully qualified and decoded event status from a received DataReport.
  *
- * @deprecated since 0.17 — will be removed in 0.18. Import from `@project-chip/matter.js/cluster` instead.
+ * @deprecated since 0.17 — will be removed in 0.19. Import from `@project-chip/matter.js/cluster` instead.
  */
 export type DecodedEventReportStatus = DecodedEventReportEntry & {
     status?: Status;
@@ -67,7 +67,7 @@ export type DecodedEventReportStatus = DecodedEventReportEntry & {
 };
 
 /**
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
  */
 export function normalizeAndDecodeReadEventReport(data: TypeFromSchema<typeof TlvEventReport>[]): {
     eventData: DecodedEventReportValue<any>[];
@@ -84,7 +84,7 @@ export function normalizeAndDecodeReadEventReport(data: TypeFromSchema<typeof Tl
 }
 
 /**
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API instead.
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API instead.
  */
 export function normalizeEventData(
     data: TypeFromSchema<typeof TlvEventData>[],
@@ -106,7 +106,7 @@ export function normalizeEventData(
 }
 
 /**
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
  */
 export function normalizeAndDecodeEventData(
     data: TypeFromSchema<typeof TlvEventData>[],
@@ -158,7 +158,7 @@ export function normalizeAndDecodeEventData(
 }
 
 /**
- * @deprecated since 0.17 — will be removed in 0.18. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
+ * @deprecated since 0.17 — will be removed in 0.19. Use the streaming `InputChunk` API or `decodeDataReport` from `@project-chip/matter.js/cluster`.
  */
 export function normalizeEventStatus(data: TypeFromSchema<typeof TlvEventStatus>[]): DecodedEventReportStatus[] {
     const result = new Array<DecodedEventReportStatus>();
diff --git a/packages/protocol/src/session/SessionManager.ts b/packages/protocol/src/session/SessionManager.ts
index bde4720329..04ca35cb76 100644
--- a/packages/protocol/src/session/SessionManager.ts
+++ b/packages/protocol/src/session/SessionManager.ts
@@ -149,7 +149,7 @@ export interface SessionManagerContext {
     /**
      * This is an arbitrary contextual object attached to sessions used for compatibility with legacy APIs.
      *
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19 with the legacy controller API.
      */
     owner?: unknown;
 }
@@ -352,7 +352,7 @@ export class SessionManager {
     }
 
     /**
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19 with the legacy controller API.
      */
     get owner() {
         return this.#context.owner;
diff --git a/packages/types/src/cluster/ClusterType.ts b/packages/types/src/cluster/ClusterType.ts
index 8a3d1bc6c4..af0194a875 100644
--- a/packages/types/src/cluster/ClusterType.ts
+++ b/packages/types/src/cluster/ClusterType.ts
@@ -90,7 +90,7 @@ const cache = new WeakMap<ClusterModel, object>();
  * feature enum, error classes, plus lazy getters for `attributes`, `commands`, `events`, `features`, `Cluster`,
  * and `Complete`.
  *
- * @deprecated Use ClusterType with a ClusterModel instead.
+ * @deprecated Scheduled for removal in 0.19.  Use ClusterType with a ClusterModel instead.
  */
 export function ClusterType<const T extends RetiredClusterType.Options>(
     options: T,
@@ -167,7 +167,7 @@ function installLazyProperties(ns: object, model: ClusterModel) {
         // Compat shim for pre-PR #3466 call sites: `PowerSource.Cluster.with(Feature.X, Feature.Y)`.
         // Returns a shallow prototype-based clone of the namespace with `supportedFeatures` set.  Feature
         // selection has no other runtime effect (attribute maps are not culled by conformance).
-        // @deprecated Removal tracked for 0.18.
+        // @deprecated Removal tracked for 0.19.
         lazy("with", () => (...features: string[]) => {
             const clone = Object.create(ns) as Record<string, unknown>;
             const supportedFeatures: Record<string, true> = {};
@@ -330,15 +330,15 @@ export namespace ClusterType {
     /**
      * Compat layer for pre-PR #3466 call sites that pin features via `Cluster.with(...)`.  Returns the namespace
      * shape with a `with()` method that shifts `Typing.SupportedFeatures`.  Feature selection has no further runtime
-     * effect; the shim exists only to keep existing call sites typing correctly during the 0.17 → 0.18 migration.
+     * effect; the shim exists only to keep existing call sites typing correctly during the 0.17 → 0.19 migration.
      *
-     * @deprecated Scheduled for removal in 0.18.  New code should type the cluster via
+     * @deprecated Scheduled for removal in 0.19.  New code should type the cluster via
      * {@link WithSupportedFeatures} directly.
      */
     export type WithCompat<NS, T extends ClusterTyping> = NS & {
         /**
          * @deprecated Feature selection is a typing-only compat shim for pre-PR #3466 call sites.
-         * Scheduled for removal in 0.18.  Prefer typing the cluster via {@link WithSupportedFeatures} directly.
+         * Scheduled for removal in 0.19.  Prefer typing the cluster via {@link WithSupportedFeatures} directly.
          */
         with<const F extends readonly (T extends { Features: infer All extends string } ? All : never)[]>(
             ...features: F
@@ -554,12 +554,12 @@ export namespace ClusterType {
     }
 
     /**
-     * @deprecated Provided for compatibility with external consumers.
+     * @deprecated Provided for compatibility with external consumers.  Scheduled for removal in 0.19.
      */
     export type AttributeValues<T> = RetiredClusterType.AttributeValues<T>;
 
     /**
-     * @deprecated Provided for compatibility with external consumers.
+     * @deprecated Provided for compatibility with external consumers.  Scheduled for removal in 0.19.
      */
     export type CommandsOf<T> = RetiredClusterType.CommandsOf<T>;
 }
diff --git a/packages/types/src/cluster/RetiredClusterType.ts b/packages/types/src/cluster/RetiredClusterType.ts
index d0e741b354..7441b8fbfa 100644
--- a/packages/types/src/cluster/RetiredClusterType.ts
+++ b/packages/types/src/cluster/RetiredClusterType.ts
@@ -23,7 +23,7 @@ import { Attribute, Command, Event } from "./RetiredElements.js";
 /**
  * Types and utilities for the deprecated ClusterType factory.
  *
- * @deprecated Remove when ClusterType compat layer is dropped.
+ * @deprecated Scheduled for removal in 0.19 when the ClusterType compat layer is dropped.
  */
 export namespace RetiredClusterType {
     /**
@@ -148,7 +148,7 @@ export namespace RetiredClusterType {
     /**
      * Input to the retired ClusterType factory.
      *
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19.
      */
     export type Options<F extends BitSchema = {}> = {
         id: number;
@@ -163,12 +163,12 @@ export namespace RetiredClusterType {
     };
 
     /**
-     * @deprecated Provided for compatibility with external consumers.
+     * @deprecated Provided for compatibility with external consumers.  Scheduled for removal in 0.19.
      */
     export type AttributeValues<T> = T extends { Typing: { Attributes: infer A } } ? A : {};
 
     /**
-     * @deprecated Provided for compatibility with external consumers.
+     * @deprecated Provided for compatibility with external consumers.  Scheduled for removal in 0.19.
      */
     export type CommandsOf<T> = T extends { Typing: { Commands: infer C } } ? C : {};
 
diff --git a/packages/types/src/cluster/RetiredElements.ts b/packages/types/src/cluster/RetiredElements.ts
index 0b7d9ee044..97b9686e28 100644
--- a/packages/types/src/cluster/RetiredElements.ts
+++ b/packages/types/src/cluster/RetiredElements.ts
@@ -10,7 +10,7 @@
  * These provide a backward-compatible API for consumers that define clusters using the deprecated
  * {@link ClusterType}() factory rather than generated cluster namespaces or the decorator system.
  *
- * @deprecated use generated cluster namespaces or the decorator system instead.
+ * @deprecated Scheduled for removal in 0.19; use generated cluster namespaces or the decorator system instead.
  */
 
 import { Priority } from "#globals/Priority.js";
@@ -24,7 +24,7 @@ import { TlvSchema } from "../tlv/TlvSchema.js";
 /* Attribute interfaces */
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface Attribute<T, _F extends BitSchema> {
     id: AttributeId;
@@ -44,63 +44,63 @@ export interface Attribute<T, _F extends BitSchema> {
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface OptionalAttribute<T, F extends BitSchema> extends Attribute<T, F> {
     optional: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface WritableAttribute<T, F extends BitSchema> extends Attribute<T, F> {
     writable: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface OptionalWritableAttribute<T, F extends BitSchema> extends OptionalAttribute<T, F> {
     writable: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface FabricScopedAttribute<T, F extends BitSchema> extends Attribute<T, F> {
     fabricScoped: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface WritableFabricScopedAttribute<T, F extends BitSchema> extends WritableAttribute<T, F> {
     fabricScoped: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface OptionalWritableFabricScopedAttribute<T, F extends BitSchema> extends OptionalWritableAttribute<T, F> {
     fabricScoped: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface FixedAttribute<T, F extends BitSchema> extends Attribute<T, F> {
     fixed: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface WritableFixedAttribute<T, F extends BitSchema> extends WritableAttribute<T, F> {
     fixed: true;
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface OptionalFixedAttribute<T, F extends BitSchema> extends OptionalAttribute<T, F> {
     fixed: true;
@@ -119,7 +119,7 @@ interface AttributeOptions<T> {
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const Attribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -149,7 +149,7 @@ export const Attribute = <T, V extends T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const OptionalAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -179,7 +179,7 @@ export const OptionalAttribute = <T, V extends T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const WritableAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -211,7 +211,7 @@ export const WritableAttribute = <T, V extends T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const OptionalWritableAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -243,7 +243,7 @@ export const OptionalWritableAttribute = <T, V extends T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const FabricScopedAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -273,7 +273,7 @@ export const FabricScopedAttribute = <T, V extends T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const WritableFabricScopedAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -305,7 +305,7 @@ export const WritableFabricScopedAttribute = <T, V extends T, F extends BitSchem
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const OptionalWritableFabricScopedAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -337,7 +337,7 @@ export const OptionalWritableFabricScopedAttribute = <T, V extends T, F extends
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const FixedAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -367,7 +367,7 @@ export const FixedAttribute = <T, V extends T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const WritableFixedAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -397,7 +397,7 @@ export const WritableFixedAttribute = <T, V extends T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const OptionalFixedAttribute = <T, V extends T, F extends BitSchema>(
     id: number,
@@ -429,7 +429,7 @@ export const OptionalFixedAttribute = <T, V extends T, F extends BitSchema>(
 /* Command interfaces */
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface Command<RequestT, ResponseT, _F extends BitSchema> {
     optional: boolean;
@@ -442,7 +442,7 @@ export interface Command<RequestT, ResponseT, _F extends BitSchema> {
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface OptionalCommand<RequestT, ResponseT, F extends BitSchema> extends Command<RequestT, ResponseT, F> {
     optional: true;
@@ -456,7 +456,7 @@ interface CommandOptions {
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const Command = <RequestT, ResponseT, F extends BitSchema>(
     requestId: number,
@@ -475,7 +475,7 @@ export const Command = <RequestT, ResponseT, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const OptionalCommand = <RequestT, ResponseT, F extends BitSchema>(
     requestId: number,
@@ -496,7 +496,7 @@ export const OptionalCommand = <RequestT, ResponseT, F extends BitSchema>(
 /* Event interfaces */
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface Event<T, _F extends BitSchema> {
     id: EventId;
@@ -508,7 +508,7 @@ export interface Event<T, _F extends BitSchema> {
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export interface OptionalEvent<T, F extends BitSchema> extends Event<T, F> {
     optional: true;
@@ -521,7 +521,7 @@ interface EventOptions {
 }
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const Event = <T, F extends BitSchema>(
     id: number,
@@ -538,7 +538,7 @@ export const Event = <T, F extends BitSchema>(
 });
 
 /**
- * @deprecated
+ * @deprecated Scheduled for removal in 0.19.
  */
 export const OptionalEvent = <T, F extends BitSchema>(
     id: number,
diff --git a/packages/types/src/clusters/access-control.d.ts b/packages/types/src/clusters/access-control.d.ts
index 0180ea6d2b..4a63db5ec2 100644
--- a/packages/types/src/clusters/access-control.d.ts
+++ b/packages/types/src/clusters/access-control.d.ts
@@ -1297,12 +1297,12 @@ export declare namespace AccessControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link AccessControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AccessControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof AccessControl, AccessControl>;
 
     /**
-     * @deprecated Use {@link AccessControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AccessControl}.
      */
     export const Complete: typeof AccessControl;
 
@@ -1310,7 +1310,7 @@ export declare namespace AccessControl {
 }
 
 /**
- * @deprecated Use {@link AccessControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link AccessControl}.
  */
 export declare const AccessControlCluster: typeof AccessControl;
 
diff --git a/packages/types/src/clusters/account-login.d.ts b/packages/types/src/clusters/account-login.d.ts
index cf486a6dd1..6b293c5af3 100644
--- a/packages/types/src/clusters/account-login.d.ts
+++ b/packages/types/src/clusters/account-login.d.ts
@@ -400,12 +400,12 @@ export declare namespace AccountLogin {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link AccountLogin}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AccountLogin}.
      */
     export const Cluster: typeof AccountLogin;
 
     /**
-     * @deprecated Use {@link AccountLogin}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AccountLogin}.
      */
     export const Complete: typeof AccountLogin;
 
@@ -413,7 +413,7 @@ export declare namespace AccountLogin {
 }
 
 /**
- * @deprecated Use {@link AccountLogin}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link AccountLogin}.
  */
 export declare const AccountLoginCluster: typeof AccountLogin;
 
diff --git a/packages/types/src/clusters/actions.d.ts b/packages/types/src/clusters/actions.d.ts
index 7f250393d7..69e52ef52a 100644
--- a/packages/types/src/clusters/actions.d.ts
+++ b/packages/types/src/clusters/actions.d.ts
@@ -1148,12 +1148,12 @@ export declare namespace Actions {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link Actions}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Actions}.
      */
     export const Cluster: typeof Actions;
 
     /**
-     * @deprecated Use {@link Actions}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Actions}.
      */
     export const Complete: typeof Actions;
 
@@ -1161,7 +1161,7 @@ export declare namespace Actions {
 }
 
 /**
- * @deprecated Use {@link Actions}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Actions}.
  */
 export declare const ActionsCluster: typeof Actions;
 
diff --git a/packages/types/src/clusters/activated-carbon-filter-monitoring.d.ts b/packages/types/src/clusters/activated-carbon-filter-monitoring.d.ts
index bba30df9ef..42b444063b 100644
--- a/packages/types/src/clusters/activated-carbon-filter-monitoring.d.ts
+++ b/packages/types/src/clusters/activated-carbon-filter-monitoring.d.ts
@@ -226,12 +226,12 @@ export declare namespace ActivatedCarbonFilterMonitoring {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ActivatedCarbonFilterMonitoring}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ActivatedCarbonFilterMonitoring}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ActivatedCarbonFilterMonitoring, ActivatedCarbonFilterMonitoring>;
 
     /**
-     * @deprecated Use {@link ActivatedCarbonFilterMonitoring}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ActivatedCarbonFilterMonitoring}.
      */
     export const Complete: typeof ActivatedCarbonFilterMonitoring;
 
@@ -239,7 +239,7 @@ export declare namespace ActivatedCarbonFilterMonitoring {
 }
 
 /**
- * @deprecated Use {@link ActivatedCarbonFilterMonitoring}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ActivatedCarbonFilterMonitoring}.
  */
 export declare const ActivatedCarbonFilterMonitoringCluster: typeof ActivatedCarbonFilterMonitoring;
 
diff --git a/packages/types/src/clusters/administrator-commissioning.d.ts b/packages/types/src/clusters/administrator-commissioning.d.ts
index 8593e767de..e1132a91b6 100644
--- a/packages/types/src/clusters/administrator-commissioning.d.ts
+++ b/packages/types/src/clusters/administrator-commissioning.d.ts
@@ -500,12 +500,12 @@ export declare namespace AdministratorCommissioning {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link AdministratorCommissioning}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AdministratorCommissioning}.
      */
     export const Cluster: ClusterType.WithCompat<typeof AdministratorCommissioning, AdministratorCommissioning>;
 
     /**
-     * @deprecated Use {@link AdministratorCommissioning}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AdministratorCommissioning}.
      */
     export const Complete: typeof AdministratorCommissioning;
 
@@ -513,7 +513,7 @@ export declare namespace AdministratorCommissioning {
 }
 
 /**
- * @deprecated Use {@link AdministratorCommissioning}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link AdministratorCommissioning}.
  */
 export declare const AdministratorCommissioningCluster: typeof AdministratorCommissioning;
 
diff --git a/packages/types/src/clusters/air-quality.d.ts b/packages/types/src/clusters/air-quality.d.ts
index 1827b3dff3..58c1944cca 100644
--- a/packages/types/src/clusters/air-quality.d.ts
+++ b/packages/types/src/clusters/air-quality.d.ts
@@ -159,12 +159,12 @@ export declare namespace AirQuality {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link AirQuality}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AirQuality}.
      */
     export const Cluster: ClusterType.WithCompat<typeof AirQuality, AirQuality>;
 
     /**
-     * @deprecated Use {@link AirQuality}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AirQuality}.
      */
     export const Complete: typeof AirQuality;
 
@@ -172,7 +172,7 @@ export declare namespace AirQuality {
 }
 
 /**
- * @deprecated Use {@link AirQuality}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link AirQuality}.
  */
 export declare const AirQualityCluster: typeof AirQuality;
 
diff --git a/packages/types/src/clusters/alarm-base.d.ts b/packages/types/src/clusters/alarm-base.d.ts
index 0fa1409102..9c75e8eac0 100644
--- a/packages/types/src/clusters/alarm-base.d.ts
+++ b/packages/types/src/clusters/alarm-base.d.ts
@@ -316,7 +316,7 @@ export declare namespace AlarmBase {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link AlarmBase}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AlarmBase}.
      */
     export const Complete: typeof AlarmBase;
 
diff --git a/packages/types/src/clusters/ambient-context-sensing.d.ts b/packages/types/src/clusters/ambient-context-sensing.d.ts
index 8d0cf9d213..f42f1276c7 100644
--- a/packages/types/src/clusters/ambient-context-sensing.d.ts
+++ b/packages/types/src/clusters/ambient-context-sensing.d.ts
@@ -681,12 +681,12 @@ export declare namespace AmbientContextSensing {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link AmbientContextSensing}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AmbientContextSensing}.
      */
     export const Cluster: ClusterType.WithCompat<typeof AmbientContextSensing, AmbientContextSensing>;
 
     /**
-     * @deprecated Use {@link AmbientContextSensing}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AmbientContextSensing}.
      */
     export const Complete: typeof AmbientContextSensing;
 
@@ -694,7 +694,7 @@ export declare namespace AmbientContextSensing {
 }
 
 /**
- * @deprecated Use {@link AmbientContextSensing}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link AmbientContextSensing}.
  */
 export declare const AmbientContextSensingCluster: typeof AmbientContextSensing;
 
diff --git a/packages/types/src/clusters/application-basic.d.ts b/packages/types/src/clusters/application-basic.d.ts
index add12125f8..c277fabe58 100644
--- a/packages/types/src/clusters/application-basic.d.ts
+++ b/packages/types/src/clusters/application-basic.d.ts
@@ -243,12 +243,12 @@ export declare namespace ApplicationBasic {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link ApplicationBasic}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ApplicationBasic}.
      */
     export const Cluster: typeof ApplicationBasic;
 
     /**
-     * @deprecated Use {@link ApplicationBasic}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ApplicationBasic}.
      */
     export const Complete: typeof ApplicationBasic;
 
@@ -256,7 +256,7 @@ export declare namespace ApplicationBasic {
 }
 
 /**
- * @deprecated Use {@link ApplicationBasic}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ApplicationBasic}.
  */
 export declare const ApplicationBasicCluster: typeof ApplicationBasic;
 
diff --git a/packages/types/src/clusters/application-launcher.d.ts b/packages/types/src/clusters/application-launcher.d.ts
index 241fd21b84..2e95622de5 100644
--- a/packages/types/src/clusters/application-launcher.d.ts
+++ b/packages/types/src/clusters/application-launcher.d.ts
@@ -458,12 +458,12 @@ export declare namespace ApplicationLauncher {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ApplicationLauncher}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ApplicationLauncher}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ApplicationLauncher, ApplicationLauncher>;
 
     /**
-     * @deprecated Use {@link ApplicationLauncher}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ApplicationLauncher}.
      */
     export const Complete: typeof ApplicationLauncher;
 
@@ -471,7 +471,7 @@ export declare namespace ApplicationLauncher {
 }
 
 /**
- * @deprecated Use {@link ApplicationLauncher}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ApplicationLauncher}.
  */
 export declare const ApplicationLauncherCluster: typeof ApplicationLauncher;
 
diff --git a/packages/types/src/clusters/audio-output.d.ts b/packages/types/src/clusters/audio-output.d.ts
index 307568e18f..7e498b940b 100644
--- a/packages/types/src/clusters/audio-output.d.ts
+++ b/packages/types/src/clusters/audio-output.d.ts
@@ -247,12 +247,12 @@ export declare namespace AudioOutput {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link AudioOutput}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AudioOutput}.
      */
     export const Cluster: ClusterType.WithCompat<typeof AudioOutput, AudioOutput>;
 
     /**
-     * @deprecated Use {@link AudioOutput}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link AudioOutput}.
      */
     export const Complete: typeof AudioOutput;
 
@@ -260,7 +260,7 @@ export declare namespace AudioOutput {
 }
 
 /**
- * @deprecated Use {@link AudioOutput}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link AudioOutput}.
  */
 export declare const AudioOutputCluster: typeof AudioOutput;
 
diff --git a/packages/types/src/clusters/basic-information.d.ts b/packages/types/src/clusters/basic-information.d.ts
index d204cce1bb..7d4a3de7c0 100644
--- a/packages/types/src/clusters/basic-information.d.ts
+++ b/packages/types/src/clusters/basic-information.d.ts
@@ -1023,12 +1023,12 @@ export declare namespace BasicInformation {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link BasicInformation}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BasicInformation}.
      */
     export const Cluster: typeof BasicInformation;
 
     /**
-     * @deprecated Use {@link BasicInformation}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BasicInformation}.
      */
     export const Complete: typeof BasicInformation;
 
@@ -1036,7 +1036,7 @@ export declare namespace BasicInformation {
 }
 
 /**
- * @deprecated Use {@link BasicInformation}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link BasicInformation}.
  */
 export declare const BasicInformationCluster: typeof BasicInformation;
 
diff --git a/packages/types/src/clusters/binding.d.ts b/packages/types/src/clusters/binding.d.ts
index b2e5ec0651..74f0bac3ca 100644
--- a/packages/types/src/clusters/binding.d.ts
+++ b/packages/types/src/clusters/binding.d.ts
@@ -143,12 +143,12 @@ export declare namespace Binding {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link Binding}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Binding}.
      */
     export const Cluster: typeof Binding;
 
     /**
-     * @deprecated Use {@link Binding}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Binding}.
      */
     export const Complete: typeof Binding;
 
@@ -156,7 +156,7 @@ export declare namespace Binding {
 }
 
 /**
- * @deprecated Use {@link Binding}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Binding}.
  */
 export declare const BindingCluster: typeof Binding;
 
diff --git a/packages/types/src/clusters/boolean-state-configuration.d.ts b/packages/types/src/clusters/boolean-state-configuration.d.ts
index ef212c3953..7ac1988851 100644
--- a/packages/types/src/clusters/boolean-state-configuration.d.ts
+++ b/packages/types/src/clusters/boolean-state-configuration.d.ts
@@ -584,12 +584,12 @@ export declare namespace BooleanStateConfiguration {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link BooleanStateConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BooleanStateConfiguration}.
      */
     export const Cluster: ClusterType.WithCompat<typeof BooleanStateConfiguration, BooleanStateConfiguration>;
 
     /**
-     * @deprecated Use {@link BooleanStateConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BooleanStateConfiguration}.
      */
     export const Complete: typeof BooleanStateConfiguration;
 
@@ -597,7 +597,7 @@ export declare namespace BooleanStateConfiguration {
 }
 
 /**
- * @deprecated Use {@link BooleanStateConfiguration}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link BooleanStateConfiguration}.
  */
 export declare const BooleanStateConfigurationCluster: typeof BooleanStateConfiguration;
 
diff --git a/packages/types/src/clusters/boolean-state.d.ts b/packages/types/src/clusters/boolean-state.d.ts
index 0eec9aa865..9a0b5d2d4f 100644
--- a/packages/types/src/clusters/boolean-state.d.ts
+++ b/packages/types/src/clusters/boolean-state.d.ts
@@ -167,12 +167,12 @@ export declare namespace BooleanState {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link BooleanState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BooleanState}.
      */
     export const Cluster: ClusterType.WithCompat<typeof BooleanState, BooleanState>;
 
     /**
-     * @deprecated Use {@link BooleanState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BooleanState}.
      */
     export const Complete: typeof BooleanState;
 
@@ -180,7 +180,7 @@ export declare namespace BooleanState {
 }
 
 /**
- * @deprecated Use {@link BooleanState}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link BooleanState}.
  */
 export declare const BooleanStateCluster: typeof BooleanState;
 
diff --git a/packages/types/src/clusters/bridged-device-basic-information.d.ts b/packages/types/src/clusters/bridged-device-basic-information.d.ts
index 88f20c8799..528d1e4ca9 100644
--- a/packages/types/src/clusters/bridged-device-basic-information.d.ts
+++ b/packages/types/src/clusters/bridged-device-basic-information.d.ts
@@ -616,12 +616,12 @@ export declare namespace BridgedDeviceBasicInformation {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link BridgedDeviceBasicInformation}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BridgedDeviceBasicInformation}.
      */
     export const Cluster: ClusterType.WithCompat<typeof BridgedDeviceBasicInformation, BridgedDeviceBasicInformation>;
 
     /**
-     * @deprecated Use {@link BridgedDeviceBasicInformation}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link BridgedDeviceBasicInformation}.
      */
     export const Complete: typeof BridgedDeviceBasicInformation;
 
@@ -629,7 +629,7 @@ export declare namespace BridgedDeviceBasicInformation {
 }
 
 /**
- * @deprecated Use {@link BridgedDeviceBasicInformation}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link BridgedDeviceBasicInformation}.
  */
 export declare const BridgedDeviceBasicInformationCluster: typeof BridgedDeviceBasicInformation;
 
diff --git a/packages/types/src/clusters/camera-av-settings-user-level-management.d.ts b/packages/types/src/clusters/camera-av-settings-user-level-management.d.ts
index 5cb1aeec5a..61bab101cd 100644
--- a/packages/types/src/clusters/camera-av-settings-user-level-management.d.ts
+++ b/packages/types/src/clusters/camera-av-settings-user-level-management.d.ts
@@ -707,12 +707,12 @@ export declare namespace CameraAvSettingsUserLevelManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link CameraAvSettingsUserLevelManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CameraAvSettingsUserLevelManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof CameraAvSettingsUserLevelManagement, CameraAvSettingsUserLevelManagement>;
 
     /**
-     * @deprecated Use {@link CameraAvSettingsUserLevelManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CameraAvSettingsUserLevelManagement}.
      */
     export const Complete: typeof CameraAvSettingsUserLevelManagement;
 
@@ -720,7 +720,7 @@ export declare namespace CameraAvSettingsUserLevelManagement {
 }
 
 /**
- * @deprecated Use {@link CameraAvSettingsUserLevelManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CameraAvSettingsUserLevelManagement}.
  */
 export declare const CameraAvSettingsUserLevelManagementCluster: typeof CameraAvSettingsUserLevelManagement;
 
diff --git a/packages/types/src/clusters/camera-av-stream-management.d.ts b/packages/types/src/clusters/camera-av-stream-management.d.ts
index 94566e899e..0f063d2448 100644
--- a/packages/types/src/clusters/camera-av-stream-management.d.ts
+++ b/packages/types/src/clusters/camera-av-stream-management.d.ts
@@ -2227,12 +2227,12 @@ export declare namespace CameraAvStreamManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link CameraAvStreamManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CameraAvStreamManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof CameraAvStreamManagement, CameraAvStreamManagement>;
 
     /**
-     * @deprecated Use {@link CameraAvStreamManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CameraAvStreamManagement}.
      */
     export const Complete: typeof CameraAvStreamManagement;
 
@@ -2240,7 +2240,7 @@ export declare namespace CameraAvStreamManagement {
 }
 
 /**
- * @deprecated Use {@link CameraAvStreamManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CameraAvStreamManagement}.
  */
 export declare const CameraAvStreamManagementCluster: typeof CameraAvStreamManagement;
 
diff --git a/packages/types/src/clusters/carbon-dioxide-concentration-measurement.d.ts b/packages/types/src/clusters/carbon-dioxide-concentration-measurement.d.ts
index 314de588ce..d405bf4f20 100644
--- a/packages/types/src/clusters/carbon-dioxide-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/carbon-dioxide-concentration-measurement.d.ts
@@ -316,12 +316,12 @@ export declare namespace CarbonDioxideConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link CarbonDioxideConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CarbonDioxideConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof CarbonDioxideConcentrationMeasurement, CarbonDioxideConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link CarbonDioxideConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CarbonDioxideConcentrationMeasurement}.
      */
     export const Complete: typeof CarbonDioxideConcentrationMeasurement;
 
@@ -329,7 +329,7 @@ export declare namespace CarbonDioxideConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link CarbonDioxideConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CarbonDioxideConcentrationMeasurement}.
  */
 export declare const CarbonDioxideConcentrationMeasurementCluster: typeof CarbonDioxideConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/carbon-monoxide-concentration-measurement.d.ts b/packages/types/src/clusters/carbon-monoxide-concentration-measurement.d.ts
index e77a93790e..7d8f186f4d 100644
--- a/packages/types/src/clusters/carbon-monoxide-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/carbon-monoxide-concentration-measurement.d.ts
@@ -316,12 +316,12 @@ export declare namespace CarbonMonoxideConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link CarbonMonoxideConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CarbonMonoxideConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof CarbonMonoxideConcentrationMeasurement, CarbonMonoxideConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link CarbonMonoxideConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CarbonMonoxideConcentrationMeasurement}.
      */
     export const Complete: typeof CarbonMonoxideConcentrationMeasurement;
 
@@ -329,7 +329,7 @@ export declare namespace CarbonMonoxideConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link CarbonMonoxideConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CarbonMonoxideConcentrationMeasurement}.
  */
 export declare const CarbonMonoxideConcentrationMeasurementCluster: typeof CarbonMonoxideConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/channel.d.ts b/packages/types/src/clusters/channel.d.ts
index 7705f9c1d3..cbfec2f566 100644
--- a/packages/types/src/clusters/channel.d.ts
+++ b/packages/types/src/clusters/channel.d.ts
@@ -1042,12 +1042,12 @@ export declare namespace Channel {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Channel}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Channel}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Channel, Channel>;
 
     /**
-     * @deprecated Use {@link Channel}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Channel}.
      */
     export const Complete: typeof Channel;
 
@@ -1055,7 +1055,7 @@ export declare namespace Channel {
 }
 
 /**
- * @deprecated Use {@link Channel}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Channel}.
  */
 export declare const ChannelCluster: typeof Channel;
 
diff --git a/packages/types/src/clusters/chime.d.ts b/packages/types/src/clusters/chime.d.ts
index a49b03f05a..6302e8e517 100644
--- a/packages/types/src/clusters/chime.d.ts
+++ b/packages/types/src/clusters/chime.d.ts
@@ -232,12 +232,12 @@ export declare namespace Chime {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link Chime}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Chime}.
      */
     export const Cluster: typeof Chime;
 
     /**
-     * @deprecated Use {@link Chime}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Chime}.
      */
     export const Complete: typeof Chime;
 
@@ -245,7 +245,7 @@ export declare namespace Chime {
 }
 
 /**
- * @deprecated Use {@link Chime}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Chime}.
  */
 export declare const ChimeCluster: typeof Chime;
 
diff --git a/packages/types/src/clusters/closure-control.d.ts b/packages/types/src/clusters/closure-control.d.ts
index 10b1e03eaa..8dda98ef7c 100644
--- a/packages/types/src/clusters/closure-control.d.ts
+++ b/packages/types/src/clusters/closure-control.d.ts
@@ -1008,12 +1008,12 @@ export declare namespace ClosureControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ClosureControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ClosureControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ClosureControl, ClosureControl>;
 
     /**
-     * @deprecated Use {@link ClosureControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ClosureControl}.
      */
     export const Complete: typeof ClosureControl;
 
@@ -1021,7 +1021,7 @@ export declare namespace ClosureControl {
 }
 
 /**
- * @deprecated Use {@link ClosureControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ClosureControl}.
  */
 export declare const ClosureControlCluster: typeof ClosureControl;
 
diff --git a/packages/types/src/clusters/closure-dimension.d.ts b/packages/types/src/clusters/closure-dimension.d.ts
index 009beea5b7..68fdf360c3 100644
--- a/packages/types/src/clusters/closure-dimension.d.ts
+++ b/packages/types/src/clusters/closure-dimension.d.ts
@@ -1071,12 +1071,12 @@ export declare namespace ClosureDimension {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ClosureDimension}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ClosureDimension}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ClosureDimension, ClosureDimension>;
 
     /**
-     * @deprecated Use {@link ClosureDimension}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ClosureDimension}.
      */
     export const Complete: typeof ClosureDimension;
 
@@ -1084,7 +1084,7 @@ export declare namespace ClosureDimension {
 }
 
 /**
- * @deprecated Use {@link ClosureDimension}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ClosureDimension}.
  */
 export declare const ClosureDimensionCluster: typeof ClosureDimension;
 
diff --git a/packages/types/src/clusters/color-control.d.ts b/packages/types/src/clusters/color-control.d.ts
index 79ddda5d98..77d6ae1419 100644
--- a/packages/types/src/clusters/color-control.d.ts
+++ b/packages/types/src/clusters/color-control.d.ts
@@ -2217,12 +2217,12 @@ export declare namespace ColorControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ColorControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ColorControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ColorControl, ColorControl>;
 
     /**
-     * @deprecated Use {@link ColorControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ColorControl}.
      */
     export const Complete: typeof ColorControl;
 
@@ -2230,7 +2230,7 @@ export declare namespace ColorControl {
 }
 
 /**
- * @deprecated Use {@link ColorControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ColorControl}.
  */
 export declare const ColorControlCluster: typeof ColorControl;
 
diff --git a/packages/types/src/clusters/commissioner-control.d.ts b/packages/types/src/clusters/commissioner-control.d.ts
index 6f661d8533..bcd772bccc 100644
--- a/packages/types/src/clusters/commissioner-control.d.ts
+++ b/packages/types/src/clusters/commissioner-control.d.ts
@@ -322,12 +322,12 @@ export declare namespace CommissionerControl {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link CommissionerControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommissionerControl}.
      */
     export const Cluster: typeof CommissionerControl;
 
     /**
-     * @deprecated Use {@link CommissionerControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommissionerControl}.
      */
     export const Complete: typeof CommissionerControl;
 
@@ -335,7 +335,7 @@ export declare namespace CommissionerControl {
 }
 
 /**
- * @deprecated Use {@link CommissionerControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CommissionerControl}.
  */
 export declare const CommissionerControlCluster: typeof CommissionerControl;
 
diff --git a/packages/types/src/clusters/commodity-metering.d.ts b/packages/types/src/clusters/commodity-metering.d.ts
index aedabb6216..ed6ef1ce1f 100644
--- a/packages/types/src/clusters/commodity-metering.d.ts
+++ b/packages/types/src/clusters/commodity-metering.d.ts
@@ -147,12 +147,12 @@ export declare namespace CommodityMetering {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link CommodityMetering}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommodityMetering}.
      */
     export const Cluster: typeof CommodityMetering;
 
     /**
-     * @deprecated Use {@link CommodityMetering}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommodityMetering}.
      */
     export const Complete: typeof CommodityMetering;
 
@@ -160,7 +160,7 @@ export declare namespace CommodityMetering {
 }
 
 /**
- * @deprecated Use {@link CommodityMetering}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CommodityMetering}.
  */
 export declare const CommodityMeteringCluster: typeof CommodityMetering;
 
diff --git a/packages/types/src/clusters/commodity-price.d.ts b/packages/types/src/clusters/commodity-price.d.ts
index 06302384e6..852681e5a7 100644
--- a/packages/types/src/clusters/commodity-price.d.ts
+++ b/packages/types/src/clusters/commodity-price.d.ts
@@ -457,12 +457,12 @@ export declare namespace CommodityPrice {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link CommodityPrice}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommodityPrice}.
      */
     export const Cluster: ClusterType.WithCompat<typeof CommodityPrice, CommodityPrice>;
 
     /**
-     * @deprecated Use {@link CommodityPrice}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommodityPrice}.
      */
     export const Complete: typeof CommodityPrice;
 
@@ -470,7 +470,7 @@ export declare namespace CommodityPrice {
 }
 
 /**
- * @deprecated Use {@link CommodityPrice}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CommodityPrice}.
  */
 export declare const CommodityPriceCluster: typeof CommodityPrice;
 
diff --git a/packages/types/src/clusters/commodity-tariff.d.ts b/packages/types/src/clusters/commodity-tariff.d.ts
index 98e7bf49a0..a9706a7c6f 100644
--- a/packages/types/src/clusters/commodity-tariff.d.ts
+++ b/packages/types/src/clusters/commodity-tariff.d.ts
@@ -1288,12 +1288,12 @@ export declare namespace CommodityTariff {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link CommodityTariff}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommodityTariff}.
      */
     export const Cluster: ClusterType.WithCompat<typeof CommodityTariff, CommodityTariff>;
 
     /**
-     * @deprecated Use {@link CommodityTariff}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link CommodityTariff}.
      */
     export const Complete: typeof CommodityTariff;
 
@@ -1301,7 +1301,7 @@ export declare namespace CommodityTariff {
 }
 
 /**
- * @deprecated Use {@link CommodityTariff}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link CommodityTariff}.
  */
 export declare const CommodityTariffCluster: typeof CommodityTariff;
 
diff --git a/packages/types/src/clusters/concentration-measurement.d.ts b/packages/types/src/clusters/concentration-measurement.d.ts
index fa903611c7..ee05eacded 100644
--- a/packages/types/src/clusters/concentration-measurement.d.ts
+++ b/packages/types/src/clusters/concentration-measurement.d.ts
@@ -410,7 +410,7 @@ export declare namespace ConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ConcentrationMeasurement}.
      */
     export const Complete: typeof ConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/content-app-observer.d.ts b/packages/types/src/clusters/content-app-observer.d.ts
index ab7b70974c..1b7971f5fa 100644
--- a/packages/types/src/clusters/content-app-observer.d.ts
+++ b/packages/types/src/clusters/content-app-observer.d.ts
@@ -189,12 +189,12 @@ export declare namespace ContentAppObserver {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link ContentAppObserver}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ContentAppObserver}.
      */
     export const Cluster: typeof ContentAppObserver;
 
     /**
-     * @deprecated Use {@link ContentAppObserver}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ContentAppObserver}.
      */
     export const Complete: typeof ContentAppObserver;
 
@@ -202,7 +202,7 @@ export declare namespace ContentAppObserver {
 }
 
 /**
- * @deprecated Use {@link ContentAppObserver}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ContentAppObserver}.
  */
 export declare const ContentAppObserverCluster: typeof ContentAppObserver;
 
diff --git a/packages/types/src/clusters/content-control.d.ts b/packages/types/src/clusters/content-control.d.ts
index 856e57ae85..59c3ee7194 100644
--- a/packages/types/src/clusters/content-control.d.ts
+++ b/packages/types/src/clusters/content-control.d.ts
@@ -1468,12 +1468,12 @@ export declare namespace ContentControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ContentControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ContentControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ContentControl, ContentControl>;
 
     /**
-     * @deprecated Use {@link ContentControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ContentControl}.
      */
     export const Complete: typeof ContentControl;
 
@@ -1481,7 +1481,7 @@ export declare namespace ContentControl {
 }
 
 /**
- * @deprecated Use {@link ContentControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ContentControl}.
  */
 export declare const ContentControlCluster: typeof ContentControl;
 
diff --git a/packages/types/src/clusters/content-launcher.d.ts b/packages/types/src/clusters/content-launcher.d.ts
index 563ec6692d..71a5fb08af 100644
--- a/packages/types/src/clusters/content-launcher.d.ts
+++ b/packages/types/src/clusters/content-launcher.d.ts
@@ -840,12 +840,12 @@ export declare namespace ContentLauncher {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ContentLauncher}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ContentLauncher}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ContentLauncher, ContentLauncher>;
 
     /**
-     * @deprecated Use {@link ContentLauncher}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ContentLauncher}.
      */
     export const Complete: typeof ContentLauncher;
 
@@ -853,7 +853,7 @@ export declare namespace ContentLauncher {
 }
 
 /**
- * @deprecated Use {@link ContentLauncher}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ContentLauncher}.
  */
 export declare const ContentLauncherCluster: typeof ContentLauncher;
 
diff --git a/packages/types/src/clusters/descriptor.d.ts b/packages/types/src/clusters/descriptor.d.ts
index 152c3ed3ae..62d0e996c5 100644
--- a/packages/types/src/clusters/descriptor.d.ts
+++ b/packages/types/src/clusters/descriptor.d.ts
@@ -295,12 +295,12 @@ export declare namespace Descriptor {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Descriptor}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Descriptor}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Descriptor, Descriptor>;
 
     /**
-     * @deprecated Use {@link Descriptor}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Descriptor}.
      */
     export const Complete: typeof Descriptor;
 
@@ -308,7 +308,7 @@ export declare namespace Descriptor {
 }
 
 /**
- * @deprecated Use {@link Descriptor}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Descriptor}.
  */
 export declare const DescriptorCluster: typeof Descriptor;
 
diff --git a/packages/types/src/clusters/device-energy-management-mode.d.ts b/packages/types/src/clusters/device-energy-management-mode.d.ts
index 148ee85738..817c9c6f75 100644
--- a/packages/types/src/clusters/device-energy-management-mode.d.ts
+++ b/packages/types/src/clusters/device-energy-management-mode.d.ts
@@ -332,12 +332,12 @@ export declare namespace DeviceEnergyManagementMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link DeviceEnergyManagementMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DeviceEnergyManagementMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof DeviceEnergyManagementMode, DeviceEnergyManagementMode>;
 
     /**
-     * @deprecated Use {@link DeviceEnergyManagementMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DeviceEnergyManagementMode}.
      */
     export const Complete: typeof DeviceEnergyManagementMode;
 
@@ -345,7 +345,7 @@ export declare namespace DeviceEnergyManagementMode {
 }
 
 /**
- * @deprecated Use {@link DeviceEnergyManagementMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link DeviceEnergyManagementMode}.
  */
 export declare const DeviceEnergyManagementModeCluster: typeof DeviceEnergyManagementMode;
 
diff --git a/packages/types/src/clusters/device-energy-management.d.ts b/packages/types/src/clusters/device-energy-management.d.ts
index 7c57356668..962b9f04f4 100644
--- a/packages/types/src/clusters/device-energy-management.d.ts
+++ b/packages/types/src/clusters/device-energy-management.d.ts
@@ -1908,12 +1908,12 @@ export declare namespace DeviceEnergyManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link DeviceEnergyManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DeviceEnergyManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof DeviceEnergyManagement, DeviceEnergyManagement>;
 
     /**
-     * @deprecated Use {@link DeviceEnergyManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DeviceEnergyManagement}.
      */
     export const Complete: typeof DeviceEnergyManagement;
 
@@ -1921,7 +1921,7 @@ export declare namespace DeviceEnergyManagement {
 }
 
 /**
- * @deprecated Use {@link DeviceEnergyManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link DeviceEnergyManagement}.
  */
 export declare const DeviceEnergyManagementCluster: typeof DeviceEnergyManagement;
 
diff --git a/packages/types/src/clusters/diagnostic-logs.d.ts b/packages/types/src/clusters/diagnostic-logs.d.ts
index be6abd5f4b..585c770a98 100644
--- a/packages/types/src/clusters/diagnostic-logs.d.ts
+++ b/packages/types/src/clusters/diagnostic-logs.d.ts
@@ -299,12 +299,12 @@ export declare namespace DiagnosticLogs {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link DiagnosticLogs}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DiagnosticLogs}.
      */
     export const Cluster: typeof DiagnosticLogs;
 
     /**
-     * @deprecated Use {@link DiagnosticLogs}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DiagnosticLogs}.
      */
     export const Complete: typeof DiagnosticLogs;
 
@@ -312,7 +312,7 @@ export declare namespace DiagnosticLogs {
 }
 
 /**
- * @deprecated Use {@link DiagnosticLogs}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link DiagnosticLogs}.
  */
 export declare const DiagnosticLogsCluster: typeof DiagnosticLogs;
 
diff --git a/packages/types/src/clusters/dishwasher-alarm.d.ts b/packages/types/src/clusters/dishwasher-alarm.d.ts
index ebaab01321..c4bc6b7684 100644
--- a/packages/types/src/clusters/dishwasher-alarm.d.ts
+++ b/packages/types/src/clusters/dishwasher-alarm.d.ts
@@ -358,12 +358,12 @@ export declare namespace DishwasherAlarm {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link DishwasherAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DishwasherAlarm}.
      */
     export const Cluster: ClusterType.WithCompat<typeof DishwasherAlarm, DishwasherAlarm>;
 
     /**
-     * @deprecated Use {@link DishwasherAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DishwasherAlarm}.
      */
     export const Complete: typeof DishwasherAlarm;
 
@@ -371,7 +371,7 @@ export declare namespace DishwasherAlarm {
 }
 
 /**
- * @deprecated Use {@link DishwasherAlarm}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link DishwasherAlarm}.
  */
 export declare const DishwasherAlarmCluster: typeof DishwasherAlarm;
 
diff --git a/packages/types/src/clusters/dishwasher-mode.d.ts b/packages/types/src/clusters/dishwasher-mode.d.ts
index c7b02ad321..e72de1327a 100644
--- a/packages/types/src/clusters/dishwasher-mode.d.ts
+++ b/packages/types/src/clusters/dishwasher-mode.d.ts
@@ -306,12 +306,12 @@ export declare namespace DishwasherMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link DishwasherMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DishwasherMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof DishwasherMode, DishwasherMode>;
 
     /**
-     * @deprecated Use {@link DishwasherMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DishwasherMode}.
      */
     export const Complete: typeof DishwasherMode;
 
@@ -319,7 +319,7 @@ export declare namespace DishwasherMode {
 }
 
 /**
- * @deprecated Use {@link DishwasherMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link DishwasherMode}.
  */
 export declare const DishwasherModeCluster: typeof DishwasherMode;
 
diff --git a/packages/types/src/clusters/door-lock.d.ts b/packages/types/src/clusters/door-lock.d.ts
index 29ff37feaf..7e71741fd5 100644
--- a/packages/types/src/clusters/door-lock.d.ts
+++ b/packages/types/src/clusters/door-lock.d.ts
@@ -4120,12 +4120,12 @@ export declare namespace DoorLock {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link DoorLock}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DoorLock}.
      */
     export const Cluster: ClusterType.WithCompat<typeof DoorLock, DoorLock>;
 
     /**
-     * @deprecated Use {@link DoorLock}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link DoorLock}.
      */
     export const Complete: typeof DoorLock;
 
@@ -4133,7 +4133,7 @@ export declare namespace DoorLock {
 }
 
 /**
- * @deprecated Use {@link DoorLock}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link DoorLock}.
  */
 export declare const DoorLockCluster: typeof DoorLock;
 
diff --git a/packages/types/src/clusters/ecosystem-information.d.ts b/packages/types/src/clusters/ecosystem-information.d.ts
index b096d5160b..10ef034ca5 100644
--- a/packages/types/src/clusters/ecosystem-information.d.ts
+++ b/packages/types/src/clusters/ecosystem-information.d.ts
@@ -285,12 +285,12 @@ export declare namespace EcosystemInformation {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link EcosystemInformation}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EcosystemInformation}.
      */
     export const Cluster: typeof EcosystemInformation;
 
     /**
-     * @deprecated Use {@link EcosystemInformation}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EcosystemInformation}.
      */
     export const Complete: typeof EcosystemInformation;
 
@@ -298,7 +298,7 @@ export declare namespace EcosystemInformation {
 }
 
 /**
- * @deprecated Use {@link EcosystemInformation}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link EcosystemInformation}.
  */
 export declare const EcosystemInformationCluster: typeof EcosystemInformation;
 
diff --git a/packages/types/src/clusters/electrical-energy-measurement.d.ts b/packages/types/src/clusters/electrical-energy-measurement.d.ts
index a52670fec5..150fc11f71 100644
--- a/packages/types/src/clusters/electrical-energy-measurement.d.ts
+++ b/packages/types/src/clusters/electrical-energy-measurement.d.ts
@@ -762,12 +762,12 @@ export declare namespace ElectricalEnergyMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ElectricalEnergyMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalEnergyMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ElectricalEnergyMeasurement, ElectricalEnergyMeasurement>;
 
     /**
-     * @deprecated Use {@link ElectricalEnergyMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalEnergyMeasurement}.
      */
     export const Complete: typeof ElectricalEnergyMeasurement;
 
@@ -775,7 +775,7 @@ export declare namespace ElectricalEnergyMeasurement {
 }
 
 /**
- * @deprecated Use {@link ElectricalEnergyMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalEnergyMeasurement}.
  */
 export declare const ElectricalEnergyMeasurementCluster: typeof ElectricalEnergyMeasurement;
 
diff --git a/packages/types/src/clusters/electrical-grid-conditions.d.ts b/packages/types/src/clusters/electrical-grid-conditions.d.ts
index cd98edd2d6..02e8787a2e 100644
--- a/packages/types/src/clusters/electrical-grid-conditions.d.ts
+++ b/packages/types/src/clusters/electrical-grid-conditions.d.ts
@@ -317,12 +317,12 @@ export declare namespace ElectricalGridConditions {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ElectricalGridConditions}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalGridConditions}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ElectricalGridConditions, ElectricalGridConditions>;
 
     /**
-     * @deprecated Use {@link ElectricalGridConditions}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalGridConditions}.
      */
     export const Complete: typeof ElectricalGridConditions;
 
@@ -330,7 +330,7 @@ export declare namespace ElectricalGridConditions {
 }
 
 /**
- * @deprecated Use {@link ElectricalGridConditions}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalGridConditions}.
  */
 export declare const ElectricalGridConditionsCluster: typeof ElectricalGridConditions;
 
diff --git a/packages/types/src/clusters/electrical-power-measurement.d.ts b/packages/types/src/clusters/electrical-power-measurement.d.ts
index 66715127a7..dea1d62edd 100644
--- a/packages/types/src/clusters/electrical-power-measurement.d.ts
+++ b/packages/types/src/clusters/electrical-power-measurement.d.ts
@@ -1133,12 +1133,12 @@ export declare namespace ElectricalPowerMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ElectricalPowerMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalPowerMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ElectricalPowerMeasurement, ElectricalPowerMeasurement>;
 
     /**
-     * @deprecated Use {@link ElectricalPowerMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalPowerMeasurement}.
      */
     export const Complete: typeof ElectricalPowerMeasurement;
 
@@ -1146,7 +1146,7 @@ export declare namespace ElectricalPowerMeasurement {
 }
 
 /**
- * @deprecated Use {@link ElectricalPowerMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ElectricalPowerMeasurement}.
  */
 export declare const ElectricalPowerMeasurementCluster: typeof ElectricalPowerMeasurement;
 
diff --git a/packages/types/src/clusters/energy-evse-mode.d.ts b/packages/types/src/clusters/energy-evse-mode.d.ts
index f8412894d4..f35d6d5cb7 100644
--- a/packages/types/src/clusters/energy-evse-mode.d.ts
+++ b/packages/types/src/clusters/energy-evse-mode.d.ts
@@ -340,12 +340,12 @@ export declare namespace EnergyEvseMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link EnergyEvseMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EnergyEvseMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof EnergyEvseMode, EnergyEvseMode>;
 
     /**
-     * @deprecated Use {@link EnergyEvseMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EnergyEvseMode}.
      */
     export const Complete: typeof EnergyEvseMode;
 
@@ -353,7 +353,7 @@ export declare namespace EnergyEvseMode {
 }
 
 /**
- * @deprecated Use {@link EnergyEvseMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link EnergyEvseMode}.
  */
 export declare const EnergyEvseModeCluster: typeof EnergyEvseMode;
 
diff --git a/packages/types/src/clusters/energy-evse.d.ts b/packages/types/src/clusters/energy-evse.d.ts
index 83a0235edd..365adf20cf 100644
--- a/packages/types/src/clusters/energy-evse.d.ts
+++ b/packages/types/src/clusters/energy-evse.d.ts
@@ -1665,12 +1665,12 @@ export declare namespace EnergyEvse {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link EnergyEvse}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EnergyEvse}.
      */
     export const Cluster: ClusterType.WithCompat<typeof EnergyEvse, EnergyEvse>;
 
     /**
-     * @deprecated Use {@link EnergyEvse}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EnergyEvse}.
      */
     export const Complete: typeof EnergyEvse;
 
@@ -1678,7 +1678,7 @@ export declare namespace EnergyEvse {
 }
 
 /**
- * @deprecated Use {@link EnergyEvse}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link EnergyEvse}.
  */
 export declare const EnergyEvseCluster: typeof EnergyEvse;
 
diff --git a/packages/types/src/clusters/energy-preference.d.ts b/packages/types/src/clusters/energy-preference.d.ts
index 724d4206e1..d436a40bf3 100644
--- a/packages/types/src/clusters/energy-preference.d.ts
+++ b/packages/types/src/clusters/energy-preference.d.ts
@@ -333,12 +333,12 @@ export declare namespace EnergyPreference {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link EnergyPreference}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EnergyPreference}.
      */
     export const Cluster: ClusterType.WithCompat<typeof EnergyPreference, EnergyPreference>;
 
     /**
-     * @deprecated Use {@link EnergyPreference}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EnergyPreference}.
      */
     export const Complete: typeof EnergyPreference;
 
@@ -346,7 +346,7 @@ export declare namespace EnergyPreference {
 }
 
 /**
- * @deprecated Use {@link EnergyPreference}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link EnergyPreference}.
  */
 export declare const EnergyPreferenceCluster: typeof EnergyPreference;
 
diff --git a/packages/types/src/clusters/ethernet-network-diagnostics.d.ts b/packages/types/src/clusters/ethernet-network-diagnostics.d.ts
index b3a3ac938c..b575ad6a8f 100644
--- a/packages/types/src/clusters/ethernet-network-diagnostics.d.ts
+++ b/packages/types/src/clusters/ethernet-network-diagnostics.d.ts
@@ -342,12 +342,12 @@ export declare namespace EthernetNetworkDiagnostics {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link EthernetNetworkDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EthernetNetworkDiagnostics}.
      */
     export const Cluster: ClusterType.WithCompat<typeof EthernetNetworkDiagnostics, EthernetNetworkDiagnostics>;
 
     /**
-     * @deprecated Use {@link EthernetNetworkDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link EthernetNetworkDiagnostics}.
      */
     export const Complete: typeof EthernetNetworkDiagnostics;
 
@@ -355,7 +355,7 @@ export declare namespace EthernetNetworkDiagnostics {
 }
 
 /**
- * @deprecated Use {@link EthernetNetworkDiagnostics}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link EthernetNetworkDiagnostics}.
  */
 export declare const EthernetNetworkDiagnosticsCluster: typeof EthernetNetworkDiagnostics;
 
diff --git a/packages/types/src/clusters/fan-control.d.ts b/packages/types/src/clusters/fan-control.d.ts
index cb43e9e84b..f620de712f 100644
--- a/packages/types/src/clusters/fan-control.d.ts
+++ b/packages/types/src/clusters/fan-control.d.ts
@@ -746,12 +746,12 @@ export declare namespace FanControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link FanControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FanControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof FanControl, FanControl>;
 
     /**
-     * @deprecated Use {@link FanControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FanControl}.
      */
     export const Complete: typeof FanControl;
 
@@ -759,7 +759,7 @@ export declare namespace FanControl {
 }
 
 /**
- * @deprecated Use {@link FanControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link FanControl}.
  */
 export declare const FanControlCluster: typeof FanControl;
 
diff --git a/packages/types/src/clusters/fixed-label.d.ts b/packages/types/src/clusters/fixed-label.d.ts
index a23e174b98..153b4bd1d5 100644
--- a/packages/types/src/clusters/fixed-label.d.ts
+++ b/packages/types/src/clusters/fixed-label.d.ts
@@ -85,12 +85,12 @@ export declare namespace FixedLabel {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link FixedLabel}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FixedLabel}.
      */
     export const Cluster: typeof FixedLabel;
 
     /**
-     * @deprecated Use {@link FixedLabel}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FixedLabel}.
      */
     export const Complete: typeof FixedLabel;
 
@@ -98,7 +98,7 @@ export declare namespace FixedLabel {
 }
 
 /**
- * @deprecated Use {@link FixedLabel}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link FixedLabel}.
  */
 export declare const FixedLabelCluster: typeof FixedLabel;
 
diff --git a/packages/types/src/clusters/flow-measurement.d.ts b/packages/types/src/clusters/flow-measurement.d.ts
index a085ed4130..ebdd58bc39 100644
--- a/packages/types/src/clusters/flow-measurement.d.ts
+++ b/packages/types/src/clusters/flow-measurement.d.ts
@@ -135,12 +135,12 @@ export declare namespace FlowMeasurement {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link FlowMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FlowMeasurement}.
      */
     export const Cluster: typeof FlowMeasurement;
 
     /**
-     * @deprecated Use {@link FlowMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FlowMeasurement}.
      */
     export const Complete: typeof FlowMeasurement;
 
@@ -148,7 +148,7 @@ export declare namespace FlowMeasurement {
 }
 
 /**
- * @deprecated Use {@link FlowMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link FlowMeasurement}.
  */
 export declare const FlowMeasurementCluster: typeof FlowMeasurement;
 
diff --git a/packages/types/src/clusters/formaldehyde-concentration-measurement.d.ts b/packages/types/src/clusters/formaldehyde-concentration-measurement.d.ts
index 038f71f597..00b128ce54 100644
--- a/packages/types/src/clusters/formaldehyde-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/formaldehyde-concentration-measurement.d.ts
@@ -314,12 +314,12 @@ export declare namespace FormaldehydeConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link FormaldehydeConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FormaldehydeConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof FormaldehydeConcentrationMeasurement, FormaldehydeConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link FormaldehydeConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link FormaldehydeConcentrationMeasurement}.
      */
     export const Complete: typeof FormaldehydeConcentrationMeasurement;
 
@@ -327,7 +327,7 @@ export declare namespace FormaldehydeConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link FormaldehydeConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link FormaldehydeConcentrationMeasurement}.
  */
 export declare const FormaldehydeConcentrationMeasurementCluster: typeof FormaldehydeConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/general-commissioning.d.ts b/packages/types/src/clusters/general-commissioning.d.ts
index 09741eae72..c6924d1799 100644
--- a/packages/types/src/clusters/general-commissioning.d.ts
+++ b/packages/types/src/clusters/general-commissioning.d.ts
@@ -960,12 +960,12 @@ export declare namespace GeneralCommissioning {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link GeneralCommissioning}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link GeneralCommissioning}.
      */
     export const Cluster: ClusterType.WithCompat<typeof GeneralCommissioning, GeneralCommissioning>;
 
     /**
-     * @deprecated Use {@link GeneralCommissioning}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link GeneralCommissioning}.
      */
     export const Complete: typeof GeneralCommissioning;
 
@@ -973,7 +973,7 @@ export declare namespace GeneralCommissioning {
 }
 
 /**
- * @deprecated Use {@link GeneralCommissioning}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link GeneralCommissioning}.
  */
 export declare const GeneralCommissioningCluster: typeof GeneralCommissioning;
 
diff --git a/packages/types/src/clusters/general-diagnostics.d.ts b/packages/types/src/clusters/general-diagnostics.d.ts
index 9e17815282..298403bde2 100644
--- a/packages/types/src/clusters/general-diagnostics.d.ts
+++ b/packages/types/src/clusters/general-diagnostics.d.ts
@@ -1004,12 +1004,12 @@ export declare namespace GeneralDiagnostics {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link GeneralDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link GeneralDiagnostics}.
      */
     export const Cluster: ClusterType.WithCompat<typeof GeneralDiagnostics, GeneralDiagnostics>;
 
     /**
-     * @deprecated Use {@link GeneralDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link GeneralDiagnostics}.
      */
     export const Complete: typeof GeneralDiagnostics;
 
@@ -1017,7 +1017,7 @@ export declare namespace GeneralDiagnostics {
 }
 
 /**
- * @deprecated Use {@link GeneralDiagnostics}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link GeneralDiagnostics}.
  */
 export declare const GeneralDiagnosticsCluster: typeof GeneralDiagnostics;
 
diff --git a/packages/types/src/clusters/group-key-management.d.ts b/packages/types/src/clusters/group-key-management.d.ts
index 59aacf546b..b7cdb41133 100644
--- a/packages/types/src/clusters/group-key-management.d.ts
+++ b/packages/types/src/clusters/group-key-management.d.ts
@@ -604,12 +604,12 @@ export declare namespace GroupKeyManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link GroupKeyManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link GroupKeyManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof GroupKeyManagement, GroupKeyManagement>;
 
     /**
-     * @deprecated Use {@link GroupKeyManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link GroupKeyManagement}.
      */
     export const Complete: typeof GroupKeyManagement;
 
@@ -617,7 +617,7 @@ export declare namespace GroupKeyManagement {
 }
 
 /**
- * @deprecated Use {@link GroupKeyManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link GroupKeyManagement}.
  */
 export declare const GroupKeyManagementCluster: typeof GroupKeyManagement;
 
diff --git a/packages/types/src/clusters/groupcast.d.ts b/packages/types/src/clusters/groupcast.d.ts
index 5ad9ff41f7..1335f0d135 100644
--- a/packages/types/src/clusters/groupcast.d.ts
+++ b/packages/types/src/clusters/groupcast.d.ts
@@ -935,12 +935,12 @@ export declare namespace Groupcast {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Groupcast}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Groupcast}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Groupcast, Groupcast>;
 
     /**
-     * @deprecated Use {@link Groupcast}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Groupcast}.
      */
     export const Complete: typeof Groupcast;
 
@@ -948,7 +948,7 @@ export declare namespace Groupcast {
 }
 
 /**
- * @deprecated Use {@link Groupcast}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Groupcast}.
  */
 export declare const GroupcastCluster: typeof Groupcast;
 
diff --git a/packages/types/src/clusters/groups.d.ts b/packages/types/src/clusters/groups.d.ts
index 10529a44d7..c939955ca0 100644
--- a/packages/types/src/clusters/groups.d.ts
+++ b/packages/types/src/clusters/groups.d.ts
@@ -428,12 +428,12 @@ export declare namespace Groups {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Groups}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Groups}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Groups, Groups>;
 
     /**
-     * @deprecated Use {@link Groups}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Groups}.
      */
     export const Complete: typeof Groups;
 
@@ -441,7 +441,7 @@ export declare namespace Groups {
 }
 
 /**
- * @deprecated Use {@link Groups}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Groups}.
  */
 export declare const GroupsCluster: typeof Groups;
 
diff --git a/packages/types/src/clusters/hepa-filter-monitoring.d.ts b/packages/types/src/clusters/hepa-filter-monitoring.d.ts
index ba1bbdab6d..5b7129659c 100644
--- a/packages/types/src/clusters/hepa-filter-monitoring.d.ts
+++ b/packages/types/src/clusters/hepa-filter-monitoring.d.ts
@@ -226,12 +226,12 @@ export declare namespace HepaFilterMonitoring {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link HepaFilterMonitoring}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link HepaFilterMonitoring}.
      */
     export const Cluster: ClusterType.WithCompat<typeof HepaFilterMonitoring, HepaFilterMonitoring>;
 
     /**
-     * @deprecated Use {@link HepaFilterMonitoring}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link HepaFilterMonitoring}.
      */
     export const Complete: typeof HepaFilterMonitoring;
 
@@ -239,7 +239,7 @@ export declare namespace HepaFilterMonitoring {
 }
 
 /**
- * @deprecated Use {@link HepaFilterMonitoring}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link HepaFilterMonitoring}.
  */
 export declare const HepaFilterMonitoringCluster: typeof HepaFilterMonitoring;
 
diff --git a/packages/types/src/clusters/icd-management.d.ts b/packages/types/src/clusters/icd-management.d.ts
index 072ac13537..d2919e5370 100644
--- a/packages/types/src/clusters/icd-management.d.ts
+++ b/packages/types/src/clusters/icd-management.d.ts
@@ -757,12 +757,12 @@ export declare namespace IcdManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link IcdManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link IcdManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof IcdManagement, IcdManagement>;
 
     /**
-     * @deprecated Use {@link IcdManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link IcdManagement}.
      */
     export const Complete: typeof IcdManagement;
 
@@ -770,7 +770,7 @@ export declare namespace IcdManagement {
 }
 
 /**
- * @deprecated Use {@link IcdManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link IcdManagement}.
  */
 export declare const IcdManagementCluster: typeof IcdManagement;
 
diff --git a/packages/types/src/clusters/identify.d.ts b/packages/types/src/clusters/identify.d.ts
index a8c676c909..37799fc974 100644
--- a/packages/types/src/clusters/identify.d.ts
+++ b/packages/types/src/clusters/identify.d.ts
@@ -296,12 +296,12 @@ export declare namespace Identify {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link Identify}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Identify}.
      */
     export const Cluster: typeof Identify;
 
     /**
-     * @deprecated Use {@link Identify}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Identify}.
      */
     export const Complete: typeof Identify;
 
@@ -309,7 +309,7 @@ export declare namespace Identify {
 }
 
 /**
- * @deprecated Use {@link Identify}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Identify}.
  */
 export declare const IdentifyCluster: typeof Identify;
 
diff --git a/packages/types/src/clusters/illuminance-measurement.d.ts b/packages/types/src/clusters/illuminance-measurement.d.ts
index d568e5d8c6..e72e4eb665 100644
--- a/packages/types/src/clusters/illuminance-measurement.d.ts
+++ b/packages/types/src/clusters/illuminance-measurement.d.ts
@@ -180,12 +180,12 @@ export declare namespace IlluminanceMeasurement {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link IlluminanceMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link IlluminanceMeasurement}.
      */
     export const Cluster: typeof IlluminanceMeasurement;
 
     /**
-     * @deprecated Use {@link IlluminanceMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link IlluminanceMeasurement}.
      */
     export const Complete: typeof IlluminanceMeasurement;
 
@@ -193,7 +193,7 @@ export declare namespace IlluminanceMeasurement {
 }
 
 /**
- * @deprecated Use {@link IlluminanceMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link IlluminanceMeasurement}.
  */
 export declare const IlluminanceMeasurementCluster: typeof IlluminanceMeasurement;
 
diff --git a/packages/types/src/clusters/joint-fabric-administrator.d.ts b/packages/types/src/clusters/joint-fabric-administrator.d.ts
index c411f5706d..72bd6ebec5 100644
--- a/packages/types/src/clusters/joint-fabric-administrator.d.ts
+++ b/packages/types/src/clusters/joint-fabric-administrator.d.ts
@@ -352,12 +352,12 @@ export declare namespace JointFabricAdministrator {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link JointFabricAdministrator}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link JointFabricAdministrator}.
      */
     export const Cluster: typeof JointFabricAdministrator;
 
     /**
-     * @deprecated Use {@link JointFabricAdministrator}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link JointFabricAdministrator}.
      */
     export const Complete: typeof JointFabricAdministrator;
 
@@ -365,7 +365,7 @@ export declare namespace JointFabricAdministrator {
 }
 
 /**
- * @deprecated Use {@link JointFabricAdministrator}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link JointFabricAdministrator}.
  */
 export declare const JointFabricAdministratorCluster: typeof JointFabricAdministrator;
 
diff --git a/packages/types/src/clusters/joint-fabric-datastore.d.ts b/packages/types/src/clusters/joint-fabric-datastore.d.ts
index 6c23c53ca5..d60d60f125 100644
--- a/packages/types/src/clusters/joint-fabric-datastore.d.ts
+++ b/packages/types/src/clusters/joint-fabric-datastore.d.ts
@@ -2005,12 +2005,12 @@ export declare namespace JointFabricDatastore {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link JointFabricDatastore}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link JointFabricDatastore}.
      */
     export const Cluster: typeof JointFabricDatastore;
 
     /**
-     * @deprecated Use {@link JointFabricDatastore}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link JointFabricDatastore}.
      */
     export const Complete: typeof JointFabricDatastore;
 
@@ -2018,7 +2018,7 @@ export declare namespace JointFabricDatastore {
 }
 
 /**
- * @deprecated Use {@link JointFabricDatastore}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link JointFabricDatastore}.
  */
 export declare const JointFabricDatastoreCluster: typeof JointFabricDatastore;
 
diff --git a/packages/types/src/clusters/keypad-input.d.ts b/packages/types/src/clusters/keypad-input.d.ts
index e2e3c8917c..b20fd3803a 100644
--- a/packages/types/src/clusters/keypad-input.d.ts
+++ b/packages/types/src/clusters/keypad-input.d.ts
@@ -293,12 +293,12 @@ export declare namespace KeypadInput {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link KeypadInput}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link KeypadInput}.
      */
     export const Cluster: ClusterType.WithCompat<typeof KeypadInput, KeypadInput>;
 
     /**
-     * @deprecated Use {@link KeypadInput}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link KeypadInput}.
      */
     export const Complete: typeof KeypadInput;
 
@@ -306,7 +306,7 @@ export declare namespace KeypadInput {
 }
 
 /**
- * @deprecated Use {@link KeypadInput}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link KeypadInput}.
  */
 export declare const KeypadInputCluster: typeof KeypadInput;
 
diff --git a/packages/types/src/clusters/label.d.ts b/packages/types/src/clusters/label.d.ts
index 8a56d13eb0..00303ded99 100644
--- a/packages/types/src/clusters/label.d.ts
+++ b/packages/types/src/clusters/label.d.ts
@@ -95,7 +95,7 @@ export declare namespace Label {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link Label}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Label}.
      */
     export const Complete: typeof Label;
 
diff --git a/packages/types/src/clusters/laundry-dryer-controls.d.ts b/packages/types/src/clusters/laundry-dryer-controls.d.ts
index 338043b865..b8c5f09583 100644
--- a/packages/types/src/clusters/laundry-dryer-controls.d.ts
+++ b/packages/types/src/clusters/laundry-dryer-controls.d.ts
@@ -136,12 +136,12 @@ export declare namespace LaundryDryerControls {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link LaundryDryerControls}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LaundryDryerControls}.
      */
     export const Cluster: typeof LaundryDryerControls;
 
     /**
-     * @deprecated Use {@link LaundryDryerControls}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LaundryDryerControls}.
      */
     export const Complete: typeof LaundryDryerControls;
 
@@ -149,7 +149,7 @@ export declare namespace LaundryDryerControls {
 }
 
 /**
- * @deprecated Use {@link LaundryDryerControls}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link LaundryDryerControls}.
  */
 export declare const LaundryDryerControlsCluster: typeof LaundryDryerControls;
 
diff --git a/packages/types/src/clusters/laundry-washer-controls.d.ts b/packages/types/src/clusters/laundry-washer-controls.d.ts
index 5c78d59067..fc218f493d 100644
--- a/packages/types/src/clusters/laundry-washer-controls.d.ts
+++ b/packages/types/src/clusters/laundry-washer-controls.d.ts
@@ -215,12 +215,12 @@ export declare namespace LaundryWasherControls {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link LaundryWasherControls}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LaundryWasherControls}.
      */
     export const Cluster: ClusterType.WithCompat<typeof LaundryWasherControls, LaundryWasherControls>;
 
     /**
-     * @deprecated Use {@link LaundryWasherControls}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LaundryWasherControls}.
      */
     export const Complete: typeof LaundryWasherControls;
 
@@ -228,7 +228,7 @@ export declare namespace LaundryWasherControls {
 }
 
 /**
- * @deprecated Use {@link LaundryWasherControls}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link LaundryWasherControls}.
  */
 export declare const LaundryWasherControlsCluster: typeof LaundryWasherControls;
 
diff --git a/packages/types/src/clusters/laundry-washer-mode.d.ts b/packages/types/src/clusters/laundry-washer-mode.d.ts
index ba2804d4bc..fd4b3df941 100644
--- a/packages/types/src/clusters/laundry-washer-mode.d.ts
+++ b/packages/types/src/clusters/laundry-washer-mode.d.ts
@@ -313,12 +313,12 @@ export declare namespace LaundryWasherMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link LaundryWasherMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LaundryWasherMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof LaundryWasherMode, LaundryWasherMode>;
 
     /**
-     * @deprecated Use {@link LaundryWasherMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LaundryWasherMode}.
      */
     export const Complete: typeof LaundryWasherMode;
 
@@ -326,7 +326,7 @@ export declare namespace LaundryWasherMode {
 }
 
 /**
- * @deprecated Use {@link LaundryWasherMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link LaundryWasherMode}.
  */
 export declare const LaundryWasherModeCluster: typeof LaundryWasherMode;
 
diff --git a/packages/types/src/clusters/level-control.d.ts b/packages/types/src/clusters/level-control.d.ts
index c27388772b..99da0e85fa 100644
--- a/packages/types/src/clusters/level-control.d.ts
+++ b/packages/types/src/clusters/level-control.d.ts
@@ -717,12 +717,12 @@ export declare namespace LevelControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link LevelControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LevelControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof LevelControl, LevelControl>;
 
     /**
-     * @deprecated Use {@link LevelControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LevelControl}.
      */
     export const Complete: typeof LevelControl;
 
@@ -730,7 +730,7 @@ export declare namespace LevelControl {
 }
 
 /**
- * @deprecated Use {@link LevelControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link LevelControl}.
  */
 export declare const LevelControlCluster: typeof LevelControl;
 
diff --git a/packages/types/src/clusters/localization-configuration.d.ts b/packages/types/src/clusters/localization-configuration.d.ts
index 8cc9cf0957..f555af8929 100644
--- a/packages/types/src/clusters/localization-configuration.d.ts
+++ b/packages/types/src/clusters/localization-configuration.d.ts
@@ -107,12 +107,12 @@ export declare namespace LocalizationConfiguration {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link LocalizationConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LocalizationConfiguration}.
      */
     export const Cluster: typeof LocalizationConfiguration;
 
     /**
-     * @deprecated Use {@link LocalizationConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LocalizationConfiguration}.
      */
     export const Complete: typeof LocalizationConfiguration;
 
@@ -120,7 +120,7 @@ export declare namespace LocalizationConfiguration {
 }
 
 /**
- * @deprecated Use {@link LocalizationConfiguration}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link LocalizationConfiguration}.
  */
 export declare const LocalizationConfigurationCluster: typeof LocalizationConfiguration;
 
diff --git a/packages/types/src/clusters/low-power.d.ts b/packages/types/src/clusters/low-power.d.ts
index 5f72579396..3907b7d64e 100644
--- a/packages/types/src/clusters/low-power.d.ts
+++ b/packages/types/src/clusters/low-power.d.ts
@@ -79,12 +79,12 @@ export declare namespace LowPower {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link LowPower}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LowPower}.
      */
     export const Cluster: typeof LowPower;
 
     /**
-     * @deprecated Use {@link LowPower}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link LowPower}.
      */
     export const Complete: typeof LowPower;
 
@@ -92,7 +92,7 @@ export declare namespace LowPower {
 }
 
 /**
- * @deprecated Use {@link LowPower}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link LowPower}.
  */
 export declare const LowPowerCluster: typeof LowPower;
 
diff --git a/packages/types/src/clusters/media-input.d.ts b/packages/types/src/clusters/media-input.d.ts
index 9ce7cfbe5e..de95f1f380 100644
--- a/packages/types/src/clusters/media-input.d.ts
+++ b/packages/types/src/clusters/media-input.d.ts
@@ -267,12 +267,12 @@ export declare namespace MediaInput {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link MediaInput}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MediaInput}.
      */
     export const Cluster: ClusterType.WithCompat<typeof MediaInput, MediaInput>;
 
     /**
-     * @deprecated Use {@link MediaInput}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MediaInput}.
      */
     export const Complete: typeof MediaInput;
 
@@ -280,7 +280,7 @@ export declare namespace MediaInput {
 }
 
 /**
- * @deprecated Use {@link MediaInput}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link MediaInput}.
  */
 export declare const MediaInputCluster: typeof MediaInput;
 
diff --git a/packages/types/src/clusters/media-playback.d.ts b/packages/types/src/clusters/media-playback.d.ts
index 464fe4e8f5..50488b5619 100644
--- a/packages/types/src/clusters/media-playback.d.ts
+++ b/packages/types/src/clusters/media-playback.d.ts
@@ -1265,12 +1265,12 @@ export declare namespace MediaPlayback {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link MediaPlayback}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MediaPlayback}.
      */
     export const Cluster: ClusterType.WithCompat<typeof MediaPlayback, MediaPlayback>;
 
     /**
-     * @deprecated Use {@link MediaPlayback}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MediaPlayback}.
      */
     export const Complete: typeof MediaPlayback;
 
@@ -1278,7 +1278,7 @@ export declare namespace MediaPlayback {
 }
 
 /**
- * @deprecated Use {@link MediaPlayback}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link MediaPlayback}.
  */
 export declare const MediaPlaybackCluster: typeof MediaPlayback;
 
diff --git a/packages/types/src/clusters/messages.d.ts b/packages/types/src/clusters/messages.d.ts
index 7bd8b46c5d..39597091cb 100644
--- a/packages/types/src/clusters/messages.d.ts
+++ b/packages/types/src/clusters/messages.d.ts
@@ -658,12 +658,12 @@ export declare namespace Messages {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Messages}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Messages}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Messages, Messages>;
 
     /**
-     * @deprecated Use {@link Messages}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Messages}.
      */
     export const Complete: typeof Messages;
 
@@ -671,7 +671,7 @@ export declare namespace Messages {
 }
 
 /**
- * @deprecated Use {@link Messages}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Messages}.
  */
 export declare const MessagesCluster: typeof Messages;
 
diff --git a/packages/types/src/clusters/meter-identification.d.ts b/packages/types/src/clusters/meter-identification.d.ts
index 3084de4120..171dbbf138 100644
--- a/packages/types/src/clusters/meter-identification.d.ts
+++ b/packages/types/src/clusters/meter-identification.d.ts
@@ -183,12 +183,12 @@ export declare namespace MeterIdentification {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link MeterIdentification}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MeterIdentification}.
      */
     export const Cluster: ClusterType.WithCompat<typeof MeterIdentification, MeterIdentification>;
 
     /**
-     * @deprecated Use {@link MeterIdentification}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MeterIdentification}.
      */
     export const Complete: typeof MeterIdentification;
 
@@ -196,7 +196,7 @@ export declare namespace MeterIdentification {
 }
 
 /**
- * @deprecated Use {@link MeterIdentification}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link MeterIdentification}.
  */
 export declare const MeterIdentificationCluster: typeof MeterIdentification;
 
diff --git a/packages/types/src/clusters/microwave-oven-control.d.ts b/packages/types/src/clusters/microwave-oven-control.d.ts
index 322984ba2c..0bd05abd51 100644
--- a/packages/types/src/clusters/microwave-oven-control.d.ts
+++ b/packages/types/src/clusters/microwave-oven-control.d.ts
@@ -420,12 +420,12 @@ export declare namespace MicrowaveOvenControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link MicrowaveOvenControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MicrowaveOvenControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof MicrowaveOvenControl, MicrowaveOvenControl>;
 
     /**
-     * @deprecated Use {@link MicrowaveOvenControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MicrowaveOvenControl}.
      */
     export const Complete: typeof MicrowaveOvenControl;
 
@@ -433,7 +433,7 @@ export declare namespace MicrowaveOvenControl {
 }
 
 /**
- * @deprecated Use {@link MicrowaveOvenControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link MicrowaveOvenControl}.
  */
 export declare const MicrowaveOvenControlCluster: typeof MicrowaveOvenControl;
 
diff --git a/packages/types/src/clusters/microwave-oven-mode.d.ts b/packages/types/src/clusters/microwave-oven-mode.d.ts
index d1018066d6..56468e535d 100644
--- a/packages/types/src/clusters/microwave-oven-mode.d.ts
+++ b/packages/types/src/clusters/microwave-oven-mode.d.ts
@@ -277,12 +277,12 @@ export declare namespace MicrowaveOvenMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link MicrowaveOvenMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MicrowaveOvenMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof MicrowaveOvenMode, MicrowaveOvenMode>;
 
     /**
-     * @deprecated Use {@link MicrowaveOvenMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link MicrowaveOvenMode}.
      */
     export const Complete: typeof MicrowaveOvenMode;
 
@@ -290,7 +290,7 @@ export declare namespace MicrowaveOvenMode {
 }
 
 /**
- * @deprecated Use {@link MicrowaveOvenMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link MicrowaveOvenMode}.
  */
 export declare const MicrowaveOvenModeCluster: typeof MicrowaveOvenMode;
 
diff --git a/packages/types/src/clusters/mode-base.d.ts b/packages/types/src/clusters/mode-base.d.ts
index d8e25091bc..c9bd39c667 100644
--- a/packages/types/src/clusters/mode-base.d.ts
+++ b/packages/types/src/clusters/mode-base.d.ts
@@ -492,7 +492,7 @@ export declare namespace ModeBase {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ModeBase}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ModeBase}.
      */
     export const Complete: typeof ModeBase;
 
diff --git a/packages/types/src/clusters/mode-select.d.ts b/packages/types/src/clusters/mode-select.d.ts
index 38c15f6f7a..4f63595e6c 100644
--- a/packages/types/src/clusters/mode-select.d.ts
+++ b/packages/types/src/clusters/mode-select.d.ts
@@ -358,12 +358,12 @@ export declare namespace ModeSelect {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ModeSelect}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ModeSelect}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ModeSelect, ModeSelect>;
 
     /**
-     * @deprecated Use {@link ModeSelect}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ModeSelect}.
      */
     export const Complete: typeof ModeSelect;
 
@@ -371,7 +371,7 @@ export declare namespace ModeSelect {
 }
 
 /**
- * @deprecated Use {@link ModeSelect}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ModeSelect}.
  */
 export declare const ModeSelectCluster: typeof ModeSelect;
 
diff --git a/packages/types/src/clusters/network-commissioning.d.ts b/packages/types/src/clusters/network-commissioning.d.ts
index 49145ba611..a331e7fbfb 100644
--- a/packages/types/src/clusters/network-commissioning.d.ts
+++ b/packages/types/src/clusters/network-commissioning.d.ts
@@ -1511,12 +1511,12 @@ export declare namespace NetworkCommissioning {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link NetworkCommissioning}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link NetworkCommissioning}.
      */
     export const Cluster: ClusterType.WithCompat<typeof NetworkCommissioning, NetworkCommissioning>;
 
     /**
-     * @deprecated Use {@link NetworkCommissioning}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link NetworkCommissioning}.
      */
     export const Complete: typeof NetworkCommissioning;
 
@@ -1524,7 +1524,7 @@ export declare namespace NetworkCommissioning {
 }
 
 /**
- * @deprecated Use {@link NetworkCommissioning}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link NetworkCommissioning}.
  */
 export declare const NetworkCommissioningCluster: typeof NetworkCommissioning;
 
diff --git a/packages/types/src/clusters/nitrogen-dioxide-concentration-measurement.d.ts b/packages/types/src/clusters/nitrogen-dioxide-concentration-measurement.d.ts
index 83d896ce93..e80cb71dfc 100644
--- a/packages/types/src/clusters/nitrogen-dioxide-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/nitrogen-dioxide-concentration-measurement.d.ts
@@ -316,12 +316,12 @@ export declare namespace NitrogenDioxideConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link NitrogenDioxideConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link NitrogenDioxideConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof NitrogenDioxideConcentrationMeasurement, NitrogenDioxideConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link NitrogenDioxideConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link NitrogenDioxideConcentrationMeasurement}.
      */
     export const Complete: typeof NitrogenDioxideConcentrationMeasurement;
 
@@ -329,7 +329,7 @@ export declare namespace NitrogenDioxideConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link NitrogenDioxideConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link NitrogenDioxideConcentrationMeasurement}.
  */
 export declare const NitrogenDioxideConcentrationMeasurementCluster: typeof NitrogenDioxideConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/occupancy-sensing.d.ts b/packages/types/src/clusters/occupancy-sensing.d.ts
index db1df20468..72f2ecfb5e 100644
--- a/packages/types/src/clusters/occupancy-sensing.d.ts
+++ b/packages/types/src/clusters/occupancy-sensing.d.ts
@@ -578,12 +578,12 @@ export declare namespace OccupancySensing {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link OccupancySensing}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OccupancySensing}.
      */
     export const Cluster: ClusterType.WithCompat<typeof OccupancySensing, OccupancySensing>;
 
     /**
-     * @deprecated Use {@link OccupancySensing}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OccupancySensing}.
      */
     export const Complete: typeof OccupancySensing;
 
@@ -591,7 +591,7 @@ export declare namespace OccupancySensing {
 }
 
 /**
- * @deprecated Use {@link OccupancySensing}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OccupancySensing}.
  */
 export declare const OccupancySensingCluster: typeof OccupancySensing;
 
diff --git a/packages/types/src/clusters/on-off.d.ts b/packages/types/src/clusters/on-off.d.ts
index b201681925..525f25aa28 100644
--- a/packages/types/src/clusters/on-off.d.ts
+++ b/packages/types/src/clusters/on-off.d.ts
@@ -499,12 +499,12 @@ export declare namespace OnOff {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link OnOff}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OnOff}.
      */
     export const Cluster: ClusterType.WithCompat<typeof OnOff, OnOff>;
 
     /**
-     * @deprecated Use {@link OnOff}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OnOff}.
      */
     export const Complete: typeof OnOff;
 
@@ -512,7 +512,7 @@ export declare namespace OnOff {
 }
 
 /**
- * @deprecated Use {@link OnOff}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OnOff}.
  */
 export declare const OnOffCluster: typeof OnOff;
 
diff --git a/packages/types/src/clusters/operational-credentials.d.ts b/packages/types/src/clusters/operational-credentials.d.ts
index f25e0b2bea..05e1f83180 100644
--- a/packages/types/src/clusters/operational-credentials.d.ts
+++ b/packages/types/src/clusters/operational-credentials.d.ts
@@ -1105,12 +1105,12 @@ export declare namespace OperationalCredentials {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link OperationalCredentials}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OperationalCredentials}.
      */
     export const Cluster: typeof OperationalCredentials;
 
     /**
-     * @deprecated Use {@link OperationalCredentials}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OperationalCredentials}.
      */
     export const Complete: typeof OperationalCredentials;
 
@@ -1118,7 +1118,7 @@ export declare namespace OperationalCredentials {
 }
 
 /**
- * @deprecated Use {@link OperationalCredentials}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OperationalCredentials}.
  */
 export declare const OperationalCredentialsCluster: typeof OperationalCredentials;
 
diff --git a/packages/types/src/clusters/operational-state.d.ts b/packages/types/src/clusters/operational-state.d.ts
index 6e6ccc7c9f..097304cbc2 100644
--- a/packages/types/src/clusters/operational-state.d.ts
+++ b/packages/types/src/clusters/operational-state.d.ts
@@ -682,12 +682,12 @@ export declare namespace OperationalState {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link OperationalState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OperationalState}.
      */
     export const Cluster: typeof OperationalState;
 
     /**
-     * @deprecated Use {@link OperationalState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OperationalState}.
      */
     export const Complete: typeof OperationalState;
 
@@ -695,7 +695,7 @@ export declare namespace OperationalState {
 }
 
 /**
- * @deprecated Use {@link OperationalState}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OperationalState}.
  */
 export declare const OperationalStateCluster: typeof OperationalState;
 
diff --git a/packages/types/src/clusters/ota-software-update-provider.d.ts b/packages/types/src/clusters/ota-software-update-provider.d.ts
index f0a4cd58b2..0d361543c7 100644
--- a/packages/types/src/clusters/ota-software-update-provider.d.ts
+++ b/packages/types/src/clusters/ota-software-update-provider.d.ts
@@ -589,12 +589,12 @@ export declare namespace OtaSoftwareUpdateProvider {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link OtaSoftwareUpdateProvider}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OtaSoftwareUpdateProvider}.
      */
     export const Cluster: typeof OtaSoftwareUpdateProvider;
 
     /**
-     * @deprecated Use {@link OtaSoftwareUpdateProvider}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OtaSoftwareUpdateProvider}.
      */
     export const Complete: typeof OtaSoftwareUpdateProvider;
 
@@ -602,7 +602,7 @@ export declare namespace OtaSoftwareUpdateProvider {
 }
 
 /**
- * @deprecated Use {@link OtaSoftwareUpdateProvider}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OtaSoftwareUpdateProvider}.
  */
 export declare const OtaSoftwareUpdateProviderCluster: typeof OtaSoftwareUpdateProvider;
 
diff --git a/packages/types/src/clusters/ota-software-update-requestor.d.ts b/packages/types/src/clusters/ota-software-update-requestor.d.ts
index 4c2951a619..af826d7c44 100644
--- a/packages/types/src/clusters/ota-software-update-requestor.d.ts
+++ b/packages/types/src/clusters/ota-software-update-requestor.d.ts
@@ -635,12 +635,12 @@ export declare namespace OtaSoftwareUpdateRequestor {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link OtaSoftwareUpdateRequestor}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OtaSoftwareUpdateRequestor}.
      */
     export const Cluster: typeof OtaSoftwareUpdateRequestor;
 
     /**
-     * @deprecated Use {@link OtaSoftwareUpdateRequestor}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OtaSoftwareUpdateRequestor}.
      */
     export const Complete: typeof OtaSoftwareUpdateRequestor;
 
@@ -648,7 +648,7 @@ export declare namespace OtaSoftwareUpdateRequestor {
 }
 
 /**
- * @deprecated Use {@link OtaSoftwareUpdateRequestor}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OtaSoftwareUpdateRequestor}.
  */
 export declare const OtaSoftwareUpdateRequestorCluster: typeof OtaSoftwareUpdateRequestor;
 
diff --git a/packages/types/src/clusters/oven-cavity-operational-state.d.ts b/packages/types/src/clusters/oven-cavity-operational-state.d.ts
index ea25ee8dbb..38a7b03dbe 100644
--- a/packages/types/src/clusters/oven-cavity-operational-state.d.ts
+++ b/packages/types/src/clusters/oven-cavity-operational-state.d.ts
@@ -353,12 +353,12 @@ export declare namespace OvenCavityOperationalState {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link OvenCavityOperationalState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OvenCavityOperationalState}.
      */
     export const Cluster: typeof OvenCavityOperationalState;
 
     /**
-     * @deprecated Use {@link OvenCavityOperationalState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OvenCavityOperationalState}.
      */
     export const Complete: typeof OvenCavityOperationalState;
 
@@ -366,7 +366,7 @@ export declare namespace OvenCavityOperationalState {
 }
 
 /**
- * @deprecated Use {@link OvenCavityOperationalState}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OvenCavityOperationalState}.
  */
 export declare const OvenCavityOperationalStateCluster: typeof OvenCavityOperationalState;
 
diff --git a/packages/types/src/clusters/oven-mode.d.ts b/packages/types/src/clusters/oven-mode.d.ts
index 937369cd9b..fe1548cb04 100644
--- a/packages/types/src/clusters/oven-mode.d.ts
+++ b/packages/types/src/clusters/oven-mode.d.ts
@@ -376,12 +376,12 @@ export declare namespace OvenMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link OvenMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OvenMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof OvenMode, OvenMode>;
 
     /**
-     * @deprecated Use {@link OvenMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OvenMode}.
      */
     export const Complete: typeof OvenMode;
 
@@ -389,7 +389,7 @@ export declare namespace OvenMode {
 }
 
 /**
- * @deprecated Use {@link OvenMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OvenMode}.
  */
 export declare const OvenModeCluster: typeof OvenMode;
 
diff --git a/packages/types/src/clusters/ozone-concentration-measurement.d.ts b/packages/types/src/clusters/ozone-concentration-measurement.d.ts
index 1ac6c9e7e8..2e38f2eb3a 100644
--- a/packages/types/src/clusters/ozone-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/ozone-concentration-measurement.d.ts
@@ -314,12 +314,12 @@ export declare namespace OzoneConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link OzoneConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OzoneConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof OzoneConcentrationMeasurement, OzoneConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link OzoneConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link OzoneConcentrationMeasurement}.
      */
     export const Complete: typeof OzoneConcentrationMeasurement;
 
@@ -327,7 +327,7 @@ export declare namespace OzoneConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link OzoneConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link OzoneConcentrationMeasurement}.
  */
 export declare const OzoneConcentrationMeasurementCluster: typeof OzoneConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/pm1-concentration-measurement.d.ts b/packages/types/src/clusters/pm1-concentration-measurement.d.ts
index 2b79c24506..609eb489c7 100644
--- a/packages/types/src/clusters/pm1-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/pm1-concentration-measurement.d.ts
@@ -314,12 +314,12 @@ export declare namespace Pm1ConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Pm1ConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Pm1ConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Pm1ConcentrationMeasurement, Pm1ConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link Pm1ConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Pm1ConcentrationMeasurement}.
      */
     export const Complete: typeof Pm1ConcentrationMeasurement;
 
@@ -327,7 +327,7 @@ export declare namespace Pm1ConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link Pm1ConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Pm1ConcentrationMeasurement}.
  */
 export declare const Pm1ConcentrationMeasurementCluster: typeof Pm1ConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/pm10-concentration-measurement.d.ts b/packages/types/src/clusters/pm10-concentration-measurement.d.ts
index ea2a214546..966176cf33 100644
--- a/packages/types/src/clusters/pm10-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/pm10-concentration-measurement.d.ts
@@ -314,12 +314,12 @@ export declare namespace Pm10ConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Pm10ConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Pm10ConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Pm10ConcentrationMeasurement, Pm10ConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link Pm10ConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Pm10ConcentrationMeasurement}.
      */
     export const Complete: typeof Pm10ConcentrationMeasurement;
 
@@ -327,7 +327,7 @@ export declare namespace Pm10ConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link Pm10ConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Pm10ConcentrationMeasurement}.
  */
 export declare const Pm10ConcentrationMeasurementCluster: typeof Pm10ConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/pm25-concentration-measurement.d.ts b/packages/types/src/clusters/pm25-concentration-measurement.d.ts
index c9ac625a77..86c13b037f 100644
--- a/packages/types/src/clusters/pm25-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/pm25-concentration-measurement.d.ts
@@ -314,12 +314,12 @@ export declare namespace Pm25ConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Pm25ConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Pm25ConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Pm25ConcentrationMeasurement, Pm25ConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link Pm25ConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Pm25ConcentrationMeasurement}.
      */
     export const Complete: typeof Pm25ConcentrationMeasurement;
 
@@ -327,7 +327,7 @@ export declare namespace Pm25ConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link Pm25ConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Pm25ConcentrationMeasurement}.
  */
 export declare const Pm25ConcentrationMeasurementCluster: typeof Pm25ConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/power-source-configuration.d.ts b/packages/types/src/clusters/power-source-configuration.d.ts
index dbcd4a28ee..cd23c65c75 100644
--- a/packages/types/src/clusters/power-source-configuration.d.ts
+++ b/packages/types/src/clusters/power-source-configuration.d.ts
@@ -88,12 +88,12 @@ export declare namespace PowerSourceConfiguration {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link PowerSourceConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PowerSourceConfiguration}.
      */
     export const Cluster: typeof PowerSourceConfiguration;
 
     /**
-     * @deprecated Use {@link PowerSourceConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PowerSourceConfiguration}.
      */
     export const Complete: typeof PowerSourceConfiguration;
 
@@ -101,7 +101,7 @@ export declare namespace PowerSourceConfiguration {
 }
 
 /**
- * @deprecated Use {@link PowerSourceConfiguration}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link PowerSourceConfiguration}.
  */
 export declare const PowerSourceConfigurationCluster: typeof PowerSourceConfiguration;
 
diff --git a/packages/types/src/clusters/power-source.d.ts b/packages/types/src/clusters/power-source.d.ts
index 18ce85c266..7057225b88 100644
--- a/packages/types/src/clusters/power-source.d.ts
+++ b/packages/types/src/clusters/power-source.d.ts
@@ -1739,12 +1739,12 @@ export declare namespace PowerSource {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link PowerSource}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PowerSource}.
      */
     export const Cluster: ClusterType.WithCompat<typeof PowerSource, PowerSource>;
 
     /**
-     * @deprecated Use {@link PowerSource}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PowerSource}.
      */
     export const Complete: typeof PowerSource;
 
@@ -1752,7 +1752,7 @@ export declare namespace PowerSource {
 }
 
 /**
- * @deprecated Use {@link PowerSource}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link PowerSource}.
  */
 export declare const PowerSourceCluster: typeof PowerSource;
 
diff --git a/packages/types/src/clusters/power-topology.d.ts b/packages/types/src/clusters/power-topology.d.ts
index 4ec0487cbe..1eaffbc980 100644
--- a/packages/types/src/clusters/power-topology.d.ts
+++ b/packages/types/src/clusters/power-topology.d.ts
@@ -143,12 +143,12 @@ export declare namespace PowerTopology {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link PowerTopology}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PowerTopology}.
      */
     export const Cluster: ClusterType.WithCompat<typeof PowerTopology, PowerTopology>;
 
     /**
-     * @deprecated Use {@link PowerTopology}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PowerTopology}.
      */
     export const Complete: typeof PowerTopology;
 
@@ -156,7 +156,7 @@ export declare namespace PowerTopology {
 }
 
 /**
- * @deprecated Use {@link PowerTopology}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link PowerTopology}.
  */
 export declare const PowerTopologyCluster: typeof PowerTopology;
 
diff --git a/packages/types/src/clusters/pressure-measurement.d.ts b/packages/types/src/clusters/pressure-measurement.d.ts
index ea71bf6c3a..b5c6c2d6db 100644
--- a/packages/types/src/clusters/pressure-measurement.d.ts
+++ b/packages/types/src/clusters/pressure-measurement.d.ts
@@ -254,12 +254,12 @@ export declare namespace PressureMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link PressureMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PressureMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof PressureMeasurement, PressureMeasurement>;
 
     /**
-     * @deprecated Use {@link PressureMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PressureMeasurement}.
      */
     export const Complete: typeof PressureMeasurement;
 
@@ -267,7 +267,7 @@ export declare namespace PressureMeasurement {
 }
 
 /**
- * @deprecated Use {@link PressureMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link PressureMeasurement}.
  */
 export declare const PressureMeasurementCluster: typeof PressureMeasurement;
 
diff --git a/packages/types/src/clusters/pump-configuration-and-control.d.ts b/packages/types/src/clusters/pump-configuration-and-control.d.ts
index 79fcc17c95..bad62c6d1e 100644
--- a/packages/types/src/clusters/pump-configuration-and-control.d.ts
+++ b/packages/types/src/clusters/pump-configuration-and-control.d.ts
@@ -1241,12 +1241,12 @@ export declare namespace PumpConfigurationAndControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link PumpConfigurationAndControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PumpConfigurationAndControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof PumpConfigurationAndControl, PumpConfigurationAndControl>;
 
     /**
-     * @deprecated Use {@link PumpConfigurationAndControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PumpConfigurationAndControl}.
      */
     export const Complete: typeof PumpConfigurationAndControl;
 
@@ -1254,7 +1254,7 @@ export declare namespace PumpConfigurationAndControl {
 }
 
 /**
- * @deprecated Use {@link PumpConfigurationAndControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link PumpConfigurationAndControl}.
  */
 export declare const PumpConfigurationAndControlCluster: typeof PumpConfigurationAndControl;
 
diff --git a/packages/types/src/clusters/push-av-stream-transport.d.ts b/packages/types/src/clusters/push-av-stream-transport.d.ts
index 2be6090ef9..87eccc0b72 100644
--- a/packages/types/src/clusters/push-av-stream-transport.d.ts
+++ b/packages/types/src/clusters/push-av-stream-transport.d.ts
@@ -1371,12 +1371,12 @@ export declare namespace PushAvStreamTransport {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link PushAvStreamTransport}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PushAvStreamTransport}.
      */
     export const Cluster: ClusterType.WithCompat<typeof PushAvStreamTransport, PushAvStreamTransport>;
 
     /**
-     * @deprecated Use {@link PushAvStreamTransport}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link PushAvStreamTransport}.
      */
     export const Complete: typeof PushAvStreamTransport;
 
@@ -1384,7 +1384,7 @@ export declare namespace PushAvStreamTransport {
 }
 
 /**
- * @deprecated Use {@link PushAvStreamTransport}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link PushAvStreamTransport}.
  */
 export declare const PushAvStreamTransportCluster: typeof PushAvStreamTransport;
 
diff --git a/packages/types/src/clusters/radon-concentration-measurement.d.ts b/packages/types/src/clusters/radon-concentration-measurement.d.ts
index ce24f4c8d0..2253bdcf6c 100644
--- a/packages/types/src/clusters/radon-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/radon-concentration-measurement.d.ts
@@ -314,12 +314,12 @@ export declare namespace RadonConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link RadonConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RadonConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof RadonConcentrationMeasurement, RadonConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link RadonConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RadonConcentrationMeasurement}.
      */
     export const Complete: typeof RadonConcentrationMeasurement;
 
@@ -327,7 +327,7 @@ export declare namespace RadonConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link RadonConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link RadonConcentrationMeasurement}.
  */
 export declare const RadonConcentrationMeasurementCluster: typeof RadonConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/refrigerator-alarm.d.ts b/packages/types/src/clusters/refrigerator-alarm.d.ts
index 6b4bf66427..3748c0fcbb 100644
--- a/packages/types/src/clusters/refrigerator-alarm.d.ts
+++ b/packages/types/src/clusters/refrigerator-alarm.d.ts
@@ -284,12 +284,12 @@ export declare namespace RefrigeratorAlarm {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link RefrigeratorAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RefrigeratorAlarm}.
      */
     export const Cluster: ClusterType.WithCompat<typeof RefrigeratorAlarm, RefrigeratorAlarm>;
 
     /**
-     * @deprecated Use {@link RefrigeratorAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RefrigeratorAlarm}.
      */
     export const Complete: typeof RefrigeratorAlarm;
 
@@ -297,7 +297,7 @@ export declare namespace RefrigeratorAlarm {
 }
 
 /**
- * @deprecated Use {@link RefrigeratorAlarm}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link RefrigeratorAlarm}.
  */
 export declare const RefrigeratorAlarmCluster: typeof RefrigeratorAlarm;
 
diff --git a/packages/types/src/clusters/refrigerator-and-temperature-controlled-cabinet-mode.d.ts b/packages/types/src/clusters/refrigerator-and-temperature-controlled-cabinet-mode.d.ts
index 1f8763d4aa..74f384835d 100644
--- a/packages/types/src/clusters/refrigerator-and-temperature-controlled-cabinet-mode.d.ts
+++ b/packages/types/src/clusters/refrigerator-and-temperature-controlled-cabinet-mode.d.ts
@@ -299,12 +299,12 @@ export declare namespace RefrigeratorAndTemperatureControlledCabinetMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link RefrigeratorAndTemperatureControlledCabinetMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RefrigeratorAndTemperatureControlledCabinetMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof RefrigeratorAndTemperatureControlledCabinetMode, RefrigeratorAndTemperatureControlledCabinetMode>;
 
     /**
-     * @deprecated Use {@link RefrigeratorAndTemperatureControlledCabinetMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RefrigeratorAndTemperatureControlledCabinetMode}.
      */
     export const Complete: typeof RefrigeratorAndTemperatureControlledCabinetMode;
 
@@ -312,7 +312,7 @@ export declare namespace RefrigeratorAndTemperatureControlledCabinetMode {
 }
 
 /**
- * @deprecated Use {@link RefrigeratorAndTemperatureControlledCabinetMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link RefrigeratorAndTemperatureControlledCabinetMode}.
  */
 export declare const RefrigeratorAndTemperatureControlledCabinetModeCluster: typeof RefrigeratorAndTemperatureControlledCabinetMode;
 
diff --git a/packages/types/src/clusters/relative-humidity-measurement.d.ts b/packages/types/src/clusters/relative-humidity-measurement.d.ts
index e6999931b7..06dad8cfc4 100644
--- a/packages/types/src/clusters/relative-humidity-measurement.d.ts
+++ b/packages/types/src/clusters/relative-humidity-measurement.d.ts
@@ -148,12 +148,12 @@ export declare namespace RelativeHumidityMeasurement {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link RelativeHumidityMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RelativeHumidityMeasurement}.
      */
     export const Cluster: typeof RelativeHumidityMeasurement;
 
     /**
-     * @deprecated Use {@link RelativeHumidityMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RelativeHumidityMeasurement}.
      */
     export const Complete: typeof RelativeHumidityMeasurement;
 
@@ -161,7 +161,7 @@ export declare namespace RelativeHumidityMeasurement {
 }
 
 /**
- * @deprecated Use {@link RelativeHumidityMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link RelativeHumidityMeasurement}.
  */
 export declare const RelativeHumidityMeasurementCluster: typeof RelativeHumidityMeasurement;
 
diff --git a/packages/types/src/clusters/resource-monitoring.d.ts b/packages/types/src/clusters/resource-monitoring.d.ts
index 5ac5934dc0..7bca9c1623 100644
--- a/packages/types/src/clusters/resource-monitoring.d.ts
+++ b/packages/types/src/clusters/resource-monitoring.d.ts
@@ -314,7 +314,7 @@ export declare namespace ResourceMonitoring {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ResourceMonitoring}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ResourceMonitoring}.
      */
     export const Complete: typeof ResourceMonitoring;
 
diff --git a/packages/types/src/clusters/rvc-clean-mode.d.ts b/packages/types/src/clusters/rvc-clean-mode.d.ts
index 78e4401abd..0e19d323c9 100644
--- a/packages/types/src/clusters/rvc-clean-mode.d.ts
+++ b/packages/types/src/clusters/rvc-clean-mode.d.ts
@@ -344,12 +344,12 @@ export declare namespace RvcCleanMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link RvcCleanMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RvcCleanMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof RvcCleanMode, RvcCleanMode>;
 
     /**
-     * @deprecated Use {@link RvcCleanMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RvcCleanMode}.
      */
     export const Complete: typeof RvcCleanMode;
 
@@ -357,7 +357,7 @@ export declare namespace RvcCleanMode {
 }
 
 /**
- * @deprecated Use {@link RvcCleanMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link RvcCleanMode}.
  */
 export declare const RvcCleanModeCluster: typeof RvcCleanMode;
 
diff --git a/packages/types/src/clusters/rvc-operational-state.d.ts b/packages/types/src/clusters/rvc-operational-state.d.ts
index 0c6ce63484..f96b63711b 100644
--- a/packages/types/src/clusters/rvc-operational-state.d.ts
+++ b/packages/types/src/clusters/rvc-operational-state.d.ts
@@ -625,12 +625,12 @@ export declare namespace RvcOperationalState {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link RvcOperationalState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RvcOperationalState}.
      */
     export const Cluster: typeof RvcOperationalState;
 
     /**
-     * @deprecated Use {@link RvcOperationalState}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RvcOperationalState}.
      */
     export const Complete: typeof RvcOperationalState;
 
@@ -638,7 +638,7 @@ export declare namespace RvcOperationalState {
 }
 
 /**
- * @deprecated Use {@link RvcOperationalState}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link RvcOperationalState}.
  */
 export declare const RvcOperationalStateCluster: typeof RvcOperationalState;
 
diff --git a/packages/types/src/clusters/rvc-run-mode.d.ts b/packages/types/src/clusters/rvc-run-mode.d.ts
index 4c3b1b12f3..15b00bc742 100644
--- a/packages/types/src/clusters/rvc-run-mode.d.ts
+++ b/packages/types/src/clusters/rvc-run-mode.d.ts
@@ -399,12 +399,12 @@ export declare namespace RvcRunMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link RvcRunMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RvcRunMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof RvcRunMode, RvcRunMode>;
 
     /**
-     * @deprecated Use {@link RvcRunMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link RvcRunMode}.
      */
     export const Complete: typeof RvcRunMode;
 
@@ -412,7 +412,7 @@ export declare namespace RvcRunMode {
 }
 
 /**
- * @deprecated Use {@link RvcRunMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link RvcRunMode}.
  */
 export declare const RvcRunModeCluster: typeof RvcRunMode;
 
diff --git a/packages/types/src/clusters/scenes-management.d.ts b/packages/types/src/clusters/scenes-management.d.ts
index 17559a7319..3f785f5e73 100644
--- a/packages/types/src/clusters/scenes-management.d.ts
+++ b/packages/types/src/clusters/scenes-management.d.ts
@@ -875,12 +875,12 @@ export declare namespace ScenesManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ScenesManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ScenesManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ScenesManagement, ScenesManagement>;
 
     /**
-     * @deprecated Use {@link ScenesManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ScenesManagement}.
      */
     export const Complete: typeof ScenesManagement;
 
@@ -888,7 +888,7 @@ export declare namespace ScenesManagement {
 }
 
 /**
- * @deprecated Use {@link ScenesManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ScenesManagement}.
  */
 export declare const ScenesManagementCluster: typeof ScenesManagement;
 
diff --git a/packages/types/src/clusters/service-area.d.ts b/packages/types/src/clusters/service-area.d.ts
index b2c35fe8a9..9a1fd67d4b 100644
--- a/packages/types/src/clusters/service-area.d.ts
+++ b/packages/types/src/clusters/service-area.d.ts
@@ -1014,12 +1014,12 @@ export declare namespace ServiceArea {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ServiceArea}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ServiceArea}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ServiceArea, ServiceArea>;
 
     /**
-     * @deprecated Use {@link ServiceArea}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ServiceArea}.
      */
     export const Complete: typeof ServiceArea;
 
@@ -1027,7 +1027,7 @@ export declare namespace ServiceArea {
 }
 
 /**
- * @deprecated Use {@link ServiceArea}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ServiceArea}.
  */
 export declare const ServiceAreaCluster: typeof ServiceArea;
 
diff --git a/packages/types/src/clusters/smoke-co-alarm.d.ts b/packages/types/src/clusters/smoke-co-alarm.d.ts
index 1d5934ce9b..0f6379f284 100644
--- a/packages/types/src/clusters/smoke-co-alarm.d.ts
+++ b/packages/types/src/clusters/smoke-co-alarm.d.ts
@@ -915,12 +915,12 @@ export declare namespace SmokeCoAlarm {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link SmokeCoAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link SmokeCoAlarm}.
      */
     export const Cluster: ClusterType.WithCompat<typeof SmokeCoAlarm, SmokeCoAlarm>;
 
     /**
-     * @deprecated Use {@link SmokeCoAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link SmokeCoAlarm}.
      */
     export const Complete: typeof SmokeCoAlarm;
 
@@ -928,7 +928,7 @@ export declare namespace SmokeCoAlarm {
 }
 
 /**
- * @deprecated Use {@link SmokeCoAlarm}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link SmokeCoAlarm}.
  */
 export declare const SmokeCoAlarmCluster: typeof SmokeCoAlarm;
 
diff --git a/packages/types/src/clusters/software-diagnostics.d.ts b/packages/types/src/clusters/software-diagnostics.d.ts
index fea015c38f..73c921ad99 100644
--- a/packages/types/src/clusters/software-diagnostics.d.ts
+++ b/packages/types/src/clusters/software-diagnostics.d.ts
@@ -296,12 +296,12 @@ export declare namespace SoftwareDiagnostics {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link SoftwareDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link SoftwareDiagnostics}.
      */
     export const Cluster: ClusterType.WithCompat<typeof SoftwareDiagnostics, SoftwareDiagnostics>;
 
     /**
-     * @deprecated Use {@link SoftwareDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link SoftwareDiagnostics}.
      */
     export const Complete: typeof SoftwareDiagnostics;
 
@@ -309,7 +309,7 @@ export declare namespace SoftwareDiagnostics {
 }
 
 /**
- * @deprecated Use {@link SoftwareDiagnostics}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link SoftwareDiagnostics}.
  */
 export declare const SoftwareDiagnosticsCluster: typeof SoftwareDiagnostics;
 
diff --git a/packages/types/src/clusters/soil-measurement.d.ts b/packages/types/src/clusters/soil-measurement.d.ts
index 64f7675da0..98e65a8510 100644
--- a/packages/types/src/clusters/soil-measurement.d.ts
+++ b/packages/types/src/clusters/soil-measurement.d.ts
@@ -114,12 +114,12 @@ export declare namespace SoilMeasurement {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link SoilMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link SoilMeasurement}.
      */
     export const Cluster: typeof SoilMeasurement;
 
     /**
-     * @deprecated Use {@link SoilMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link SoilMeasurement}.
      */
     export const Complete: typeof SoilMeasurement;
 
@@ -127,7 +127,7 @@ export declare namespace SoilMeasurement {
 }
 
 /**
- * @deprecated Use {@link SoilMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link SoilMeasurement}.
  */
 export declare const SoilMeasurementCluster: typeof SoilMeasurement;
 
diff --git a/packages/types/src/clusters/switch.d.ts b/packages/types/src/clusters/switch.d.ts
index 2806e5fe7b..6ebe9c8baf 100644
--- a/packages/types/src/clusters/switch.d.ts
+++ b/packages/types/src/clusters/switch.d.ts
@@ -741,12 +741,12 @@ export declare namespace Switch {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Switch}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Switch}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Switch, Switch>;
 
     /**
-     * @deprecated Use {@link Switch}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Switch}.
      */
     export const Complete: typeof Switch;
 
@@ -754,7 +754,7 @@ export declare namespace Switch {
 }
 
 /**
- * @deprecated Use {@link Switch}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Switch}.
  */
 export declare const SwitchCluster: typeof Switch;
 
diff --git a/packages/types/src/clusters/target-navigator.d.ts b/packages/types/src/clusters/target-navigator.d.ts
index 89fc751b29..a9d06286ab 100644
--- a/packages/types/src/clusters/target-navigator.d.ts
+++ b/packages/types/src/clusters/target-navigator.d.ts
@@ -288,12 +288,12 @@ export declare namespace TargetNavigator {
     export const events: ClusterType.EventObjects<Events>;
 
     /**
-     * @deprecated Use {@link TargetNavigator}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TargetNavigator}.
      */
     export const Cluster: typeof TargetNavigator;
 
     /**
-     * @deprecated Use {@link TargetNavigator}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TargetNavigator}.
      */
     export const Complete: typeof TargetNavigator;
 
@@ -301,7 +301,7 @@ export declare namespace TargetNavigator {
 }
 
 /**
- * @deprecated Use {@link TargetNavigator}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TargetNavigator}.
  */
 export declare const TargetNavigatorCluster: typeof TargetNavigator;
 
diff --git a/packages/types/src/clusters/temperature-alarm.d.ts b/packages/types/src/clusters/temperature-alarm.d.ts
index 987ef9d8fe..9cda47ff92 100644
--- a/packages/types/src/clusters/temperature-alarm.d.ts
+++ b/packages/types/src/clusters/temperature-alarm.d.ts
@@ -680,12 +680,12 @@ export declare namespace TemperatureAlarm {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link TemperatureAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureAlarm}.
      */
     export const Cluster: ClusterType.WithCompat<typeof TemperatureAlarm, TemperatureAlarm>;
 
     /**
-     * @deprecated Use {@link TemperatureAlarm}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureAlarm}.
      */
     export const Complete: typeof TemperatureAlarm;
 
@@ -693,7 +693,7 @@ export declare namespace TemperatureAlarm {
 }
 
 /**
- * @deprecated Use {@link TemperatureAlarm}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureAlarm}.
  */
 export declare const TemperatureAlarmCluster: typeof TemperatureAlarm;
 
diff --git a/packages/types/src/clusters/temperature-control.d.ts b/packages/types/src/clusters/temperature-control.d.ts
index e56de411d7..b6904fe796 100644
--- a/packages/types/src/clusters/temperature-control.d.ts
+++ b/packages/types/src/clusters/temperature-control.d.ts
@@ -304,12 +304,12 @@ export declare namespace TemperatureControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link TemperatureControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof TemperatureControl, TemperatureControl>;
 
     /**
-     * @deprecated Use {@link TemperatureControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureControl}.
      */
     export const Complete: typeof TemperatureControl;
 
@@ -317,7 +317,7 @@ export declare namespace TemperatureControl {
 }
 
 /**
- * @deprecated Use {@link TemperatureControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureControl}.
  */
 export declare const TemperatureControlCluster: typeof TemperatureControl;
 
diff --git a/packages/types/src/clusters/temperature-measurement.d.ts b/packages/types/src/clusters/temperature-measurement.d.ts
index 8928094cc8..ec6a841b87 100644
--- a/packages/types/src/clusters/temperature-measurement.d.ts
+++ b/packages/types/src/clusters/temperature-measurement.d.ts
@@ -133,12 +133,12 @@ export declare namespace TemperatureMeasurement {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link TemperatureMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureMeasurement}.
      */
     export const Cluster: typeof TemperatureMeasurement;
 
     /**
-     * @deprecated Use {@link TemperatureMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureMeasurement}.
      */
     export const Complete: typeof TemperatureMeasurement;
 
@@ -146,7 +146,7 @@ export declare namespace TemperatureMeasurement {
 }
 
 /**
- * @deprecated Use {@link TemperatureMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TemperatureMeasurement}.
  */
 export declare const TemperatureMeasurementCluster: typeof TemperatureMeasurement;
 
diff --git a/packages/types/src/clusters/thermostat-user-interface-configuration.d.ts b/packages/types/src/clusters/thermostat-user-interface-configuration.d.ts
index 6666feba6e..e3327e4d57 100644
--- a/packages/types/src/clusters/thermostat-user-interface-configuration.d.ts
+++ b/packages/types/src/clusters/thermostat-user-interface-configuration.d.ts
@@ -182,12 +182,12 @@ export declare namespace ThermostatUserInterfaceConfiguration {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link ThermostatUserInterfaceConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThermostatUserInterfaceConfiguration}.
      */
     export const Cluster: typeof ThermostatUserInterfaceConfiguration;
 
     /**
-     * @deprecated Use {@link ThermostatUserInterfaceConfiguration}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThermostatUserInterfaceConfiguration}.
      */
     export const Complete: typeof ThermostatUserInterfaceConfiguration;
 
@@ -195,7 +195,7 @@ export declare namespace ThermostatUserInterfaceConfiguration {
 }
 
 /**
- * @deprecated Use {@link ThermostatUserInterfaceConfiguration}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ThermostatUserInterfaceConfiguration}.
  */
 export declare const ThermostatUserInterfaceConfigurationCluster: typeof ThermostatUserInterfaceConfiguration;
 
diff --git a/packages/types/src/clusters/thermostat.d.ts b/packages/types/src/clusters/thermostat.d.ts
index d3cde3fd4f..6c9149ecec 100644
--- a/packages/types/src/clusters/thermostat.d.ts
+++ b/packages/types/src/clusters/thermostat.d.ts
@@ -3671,12 +3671,12 @@ export declare namespace Thermostat {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link Thermostat}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Thermostat}.
      */
     export const Cluster: ClusterType.WithCompat<typeof Thermostat, Thermostat>;
 
     /**
-     * @deprecated Use {@link Thermostat}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link Thermostat}.
      */
     export const Complete: typeof Thermostat;
 
@@ -3684,7 +3684,7 @@ export declare namespace Thermostat {
 }
 
 /**
- * @deprecated Use {@link Thermostat}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link Thermostat}.
  */
 export declare const ThermostatCluster: typeof Thermostat;
 
diff --git a/packages/types/src/clusters/thread-border-router-management.d.ts b/packages/types/src/clusters/thread-border-router-management.d.ts
index d85125e90f..6cbceddea4 100644
--- a/packages/types/src/clusters/thread-border-router-management.d.ts
+++ b/packages/types/src/clusters/thread-border-router-management.d.ts
@@ -360,12 +360,12 @@ export declare namespace ThreadBorderRouterManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ThreadBorderRouterManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThreadBorderRouterManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ThreadBorderRouterManagement, ThreadBorderRouterManagement>;
 
     /**
-     * @deprecated Use {@link ThreadBorderRouterManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThreadBorderRouterManagement}.
      */
     export const Complete: typeof ThreadBorderRouterManagement;
 
@@ -373,7 +373,7 @@ export declare namespace ThreadBorderRouterManagement {
 }
 
 /**
- * @deprecated Use {@link ThreadBorderRouterManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ThreadBorderRouterManagement}.
  */
 export declare const ThreadBorderRouterManagementCluster: typeof ThreadBorderRouterManagement;
 
diff --git a/packages/types/src/clusters/thread-network-diagnostics.d.ts b/packages/types/src/clusters/thread-network-diagnostics.d.ts
index 418b20731d..ee84bd7995 100644
--- a/packages/types/src/clusters/thread-network-diagnostics.d.ts
+++ b/packages/types/src/clusters/thread-network-diagnostics.d.ts
@@ -1720,12 +1720,12 @@ export declare namespace ThreadNetworkDiagnostics {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ThreadNetworkDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThreadNetworkDiagnostics}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ThreadNetworkDiagnostics, ThreadNetworkDiagnostics>;
 
     /**
-     * @deprecated Use {@link ThreadNetworkDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThreadNetworkDiagnostics}.
      */
     export const Complete: typeof ThreadNetworkDiagnostics;
 
@@ -1733,7 +1733,7 @@ export declare namespace ThreadNetworkDiagnostics {
 }
 
 /**
- * @deprecated Use {@link ThreadNetworkDiagnostics}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ThreadNetworkDiagnostics}.
  */
 export declare const ThreadNetworkDiagnosticsCluster: typeof ThreadNetworkDiagnostics;
 
diff --git a/packages/types/src/clusters/thread-network-directory.d.ts b/packages/types/src/clusters/thread-network-directory.d.ts
index 9b989469f0..c42765cad4 100644
--- a/packages/types/src/clusters/thread-network-directory.d.ts
+++ b/packages/types/src/clusters/thread-network-directory.d.ts
@@ -283,12 +283,12 @@ export declare namespace ThreadNetworkDirectory {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link ThreadNetworkDirectory}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThreadNetworkDirectory}.
      */
     export const Cluster: typeof ThreadNetworkDirectory;
 
     /**
-     * @deprecated Use {@link ThreadNetworkDirectory}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ThreadNetworkDirectory}.
      */
     export const Complete: typeof ThreadNetworkDirectory;
 
@@ -296,7 +296,7 @@ export declare namespace ThreadNetworkDirectory {
 }
 
 /**
- * @deprecated Use {@link ThreadNetworkDirectory}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ThreadNetworkDirectory}.
  */
 export declare const ThreadNetworkDirectoryCluster: typeof ThreadNetworkDirectory;
 
diff --git a/packages/types/src/clusters/time-format-localization.d.ts b/packages/types/src/clusters/time-format-localization.d.ts
index b70caacc50..b55cdec8dd 100644
--- a/packages/types/src/clusters/time-format-localization.d.ts
+++ b/packages/types/src/clusters/time-format-localization.d.ts
@@ -246,12 +246,12 @@ export declare namespace TimeFormatLocalization {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link TimeFormatLocalization}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TimeFormatLocalization}.
      */
     export const Cluster: ClusterType.WithCompat<typeof TimeFormatLocalization, TimeFormatLocalization>;
 
     /**
-     * @deprecated Use {@link TimeFormatLocalization}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TimeFormatLocalization}.
      */
     export const Complete: typeof TimeFormatLocalization;
 
@@ -259,7 +259,7 @@ export declare namespace TimeFormatLocalization {
 }
 
 /**
- * @deprecated Use {@link TimeFormatLocalization}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TimeFormatLocalization}.
  */
 export declare const TimeFormatLocalizationCluster: typeof TimeFormatLocalization;
 
diff --git a/packages/types/src/clusters/time-synchronization.d.ts b/packages/types/src/clusters/time-synchronization.d.ts
index 0ea1e5ebda..9ee6c2180a 100644
--- a/packages/types/src/clusters/time-synchronization.d.ts
+++ b/packages/types/src/clusters/time-synchronization.d.ts
@@ -1249,12 +1249,12 @@ export declare namespace TimeSynchronization {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link TimeSynchronization}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TimeSynchronization}.
      */
     export const Cluster: ClusterType.WithCompat<typeof TimeSynchronization, TimeSynchronization>;
 
     /**
-     * @deprecated Use {@link TimeSynchronization}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TimeSynchronization}.
      */
     export const Complete: typeof TimeSynchronization;
 
@@ -1262,7 +1262,7 @@ export declare namespace TimeSynchronization {
 }
 
 /**
- * @deprecated Use {@link TimeSynchronization}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TimeSynchronization}.
  */
 export declare const TimeSynchronizationCluster: typeof TimeSynchronization;
 
diff --git a/packages/types/src/clusters/tls-certificate-management.d.ts b/packages/types/src/clusters/tls-certificate-management.d.ts
index ef17fb8176..0169b38af1 100644
--- a/packages/types/src/clusters/tls-certificate-management.d.ts
+++ b/packages/types/src/clusters/tls-certificate-management.d.ts
@@ -595,12 +595,12 @@ export declare namespace TlsCertificateManagement {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link TlsCertificateManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TlsCertificateManagement}.
      */
     export const Cluster: typeof TlsCertificateManagement;
 
     /**
-     * @deprecated Use {@link TlsCertificateManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TlsCertificateManagement}.
      */
     export const Complete: typeof TlsCertificateManagement;
 
@@ -608,7 +608,7 @@ export declare namespace TlsCertificateManagement {
 }
 
 /**
- * @deprecated Use {@link TlsCertificateManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TlsCertificateManagement}.
  */
 export declare const TlsCertificateManagementCluster: typeof TlsCertificateManagement;
 
diff --git a/packages/types/src/clusters/tls-client-management.d.ts b/packages/types/src/clusters/tls-client-management.d.ts
index f387b6c974..d6ef2abb9c 100644
--- a/packages/types/src/clusters/tls-client-management.d.ts
+++ b/packages/types/src/clusters/tls-client-management.d.ts
@@ -383,12 +383,12 @@ export declare namespace TlsClientManagement {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link TlsClientManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TlsClientManagement}.
      */
     export const Cluster: typeof TlsClientManagement;
 
     /**
-     * @deprecated Use {@link TlsClientManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TlsClientManagement}.
      */
     export const Complete: typeof TlsClientManagement;
 
@@ -396,7 +396,7 @@ export declare namespace TlsClientManagement {
 }
 
 /**
- * @deprecated Use {@link TlsClientManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TlsClientManagement}.
  */
 export declare const TlsClientManagementCluster: typeof TlsClientManagement;
 
diff --git a/packages/types/src/clusters/total-volatile-organic-compounds-concentration-measurement.d.ts b/packages/types/src/clusters/total-volatile-organic-compounds-concentration-measurement.d.ts
index 8a9734fe31..133b68af72 100644
--- a/packages/types/src/clusters/total-volatile-organic-compounds-concentration-measurement.d.ts
+++ b/packages/types/src/clusters/total-volatile-organic-compounds-concentration-measurement.d.ts
@@ -318,12 +318,12 @@ export declare namespace TotalVolatileOrganicCompoundsConcentrationMeasurement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link TotalVolatileOrganicCompoundsConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TotalVolatileOrganicCompoundsConcentrationMeasurement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof TotalVolatileOrganicCompoundsConcentrationMeasurement, TotalVolatileOrganicCompoundsConcentrationMeasurement>;
 
     /**
-     * @deprecated Use {@link TotalVolatileOrganicCompoundsConcentrationMeasurement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link TotalVolatileOrganicCompoundsConcentrationMeasurement}.
      */
     export const Complete: typeof TotalVolatileOrganicCompoundsConcentrationMeasurement;
 
@@ -331,7 +331,7 @@ export declare namespace TotalVolatileOrganicCompoundsConcentrationMeasurement {
 }
 
 /**
- * @deprecated Use {@link TotalVolatileOrganicCompoundsConcentrationMeasurement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link TotalVolatileOrganicCompoundsConcentrationMeasurement}.
  */
 export declare const TotalVolatileOrganicCompoundsConcentrationMeasurementCluster: typeof TotalVolatileOrganicCompoundsConcentrationMeasurement;
 
diff --git a/packages/types/src/clusters/unit-localization.d.ts b/packages/types/src/clusters/unit-localization.d.ts
index b58c46fa42..012a0def56 100644
--- a/packages/types/src/clusters/unit-localization.d.ts
+++ b/packages/types/src/clusters/unit-localization.d.ts
@@ -147,12 +147,12 @@ export declare namespace UnitLocalization {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link UnitLocalization}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link UnitLocalization}.
      */
     export const Cluster: ClusterType.WithCompat<typeof UnitLocalization, UnitLocalization>;
 
     /**
-     * @deprecated Use {@link UnitLocalization}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link UnitLocalization}.
      */
     export const Complete: typeof UnitLocalization;
 
@@ -160,7 +160,7 @@ export declare namespace UnitLocalization {
 }
 
 /**
- * @deprecated Use {@link UnitLocalization}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link UnitLocalization}.
  */
 export declare const UnitLocalizationCluster: typeof UnitLocalization;
 
diff --git a/packages/types/src/clusters/user-label.d.ts b/packages/types/src/clusters/user-label.d.ts
index 758d7ec571..babfb9cf6f 100644
--- a/packages/types/src/clusters/user-label.d.ts
+++ b/packages/types/src/clusters/user-label.d.ts
@@ -90,12 +90,12 @@ export declare namespace UserLabel {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link UserLabel}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link UserLabel}.
      */
     export const Cluster: typeof UserLabel;
 
     /**
-     * @deprecated Use {@link UserLabel}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link UserLabel}.
      */
     export const Complete: typeof UserLabel;
 
@@ -103,7 +103,7 @@ export declare namespace UserLabel {
 }
 
 /**
- * @deprecated Use {@link UserLabel}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link UserLabel}.
  */
 export declare const UserLabelCluster: typeof UserLabel;
 
diff --git a/packages/types/src/clusters/valve-configuration-and-control.d.ts b/packages/types/src/clusters/valve-configuration-and-control.d.ts
index ba61b3b4d2..0c3d16d57b 100644
--- a/packages/types/src/clusters/valve-configuration-and-control.d.ts
+++ b/packages/types/src/clusters/valve-configuration-and-control.d.ts
@@ -647,12 +647,12 @@ export declare namespace ValveConfigurationAndControl {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ValveConfigurationAndControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ValveConfigurationAndControl}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ValveConfigurationAndControl, ValveConfigurationAndControl>;
 
     /**
-     * @deprecated Use {@link ValveConfigurationAndControl}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ValveConfigurationAndControl}.
      */
     export const Complete: typeof ValveConfigurationAndControl;
 
@@ -660,7 +660,7 @@ export declare namespace ValveConfigurationAndControl {
 }
 
 /**
- * @deprecated Use {@link ValveConfigurationAndControl}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ValveConfigurationAndControl}.
  */
 export declare const ValveConfigurationAndControlCluster: typeof ValveConfigurationAndControl;
 
diff --git a/packages/types/src/clusters/wake-on-lan.d.ts b/packages/types/src/clusters/wake-on-lan.d.ts
index e7c58487ac..f4a391415b 100644
--- a/packages/types/src/clusters/wake-on-lan.d.ts
+++ b/packages/types/src/clusters/wake-on-lan.d.ts
@@ -133,12 +133,12 @@ export declare namespace WakeOnLan {
     export const attributes: ClusterType.AttributeObjects<Attributes>;
 
     /**
-     * @deprecated Use {@link WakeOnLan}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WakeOnLan}.
      */
     export const Cluster: typeof WakeOnLan;
 
     /**
-     * @deprecated Use {@link WakeOnLan}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WakeOnLan}.
      */
     export const Complete: typeof WakeOnLan;
 
@@ -146,7 +146,7 @@ export declare namespace WakeOnLan {
 }
 
 /**
- * @deprecated Use {@link WakeOnLan}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WakeOnLan}.
  */
 export declare const WakeOnLanCluster: typeof WakeOnLan;
 
diff --git a/packages/types/src/clusters/water-heater-management.d.ts b/packages/types/src/clusters/water-heater-management.d.ts
index 24822c3086..26166178b2 100644
--- a/packages/types/src/clusters/water-heater-management.d.ts
+++ b/packages/types/src/clusters/water-heater-management.d.ts
@@ -507,12 +507,12 @@ export declare namespace WaterHeaterManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link WaterHeaterManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WaterHeaterManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof WaterHeaterManagement, WaterHeaterManagement>;
 
     /**
-     * @deprecated Use {@link WaterHeaterManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WaterHeaterManagement}.
      */
     export const Complete: typeof WaterHeaterManagement;
 
@@ -520,7 +520,7 @@ export declare namespace WaterHeaterManagement {
 }
 
 /**
- * @deprecated Use {@link WaterHeaterManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WaterHeaterManagement}.
  */
 export declare const WaterHeaterManagementCluster: typeof WaterHeaterManagement;
 
diff --git a/packages/types/src/clusters/water-heater-mode.d.ts b/packages/types/src/clusters/water-heater-mode.d.ts
index 0eb4ce1134..2be5005321 100644
--- a/packages/types/src/clusters/water-heater-mode.d.ts
+++ b/packages/types/src/clusters/water-heater-mode.d.ts
@@ -318,12 +318,12 @@ export declare namespace WaterHeaterMode {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link WaterHeaterMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WaterHeaterMode}.
      */
     export const Cluster: ClusterType.WithCompat<typeof WaterHeaterMode, WaterHeaterMode>;
 
     /**
-     * @deprecated Use {@link WaterHeaterMode}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WaterHeaterMode}.
      */
     export const Complete: typeof WaterHeaterMode;
 
@@ -331,7 +331,7 @@ export declare namespace WaterHeaterMode {
 }
 
 /**
- * @deprecated Use {@link WaterHeaterMode}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WaterHeaterMode}.
  */
 export declare const WaterHeaterModeCluster: typeof WaterHeaterMode;
 
diff --git a/packages/types/src/clusters/water-tank-level-monitoring.d.ts b/packages/types/src/clusters/water-tank-level-monitoring.d.ts
index 309aa16de3..b8dddbb803 100644
--- a/packages/types/src/clusters/water-tank-level-monitoring.d.ts
+++ b/packages/types/src/clusters/water-tank-level-monitoring.d.ts
@@ -226,12 +226,12 @@ export declare namespace WaterTankLevelMonitoring {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link WaterTankLevelMonitoring}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WaterTankLevelMonitoring}.
      */
     export const Cluster: ClusterType.WithCompat<typeof WaterTankLevelMonitoring, WaterTankLevelMonitoring>;
 
     /**
-     * @deprecated Use {@link WaterTankLevelMonitoring}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WaterTankLevelMonitoring}.
      */
     export const Complete: typeof WaterTankLevelMonitoring;
 
@@ -239,7 +239,7 @@ export declare namespace WaterTankLevelMonitoring {
 }
 
 /**
- * @deprecated Use {@link WaterTankLevelMonitoring}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WaterTankLevelMonitoring}.
  */
 export declare const WaterTankLevelMonitoringCluster: typeof WaterTankLevelMonitoring;
 
diff --git a/packages/types/src/clusters/web-rtc-transport-definitions.d.ts b/packages/types/src/clusters/web-rtc-transport-definitions.d.ts
index e68474ef0f..ea90ae7fed 100644
--- a/packages/types/src/clusters/web-rtc-transport-definitions.d.ts
+++ b/packages/types/src/clusters/web-rtc-transport-definitions.d.ts
@@ -309,7 +309,7 @@ export declare namespace WebRtcTransportDefinitions {
     }
 
     /**
-     * @deprecated Use {@link WebRtcTransportDefinitions}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WebRtcTransportDefinitions}.
      */
     export const Complete: typeof WebRtcTransportDefinitions;
 
diff --git a/packages/types/src/clusters/web-rtc-transport-provider.d.ts b/packages/types/src/clusters/web-rtc-transport-provider.d.ts
index b7d404f17b..84f7a48412 100644
--- a/packages/types/src/clusters/web-rtc-transport-provider.d.ts
+++ b/packages/types/src/clusters/web-rtc-transport-provider.d.ts
@@ -567,12 +567,12 @@ export declare namespace WebRtcTransportProvider {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link WebRtcTransportProvider}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WebRtcTransportProvider}.
      */
     export const Cluster: ClusterType.WithCompat<typeof WebRtcTransportProvider, WebRtcTransportProvider>;
 
     /**
-     * @deprecated Use {@link WebRtcTransportProvider}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WebRtcTransportProvider}.
      */
     export const Complete: typeof WebRtcTransportProvider;
 
@@ -580,7 +580,7 @@ export declare namespace WebRtcTransportProvider {
 }
 
 /**
- * @deprecated Use {@link WebRtcTransportProvider}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WebRtcTransportProvider}.
  */
 export declare const WebRtcTransportProviderCluster: typeof WebRtcTransportProvider;
 
diff --git a/packages/types/src/clusters/web-rtc-transport-requestor.d.ts b/packages/types/src/clusters/web-rtc-transport-requestor.d.ts
index 3c73ee782f..9d01e9d3e8 100644
--- a/packages/types/src/clusters/web-rtc-transport-requestor.d.ts
+++ b/packages/types/src/clusters/web-rtc-transport-requestor.d.ts
@@ -268,12 +268,12 @@ export declare namespace WebRtcTransportRequestor {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link WebRtcTransportRequestor}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WebRtcTransportRequestor}.
      */
     export const Cluster: typeof WebRtcTransportRequestor;
 
     /**
-     * @deprecated Use {@link WebRtcTransportRequestor}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WebRtcTransportRequestor}.
      */
     export const Complete: typeof WebRtcTransportRequestor;
 
@@ -281,7 +281,7 @@ export declare namespace WebRtcTransportRequestor {
 }
 
 /**
- * @deprecated Use {@link WebRtcTransportRequestor}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WebRtcTransportRequestor}.
  */
 export declare const WebRtcTransportRequestorCluster: typeof WebRtcTransportRequestor;
 
diff --git a/packages/types/src/clusters/wi-fi-network-diagnostics.d.ts b/packages/types/src/clusters/wi-fi-network-diagnostics.d.ts
index 9543d3f3fd..697ebb390f 100644
--- a/packages/types/src/clusters/wi-fi-network-diagnostics.d.ts
+++ b/packages/types/src/clusters/wi-fi-network-diagnostics.d.ts
@@ -569,12 +569,12 @@ export declare namespace WiFiNetworkDiagnostics {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link WiFiNetworkDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WiFiNetworkDiagnostics}.
      */
     export const Cluster: ClusterType.WithCompat<typeof WiFiNetworkDiagnostics, WiFiNetworkDiagnostics>;
 
     /**
-     * @deprecated Use {@link WiFiNetworkDiagnostics}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WiFiNetworkDiagnostics}.
      */
     export const Complete: typeof WiFiNetworkDiagnostics;
 
@@ -582,7 +582,7 @@ export declare namespace WiFiNetworkDiagnostics {
 }
 
 /**
- * @deprecated Use {@link WiFiNetworkDiagnostics}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WiFiNetworkDiagnostics}.
  */
 export declare const WiFiNetworkDiagnosticsCluster: typeof WiFiNetworkDiagnostics;
 
diff --git a/packages/types/src/clusters/wi-fi-network-management.d.ts b/packages/types/src/clusters/wi-fi-network-management.d.ts
index a7d1f87750..0506314cba 100644
--- a/packages/types/src/clusters/wi-fi-network-management.d.ts
+++ b/packages/types/src/clusters/wi-fi-network-management.d.ts
@@ -200,12 +200,12 @@ export declare namespace WiFiNetworkManagement {
     export const commands: ClusterType.CommandObjects<Commands>;
 
     /**
-     * @deprecated Use {@link WiFiNetworkManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WiFiNetworkManagement}.
      */
     export const Cluster: typeof WiFiNetworkManagement;
 
     /**
-     * @deprecated Use {@link WiFiNetworkManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WiFiNetworkManagement}.
      */
     export const Complete: typeof WiFiNetworkManagement;
 
@@ -213,7 +213,7 @@ export declare namespace WiFiNetworkManagement {
 }
 
 /**
- * @deprecated Use {@link WiFiNetworkManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WiFiNetworkManagement}.
  */
 export declare const WiFiNetworkManagementCluster: typeof WiFiNetworkManagement;
 
diff --git a/packages/types/src/clusters/window-covering.d.ts b/packages/types/src/clusters/window-covering.d.ts
index df45c5f86d..d668d7921c 100644
--- a/packages/types/src/clusters/window-covering.d.ts
+++ b/packages/types/src/clusters/window-covering.d.ts
@@ -1154,12 +1154,12 @@ export declare namespace WindowCovering {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link WindowCovering}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WindowCovering}.
      */
     export const Cluster: ClusterType.WithCompat<typeof WindowCovering, WindowCovering>;
 
     /**
-     * @deprecated Use {@link WindowCovering}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link WindowCovering}.
      */
     export const Complete: typeof WindowCovering;
 
@@ -1167,7 +1167,7 @@ export declare namespace WindowCovering {
 }
 
 /**
- * @deprecated Use {@link WindowCovering}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link WindowCovering}.
  */
 export declare const WindowCoveringCluster: typeof WindowCovering;
 
diff --git a/packages/types/src/clusters/zone-management.d.ts b/packages/types/src/clusters/zone-management.d.ts
index 4ee5c51232..f6d9fe368a 100644
--- a/packages/types/src/clusters/zone-management.d.ts
+++ b/packages/types/src/clusters/zone-management.d.ts
@@ -841,12 +841,12 @@ export declare namespace ZoneManagement {
     export const features: ClusterType.Features<Features>;
 
     /**
-     * @deprecated Use {@link ZoneManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ZoneManagement}.
      */
     export const Cluster: ClusterType.WithCompat<typeof ZoneManagement, ZoneManagement>;
 
     /**
-     * @deprecated Use {@link ZoneManagement}.
+     * @deprecated Scheduled for removal in 0.19. Use {@link ZoneManagement}.
      */
     export const Complete: typeof ZoneManagement;
 
@@ -854,7 +854,7 @@ export declare namespace ZoneManagement {
 }
 
 /**
- * @deprecated Use {@link ZoneManagement}.
+ * @deprecated Scheduled for removal in 0.19. Use {@link ZoneManagement}.
  */
 export declare const ZoneManagementCluster: typeof ZoneManagement;
 
diff --git a/packages/types/src/tlv/TlvArray.ts b/packages/types/src/tlv/TlvArray.ts
index 163cb84f87..2d7ce8b6e7 100644
--- a/packages/types/src/tlv/TlvArray.ts
+++ b/packages/types/src/tlv/TlvArray.ts
@@ -40,7 +40,7 @@ export class ArraySchema<T> extends TlvSchema<T[]> {
         super();
     }
 
-    /** @deprecated Part of old ClusterType() compat layer. */
+    /** @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19. */
     override get element(): TlvSchema.Element {
         const result: TlvSchema.Element = { type: "list" };
 
diff --git a/packages/types/src/tlv/TlvBoolean.ts b/packages/types/src/tlv/TlvBoolean.ts
index 1c404b8962..07441c5816 100644
--- a/packages/types/src/tlv/TlvBoolean.ts
+++ b/packages/types/src/tlv/TlvBoolean.ts
@@ -29,7 +29,7 @@ export class BooleanSchema extends TlvSchema<boolean> {
             throw new ValidationDatatypeMismatchError(`Expected boolean, got ${typeof value}.`);
     }
 
-    /** @deprecated Part of old ClusterType() compat layer. */
+    /** @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19. */
     override get element(): TlvSchema.Element {
         return { type: "bool" };
     }
diff --git a/packages/types/src/tlv/TlvNullable.ts b/packages/types/src/tlv/TlvNullable.ts
index eeb0297ae0..5ff8c38470 100644
--- a/packages/types/src/tlv/TlvNullable.ts
+++ b/packages/types/src/tlv/TlvNullable.ts
@@ -47,7 +47,7 @@ export class NullableSchema<T> extends TlvSchema<T | null> {
         this.schema = schema;
     }
 
-    /** @deprecated Part of old ClusterType() compat layer. */
+    /** @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19. */
     override get element(): TlvSchema.Element | undefined {
         const inner = this.schema.element;
         if (inner === undefined) {
diff --git a/packages/types/src/tlv/TlvNumber.ts b/packages/types/src/tlv/TlvNumber.ts
index 54e7da2e8a..3372215b1b 100644
--- a/packages/types/src/tlv/TlvNumber.ts
+++ b/packages/types/src/tlv/TlvNumber.ts
@@ -91,7 +91,7 @@ export class TlvNumericSchema<T extends bigint | number> extends TlvSchema<T> {
         return this.#max ?? this.baseTypeMax;
     }
 
-    /** @deprecated Part of old ClusterType() compat layer. */
+    /** @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19. */
     override get element(): TlvSchema.Element | undefined {
         const typeName = numericTypeByMax.get(this.baseTypeMax);
         if (typeName === undefined) {
diff --git a/packages/types/src/tlv/TlvObject.ts b/packages/types/src/tlv/TlvObject.ts
index edb3acfb27..fae72ac900 100644
--- a/packages/types/src/tlv/TlvObject.ts
+++ b/packages/types/src/tlv/TlvObject.ts
@@ -91,7 +91,7 @@ export class ObjectSchema<F extends TlvFields> extends TlvSchema<TypeFromFields<
         this.isFabricScoped = isFabricScoped;
     }
 
-    /** @deprecated Part of old ClusterType() compat layer. */
+    /** @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19. */
     override get element(): TlvSchema.Element {
         const children: FieldElement[] = [];
 
diff --git a/packages/types/src/tlv/TlvSchema.ts b/packages/types/src/tlv/TlvSchema.ts
index 5352aa4c7a..e525ed2fba 100644
--- a/packages/types/src/tlv/TlvSchema.ts
+++ b/packages/types/src/tlv/TlvSchema.ts
@@ -38,9 +38,8 @@ export abstract class TlvSchema<T> extends Schema<T> implements TlvSchema<T> {
      * Reverse-maps this TLV schema to model element fields.
      *
      * Used for old ClusterType() compatibility — converts TLV-carrying descriptors back to model elements.
-     * Remove when ClusterType compat layer is dropped.
      *
-     * @deprecated
+     * @deprecated Scheduled for removal in 0.19 when the ClusterType compat layer is dropped.
      */
     get element(): TlvSchema.Element | undefined {
         return undefined;
@@ -90,7 +89,7 @@ export namespace TlvSchema {
      *
      * Sufficient to construct a {@link FieldElement} or {@link ValueElement}.
      *
-     * @deprecated Part of old ClusterType() compat layer.
+     * @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19.
      */
     export interface Element {
         type?: string;
diff --git a/packages/types/src/tlv/TlvString.ts b/packages/types/src/tlv/TlvString.ts
index 811689d3f0..3beeda80da 100644
--- a/packages/types/src/tlv/TlvString.ts
+++ b/packages/types/src/tlv/TlvString.ts
@@ -90,7 +90,7 @@ export class StringSchema<T extends TlvType.ByteString | TlvType.Utf8String> ext
             );
     }
 
-    /** @deprecated Part of old ClusterType() compat layer. */
+    /** @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19. */
     override get element(): TlvSchema.Element {
         const result: TlvSchema.Element = {
             type: this.type === TlvType.Utf8String ? "string" : "octstr",
diff --git a/packages/types/src/tlv/TlvWrapper.ts b/packages/types/src/tlv/TlvWrapper.ts
index 24c64ff9a8..e0c424a3be 100644
--- a/packages/types/src/tlv/TlvWrapper.ts
+++ b/packages/types/src/tlv/TlvWrapper.ts
@@ -16,7 +16,7 @@ export class TlvWrapper<O, T> extends TlvSchema<O> {
         super();
     }
 
-    /** @deprecated Part of old ClusterType() compat layer. */
+    /** @deprecated Part of old ClusterType() compat layer.  Scheduled for removal in 0.19. */
     override get element(): TlvSchema.Element | undefined {
         return this.underlyingSchema.element;
     }
diff --git a/support/codegen/src/clusters/generate-cluster.ts b/support/codegen/src/clusters/generate-cluster.ts
index f34ef34d73..710da4e69a 100644
--- a/support/codegen/src/clusters/generate-cluster.ts
+++ b/support/codegen/src/clusters/generate-cluster.ts
@@ -112,11 +112,15 @@ function generateComponents(file: ClusterFile) {
 
     if (cluster.id !== undefined) {
         // Clusters with features get a pre-PR #3466 compat shim (`.with(Feature.X, ...)`) via
-        // ClusterType.WithCompat.  See ClusterType.WithCompat JSDoc; scheduled for removal in 0.18.
+        // ClusterType.WithCompat.  See ClusterType.WithCompat JSDoc; scheduled for removal in 0.19.
         const clusterType = hasFeatures ? `ClusterType.WithCompat<typeof ${name}, ${name}>` : `typeof ${name}`;
-        file.ns.atom(`export const Cluster: ${clusterType}`).document(`@deprecated Use {@link ${name}}.`);
+        file.ns
+            .atom(`export const Cluster: ${clusterType}`)
+            .document(`@deprecated Scheduled for removal in 0.19.  Use {@link ${name}}.`);
     }
-    file.ns.atom(`export const Complete: typeof ${name}`).document(`@deprecated Use {@link ${name}}.`);
+    file.ns
+        .atom(`export const Complete: typeof ${name}`)
+        .document(`@deprecated Scheduled for removal in 0.19.  Use {@link ${name}}.`);
 
     // --- Undocumented internals ---
 
@@ -126,7 +130,7 @@ function generateComponents(file: ClusterFile) {
 
     if (cluster.id !== undefined) {
         file.atom(`export declare const ${file.clusterName}: typeof ${name}`).document(
-            `@deprecated Use {@link ${name}}.`,
+            `@deprecated Scheduled for removal in 0.19.  Use {@link ${name}}.`,
         );
     }
 

From 5de5bf4e40110663a64b422bc1494e1a3443e3b6 Mon Sep 17 00:00:00 2001
From: Ingo Fischer <github@fischer-ka.de>
Date: Mon, 27 Jul 2026 17:07:35 +0200
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 docs/MIGRATION_GUIDE_08.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/MIGRATION_GUIDE_08.md b/docs/MIGRATION_GUIDE_08.md
index cf9cc10a1e..6bbd7f5102 100644
--- a/docs/MIGRATION_GUIDE_08.md
+++ b/docs/MIGRATION_GUIDE_08.md
@@ -6,7 +6,7 @@ cluster definitions and this has now been enhanced for all device types. Additio
 implemented also needed to be adjusted and was enhanced with a very flexible way to choose the wanted cluster features.
 
 This means that developers need to adjust their code to use the new classes and concepts introduced by this change. The
-former Device building API (pre 0.8, called "Legacy") was deprecated with 0.8 and removed in 0.13, so this document is
+former Device building API (pre 0.8, called "Legacy") was deprecated in 0.8 and removed in 0.13, so this document is
 only relevant when migrating code that still targets a matter.js version before 0.13.
 
 The legacy Controller API (`CommissioningController`, `PairedNode` and the surrounding classes of the