@riddix/hamh 2.1.0-alpha.853 → 2.1.0-alpha.855

package/README.md

@@ -19,9 +19,9 @@
 ---
 
 > [!NOTE]
-> 🔀 **Community Fork** - This is a fork of the original [t0bst4r/home-assistant-matter-hub](https://github.com/t0bst4r/home-assistant-matter-hub), which was discontinued in January 2026. We continue active development with bug fixes, new features, and community support. Thank you **[@t0bst4r](https://github.com/t0bst4r)** for the original work! ❤️
+> 🔀 **Community Fork** - This is the actively maintained fork and successor of the original [t0bst4r/home-assistant-matter-hub](https://github.com/t0bst4r/home-assistant-matter-hub), which was discontinued in January 2026 and has since been archived. We continue active development with bug fixes, new features, and community support. Thank you **[@t0bst4r](https://github.com/t0bst4r)** for the original work! ❤️
 >
-> **📦 Migrating?** See [Migration Guide](#migration-from-t0bst4r) - your paired devices will continue to work!
+> **📦 Migrating?** See [Migration Guide](#migration-from-t0bst4r) - your paired devices will continue to work! For a side-by-side feature list, see the [fork comparison](https://riddix.github.io/home-assistant-matter-hub/getting-started/fork-comparison). The add-on slugs are `hamh` (stable), `hamh-alpha` and `hamh-testing`.
 
 ---
 

package/dist/backend/cli.js

@@ -133493,6 +133493,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     lockPinMaxLength: config8.lockPinMaxLength,
                     powerEntity: config8.powerEntity,
                     energyEntity: config8.energyEntity,
+                    meterSerialNumber: config8.meterSerialNumber,
+                    pointOfDelivery: config8.pointOfDelivery,
                     voltageEntity: config8.voltageEntity,
                     currentEntity: config8.currentEntity,
                     batteryPowerEntity: config8.batteryPowerEntity,
@@ -133657,6 +133659,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   lockPinMaxLength: config8.lockPinMaxLength,
                   powerEntity: config8.powerEntity,
                   energyEntity: config8.energyEntity,
+                  meterSerialNumber: config8.meterSerialNumber,
+                  pointOfDelivery: config8.pointOfDelivery,
                   voltageEntity: config8.voltageEntity,
                   currentEntity: config8.currentEntity,
                   batteryPowerEntity: config8.batteryPowerEntity,
@@ -134512,6 +134516,8 @@ function entityMappingApi(mappingStorage, identityStorage) {
       lockPinMaxLength: body.lockPinMaxLength,
       powerEntity: body.powerEntity,
       energyEntity: body.energyEntity,
+      meterSerialNumber: body.meterSerialNumber,
+      pointOfDelivery: body.pointOfDelivery,
       voltageEntity: body.voltageEntity,
       currentEntity: body.currentEntity,
       batteryPowerEntity: body.batteryPowerEntity,
@@ -135016,6 +135022,8 @@ function configToProfileEntry(config8) {
     lockPinMaxLength: config8.lockPinMaxLength,
     powerEntity: config8.powerEntity,
     energyEntity: config8.energyEntity,
+    meterSerialNumber: config8.meterSerialNumber,
+    pointOfDelivery: config8.pointOfDelivery,
     voltageEntity: config8.voltageEntity,
     currentEntity: config8.currentEntity,
     batteryPowerEntity: config8.batteryPowerEntity,
@@ -135158,6 +135166,8 @@ function mappingProfileApi(mappingStorage) {
           lockPinMaxLength: entry.lockPinMaxLength,
           powerEntity: entry.powerEntity,
           energyEntity: entry.energyEntity,
+          meterSerialNumber: entry.meterSerialNumber,
+          pointOfDelivery: entry.pointOfDelivery,
           voltageEntity: entry.voltageEntity,
           currentEntity: entry.currentEntity,
           batteryPowerEntity: entry.batteryPowerEntity,
@@ -139936,6 +139946,8 @@ var EntityMappingStorage = class extends Service {
       lockPinMaxLength: pinLengths.max,
       powerEntity: request.powerEntity?.trim() || void 0,
       energyEntity: request.energyEntity?.trim() || void 0,
+      meterSerialNumber: request.meterSerialNumber?.trim() || void 0,
+      pointOfDelivery: request.pointOfDelivery?.trim() || void 0,
       voltageEntity: request.voltageEntity?.trim() || void 0,
       currentEntity: request.currentEntity?.trim() || void 0,
       batteryPowerEntity: request.batteryPowerEntity?.trim() || void 0,
@@ -139971,7 +139983,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
+    if (!config8.matterDeviceType && !config8.customName && !config8.customProductName && !config8.customVendorName && !config8.customSerialNumber && config8.customVendorId === void 0 && config8.disabled !== true && !config8.filterLifeEntity && !config8.cleaningModeEntity && !config8.temperatureEntity && !config8.humidityEntity && !config8.batteryEntity && !config8.disableBatteryMapping && !config8.chargingStateEntity && !config8.roomEntities && !config8.disableLockPin && !config8.lockUsercodeService && config8.lockUsercodeSlot === void 0 && config8.lockPinMinLength === void 0 && config8.lockPinMaxLength === void 0 && !config8.powerEntity && !config8.energyEntity && !config8.meterSerialNumber && !config8.pointOfDelivery && !config8.voltageEntity && !config8.currentEntity && !config8.batteryPowerEntity && !config8.batteryEnergyEntity && !config8.chargingSwitchEntity && !config8.currentLimitEntity && !config8.pressureEntity && !config8.suctionLevelEntity && !config8.mopIntensityEntity && (!config8.customServiceAreas || config8.customServiceAreas.length === 0) && (!config8.customFanSpeedTags || Object.keys(config8.customFanSpeedTags).length === 0) && (!config8.fanWindPresets || (config8.fanWindPresets.natural?.length ?? 0) === 0 && (config8.fanWindPresets.sleep?.length ?? 0) === 0) && !config8.fanRestoreSpeedOnPowerOn && !config8.currentRoomEntity && !config8.cleanedAreaEntity && !config8.vacuumAscendingRoomOrder && !config8.disableCustomAreaRoomModes && !config8.valetudoIdentifier && !config8.coverSwapOpenClose && !config8.coverExposeAsDimmableLight && !config8.selectExposeAsSwitch && !config8.selectSwitchOnOption && !config8.selectSwitchOffOption && !config8.coverSliderDebounceMs && !config8.updateThrottleMs && !config8.disableClimateOnOff && !config8.disableClimateFanControl && !config8.climateKeepModeOnIdle && !config8.climateExposeFan && !config8.climateAutoMode && (!config8.composedEntities || config8.composedEntities.length === 0) && !config8.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config8);
@@ -149611,6 +149623,7 @@ var DoorbellDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors(DoorbellRequirements.server.mandatory.Identify)
 });
 Object.freeze(DoorbellDeviceDefinition);
+var DoorbellDevice = DoorbellDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/commodity-price.js
 init_ClusterType();
@@ -149834,6 +149847,7 @@ var ElectricalUtilityMeterDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors(ElectricalUtilityMeterRequirements.server.mandatory.MeterIdentification)
 });
 Object.freeze(ElectricalUtilityMeterDeviceDefinition);
+var ElectricalUtilityMeterDevice = ElectricalUtilityMeterDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+types@0.17.9/node_modules/@matter/types/dist/esm/clusters/energy-evse.js
 init_ClusterType();
@@ -157731,9 +157745,39 @@ function decideWedgeRotation(input) {
   const imSilenceMs = lastImRequestMsAgo == null ? sessionAgeMs : lastImRequestMsAgo;
   return subscriptionCount > 0 && sessionAgeMs > WEDGE_WARMUP_MS && imSilenceMs > WEDGE_IM_SILENCE_MS && (lastRotatedMsAgo == null || lastRotatedMsAgo > WEDGE_MIN_ROTATE_INTERVAL_MS);
 }
+var WEDGE_V2_COMMAND_SILENCE_MS = 45 * 60 * 1e3;
+var WEDGE_V2_WINDOW_MS = 30 * 60 * 1e3;
+var WEDGE_V2_MIN_SUBSCRIBES = 3;
+var WEDGE_V2_MIN_GIVE_UPS = 2;
+var WEDGE_RING_SIZE = 10;
+var WEDGE_GIVE_UP_QUIET_MS = 5e3;
+function inWindow(timesMs, nowMs) {
+  return timesMs.filter((t) => nowMs - t <= WEDGE_V2_WINDOW_MS);
+}
+function countRecent(timesMs, nowMs) {
+  return inWindow(timesMs, nowMs).length;
+}
+function decideWedgeRotationV2(input) {
+  const silenceMs = input.commandSilenceMs ?? input.sessionAgeMs;
+  if (input.subscriptionCount <= 0) return false;
+  if (input.sessionAgeMs <= WEDGE_WARMUP_MS) return false;
+  if (silenceMs <= WEDGE_V2_COMMAND_SILENCE_MS) return false;
+  const subscribes = inWindow(input.subscribeTimesMs, input.nowMs);
+  const giveUps = inWindow(input.giveUpTimesMs, input.nowMs);
+  if (subscribes.length < WEDGE_V2_MIN_SUBSCRIBES) return false;
+  if (giveUps.length < WEDGE_V2_MIN_GIVE_UPS) return false;
+  if (Math.max(...giveUps) <= Math.min(...subscribes)) return false;
+  return input.lastRotatedMsAgo == null || input.lastRotatedMsAgo > WEDGE_MIN_ROTATE_INTERVAL_MS;
+}
 
 // src/services/bridges/bridge.ts
 var imWrapMarker = /* @__PURE__ */ Symbol("hamh.wedgeImWrap");
+var commandMessageTypes = [
+  MessageType.ReadRequest,
+  MessageType.WriteRequest,
+  MessageType.InvokeRequest,
+  MessageType.TimedRequest
+];
 var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS = 6e4;
@@ -157787,6 +157831,13 @@ var Bridge = class {
   lastImRequestAt = /* @__PURE__ */ new WeakMap();
   wedgeLastRotatedAt = /* @__PURE__ */ new WeakMap();
   wedgeWatchdogTimer = null;
+  // V2 shadow signals (#365): last command-class request per session, plus
+  // rings of subscribe and delivery give-up times (newest WEDGE_RING_SIZE).
+  lastCommandImAt = /* @__PURE__ */ new WeakMap();
+  subscribeTimesMs = /* @__PURE__ */ new WeakMap();
+  giveUpTimesMs = /* @__PURE__ */ new WeakMap();
+  // Sessions whose subscriptions.deleted we already hooked for give-ups.
+  wedgeHookedSessions = /* @__PURE__ */ new WeakSet();
   // Watches the advertised interface addresses so a dynamic ISP IPv6 prefix
   // change forces a fresh operational announcement (#415).
   mdnsAddressTimer = null;
@@ -157850,6 +157901,20 @@ var Bridge = class {
         const lastImAt = this.lastImRequestAt.get(s);
         const lastImRequestMsAgo = lastImAt != null ? nowMs - lastImAt : null;
         const startedAt = this.sessionStartedAt.get(s.id);
+        const lastCmdAt = this.lastCommandImAt.get(s);
+        const lastCommandImRequestMsAgo = lastCmdAt != null ? nowMs - lastCmdAt : null;
+        const subscribeTimes = this.subscribeTimesMs.get(s) ?? [];
+        const giveUpTimes = this.giveUpTimesMs.get(s) ?? [];
+        const lastRotatedAt = this.wedgeLastRotatedAt.get(s);
+        const wedgeV2WouldRotate = decideWedgeRotationV2({
+          subscriptionCount: subCount,
+          sessionAgeMs: startedAt != null ? nowMs - startedAt : 0,
+          commandSilenceMs: lastCommandImRequestMsAgo,
+          subscribeTimesMs: subscribeTimes,
+          giveUpTimesMs: giveUpTimes,
+          nowMs,
+          lastRotatedMsAgo: lastRotatedAt != null ? nowMs - lastRotatedAt : null
+        });
         return {
           id: s.id,
           peerNodeId: String(s.peerNodeId),
@@ -157859,6 +157924,10 @@ var Bridge = class {
           lastActiveMsAgo,
           lastAnyActivityMsAgo,
           lastImRequestMsAgo,
+          lastCommandImRequestMsAgo,
+          subscribesLast30Min: countRecent(subscribeTimes, nowMs),
+          giveUpsLast30Min: countRecent(giveUpTimes, nowMs),
+          wedgeV2WouldRotate,
           isPeerActive: Boolean(s.isPeerActive),
           ageMsFromOpen: startedAt != null ? nowMs - startedAt : null
         };
@@ -158088,6 +158157,15 @@ ${e?.toString()}`);
     try {
       const sessionManager = this.server.env.get(SessionManager);
       seedExistingSessionStarts(this.sessionStartedAt, sessionManager.sessions);
+      const hookGiveUpsWithPeers = (sess) => this.hookSubscriptionGiveUps(
+        sess,
+        () => [...sessionManager.sessions].filter(
+          (s) => s.peerNodeId === sess.peerNodeId && s.fabric?.fabricIndex === sess.fabric?.fabricIndex
+        )
+      );
+      for (const sess of sessionManager.sessions) {
+        hookGiveUpsWithPeers(sess);
+      }
       this.sessionDiagHandler = (session) => {
         const sessions = [...sessionManager.sessions];
         let totalSubs = 0;
@@ -158150,6 +158228,7 @@ ${e?.toString()}`);
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
       this.sessionAddedHandler = (newSession) => {
         this.sessionStartedAt.set(newSession.id, Date.now());
+        hookGiveUpsWithPeers(newSession);
         this.log.info(
           `Session opened: id=${newSession.id} peer=${newSession.peerNodeId}`
         );
@@ -158243,7 +158322,14 @@ ${e?.toString()}`);
       is.onNewExchange = (exchange, message) => {
         const session = exchange.session;
         if (session) {
-          this.lastImRequestAt.set(session, Date.now());
+          const now = Date.now();
+          this.lastImRequestAt.set(session, now);
+          const type = message?.payloadHeader?.messageType;
+          if (type === MessageType.SubscribeRequest) {
+            this.pushWedgeRing(this.subscribeTimesMs, session, now);
+          } else if (type != null && commandMessageTypes.includes(type)) {
+            this.lastCommandImAt.set(session, now);
+          }
         }
         return original(exchange, message);
       };
@@ -158251,6 +158337,52 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  // Keep only the newest WEDGE_RING_SIZE timestamps per session.
+  pushWedgeRing(ring, session, now) {
+    const times = ring.get(session) ?? [];
+    times.push(now);
+    if (times.length > WEDGE_RING_SIZE) {
+      times.splice(0, times.length - WEDGE_RING_SIZE);
+    }
+    ring.set(session, times);
+  }
+  // Watch this session's subscriptions for server-side delivery give-ups
+  // (#365 v2 shadow). isTerminated true fires both on a peer cancel and on
+  // the 3-strikes delivery give-up; only the give-up arrives without a
+  // coincident inbound IM request, so that is the discriminator.
+  hookSubscriptionGiveUps(session, peerSessions) {
+    const key = session;
+    if (this.wedgeHookedSessions.has(key)) {
+      return;
+    }
+    const deleted = session.subscriptions?.deleted;
+    if (typeof deleted?.on !== "function") {
+      return;
+    }
+    this.wedgeHookedSessions.add(key);
+    deleted.on((sub) => {
+      if (sub?.isTerminated !== true) {
+        return;
+      }
+      const now = Date.now();
+      const fresh = (s) => {
+        const at = this.lastImRequestAt.get(s);
+        return at != null && now - at <= WEDGE_GIVE_UP_QUIET_MS;
+      };
+      if (fresh(key)) {
+        return;
+      }
+      for (const s of peerSessions?.() ?? []) {
+        if (s !== key && fresh(s)) {
+          return;
+        }
+      }
+      this.pushWedgeRing(this.giveUpTimesMs, key, now);
+      this.log.debug(
+        `wedge v2 give-up recorded sub=${sub?.subscriptionId}`
+      );
+    });
+  }
   closeStaleSession(sessionId) {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -158513,14 +158645,38 @@ ${e?.toString()}`);
         const lastImRequestMsAgo = lastImAt != null ? now - lastImAt : null;
         const lastRotatedAt = this.wedgeLastRotatedAt.get(s);
         const lastRotatedMsAgo = lastRotatedAt != null ? now - lastRotatedAt : null;
-        if (!decideWedgeRotation({
+        const v1 = decideWedgeRotation({
           subscriptionCount: s.subscriptions.size,
           sessionAgeMs,
           lastImRequestMsAgo,
           lastRotatedMsAgo
-        })) {
+        });
+        const lastCmdAt = this.lastCommandImAt.get(s);
+        const commandSilenceMs = lastCmdAt != null ? now - lastCmdAt : null;
+        const subscribeTimes = this.subscribeTimesMs.get(s) ?? [];
+        const giveUpTimes = this.giveUpTimesMs.get(s) ?? [];
+        const v2 = decideWedgeRotationV2({
+          subscriptionCount: s.subscriptions.size,
+          sessionAgeMs,
+          commandSilenceMs,
+          subscribeTimesMs: subscribeTimes,
+          giveUpTimesMs: giveUpTimes,
+          nowMs: now,
+          lastRotatedMsAgo
+        });
+        const cmdSilenceMin = Math.round(
+          (commandSilenceMs ?? sessionAgeMs) / 6e4
+        );
+        const v2Stats = `cmdSilenceMin=${cmdSilenceMin} subscribes30m=${countRecent(subscribeTimes, now)} giveUps30m=${countRecent(giveUpTimes, now)}`;
+        if (v2 && !v1) {
+          this.log.info(`wedge v2 would rotate session ${s.id}: ${v2Stats}`);
+        }
+        if (!v1) {
           continue;
         }
+        this.log.info(
+          `wedge v2 session ${s.id}: v1 rotated, v2 agree=${v2} ${v2Stats}`
+        );
         const silenceMin = Math.round(
           (lastImRequestMsAgo ?? sessionAgeMs) / 6e4
         );
@@ -164991,6 +165147,9 @@ var HaGenericSwitchServer = HaGenericSwitchServerMultiBase.set({
   multiPressMax: 3
 });
 
+// src/matter/endpoints/legacy/event/doorbell.ts
+init_home_assistant_entity_behavior();
+
 // src/matter/endpoints/legacy/event/index.ts
 init_home_assistant_entity_behavior();
 var EventEndpointTypeMulti = GenericSwitchDevice.with(
@@ -165033,6 +165192,33 @@ function EventDevice(homeAssistantEntity) {
   });
 }
 
+// src/matter/endpoints/legacy/event/doorbell.ts
+var DoorbellEndpointTypeMulti = DoorbellDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaGenericSwitchServer
+);
+var DoorbellEndpointTypeSimple = DoorbellDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaGenericSwitchServerSimple
+);
+function DoorbellDevice2(homeAssistantEntity) {
+  const attrs = homeAssistantEntity.entity.state.attributes;
+  const multiPressMax = detectMultiPressMax(attrs.event_types ?? []);
+  if (multiPressMax >= 2) {
+    return DoorbellEndpointTypeMulti.set({
+      homeAssistantEntity,
+      switch: { multiPressMax }
+    });
+  }
+  return DoorbellEndpointTypeSimple.set({
+    homeAssistantEntity
+  });
+}
+
 // src/matter/endpoints/legacy/fan/index.ts
 init_dist();
 init_home_assistant_entity_behavior();
@@ -168613,6 +168799,38 @@ var ElectricalMeterType = ElectricalMeterDevice.with(
   HaPowerTopologyServer
 );
 
+// src/matter/endpoints/legacy/sensor/devices/electrical-utility-meter.ts
+init_home_assistant_entity_behavior();
+var HaMeterIdentificationServer = class extends MeterIdentificationServer {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    const mapping = homeAssistant.state.mapping;
+    applyPatchState(this.state, {
+      meterSerialNumber: mapping?.meterSerialNumber ?? null,
+      pointOfDelivery: mapping?.pointOfDelivery ?? null
+    });
+  }
+};
+((HaMeterIdentificationServer2) => {
+  class State extends MeterIdentificationServer.State {
+  }
+  HaMeterIdentificationServer2.State = State;
+})(HaMeterIdentificationServer || (HaMeterIdentificationServer = {}));
+var ElectricalUtilityMeterType = ElectricalUtilityMeterDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaMeterIdentificationServer.set({
+    meterType: null,
+    pointOfDelivery: null,
+    meterSerialNumber: null
+  }),
+  PowerServer,
+  EnergyServer,
+  HaPowerTopologyServer
+);
+
 // src/matter/endpoints/legacy/sensor/devices/energy-evse.ts
 init_esm();
 init_home_assistant_actions();
@@ -173433,6 +173651,8 @@ var matterDeviceTypeFactories = {
   // Legacy SolarPower alias, kept for existing mappings.
   electrical_sensor: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
   solar_power: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
+  // Matter 1.4 utility meter (0x0511), opt-in so existing pairings keep 0x0514.
+  electrical_utility_meter: (ha) => ElectricalUtilityMeterType.set({ homeAssistantEntity: ha }),
   evse: (ha) => energyEvseType().set({ homeAssistantEntity: ha }),
   contact_sensor: (ha) => ContactSensorType.set({ homeAssistantEntity: ha }),
   motion_sensor: (ha) => MotionSensorType.set({ homeAssistantEntity: ha }),
@@ -173444,6 +173664,7 @@ var matterDeviceTypeFactories = {
   water_heater: WaterHeaterDevice2,
   water_heater_management: WaterHeaterManagementDevice,
   generic_switch: EventDevice,
+  doorbell: DoorbellDevice2,
   smoke_co_alarm: (ha) => SmokeAlarmType.set({ homeAssistantEntity: ha }),
   water_freeze_detector: (ha) => WaterFreezeDetectorType.set({ homeAssistantEntity: ha }),
   water_leak_detector: (ha) => WaterLeakDetectorType.set({ homeAssistantEntity: ha })
@@ -176895,6 +177116,12 @@ init_esm7();
 import * as os10 from "node:os";
 init_diagnostic_event_bus();
 var imWrapMarker2 = /* @__PURE__ */ Symbol("hamh.wedgeImWrap");
+var commandMessageTypes2 = [
+  MessageType.ReadRequest,
+  MessageType.WriteRequest,
+  MessageType.InvokeRequest,
+  MessageType.TimedRequest
+];
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2 = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS2 = 6e4;
@@ -176933,6 +177160,13 @@ var ServerModeBridge = class {
   lastImRequestAt = /* @__PURE__ */ new WeakMap();
   wedgeLastRotatedAt = /* @__PURE__ */ new WeakMap();
   wedgeWatchdogTimer = null;
+  // V2 shadow signals (#365): last command-class request per session, plus
+  // rings of subscribe and delivery give-up times (newest WEDGE_RING_SIZE).
+  lastCommandImAt = /* @__PURE__ */ new WeakMap();
+  subscribeTimesMs = /* @__PURE__ */ new WeakMap();
+  giveUpTimesMs = /* @__PURE__ */ new WeakMap();
+  // Sessions whose subscriptions.deleted we already hooked for give-ups.
+  wedgeHookedSessions = /* @__PURE__ */ new WeakSet();
   // Watches the advertised interface addresses so a dynamic ISP IPv6 prefix
   // change forces a fresh operational announcement (#415).
   mdnsAddressTimer = null;
@@ -177013,6 +177247,20 @@ var ServerModeBridge = class {
         const lastImAt = this.lastImRequestAt.get(s);
         const lastImRequestMsAgo = lastImAt != null ? nowMs - lastImAt : null;
         const startedAt = this.sessionStartedAt.get(s.id);
+        const lastCmdAt = this.lastCommandImAt.get(s);
+        const lastCommandImRequestMsAgo = lastCmdAt != null ? nowMs - lastCmdAt : null;
+        const subscribeTimes = this.subscribeTimesMs.get(s) ?? [];
+        const giveUpTimes = this.giveUpTimesMs.get(s) ?? [];
+        const lastRotatedAt = this.wedgeLastRotatedAt.get(s);
+        const wedgeV2WouldRotate = decideWedgeRotationV2({
+          subscriptionCount: subCount,
+          sessionAgeMs: startedAt != null ? nowMs - startedAt : 0,
+          commandSilenceMs: lastCommandImRequestMsAgo,
+          subscribeTimesMs: subscribeTimes,
+          giveUpTimesMs: giveUpTimes,
+          nowMs,
+          lastRotatedMsAgo: lastRotatedAt != null ? nowMs - lastRotatedAt : null
+        });
         return {
           id: s.id,
           peerNodeId: String(s.peerNodeId),
@@ -177022,6 +177270,10 @@ var ServerModeBridge = class {
           lastActiveMsAgo,
           lastAnyActivityMsAgo,
           lastImRequestMsAgo,
+          lastCommandImRequestMsAgo,
+          subscribesLast30Min: countRecent(subscribeTimes, nowMs),
+          giveUpsLast30Min: countRecent(giveUpTimes, nowMs),
+          wedgeV2WouldRotate,
           isPeerActive: Boolean(s.isPeerActive),
           ageMsFromOpen: startedAt != null ? nowMs - startedAt : null
         };
@@ -177245,6 +177497,7 @@ ${e?.toString()}`);
       sessionManager.subscriptionsChanged.on(this.sessionDiagHandler);
       this.sessionAddedHandler = (newSession) => {
         this.sessionStartedAt.set(newSession.id, Date.now());
+        hookGiveUpsWithPeers(newSession);
         this.log.info(
           `Session opened: id=${newSession.id} peer=${newSession.peerNodeId}`
         );
@@ -177321,6 +177574,15 @@ ${e?.toString()}`);
       sessionManager.sessions.added.on(this.sessionAddedHandler);
       sessionManager.sessions.deleted.on(this.sessionDeletedHandler);
       seedExistingSessionStarts(this.sessionStartedAt, sessionManager.sessions);
+      const hookGiveUpsWithPeers = (sess) => this.hookSubscriptionGiveUps(
+        sess,
+        () => [...sessionManager.sessions].filter(
+          (s) => s.peerNodeId === sess.peerNodeId && s.fabric?.fabricIndex === sess.fabric?.fabricIndex
+        )
+      );
+      for (const sess of sessionManager.sessions) {
+        hookGiveUpsWithPeers(sess);
+      }
       this.wireImRequestTracking();
     } catch {
     }
@@ -177339,7 +177601,14 @@ ${e?.toString()}`);
       is.onNewExchange = (exchange, message) => {
         const session = exchange.session;
         if (session) {
-          this.lastImRequestAt.set(session, Date.now());
+          const now = Date.now();
+          this.lastImRequestAt.set(session, now);
+          const type = message?.payloadHeader?.messageType;
+          if (type === MessageType.SubscribeRequest) {
+            this.pushWedgeRing(this.subscribeTimesMs, session, now);
+          } else if (type != null && commandMessageTypes2.includes(type)) {
+            this.lastCommandImAt.set(session, now);
+          }
         }
         return original(exchange, message);
       };
@@ -177347,6 +177616,52 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  // Keep only the newest WEDGE_RING_SIZE timestamps per session.
+  pushWedgeRing(ring, session, now) {
+    const times = ring.get(session) ?? [];
+    times.push(now);
+    if (times.length > WEDGE_RING_SIZE) {
+      times.splice(0, times.length - WEDGE_RING_SIZE);
+    }
+    ring.set(session, times);
+  }
+  // Watch this session's subscriptions for server-side delivery give-ups
+  // (#365 v2 shadow). isTerminated true fires both on a peer cancel and on
+  // the 3-strikes delivery give-up; only the give-up arrives without a
+  // coincident inbound IM request, so that is the discriminator.
+  hookSubscriptionGiveUps(session, peerSessions) {
+    const key = session;
+    if (this.wedgeHookedSessions.has(key)) {
+      return;
+    }
+    const deleted = session.subscriptions?.deleted;
+    if (typeof deleted?.on !== "function") {
+      return;
+    }
+    this.wedgeHookedSessions.add(key);
+    deleted.on((sub) => {
+      if (sub?.isTerminated !== true) {
+        return;
+      }
+      const now = Date.now();
+      const fresh = (s) => {
+        const at = this.lastImRequestAt.get(s);
+        return at != null && now - at <= WEDGE_GIVE_UP_QUIET_MS;
+      };
+      if (fresh(key)) {
+        return;
+      }
+      for (const s of peerSessions?.() ?? []) {
+        if (s !== key && fresh(s)) {
+          return;
+        }
+      }
+      this.pushWedgeRing(this.giveUpTimesMs, key, now);
+      this.log.debug(
+        `wedge v2 give-up recorded sub=${sub?.subscriptionId}`
+      );
+    });
+  }
   closeStaleSession(sessionId) {
     try {
       const sessionManager = this.server.env.get(SessionManager);
@@ -177598,14 +177913,38 @@ ${e?.toString()}`);
         const lastImRequestMsAgo = lastImAt != null ? now - lastImAt : null;
         const lastRotatedAt = this.wedgeLastRotatedAt.get(s);
         const lastRotatedMsAgo = lastRotatedAt != null ? now - lastRotatedAt : null;
-        if (!decideWedgeRotation({
+        const v1 = decideWedgeRotation({
           subscriptionCount: s.subscriptions.size,
           sessionAgeMs,
           lastImRequestMsAgo,
           lastRotatedMsAgo
-        })) {
+        });
+        const lastCmdAt = this.lastCommandImAt.get(s);
+        const commandSilenceMs = lastCmdAt != null ? now - lastCmdAt : null;
+        const subscribeTimes = this.subscribeTimesMs.get(s) ?? [];
+        const giveUpTimes = this.giveUpTimesMs.get(s) ?? [];
+        const v2 = decideWedgeRotationV2({
+          subscriptionCount: s.subscriptions.size,
+          sessionAgeMs,
+          commandSilenceMs,
+          subscribeTimesMs: subscribeTimes,
+          giveUpTimesMs: giveUpTimes,
+          nowMs: now,
+          lastRotatedMsAgo
+        });
+        const cmdSilenceMin = Math.round(
+          (commandSilenceMs ?? sessionAgeMs) / 6e4
+        );
+        const v2Stats = `cmdSilenceMin=${cmdSilenceMin} subscribes30m=${countRecent(subscribeTimes, now)} giveUps30m=${countRecent(giveUpTimes, now)}`;
+        if (v2 && !v1) {
+          this.log.info(`wedge v2 would rotate session ${s.id}: ${v2Stats}`);
+        }
+        if (!v1) {
           continue;
         }
+        this.log.info(
+          `wedge v2 session ${s.id}: v1 rotated, v2 agree=${v2} ${v2Stats}`
+        );
         const silenceMin = Math.round(
           (lastImRequestMsAgo ?? sessionAgeMs) / 6e4
         );