@riddix/hamh 2.1.0-alpha.830 → 2.1.0-alpha.832

package/dist/backend/cli.js

@@ -130689,7 +130689,14 @@ var init_controller_compat = __esm({
         google: "no",
         alexa: "unknown",
         aqara: "unknown",
-        note: "Power/energy is rarely shown unless it is on a smart plug."
+        note: "SolarPower is only rendered standalone by SmartThings today."
+      },
+      1300: {
+        apple: "no",
+        google: "yes",
+        alexa: "no",
+        aqara: "unknown",
+        note: "ElectricalMeter shows in Google Home and SmartThings; Apple and Alexa do not surface standalone power/energy."
       },
       24: {
         apple: "no",
@@ -131529,6 +131536,12 @@ var init_bridge_config_schema = __esm({
           description: "When a controller drops all subscriptions, clean up the dead session and re-announce after 5 seconds instead of 60. Opt-in for Google Home users whose devices go offline after a cancelled subscription (#386). It shortens the offline window but cannot stop the controller from rejecting the subscription. Default off.",
           type: "boolean",
           default: false
+        },
+        stableIdentity: {
+          title: "Stable Device Identity",
+          description: "Anchor each device to its Home Assistant entity registry id instead of the entity id, so renaming an entity no longer re-adds it in your controller (Alexa, Google Home, Apple Home) and keeps groups and automations. Records are seeded from the start, so enabling this later is safe and never re-adds existing devices. Default off.",
+          type: "boolean",
+          default: false
         }
       }
     };
@@ -132293,6 +132306,12 @@ var init_home_assistant_entity_behavior = __esm({
         customName;
         /** Entity mapping configuration (optional, used for advanced features like filter life sensor) */
         mapping;
+        /**
+         * Stable identity anchor for uniqueId/serialNumber. Set to the entity_id the
+         * identity was first seeded under, so those stay frozen across HA renames.
+         * Undefined falls back to the live entity_id (legacy behaviour).
+         */
+        identityAnchor;
       }
       HomeAssistantEntityBehavior2.State = State;
       class Events2 extends EventEmitter {
@@ -132616,6 +132635,10 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     lockPinMaxLength: config11.lockPinMaxLength,
                     powerEntity: config11.powerEntity,
                     energyEntity: config11.energyEntity,
+                    voltageEntity: config11.voltageEntity,
+                    currentEntity: config11.currentEntity,
+                    batteryPowerEntity: config11.batteryPowerEntity,
+                    batteryEnergyEntity: config11.batteryEnergyEntity,
                     suctionLevelEntity: config11.suctionLevelEntity,
                     mopIntensityEntity: config11.mopIntensityEntity,
                     valetudoIdentifier: config11.valetudoIdentifier,
@@ -132773,6 +132796,10 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   lockPinMaxLength: config11.lockPinMaxLength,
                   powerEntity: config11.powerEntity,
                   energyEntity: config11.energyEntity,
+                  voltageEntity: config11.voltageEntity,
+                  currentEntity: config11.currentEntity,
+                  batteryPowerEntity: config11.batteryPowerEntity,
+                  batteryEnergyEntity: config11.batteryEnergyEntity,
                   suctionLevelEntity: config11.suctionLevelEntity,
                   mopIntensityEntity: config11.mopIntensityEntity,
                   temperatureEntity: config11.temperatureEntity,
@@ -133576,7 +133603,7 @@ function diagnosticApi(bridgeService, haClient, haRegistry, version2, startTime)
 
 // src/api/entity-mapping-api.ts
 import express7 from "express";
-function entityMappingApi(mappingStorage) {
+function entityMappingApi(mappingStorage, identityStorage) {
   const router = express7.Router();
   router.get("/:bridgeId", (req, res) => {
     const { bridgeId } = req.params;
@@ -133621,6 +133648,10 @@ function entityMappingApi(mappingStorage) {
       lockPinMaxLength: body.lockPinMaxLength,
       powerEntity: body.powerEntity,
       energyEntity: body.energyEntity,
+      voltageEntity: body.voltageEntity,
+      currentEntity: body.currentEntity,
+      batteryPowerEntity: body.batteryPowerEntity,
+      batteryEnergyEntity: body.batteryEnergyEntity,
       suctionLevelEntity: body.suctionLevelEntity,
       mopIntensityEntity: body.mopIntensityEntity,
       customServiceAreas: body.customServiceAreas,
@@ -133657,6 +133688,7 @@ function entityMappingApi(mappingStorage) {
   router.delete("/:bridgeId", async (req, res) => {
     const { bridgeId } = req.params;
     await mappingStorage.deleteBridgeMappings(bridgeId);
+    await identityStorage.deleteBridgeIdentities(bridgeId);
     res.status(204).send();
   });
   return router;
@@ -134117,6 +134149,10 @@ function configToProfileEntry(config11) {
     lockPinMaxLength: config11.lockPinMaxLength,
     powerEntity: config11.powerEntity,
     energyEntity: config11.energyEntity,
+    voltageEntity: config11.voltageEntity,
+    currentEntity: config11.currentEntity,
+    batteryPowerEntity: config11.batteryPowerEntity,
+    batteryEnergyEntity: config11.batteryEnergyEntity,
     suctionLevelEntity: config11.suctionLevelEntity,
     mopIntensityEntity: config11.mopIntensityEntity,
     customServiceAreas: config11.customServiceAreas,
@@ -134252,6 +134288,10 @@ function mappingProfileApi(mappingStorage) {
           lockPinMaxLength: entry.lockPinMaxLength,
           powerEntity: entry.powerEntity,
           energyEntity: entry.energyEntity,
+          voltageEntity: entry.voltageEntity,
+          currentEntity: entry.currentEntity,
+          batteryPowerEntity: entry.batteryPowerEntity,
+          batteryEnergyEntity: entry.batteryEnergyEntity,
           suctionLevelEntity: entry.suctionLevelEntity,
           mopIntensityEntity: entry.mopIntensityEntity,
           customServiceAreas: entry.customServiceAreas,
@@ -134523,7 +134563,7 @@ function endpointToJson(endpoint, parentId) {
 
 // src/api/matter-api.ts
 var ajv = new Ajv();
-function matterApi(bridgeService, haRegistry) {
+function matterApi(bridgeService, haRegistry, identityStorage) {
   const router = express11.Router();
   router.get("/", (_, res) => {
     res.status(200).json({});
@@ -134600,6 +134640,7 @@ function matterApi(bridgeService, haRegistry) {
     const bridgeId = req.params.bridgeId;
     try {
       await bridgeService.delete(bridgeId);
+      await identityStorage?.deleteBridgeIdentities(bridgeId);
       res.status(204).send();
     } catch (e) {
       res.status(500).json({
@@ -134615,6 +134656,7 @@ function matterApi(bridgeService, haRegistry) {
       return;
     }
     try {
+      await identityStorage?.deleteBridgeIdentities(bridgeId);
       await bridge.factoryReset();
       await bridge.start();
       res.status(200).json(bridge.data);
@@ -136597,13 +136639,14 @@ var WebSocketApi = class {
 
 // src/api/web-api.ts
 var WebApi = class extends Service {
-  constructor(logger245, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, lockCredentialStorage, settingsStorage, backupService, props) {
+  constructor(logger245, bridgeService, haClient, haRegistry, bridgeStorage, mappingStorage, identityStorage, lockCredentialStorage, settingsStorage, backupService, props) {
     super("WebApi");
     this.bridgeService = bridgeService;
     this.haClient = haClient;
     this.haRegistry = haRegistry;
     this.bridgeStorage = bridgeStorage;
     this.mappingStorage = mappingStorage;
+    this.identityStorage = identityStorage;
     this.lockCredentialStorage = lockCredentialStorage;
     this.settingsStorage = settingsStorage;
     this.backupService = backupService;
@@ -136623,6 +136666,7 @@ var WebApi = class extends Service {
   haRegistry;
   bridgeStorage;
   mappingStorage;
+  identityStorage;
   lockCredentialStorage;
   settingsStorage;
   backupService;
@@ -136639,7 +136683,10 @@ var WebApi = class extends Service {
   }
   async initialize() {
     const api = express17.Router();
-    api.use(express17.json()).use(nocache()).use("/matter", matterApi(this.bridgeService, this.haRegistry)).use(
+    api.use(express17.json()).use(nocache()).use(
+      "/matter",
+      matterApi(this.bridgeService, this.haRegistry, this.identityStorage)
+    ).use(
       "/health",
       healthApi(
         this.bridgeService,
@@ -136650,7 +136697,10 @@ var WebApi = class extends Service {
     ).use("/bridges", bridgeExportApi(this.bridgeStorage)).use("/bridge-icons", bridgeIconApi(this.props.storageLocation)).use(
       "/device-images",
       deviceImageApi(this.props.storageLocation, this.haRegistry)
-    ).use("/entity-mappings", entityMappingApi(this.mappingStorage)).use("/mapping-profiles", mappingProfileApi(this.mappingStorage)).use("/lock-credentials", lockCredentialApi(this.lockCredentialStorage)).use(
+    ).use(
+      "/entity-mappings",
+      entityMappingApi(this.mappingStorage, this.identityStorage)
+    ).use("/mapping-profiles", mappingProfileApi(this.mappingStorage)).use("/lock-credentials", lockCredentialApi(this.lockCredentialStorage)).use(
       "/settings",
       settingsApi(this.settingsStorage, this.bridgeService, this.props.auth)
     ).use(
@@ -138355,9 +138405,112 @@ var BridgeStorage = class extends Service {
   }
 };
 
-// src/services/storage/entity-mapping-storage.ts
+// src/services/storage/entity-identity-storage.ts
 init_service();
 var CURRENT_VERSION = 1;
+var PERSIST_DEBOUNCE_MS = 500;
+var EntityIdentityStorage = class extends Service {
+  constructor(appStorage) {
+    super("EntityIdentityStorage");
+    this.appStorage = appStorage;
+  }
+  appStorage;
+  storage;
+  identities = /* @__PURE__ */ new Map();
+  persistTimer = null;
+  async initialize() {
+    this.storage = this.appStorage.createContext("entity-identities");
+    await this.load();
+  }
+  async dispose() {
+    await this.flush();
+  }
+  async load() {
+    const stored = await this.storage.get("data", {
+      version: CURRENT_VERSION,
+      identities: {}
+    });
+    if (!stored || Object.keys(stored).length === 0) {
+      return;
+    }
+    const data = stored;
+    if (data.version !== CURRENT_VERSION) {
+      await this.migrate(data);
+      return;
+    }
+    for (const [bridgeId, records] of Object.entries(data.identities)) {
+      const bridgeMap = /* @__PURE__ */ new Map();
+      for (const [key, record] of Object.entries(records)) {
+        bridgeMap.set(key, record);
+      }
+      this.identities.set(bridgeId, bridgeMap);
+    }
+  }
+  async migrate(data) {
+    if (data.version < CURRENT_VERSION) {
+      for (const [bridgeId, records] of Object.entries(data.identities)) {
+        const bridgeMap = /* @__PURE__ */ new Map();
+        for (const [key, record] of Object.entries(records)) {
+          bridgeMap.set(key, record);
+        }
+        this.identities.set(bridgeId, bridgeMap);
+      }
+      await this.persist();
+    }
+  }
+  async persist() {
+    const data = {
+      version: CURRENT_VERSION,
+      identities: {}
+    };
+    for (const [bridgeId, bridgeMap] of this.identities) {
+      const records = {};
+      for (const [key, record] of bridgeMap) {
+        records[key] = record;
+      }
+      data.identities[bridgeId] = records;
+    }
+    await this.storage.set("data", data);
+  }
+  schedulePersist() {
+    if (this.persistTimer) return;
+    this.persistTimer = setTimeout(() => {
+      this.persistTimer = null;
+      void this.persist();
+    }, PERSIST_DEBOUNCE_MS);
+  }
+  // Flush any pending debounced write, used on dispose and by tests.
+  async flush() {
+    if (this.persistTimer) {
+      clearTimeout(this.persistTimer);
+      this.persistTimer = null;
+    }
+    await this.persist();
+  }
+  getIdentity(bridgeId, key) {
+    return this.identities.get(bridgeId)?.get(key);
+  }
+  getBridgeIdentities(bridgeId) {
+    return this.identities.get(bridgeId) ?? /* @__PURE__ */ new Map();
+  }
+  setIdentity(bridgeId, key, record) {
+    let bridgeMap = this.identities.get(bridgeId);
+    if (!bridgeMap) {
+      bridgeMap = /* @__PURE__ */ new Map();
+      this.identities.set(bridgeId, bridgeMap);
+    }
+    bridgeMap.set(key, record);
+    this.schedulePersist();
+  }
+  async deleteBridgeIdentities(bridgeId) {
+    this.identities.delete(bridgeId);
+    await this.flush();
+  }
+};
+
+// src/services/storage/entity-mapping-storage.ts
+init_service();
+var CURRENT_VERSION2 = 1;
 var EntityMappingStorage = class extends Service {
   constructor(appStorage) {
     super("EntityMappingStorage");
@@ -138372,14 +138525,14 @@ var EntityMappingStorage = class extends Service {
   }
   async load() {
     const stored = await this.storage.get("data", {
-      version: CURRENT_VERSION,
+      version: CURRENT_VERSION2,
       mappings: {}
     });
     if (!stored || Object.keys(stored).length === 0) {
       return;
     }
     const data = stored;
-    if (data.version !== CURRENT_VERSION) {
+    if (data.version !== CURRENT_VERSION2) {
       await this.migrate(data);
       return;
     }
@@ -138392,7 +138545,7 @@ var EntityMappingStorage = class extends Service {
     }
   }
   async migrate(data) {
-    if (data.version < CURRENT_VERSION) {
+    if (data.version < CURRENT_VERSION2) {
       for (const [bridgeId, configs] of Object.entries(data.mappings)) {
         const bridgeMap = /* @__PURE__ */ new Map();
         for (const config11 of configs) {
@@ -138405,7 +138558,7 @@ var EntityMappingStorage = class extends Service {
   }
   async persist() {
     const data = {
-      version: CURRENT_VERSION,
+      version: CURRENT_VERSION2,
       mappings: {}
     };
     for (const [bridgeId, bridgeMap] of this.mappings) {
@@ -138455,6 +138608,10 @@ var EntityMappingStorage = class extends Service {
       lockPinMaxLength: pinLengths.max,
       powerEntity: request.powerEntity?.trim() || void 0,
       energyEntity: request.energyEntity?.trim() || void 0,
+      voltageEntity: request.voltageEntity?.trim() || void 0,
+      currentEntity: request.currentEntity?.trim() || void 0,
+      batteryPowerEntity: request.batteryPowerEntity?.trim() || void 0,
+      batteryEnergyEntity: request.batteryEnergyEntity?.trim() || void 0,
       pressureEntity: request.pressureEntity?.trim() || void 0,
       suctionLevelEntity: request.suctionLevelEntity?.trim() || void 0,
       mopIntensityEntity: request.mopIntensityEntity?.trim() || void 0,
@@ -138483,7 +138640,7 @@ var EntityMappingStorage = class extends Service {
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
       disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0) && !config11.disableMomentaryFlip) {
+    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.voltageEntity && !config11.currentEntity && !config11.batteryPowerEntity && !config11.batteryEnergyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0) && !config11.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -138565,7 +138722,7 @@ function sanitizeThrottleMs(value) {
 // src/services/storage/lock-credential-storage.ts
 init_service();
 import { pbkdf2Sync, randomBytes as randomBytes3, timingSafeEqual as timingSafeEqual2 } from "node:crypto";
-var CURRENT_VERSION2 = 2;
+var CURRENT_VERSION3 = 2;
 var HASH_ITERATIONS = 1e5;
 var HASH_KEY_LENGTH = 64;
 var HASH_ALGORITHM = "sha512";
@@ -138584,14 +138741,14 @@ var LockCredentialStorage = class extends Service {
   }
   async load() {
     const stored = await this.storage.get("data", {
-      version: CURRENT_VERSION2,
+      version: CURRENT_VERSION3,
       credentials: []
     });
     if (!stored || Object.keys(stored).length === 0) {
       return;
     }
     const data = stored;
-    if (data.version !== CURRENT_VERSION2) {
+    if (data.version !== CURRENT_VERSION3) {
       await this.migrate(data);
       return;
     }
@@ -138620,7 +138777,7 @@ var LockCredentialStorage = class extends Service {
   }
   async persist() {
     const data = {
-      version: CURRENT_VERSION2,
+      version: CURRENT_VERSION3,
       credentials: Array.from(this.credentials.values())
     };
     await this.storage.set("data", data);
@@ -148297,6 +148454,7 @@ var ElectricalMeterDeviceDefinition = MutableEndpoint({
   behaviors: SupportedBehaviors()
 });
 Object.freeze(ElectricalMeterDeviceDefinition);
+var ElectricalMeterDevice = ElectricalMeterDeviceDefinition;
 
 // ../../node_modules/.pnpm/@matter+types@0.17.5/node_modules/@matter/types/dist/esm/clusters/meter-identification.js
 init_ClusterType();
@@ -156975,8 +157133,8 @@ var AggregatorEndpoint2 = class extends Endpoint {
 // src/matter/endpoints/entity-endpoint.ts
 init_esm7();
 var EntityEndpoint = class extends Endpoint {
-  constructor(type, entityId, customName, mappedEntityIds) {
-    super(type, { id: createEndpointId(entityId, customName) });
+  constructor(type, entityId, customName, mappedEntityIds, endpointId) {
+    super(type, { id: endpointId ?? createEndpointId(entityId, customName) });
     this.entityId = entityId;
     this.mappedEntityIds = mappedEntityIds ?? [];
   }
@@ -157018,6 +157176,10 @@ function getMappedEntityIds(mapping) {
   if (mapping.filterLifeEntity) ids.push(mapping.filterLifeEntity);
   if (mapping.powerEntity) ids.push(mapping.powerEntity);
   if (mapping.energyEntity) ids.push(mapping.energyEntity);
+  if (mapping.voltageEntity) ids.push(mapping.voltageEntity);
+  if (mapping.currentEntity) ids.push(mapping.currentEntity);
+  if (mapping.batteryPowerEntity) ids.push(mapping.batteryPowerEntity);
+  if (mapping.batteryEnergyEntity) ids.push(mapping.batteryEnergyEntity);
   if (mapping.currentRoomEntity) ids.push(mapping.currentRoomEntity);
   if (mapping.cleanedAreaEntity) ids.push(mapping.cleanedAreaEntity);
   if (mapping.composedEntities) {
@@ -157262,13 +157424,14 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const device = entity.deviceRegistry;
     const mapping = homeAssistant.state.mapping;
+    const anchor = homeAssistant.state.identityAnchor ?? entity.entity_id;
     const registryName = featureFlags?.preferEntityRegistryName ? entity.registry?.name ?? entity.registry?.original_name : void 0;
     const nodeLabel = ellipse(32, homeAssistant.state.customName) ?? ellipse(32, registryName) ?? ellipse(32, entity.state?.attributes?.friendly_name) ?? ellipse(32, entity.entity_id);
     const productNameFromNodeLabel = featureFlags?.productNameFromNodeLabel === true ? ellipse(32, sanitizeMatterString(nodeLabel ?? "")) ?? void 0 : void 0;
     const serialNumberSuffix = this.env.get(BridgeDataProvider).serialNumberSuffix;
     const maxRawLen = 32 - (serialNumberSuffix?.length ?? 0);
     const registrySerial = featureFlags?.useHaRegistrySerial ? ellipse(maxRawLen, device?.serial_number) : void 0;
-    const rawSerial = ellipse(maxRawLen, mapping?.customSerialNumber) ?? registrySerial ?? hash(maxRawLen, entity.entity_id);
+    const rawSerial = ellipse(maxRawLen, mapping?.customSerialNumber) ?? registrySerial ?? hash(maxRawLen, anchor);
     const serialNumber = rawSerial && serialNumberSuffix ? `${rawSerial}${serialNumberSuffix}` : rawSerial;
     const customVendorId = mapping?.customVendorId;
     const vendorId3 = isValidVendorId(customVendorId) ? customVendorId : basicInformation.vendorId;
@@ -157288,18 +157451,18 @@ var BasicInformationServer2 = class extends BridgedDeviceBasicInformationServer
       // multiple fabric connections. Using MD5 hash of entity_id for stability.
       // uniqueIdSuffix mints a fresh identity so stale controller cloud
       // records keyed on it can be shed (#385).
-      uniqueId: this.frozenUniqueId(entity.entity_id)
+      uniqueId: this.frozenUniqueId(anchor)
     });
     logger201.debug(
       `[${entity.entity_id}] basicInfo vendor=${this.state.vendorName} product=${this.state.productName} label=${this.state.productLabel} serial=${this.state.serialNumber} node=${this.state.nodeLabel} uniqueId=${this.state.uniqueId}`
     );
   }
-  frozenUniqueId(entityId) {
+  frozenUniqueId(anchor) {
     const provider = this.env.get(BridgeDataProvider);
-    const key = `${provider.id}:${entityId}`;
+    const key = `${provider.id}:${anchor}`;
     let uniqueId = appliedUniqueIds.get(key);
     if (uniqueId == null) {
-      uniqueId = crypto6.createHash("md5").update(entityId + (provider.uniqueIdSuffix ?? "")).digest("hex").substring(0, 32);
+      uniqueId = crypto6.createHash("md5").update(anchor + (provider.uniqueIdSuffix ?? "")).digest("hex").substring(0, 32);
       appliedUniqueIds.set(key, uniqueId);
     }
     return uniqueId;
@@ -157459,7 +157622,8 @@ var HaElectricalEnergyMeasurementServer = ElectricalEnergyMeasurementServerBase.
 init_esm();
 init_home_assistant_entity_behavior();
 var logger203 = Logger.get("ElectricalPowerMeasurementServer");
-var ElectricalPowerMeasurementServerBase = class extends ElectricalPowerMeasurementServer {
+var FeaturedBase2 = ElectricalPowerMeasurementServer.with("AlternatingCurrent");
+var ElectricalPowerMeasurementServerBase = class extends FeaturedBase2 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -157475,23 +157639,38 @@ var ElectricalPowerMeasurementServerBase = class extends ElectricalPowerMeasurem
   }
   update() {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    const powerEntity = homeAssistant.state.mapping?.powerEntity;
-    if (!powerEntity) return;
+    const mapping = homeAssistant.state.mapping;
+    const powerEntity = mapping?.powerEntity;
+    const voltageEntity = mapping?.voltageEntity;
+    const currentEntity = mapping?.currentEntity;
+    if (!powerEntity && !voltageEntity && !currentEntity) return;
     const stateProvider = this.agent.env.get(EntityStateProvider);
-    const powerWatts = stateProvider.getNumericState(powerEntity);
-    if (powerWatts == null) return;
-    const activePower = Math.round(powerWatts * 1e3);
-    applyPatchState(this.state, { activePower });
+    const patch = {};
+    if (powerEntity) {
+      const powerWatts = stateProvider.getNumericState(powerEntity);
+      if (powerWatts != null) patch.activePower = Math.round(powerWatts * 1e3);
+    }
+    if (voltageEntity) {
+      const volts = stateProvider.getNumericState(voltageEntity);
+      if (volts != null) patch.voltage = Math.round(volts * 1e3);
+    }
+    if (currentEntity) {
+      const amps = stateProvider.getNumericState(currentEntity);
+      if (amps != null) patch.activeCurrent = Math.round(amps * 1e3);
+    }
+    if (Object.keys(patch).length > 0) applyPatchState(this.state, patch);
   }
 };
 ((ElectricalPowerMeasurementServerBase2) => {
-  class State extends ElectricalPowerMeasurementServer.State {
+  class State extends FeaturedBase2.State {
   }
   ElectricalPowerMeasurementServerBase2.State = State;
 })(ElectricalPowerMeasurementServerBase || (ElectricalPowerMeasurementServerBase = {}));
 var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.set({
   powerMode: ElectricalPowerMeasurement3.PowerMode.Ac,
-  numberOfMeasurementTypes: 1,
+  // Voltage and current are folded onto this endpoint when mapped, so the
+  // accuracy list carries an entry for each reported measurement type.
+  numberOfMeasurementTypes: 3,
   accuracy: [
     {
       measurementType: ElectricalPowerMeasurement3.MeasurementType.ActivePower,
@@ -157508,6 +157687,37 @@ var HaElectricalPowerMeasurementServer = ElectricalPowerMeasurementServerBase.se
           // 1W accuracy
         }
       ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.Voltage,
+      measured: true,
+      minMeasuredValue: 0,
+      maxMeasuredValue: 1e6,
+      // 1000V in mV
+      accuracyRanges: [
+        {
+          rangeMin: 0,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+          // 1V accuracy
+        }
+      ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActiveCurrent,
+      measured: true,
+      minMeasuredValue: -1e6,
+      // -1000A in mA
+      maxMeasuredValue: 1e6,
+      // 1000A in mA
+      accuracyRanges: [
+        {
+          rangeMin: -1e6,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+          // 1A accuracy
+        }
+      ]
     }
   ]
 });
@@ -157603,8 +157813,8 @@ function HumidityMeasurementServer(config11) {
 init_esm();
 init_home_assistant_entity_behavior();
 var logger205 = Logger.get("PowerSourceServer");
-var FeaturedBase2 = PowerSourceServer.with("Battery", "Rechargeable");
-var PowerSourceServerBase = class extends FeaturedBase2 {
+var FeaturedBase3 = PowerSourceServer.with("Battery", "Rechargeable");
+var PowerSourceServerBase = class extends FeaturedBase3 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -157682,7 +157892,7 @@ var PowerSourceServerBase = class extends FeaturedBase2 {
   }
 };
 ((PowerSourceServerBase2) => {
-  class State extends FeaturedBase2.State {
+  class State extends FeaturedBase3.State {
     config;
   }
   PowerSourceServerBase2.State = State;
@@ -157763,8 +157973,8 @@ function TemperatureMeasurementServer2(config11) {
 
 // src/matter/behaviors/hepa-filter-monitoring-server.ts
 init_home_assistant_entity_behavior();
-var FeaturedBase3 = HepaFilterMonitoringServer.with("Condition", "Warning");
-var HepaFilterMonitoringServerBase = class extends FeaturedBase3 {
+var FeaturedBase4 = HepaFilterMonitoringServer.with("Condition", "Warning");
+var HepaFilterMonitoringServerBase = class extends FeaturedBase4 {
   async initialize() {
     this.state.condition = 100;
     this.state.degradationDirection = ResourceMonitoring3.DegradationDirection.Down;
@@ -157801,7 +158011,7 @@ var HepaFilterMonitoringServerBase = class extends FeaturedBase3 {
   }
 };
 ((HepaFilterMonitoringServerBase2) => {
-  class State extends FeaturedBase3.State {
+  class State extends FeaturedBase4.State {
     config;
   }
   HepaFilterMonitoringServerBase2.State = State;
@@ -158059,8 +158269,8 @@ function notifyLightTurnedOn(entityId) {
   lastTurnOnTimestamps.set(entityId, now);
 }
 var logger206 = Logger.get("LevelControlServer");
-var FeaturedBase4 = LevelControlServer.with("OnOff", "Lighting");
-var LevelControlServerBase = class extends FeaturedBase4 {
+var FeaturedBase5 = LevelControlServer.with("OnOff", "Lighting");
+var LevelControlServerBase = class extends FeaturedBase5 {
   pendingTransitionTime;
   async initialize() {
     if (this.state.currentLevel == null) {
@@ -158217,7 +158427,7 @@ var LevelControlServerBase = class extends FeaturedBase4 {
   }
 };
 ((LevelControlServerBase2) => {
-  class State extends FeaturedBase4.State {
+  class State extends FeaturedBase5.State {
     config;
   }
   LevelControlServerBase2.State = State;
@@ -158359,7 +158569,7 @@ var logger208 = Logger.get("FanControlServer");
 var defaultStepSize = 33.33;
 var minSpeedMax = 3;
 var maxSpeedMax = 100;
-var FeaturedBase5 = FanControlServer.with(
+var FeaturedBase6 = FanControlServer.with(
   "Step",
   "MultiSpeed",
   "AirflowDirection",
@@ -158369,7 +158579,7 @@ var FeaturedBase5 = FanControlServer.with(
 ).set({
   windSupport: { naturalWind: true, sleepWind: true }
 });
-var FanControlServerBase = class extends FeaturedBase5 {
+var FanControlServerBase = class extends FeaturedBase6 {
   // Fallback last-speed tracking for endpoints without FanSpeedMemoryBehavior
   // (climate companion, humidifier). matter.js builds behavior instances per
   // transaction, so these fields only live within one interaction; fans use
@@ -158822,7 +159032,7 @@ var FanControlServerBase = class extends FeaturedBase5 {
   }
 };
 ((FanControlServerBase2) => {
-  class State extends FeaturedBase5.State {
+  class State extends FeaturedBase6.State {
     config;
   }
   FanControlServerBase2.State = State;
@@ -159071,7 +159281,7 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
         })
       );
     }
-    const endpointId = createEndpointId2(primaryEntityId, config11.customName);
+    const endpointId = config11.endpointId ?? createEndpointId2(primaryEntityId, config11.customName);
     const parts = [];
     const airPurifierSub = new Endpoint(
       airPurifierSubType.set({
@@ -159116,7 +159326,8 @@ var ComposedAirPurifierEndpoint = class _ComposedAirPurifierEndpoint extends End
       homeAssistantEntity: {
         entity: primaryPayload,
         customName: config11.customName,
-        mapping: parentMapping
+        mapping: parentMapping,
+        identityAnchor: config11.identityAnchor
       }
     });
     const mappedIds = [];
@@ -160574,7 +160785,7 @@ var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpo
     const { registry: registry2, primaryEntityId } = config11;
     const payload = buildEntityPayload2(registry2, primaryEntityId);
     if (!payload) return void 0;
-    const endpointId = createEndpointId3(primaryEntityId, config11.customName);
+    const endpointId = config11.endpointId ?? createEndpointId3(primaryEntityId, config11.customName);
     const mapping = config11.mapping ?? {
       entityId: primaryEntityId
     };
@@ -160618,7 +160829,8 @@ var ComposedClimateFanEndpoint = class _ComposedClimateFanEndpoint extends Endpo
       homeAssistantEntity: {
         entity: payload,
         customName: config11.customName,
-        mapping
+        mapping,
+        identityAnchor: config11.identityAnchor
       }
     });
     const endpoint = new _ComposedClimateFanEndpoint(
@@ -160882,7 +161094,7 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
         })
       );
     }
-    const endpointId = createEndpointId4(primaryEntityId, config11.customName);
+    const endpointId = config11.endpointId ?? createEndpointId4(primaryEntityId, config11.customName);
     const parts = [];
     const tempSub = new Endpoint(
       TemperatureSubType2.set({
@@ -160924,7 +161136,8 @@ var ComposedSensorEndpoint = class _ComposedSensorEndpoint extends Endpoint {
       homeAssistantEntity: {
         entity: primaryPayload,
         customName: config11.customName,
-        mapping
+        mapping,
+        identityAnchor: config11.identityAnchor
       }
     });
     const mappedIds = [];
@@ -161821,7 +162034,7 @@ init_home_assistant_actions();
 init_home_assistant_entity_behavior();
 var logger216 = Logger.get("WindowCoveringServer");
 var MovementStatus = WindowCovering3.MovementStatus;
-var FeaturedBase6 = WindowCoveringServer.with(
+var FeaturedBase7 = WindowCoveringServer.with(
   "Lift",
   "PositionAwareLift",
   "Tilt",
@@ -161857,7 +162070,7 @@ function clearPendingTilt(st) {
   }
   st.pendingTilt = null;
 }
-var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedBase6 {
+var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedBase7 {
   // Written and read within one synchronous command (upOrOpen fires lift then
   // tilt on the same instance), so these stay as instance fields (#246).
   lastLiftMovementMs = 0;
@@ -162166,7 +162379,7 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   }
 };
 ((WindowCoveringServerBase2) => {
-  class State extends FeaturedBase6.State {
+  class State extends FeaturedBase7.State {
     config;
   }
   WindowCoveringServerBase2.State = State;
@@ -163878,8 +164091,8 @@ function consumePendingColorStaging(entityId) {
   pendingColorStaging.delete(entityId);
   return data;
 }
-var FeaturedBase7 = ColorControlServer.with("ColorTemperature", "HueSaturation", "Xy");
-var ColorControlServerBase = class extends FeaturedBase7 {
+var FeaturedBase8 = ColorControlServer.with("ColorTemperature", "HueSaturation", "Xy");
+var ColorControlServerBase = class extends FeaturedBase8 {
   pendingTransitionTime;
   async [Symbol.asyncDispose]() {
     const entityId = this.agent.get(HomeAssistantEntityBehavior).entityId;
@@ -164224,7 +164437,7 @@ var ColorControlServerBase = class extends FeaturedBase7 {
   }
 };
 ((ColorControlServerBase2) => {
-  class State extends FeaturedBase7.State {
+  class State extends FeaturedBase8.State {
     config;
   }
   ColorControlServerBase2.State = State;
@@ -164441,11 +164654,12 @@ function LightDevice(homeAssistantEntity) {
   ) : supportsBrightness ? hasBattery ? DimmableLightWithBatteryType : DimmableLightType : hasBattery ? OnOffLightWithBatteryType : OnOffLightType;
   const hasPowerEntity = !!homeAssistantEntity.mapping?.powerEntity;
   const hasEnergyEntity = !!homeAssistantEntity.mapping?.energyEntity;
+  const hasElectricalPower = hasPowerEntity || !!homeAssistantEntity.mapping?.voltageEntity || !!homeAssistantEntity.mapping?.currentEntity;
   let device = deviceType;
-  if (hasPowerEntity || hasEnergyEntity) {
+  if (hasElectricalPower || hasEnergyEntity) {
     device = device.with(HaPowerTopologyServer);
   }
-  if (hasPowerEntity) {
+  if (hasElectricalPower) {
     device = device.with(HaElectricalPowerMeasurementServer);
   }
   if (hasEnergyEntity) {
@@ -165477,8 +165691,8 @@ function sweepOptimisticLevel2(now) {
     }
   }
 }
-var FeaturedBase8 = LevelControlServer.with("OnOff");
-var SpeakerLevelControlServerBase = class extends FeaturedBase8 {
+var FeaturedBase9 = LevelControlServer.with("OnOff");
+var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
   async initialize() {
     if (this.state.currentLevel == null) {
       this.state.currentLevel = 0;
@@ -165580,7 +165794,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase8 {
   }
 };
 ((SpeakerLevelControlServerBase2) => {
-  class State extends FeaturedBase8.State {
+  class State extends FeaturedBase9.State {
     config;
   }
   SpeakerLevelControlServerBase2.State = State;
@@ -166014,6 +166228,126 @@ var BatterySensorType = BatteryStorageDevice.with(
   })
 );
 
+// src/matter/endpoints/legacy/sensor/devices/battery-storage-ess.ts
+init_home_assistant_entity_behavior();
+var PowerFeaturedBase = ElectricalPowerMeasurementServer.with("DirectCurrent");
+var EssPowerServer = class extends PowerFeaturedBase {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update();
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update() {
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    const powerEntity = mapping?.batteryPowerEntity;
+    if (!powerEntity) return;
+    const stateProvider = this.agent.env.get(EntityStateProvider);
+    const watts = stateProvider.getNumericState(powerEntity);
+    if (watts == null) return;
+    applyPatchState(this.state, { activePower: Math.round(watts * -1e3) });
+  }
+};
+((EssPowerServer2) => {
+  class State extends PowerFeaturedBase.State {
+  }
+  EssPowerServer2.State = State;
+})(EssPowerServer || (EssPowerServer = {}));
+var EssPower = EssPowerServer.set({
+  powerMode: ElectricalPowerMeasurement3.PowerMode.Dc,
+  numberOfMeasurementTypes: 1,
+  // Seed 0 so the cluster reports a value before the first update (SmartThings).
+  activePower: 0,
+  accuracy: [
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActivePower,
+      measured: true,
+      // Wide symmetric range: batteries both charge (negative) and discharge.
+      minMeasuredValue: -1e8,
+      maxMeasuredValue: 1e8,
+      accuracyRanges: [
+        {
+          rangeMin: -1e8,
+          rangeMax: 1e8,
+          fixedMax: 1e3
+        }
+      ]
+    }
+  ]
+});
+var EnergyFeaturedBase = ElectricalEnergyMeasurementServer.with(
+  "CumulativeEnergy",
+  "ImportedEnergy"
+);
+var EssEnergyServer = class extends EnergyFeaturedBase {
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update();
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update() {
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    const energyEntity = mapping?.batteryEnergyEntity;
+    if (!energyEntity) return;
+    const stateProvider = this.agent.env.get(EntityStateProvider);
+    const kwh = stateProvider.getNumericState(energyEntity);
+    if (kwh == null) return;
+    const energyImported = { energy: Math.round(kwh * 1e6) };
+    const changed = applyPatchState(this.state, {
+      cumulativeEnergyImported: energyImported
+    });
+    if ("cumulativeEnergyImported" in changed) {
+      this.events.cumulativeEnergyMeasured?.emit(
+        { energyImported, energyExported: void 0 },
+        this.context
+      );
+    }
+  }
+};
+((EssEnergyServer2) => {
+  class State extends EnergyFeaturedBase.State {
+  }
+  EssEnergyServer2.State = State;
+})(EssEnergyServer || (EssEnergyServer = {}));
+var EssEnergy = EssEnergyServer.set({
+  cumulativeEnergyImported: { energy: 0 },
+  accuracy: {
+    measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
+    measured: true,
+    minMeasuredValue: -1e6,
+    maxMeasuredValue: 1e11,
+    accuracyRanges: [
+      {
+        rangeMin: -1e6,
+        rangeMax: 1e11,
+        fixedMax: 1e3
+      }
+    ]
+  }
+});
+var BatteryStorageEssBase = BatteryStorageDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaPowerTopologyServer,
+  PowerSourceServer2({
+    getBatteryPercent(entity) {
+      const state = entity.state;
+      if (state == null || Number.isNaN(+state)) {
+        return null;
+      }
+      return +state;
+    }
+  })
+);
+function batteryStorageEssType(mapping) {
+  let device = BatteryStorageEssBase;
+  if (mapping?.batteryPowerEntity) device = device.with(EssPower);
+  if (mapping?.batteryEnergyEntity) device = device.with(EssEnergy);
+  return device;
+}
+
 // src/matter/behaviors/carbon-monoxide-concentration-measurement-server.ts
 init_home_assistant_entity_behavior();
 var CarbonMonoxideConcentrationMeasurementServerBase = CarbonMonoxideConcentrationMeasurementServer.with(
@@ -166105,10 +166439,14 @@ var CarbonMonoxideSensorType = AirQualitySensorDevice.with(
   CarbonMonoxideConcentrationMeasurementServer2
 );
 
+// src/matter/endpoints/legacy/sensor/devices/electrical-meter.ts
+init_home_assistant_entity_behavior();
+
 // src/matter/endpoints/legacy/sensor/devices/electrical-sensor.ts
 init_dist();
 init_home_assistant_entity_behavior();
-var StandalonePowerServer = class extends ElectricalPowerMeasurementServer {
+var PowerFeaturedBase2 = ElectricalPowerMeasurementServer.with("AlternatingCurrent");
+var StandalonePowerServer = class extends PowerFeaturedBase2 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -166116,36 +166454,48 @@ var StandalonePowerServer = class extends ElectricalPowerMeasurementServer {
     this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
-    if (!entity.state || !entity.state.attributes) {
-      return;
-    }
-    const state = entity.state.state;
-    if (state == null || Number.isNaN(+state)) return;
-    const attrs = entity.state.attributes;
-    const dc = attrs.device_class;
-    if (dc === SensorDeviceClass.power) {
-      applyPatchState(this.state, {
-        activePower: Math.round(+state * 1e3)
-      });
-    } else if (dc === SensorDeviceClass.voltage) {
-      applyPatchState(this.state, {
-        voltage: Math.round(+state * 1e3)
-      });
-    } else if (dc === SensorDeviceClass.current) {
-      applyPatchState(this.state, {
-        activeCurrent: Math.round(+state * 1e3)
-      });
+    const patch = {};
+    const attrs = entity.state?.attributes;
+    const dc = attrs?.device_class;
+    const primary = entity.state?.state;
+    if (primary != null && !Number.isNaN(+primary)) {
+      if (dc === SensorDeviceClass.power) {
+        patch.activePower = Math.round(+primary * 1e3);
+      } else if (dc === SensorDeviceClass.voltage) {
+        patch.voltage = Math.round(+primary * 1e3);
+      } else if (dc === SensorDeviceClass.current) {
+        patch.activeCurrent = Math.round(+primary * 1e3);
+      }
+    }
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    if (mapping?.powerEntity || mapping?.voltageEntity || mapping?.currentEntity) {
+      const stateProvider = this.agent.env.get(EntityStateProvider);
+      if (mapping.powerEntity) {
+        const w = stateProvider.getNumericState(mapping.powerEntity);
+        if (w != null) patch.activePower = Math.round(w * 1e3);
+      }
+      if (mapping.voltageEntity) {
+        const v = stateProvider.getNumericState(mapping.voltageEntity);
+        if (v != null) patch.voltage = Math.round(v * 1e3);
+      }
+      if (mapping.currentEntity) {
+        const a = stateProvider.getNumericState(mapping.currentEntity);
+        if (a != null) patch.activeCurrent = Math.round(a * 1e3);
+      }
     }
+    if (Object.keys(patch).length > 0) applyPatchState(this.state, patch);
   }
 };
 ((StandalonePowerServer2) => {
-  class State extends ElectricalPowerMeasurementServer.State {
+  class State extends PowerFeaturedBase2.State {
   }
   StandalonePowerServer2.State = State;
 })(StandalonePowerServer || (StandalonePowerServer = {}));
 var PowerServer = StandalonePowerServer.set({
   powerMode: ElectricalPowerMeasurement3.PowerMode.Ac,
-  numberOfMeasurementTypes: 1,
+  // Power, voltage and current can all be folded onto this endpoint, so the
+  // accuracy list carries an entry for each reported measurement type.
+  numberOfMeasurementTypes: 3,
   // SmartThings keeps the endpoint in a "device not yet updated" state
   // when activePower stays null. Seed 0 so the cluster reports a value
   // for energy/voltage/current-only sensors that never feed activePower.
@@ -166163,14 +166513,43 @@ var PowerServer = StandalonePowerServer.set({
           fixedMax: 1e3
         }
       ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.Voltage,
+      measured: true,
+      minMeasuredValue: 0,
+      maxMeasuredValue: 1e6,
+      // 1000V in mV
+      accuracyRanges: [
+        {
+          rangeMin: 0,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+        }
+      ]
+    },
+    {
+      measurementType: ElectricalPowerMeasurement3.MeasurementType.ActiveCurrent,
+      measured: true,
+      minMeasuredValue: -1e6,
+      // -1000A in mA
+      maxMeasuredValue: 1e6,
+      // 1000A in mA
+      accuracyRanges: [
+        {
+          rangeMin: -1e6,
+          rangeMax: 1e6,
+          fixedMax: 1e3
+        }
+      ]
     }
   ]
 });
-var EnergyFeaturedBase = ElectricalEnergyMeasurementServer.with(
+var EnergyFeaturedBase2 = ElectricalEnergyMeasurementServer.with(
   "CumulativeEnergy",
   "ImportedEnergy"
 );
-var StandaloneEnergyServer = class extends EnergyFeaturedBase {
+var StandaloneEnergyServer = class extends EnergyFeaturedBase2 {
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -166178,32 +166557,39 @@ var StandaloneEnergyServer = class extends EnergyFeaturedBase {
     this.reactTo(homeAssistant.onChange, this.update, { offline: true });
   }
   update(entity) {
-    if (!entity.state || !entity.state.attributes) {
-      return;
+    let energyKwh = null;
+    const attrs = entity.state?.attributes;
+    if (attrs?.device_class === SensorDeviceClass.energy) {
+      const state = entity.state?.state;
+      if (state != null && !Number.isNaN(+state)) energyKwh = +state;
+    }
+    const mapping = this.agent.get(HomeAssistantEntityBehavior).state.mapping;
+    if (mapping?.energyEntity) {
+      const stateProvider = this.agent.env.get(EntityStateProvider);
+      const mapped = stateProvider.getNumericState(mapping.energyEntity);
+      if (mapped != null) energyKwh = mapped;
     }
-    const attrs = entity.state.attributes;
-    if (attrs.device_class !== SensorDeviceClass.energy) return;
-    const state = entity.state.state;
-    if (state == null || Number.isNaN(+state)) return;
-    const energyMwh = Math.round(+state * 1e6);
-    const energyImported = { energy: energyMwh };
-    applyPatchState(this.state, {
+    if (energyKwh == null) return;
+    const energyImported = { energy: Math.round(energyKwh * 1e6) };
+    const changed = applyPatchState(this.state, {
       cumulativeEnergyImported: energyImported
     });
-    this.events.cumulativeEnergyMeasured?.emit(
-      { energyImported, energyExported: void 0 },
-      this.context
-    );
+    if ("cumulativeEnergyImported" in changed) {
+      this.events.cumulativeEnergyMeasured?.emit(
+        { energyImported, energyExported: void 0 },
+        this.context
+      );
+    }
   }
 };
 ((StandaloneEnergyServer2) => {
-  class State extends EnergyFeaturedBase.State {
+  class State extends EnergyFeaturedBase2.State {
   }
   StandaloneEnergyServer2.State = State;
 })(StandaloneEnergyServer || (StandaloneEnergyServer = {}));
 var EnergyServer = StandaloneEnergyServer.set({
   // Match the activePower=0 default so SmartThings doesn't show "- kWh"
-  // on a SolarPower endpoint whose mapped entity only carries power data.
+  // on an endpoint whose mapped entity only carries power data.
   cumulativeEnergyImported: { energy: 0 },
   accuracy: {
     measurementType: ElectricalPowerMeasurement3.MeasurementType.ElectricalEnergy,
@@ -166228,6 +166614,15 @@ var ElectricalSensorType = SolarPowerDevice.with(
   EnergyServer
 );
 
+// src/matter/endpoints/legacy/sensor/devices/electrical-meter.ts
+var ElectricalMeterType = ElectricalMeterDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  PowerServer,
+  EnergyServer
+);
+
 // src/matter/behaviors/flow-measurement-server.ts
 init_home_assistant_entity_behavior();
 var FlowMeasurementServerBase = class extends FlowMeasurementServer {
@@ -167595,9 +167990,12 @@ function SensorDevice(homeAssistantEntity) {
     return RadonSensorType.set({ homeAssistantEntity });
   }
   if (deviceClass === SensorDeviceClass.power || deviceClass === SensorDeviceClass.energy || deviceClass === SensorDeviceClass.voltage || deviceClass === SensorDeviceClass.current) {
-    return ElectricalSensorType.set({ homeAssistantEntity });
+    return ElectricalMeterType.set({ homeAssistantEntity });
   }
   if (deviceClass === SensorDeviceClass.battery) {
+    if (mapping?.batteryPowerEntity || mapping?.batteryEnergyEntity) {
+      return batteryStorageEssType(mapping).set({ homeAssistantEntity });
+    }
     return BatterySensorType.set({ homeAssistantEntity });
   }
   if (deviceClass) {
@@ -167671,11 +168069,12 @@ function SwitchDevice(homeAssistantEntity) {
   const hasBatteryEntity = !!homeAssistantEntity.mapping?.batteryEntity;
   const hasPowerEntity = !!homeAssistantEntity.mapping?.powerEntity;
   const hasEnergyEntity = !!homeAssistantEntity.mapping?.energyEntity;
+  const hasElectricalPower = hasPowerEntity || !!homeAssistantEntity.mapping?.voltageEntity || !!homeAssistantEntity.mapping?.currentEntity;
   let device = hasBatteryAttr || hasBatteryEntity ? SwitchWithBatteryEndpointType : SwitchEndpointType;
-  if (hasPowerEntity || hasEnergyEntity) {
+  if (hasElectricalPower || hasEnergyEntity) {
     device = device.with(HaPowerTopologyServer);
   }
-  if (hasPowerEntity) {
+  if (hasElectricalPower) {
     device = device.with(HaElectricalPowerMeasurementServer);
   }
   if (hasEnergyEntity) {
@@ -169960,7 +170359,7 @@ function WeatherDevice(homeAssistant) {
 
 // src/matter/endpoints/legacy/create-legacy-endpoint-type.ts
 var legacyLogger = Logger.get("LegacyEndpointType");
-function createLegacyEndpointType(entity, mapping, areaName, options) {
+function createLegacyEndpointType(entity, mapping, areaName, options, identityAnchor) {
   if (mapping?.disableBatteryMapping) {
     entity = {
       ...entity,
@@ -169973,11 +170372,12 @@ function createLegacyEndpointType(entity, mapping, areaName, options) {
   }
   const domain = entity.entity_id.split(".")[0];
   const customName = mapping?.customName;
+  const ha = { entity, customName, mapping, identityAnchor };
   let type;
   if (mapping?.matterDeviceType) {
     const overrideFactory = matterDeviceTypeFactories[mapping.matterDeviceType];
     if (overrideFactory) {
-      type = overrideFactory({ entity, customName, mapping });
+      type = overrideFactory(ha);
       if (type && mapping.batteryEntity && !hasPowerSource(type)) {
         type = addPowerSource(type);
       }
@@ -169986,14 +170386,14 @@ function createLegacyEndpointType(entity, mapping, areaName, options) {
   if (!type) {
     if (domain === "vacuum") {
       type = VacuumDevice(
-        { entity, customName, mapping },
+        ha,
         options?.vacuumOnOff,
         options?.cleaningModeOptions
       );
     } else {
       const factory = deviceCtrs[domain];
       if (factory) {
-        type = factory({ entity, customName, mapping });
+        type = factory(ha);
       } else if (options?.pluginDomainMappings?.has(domain)) {
         const mappedType = options.pluginDomainMappings.get(domain);
         const mappedFactory = matterDeviceTypeFactories[mappedType];
@@ -170001,7 +170401,7 @@ function createLegacyEndpointType(entity, mapping, areaName, options) {
           legacyLogger.info(
             `Using plugin domain mapping for "${domain}" \u2192 "${mappedType}"`
           );
-          type = mappedFactory({ entity, customName, mapping });
+          type = mappedFactory(ha);
         }
       } else {
         return void 0;
@@ -170112,7 +170512,12 @@ var matterDeviceTypeFactories = {
   light_sensor: (ha) => IlluminanceSensorType.set({ homeAssistantEntity: ha }),
   flow_sensor: (ha) => FlowSensorType.set({ homeAssistantEntity: ha }),
   air_quality_sensor: (ha) => AirQualitySensorType.set({ homeAssistantEntity: ha }),
-  battery_storage: (ha) => BatterySensorType.set({ homeAssistantEntity: ha }),
+  battery_storage: (ha) => {
+    if (ha.mapping?.batteryPowerEntity || ha.mapping?.batteryEnergyEntity) {
+      return batteryStorageEssType(ha.mapping).set({ homeAssistantEntity: ha });
+    }
+    return BatterySensorType.set({ homeAssistantEntity: ha });
+  },
   tvoc_sensor: (ha) => TvocSensorType.set({ homeAssistantEntity: ha }),
   carbon_monoxide_sensor: (ha) => CarbonMonoxideSensorType.set({ homeAssistantEntity: ha }),
   nitrogen_dioxide_sensor: (ha) => NitrogenDioxideSensorType.set({ homeAssistantEntity: ha }),
@@ -170120,7 +170525,10 @@ var matterDeviceTypeFactories = {
   formaldehyde_sensor: (ha) => FormaldehydeSensorType.set({ homeAssistantEntity: ha }),
   radon_sensor: (ha) => RadonSensorType.set({ homeAssistantEntity: ha }),
   pm1_sensor: (ha) => Pm1SensorType.set({ homeAssistantEntity: ha }),
+  electrical_meter: (ha) => ElectricalMeterType.set({ homeAssistantEntity: ha }),
+  // Legacy SolarPower alias, kept for existing mappings.
   electrical_sensor: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
+  solar_power: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
   contact_sensor: (ha) => ContactSensorType.set({ homeAssistantEntity: ha }),
   motion_sensor: (ha) => MotionSensorType.set({ homeAssistantEntity: ha }),
   occupancy_sensor: (ha) => OccupancySensorType.set({ homeAssistantEntity: ha }),
@@ -170186,7 +170594,7 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
     if (hasParentBattery) {
       parentType = parentType.with(DefaultPowerSourceServer);
     }
-    const endpointId = createEndpointId5(primaryEntityId, config11.customName);
+    const endpointId = config11.endpointId ?? createEndpointId5(primaryEntityId, config11.customName);
     const parts = [];
     const subEndpointMap = /* @__PURE__ */ new Map();
     const mappedIds = [];
@@ -170264,7 +170672,8 @@ var UserComposedEndpoint = class _UserComposedEndpoint extends Endpoint {
       homeAssistantEntity: {
         entity: primaryPayload,
         customName: config11.customName,
-        mapping: config11.mapping
+        mapping: config11.mapping,
+        identityAnchor: config11.identityAnchor
       }
     });
     const endpoint = new _UserComposedEndpoint(
@@ -170386,7 +170795,7 @@ function asStandaloneEndpointType(type) {
 // src/matter/endpoints/legacy/legacy-endpoint.ts
 var logger240 = Logger.get("LegacyEndpoint");
 var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
-  static async create(registry2, entityId, mapping, pluginDomainMappings, standalone = false) {
+  static async create(registry2, entityId, mapping, pluginDomainMappings, standalone = false, endpointId, identityAnchor) {
     const deviceRegistry = registry2.deviceOf(entityId);
     let state = registry2.initialState(entityId);
     const entity = registry2.entity(entityId);
@@ -170639,7 +171048,9 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
         mapping: effectiveMapping,
         composedEntities: effectiveMapping.composedEntities,
         customName: effectiveMapping?.customName,
-        areaName: composedAreaName
+        areaName: composedAreaName,
+        endpointId,
+        identityAnchor
       });
       if (composed) {
         return composed;
@@ -170661,7 +171072,9 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
           powerEntityId: effectiveMapping?.powerEntity,
           energyEntityId: effectiveMapping?.energyEntity,
           customName: effectiveMapping?.customName,
-          areaName: composedAreaName
+          areaName: composedAreaName,
+          endpointId,
+          identityAnchor
         });
         return composed;
       }
@@ -170681,7 +171094,9 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
             energyEntityId: effectiveMapping?.energyEntity,
             mapping: effectiveMapping,
             customName: effectiveMapping?.customName,
-            areaName: composedAreaName
+            areaName: composedAreaName,
+            endpointId,
+            identityAnchor
           });
           if (composed) {
             return composed;
@@ -170698,7 +171113,9 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
           primaryEntityId: entityId,
           mapping: effectiveMapping,
           customName: effectiveMapping?.customName,
-          areaName: composedAreaName
+          areaName: composedAreaName,
+          endpointId,
+          identityAnchor
         });
         if (composed) {
           return composed;
@@ -170732,11 +171149,17 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       }
     }
     const areaName = registry2.getAreaName(entityId);
-    let type = createLegacyEndpointType(payload, effectiveMapping, areaName, {
-      vacuumOnOff: registry2.isVacuumOnOffEnabled(),
-      cleaningModeOptions,
-      pluginDomainMappings
-    });
+    let type = createLegacyEndpointType(
+      payload,
+      effectiveMapping,
+      areaName,
+      {
+        vacuumOnOff: registry2.isVacuumOnOffEnabled(),
+        cleaningModeOptions,
+        pluginDomainMappings
+      },
+      identityAnchor
+    );
     if (!type) {
       return;
     }
@@ -170750,11 +171173,12 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       entityId,
       customName,
       mappedIds,
-      effectiveMapping?.updateThrottleMs
+      effectiveMapping?.updateThrottleMs,
+      endpointId
     );
   }
-  constructor(type, entityId, customName, mappedEntityIds, throttleMs) {
-    super(type, entityId, customName, mappedEntityIds);
+  constructor(type, entityId, customName, mappedEntityIds, throttleMs, endpointId) {
+    super(type, entityId, customName, mappedEntityIds, endpointId);
     this.flushUpdate = throttleMs && throttleMs > 50 ? throttleLatest(this.flushPendingUpdate.bind(this), throttleMs) : debounce6(this.flushPendingUpdate.bind(this), 50);
   }
   lastState;
@@ -171601,11 +172025,124 @@ var EntityIsolationServiceImpl = class {
 };
 var EntityIsolationService = new EntityIsolationServiceImpl();
 
+// src/services/bridges/identity-resolver.ts
+var SEP = "\0";
+function identityKey(entity) {
+  const uniqueId = entity.registry?.unique_id;
+  const platform = entity.registry?.platform;
+  if (!uniqueId || !platform) {
+    return null;
+  }
+  const domain = entity.entity_id.split(".")[0];
+  return platform + SEP + domain + SEP + uniqueId;
+}
+var IdentityResolver = class {
+  constructor(identityStorage, mappingStorage) {
+    this.identityStorage = identityStorage;
+    this.mappingStorage = mappingStorage;
+  }
+  identityStorage;
+  mappingStorage;
+  async resolveIdentity(bridgeId, entity, mapping, opts) {
+    const entityId = entity.entity_id;
+    const key = identityKey(entity);
+    if (key == null) {
+      return {
+        endpointId: createEndpointId(entityId, mapping?.customName),
+        anchorEntityId: entityId,
+        protected: false
+      };
+    }
+    const existing = this.identityStorage.getIdentity(bridgeId, key);
+    if (existing) {
+      const renamedFrom = existing.lastEntityId !== entityId ? existing.lastEntityId ?? existing.anchorEntityId : void 0;
+      if (opts.stableIdentity) {
+        if (renamedFrom) {
+          this.identityStorage.setIdentity(bridgeId, key, {
+            ...existing,
+            lastEntityId: entityId
+          });
+          await this.rekeyMapping(bridgeId, renamedFrom, entityId);
+        }
+        return {
+          endpointId: existing.endpointId,
+          anchorEntityId: existing.anchorEntityId,
+          protected: true,
+          renamedFrom
+        };
+      }
+      const liveEndpointId = createEndpointId(entityId, mapping?.customName);
+      if (existing.endpointId !== liveEndpointId || existing.anchorEntityId !== entityId || existing.lastEntityId !== entityId) {
+        this.identityStorage.setIdentity(bridgeId, key, {
+          ...existing,
+          endpointId: liveEndpointId,
+          anchorEntityId: entityId,
+          lastEntityId: entityId
+        });
+      }
+      return {
+        endpointId: liveEndpointId,
+        anchorEntityId: entityId,
+        protected: false,
+        renamedFrom
+      };
+    }
+    const desired = createEndpointId(entityId, mapping?.customName);
+    let endpointId = desired;
+    if (opts.stableIdentity) {
+      let n = 2;
+      while (opts.isEndpointIdTaken(endpointId, key)) {
+        endpointId = `${desired}_${n++}`;
+      }
+    }
+    const record = {
+      endpointId,
+      anchorEntityId: entityId,
+      lastEntityId: entityId,
+      createdAt: (/* @__PURE__ */ new Date()).toISOString()
+    };
+    this.identityStorage.setIdentity(bridgeId, key, record);
+    if (opts.stableIdentity) {
+      return {
+        endpointId: record.endpointId,
+        anchorEntityId: record.anchorEntityId,
+        protected: true
+      };
+    }
+    return {
+      endpointId: desired,
+      anchorEntityId: entityId,
+      protected: false
+    };
+  }
+  // Carry a mapping from the old entity_id to the new one on rename. anchorEntityId
+  // never changes, only the mapping key. Skips when no old mapping exists or a new
+  // one already does, so a manual mapping under the new id is never clobbered.
+  async rekeyMapping(bridgeId, oldEntityId, newEntityId) {
+    if (oldEntityId === newEntityId) {
+      return;
+    }
+    const old = this.mappingStorage.getMapping(bridgeId, oldEntityId);
+    if (!old) {
+      return;
+    }
+    if (this.mappingStorage.getMapping(bridgeId, newEntityId)) {
+      return;
+    }
+    await this.mappingStorage.setMapping({
+      ...old,
+      bridgeId,
+      entityId: newEntityId
+    });
+    await this.mappingStorage.deleteMapping(bridgeId, oldEntityId);
+  }
+};
+
 // src/services/bridges/bridge-endpoint-manager.ts
 var MAX_ENTITY_ID_LENGTH = 150;
 var ENDPOINT_REMOVAL_GRACE_MS = 6e4;
 var BridgeEndpointManager = class extends Service {
-  constructor(client, registry2, mappingStorage, bridgeId, log, pluginManager, pluginRegistry, pluginInstaller) {
+  constructor(client, registry2, mappingStorage, identityStorage, bridgeId, log, pluginManager, pluginRegistry, pluginInstaller) {
     super("BridgeEndpointManager");
     this.client = client;
     this.registry = registry2;
@@ -171616,6 +172153,10 @@ var BridgeEndpointManager = class extends Service {
     this.pluginRegistry = pluginRegistry;
     this.pluginInstaller = pluginInstaller;
     this.root = new AggregatorEndpoint2("aggregator");
+    this.identityResolver = new IdentityResolver(
+      identityStorage,
+      mappingStorage
+    );
     EntityIsolationService.registerIsolationCallback(
       bridgeId,
       this.isolateEntity.bind(this)
@@ -171654,6 +172195,7 @@ var BridgeEndpointManager = class extends Service {
       failedAt: (/* @__PURE__ */ new Date()).toISOString()
     });
   }
+  identityResolver;
   wirePluginCallbacks() {
     if (!this.pluginManager) return;
     this.pluginManager.onDeviceRegistered = async (pluginName, device) => {
@@ -171993,10 +172535,57 @@ var BridgeEndpointManager = class extends Service {
         if (humId) this.registry.markComposedSubEntityUsed(humId);
       }
     }
+    const stableIdentity = this.registry.isStableIdentityEnabled();
+    const resolvedByEntity = /* @__PURE__ */ new Map();
+    const endpointIdToEntity = /* @__PURE__ */ new Map();
+    const claimedEndpointIds = /* @__PURE__ */ new Map();
+    for (const entityId of this.entityIds) {
+      const entityInfo = {
+        entity_id: entityId,
+        registry: this.registry.entity(entityId)
+      };
+      const resolved = await this.identityResolver.resolveIdentity(
+        this.bridgeId,
+        entityInfo,
+        this.getEntityMapping(entityId),
+        {
+          stableIdentity,
+          isEndpointIdTaken: (id, key) => claimedEndpointIds.has(id) && claimedEndpointIds.get(id) !== key
+        }
+      );
+      resolvedByEntity.set(entityId, resolved);
+      claimedEndpointIds.set(
+        resolved.endpointId,
+        identityKey(entityInfo) ?? `\0e:${entityId}`
+      );
+      endpointIdToEntity.set(resolved.endpointId, entityId);
+      if (resolved.renamedFrom && this.mappingFingerprints.has(resolved.renamedFrom)) {
+        const fp = this.mappingFingerprints.get(resolved.renamedFrom);
+        this.mappingFingerprints.delete(resolved.renamedFrom);
+        this.mappingFingerprints.set(entityId, fp);
+      }
+    }
     const existingEndpoints = [];
     const now = Date.now();
     for (const endpoint of endpoints) {
       const present = this.entityIds.includes(endpoint.entityId);
+      const claimant = endpointIdToEntity.get(endpoint.id);
+      if (!present && claimant != null && claimant !== endpoint.entityId) {
+        this.log.info(
+          `Entity renamed ${endpoint.entityId} -> ${claimant}, keeping endpoint ${endpoint.id}`
+        );
+        try {
+          await endpoint.close();
+        } catch (e) {
+          this.log.warn(
+            `Failed to close renamed endpoint ${endpoint.entityId}:`,
+            e
+          );
+        }
+        this.pendingRemovals.delete(endpoint.entityId);
+        this.mappingFingerprints.delete(endpoint.entityId);
+        continue;
+      }
       if (present) {
         this.pendingRemovals.delete(endpoint.entityId);
       }
@@ -172039,7 +172628,8 @@ var BridgeEndpointManager = class extends Service {
           this.log.info(
             `Mapping changed for ${endpoint.entityId}, recreating endpoint`
           );
-          const sameId = createEndpointId(endpoint.entityId, currentMapping?.customName) === endpoint.id;
+          const resolvedId = resolvedByEntity.get(endpoint.entityId)?.endpointId ?? createEndpointId(endpoint.entityId, currentMapping?.customName);
+          const sameId = resolvedId === endpoint.id;
           try {
             if (sameId) {
               await endpoint.close();
@@ -172097,11 +172687,15 @@ var BridgeEndpointManager = class extends Service {
       if (!endpoint) {
         try {
           const domainMappings = this.getPluginDomainMappings();
+          const resolved = resolvedByEntity.get(entityId);
           endpoint = await LegacyEndpoint.create(
             this.registry,
             entityId,
             mapping,
-            domainMappings
+            domainMappings,
+            false,
+            resolved?.endpointId,
+            resolved?.anchorEntityId
           );
         } catch (e) {
           const reason = this.extractErrorReason(e);
@@ -172513,6 +173107,11 @@ var BridgeRegistry = class _BridgeRegistry {
   isVacuumOnOffEnabled() {
     return this.dataProvider.featureFlags?.vacuumOnOff === true;
   }
+  // Consume frozen device identities (#404). Seeding always runs; only
+  // consumption of the stored endpoint id/anchor is gated on this flag.
+  isStableIdentityEnabled() {
+    return this.dataProvider.featureFlags?.stableIdentity === true;
+  }
   /**
    * Check if the vacuum OnOff cluster should be included for server-mode vacuums.
    * Defaults to OFF. OnOff is NOT part of the RoboticVacuumCleaner (0x74) device
@@ -173942,7 +174541,7 @@ function ServerModeVacuumDevice(homeAssistantEntity, includeOnOff = false, clean
 // src/matter/endpoints/server-mode-vacuum-endpoint.ts
 var logger243 = Logger.get("ServerModeVacuumEndpoint");
 var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEndpoint {
-  static async create(registry2, entityId, mapping) {
+  static async create(registry2, entityId, mapping, endpointId) {
     const deviceRegistry = registry2.deviceOf(entityId);
     let state = registry2.initialState(entityId);
     const entity = registry2.entity(entityId);
@@ -174123,14 +174722,15 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
       endpointType,
       entityId,
       customName,
-      mappedIds
+      mappedIds,
+      endpointId
     );
   }
   lastState;
   pendingMappedChange = false;
   flushUpdate;
-  constructor(type, entityId, customName, mappedEntityIds) {
-    super(type, entityId, customName, mappedEntityIds);
+  constructor(type, entityId, customName, mappedEntityIds, endpointId) {
+    super(type, entityId, customName, mappedEntityIds, endpointId);
     this.flushUpdate = debounce7(this.flushPendingUpdate.bind(this), 50);
   }
   clearTimers() {
@@ -174197,7 +174797,7 @@ var ServerModeVacuumEndpoint = class _ServerModeVacuumEndpoint extends EntityEnd
 // src/services/bridges/server-mode-endpoint-manager.ts
 var MAX_SERVER_MODE_DEVICES = 10;
 var ServerModeEndpointManager = class extends Service {
-  constructor(serverNode, client, registry2, mappingStorage, dataProvider, log) {
+  constructor(serverNode, client, registry2, mappingStorage, identityStorage, dataProvider, log) {
     super("ServerModeEndpointManager");
     this.serverNode = serverNode;
     this.client = client;
@@ -174205,6 +174805,10 @@ var ServerModeEndpointManager = class extends Service {
     this.mappingStorage = mappingStorage;
     this.dataProvider = dataProvider;
     this.log = log;
+    this.identityResolver = new IdentityResolver(
+      identityStorage,
+      mappingStorage
+    );
   }
   serverNode;
   client;
@@ -174223,6 +174827,7 @@ var ServerModeEndpointManager = class extends Service {
   get devices() {
     return [...this.endpoints.values()].map((entry) => entry.endpoint);
   }
+  identityResolver;
   getEntityMapping(entityId) {
     return this.mappingStorage.getMapping(this.dataProvider.id, entityId);
   }
@@ -174291,6 +174896,19 @@ var ServerModeEndpointManager = class extends Service {
       this.endpoints.delete(entityId);
     }
   }
+  // Like removeEndpoints but close() keeps the persisted number pre-allocated,
+  // so a same-id recreate reuses it. Used on rename and same-id recreates (#404).
+  async closeEndpoint(entityId) {
+    const entry = this.endpoints.get(entityId);
+    if (!entry) return;
+    try {
+      await entry.endpoint.close();
+    } catch (e) {
+      this.log.warn(`Failed to close endpoint ${entityId}:`, e);
+    }
+    this.serverNode.forgetDevice(entry.endpoint);
+    this.endpoints.delete(entityId);
+  }
   async refreshDevices() {
     this.registry.refresh();
     this._failedEntities = [];
@@ -174318,10 +174936,45 @@ var ServerModeEndpointManager = class extends Service {
           `Server mode node is capped at ${MAX_SERVER_MODE_DEVICES} devices, ${surplus.length} entities skipped`
         );
       }
+      const stableIdentity = this.dataProvider.featureFlags?.stableIdentity === true;
+      const resolvedByEntity = /* @__PURE__ */ new Map();
+      const endpointIdToEntity = /* @__PURE__ */ new Map();
+      const claimedEndpointIds = /* @__PURE__ */ new Map();
+      for (const entityId of orderedIds) {
+        const entityInfo = {
+          entity_id: entityId,
+          registry: this.registry.entity(entityId)
+        };
+        const resolved = await this.identityResolver.resolveIdentity(
+          this.dataProvider.id,
+          entityInfo,
+          this.getEntityMapping(entityId),
+          {
+            stableIdentity,
+            isEndpointIdTaken: (id, key) => claimedEndpointIds.has(id) && claimedEndpointIds.get(id) !== key
+          }
+        );
+        resolvedByEntity.set(entityId, resolved);
+        claimedEndpointIds.set(
+          resolved.endpointId,
+          identityKey(entityInfo) ?? `\0e:${entityId}`
+        );
+        endpointIdToEntity.set(resolved.endpointId, entityId);
+      }
       const keep = new Set(orderedIds);
       const removed = [...this.endpoints.keys()].filter((id) => !keep.has(id));
       let structureChanged = removed.length > 0;
-      await this.removeEndpoints(removed);
+      const genuinelyRemoved = [];
+      for (const oldId of removed) {
+        const entry = this.endpoints.get(oldId);
+        const claimant = entry ? endpointIdToEntity.get(entry.endpoint.id) : void 0;
+        if (entry && claimant != null && claimant !== oldId) {
+          await this.closeEndpoint(oldId);
+        } else {
+          genuinelyRemoved.push(oldId);
+        }
+      }
+      await this.removeEndpoints(genuinelyRemoved);
       for (const entityId of orderedIds) {
         const mapping = this.getEntityMapping(entityId);
         if (mapping?.disabled) {
@@ -174344,9 +174997,14 @@ var ServerModeEndpointManager = class extends Service {
           this.log.debug(`Device endpoint already exists for ${entityId}`);
           continue;
         }
+        const resolved = resolvedByEntity.get(entityId);
         if (existing) {
           this.log.info(`Mapping changed for ${entityId}, recreating endpoint`);
-          await this.removeEndpoints([entityId]);
+          if (resolved && existing.endpoint.id === resolved.endpointId) {
+            await this.closeEndpoint(entityId);
+          } else {
+            await this.removeEndpoints([entityId]);
+          }
           structureChanged = true;
         }
         const claimedBy = [...this.endpoints.entries()].find(
@@ -174359,7 +175017,7 @@ var ServerModeEndpointManager = class extends Service {
           });
           continue;
         }
-        const endpointId = createEndpointId(entityId, mapping?.customName);
+        const endpointId = resolved?.endpointId ?? createEndpointId(entityId, mapping?.customName);
         const collision = [...this.endpoints.entries()].find(
           ([, entry]) => entry.endpoint.id === endpointId
         );
@@ -174382,12 +175040,18 @@ var ServerModeEndpointManager = class extends Service {
         }
         try {
           const domain = entityId.split(".")[0];
-          const endpoint = domain === "vacuum" ? await this.createServerModeVacuumEndpoint(entityId, mapping) : await LegacyEndpoint.create(
+          const endpoint = domain === "vacuum" ? await this.createServerModeVacuumEndpoint(
+            entityId,
+            mapping,
+            resolved?.endpointId
+          ) : await LegacyEndpoint.create(
             this.registry,
             entityId,
             mapping,
             void 0,
-            true
+            true,
+            resolved?.endpointId,
+            resolved?.anchorEntityId
           );
           if (!endpoint) {
             this._failedEntities.push({
@@ -174455,8 +175119,13 @@ var ServerModeEndpointManager = class extends Service {
    * This makes the vacuum appear as a standalone Matter device, which is required
    * for Apple Home Siri voice commands and Alexa discovery.
    */
-  async createServerModeVacuumEndpoint(entityId, mapping) {
-    return ServerModeVacuumEndpoint.create(this.registry, entityId, mapping);
+  async createServerModeVacuumEndpoint(entityId, mapping, endpointId) {
+    return ServerModeVacuumEndpoint.create(
+      this.registry,
+      entityId,
+      mapping,
+      endpointId
+    );
   }
 };
 
@@ -174540,6 +175209,7 @@ var BridgeEnvironment = class _BridgeEnvironment extends EnvironmentBase {
         await this.load(HomeAssistantClient),
         this.get(BridgeRegistry),
         await this.load(EntityMappingStorage),
+        await this.load(EntityIdentityStorage),
         bridgeId,
         this.endpointManagerLogger,
         pluginManager,
@@ -174625,6 +175295,7 @@ var BridgeEnvironmentFactory = class extends BridgeFactory {
       await env.load(HomeAssistantClient),
       env.get(BridgeRegistry),
       await env.load(EntityMappingStorage),
+      await env.load(EntityIdentityStorage),
       dataProvider,
       loggerService.get("ServerModeEndpointManager")
     );
@@ -174676,6 +175347,10 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
       EntityMappingStorage,
       new EntityMappingStorage(await this.load(AppStorage))
     );
+    this.set(
+      EntityIdentityStorage,
+      new EntityIdentityStorage(await this.load(AppStorage))
+    );
     this.set(
       LockCredentialStorage,
       new LockCredentialStorage(await this.load(AppStorage))
@@ -174736,6 +175411,7 @@ var AppEnvironment = class _AppEnvironment extends EnvironmentBase {
         await this.load(HomeAssistantRegistry),
         await this.load(BridgeStorage),
         await this.load(EntityMappingStorage),
+        await this.load(EntityIdentityStorage),
         await this.load(LockCredentialStorage),
         await this.load(AppSettingsStorage),
         await this.load(BackupService),