@riddix/hamh 2.1.0-alpha.871 → 2.1.0-alpha.872

package/dist/backend/cli.js

@@ -110398,9 +110398,9 @@ function inspectEndpoint(endpoint, properties, behindAggregator = false) {
         properties.supportsEthernet = true;
       }
     }
-    const networkInterfaces6 = endpoint.maybeStateOf(GeneralDiagnosticsClient)?.networkInterfaces;
-    if (networkInterfaces6 !== void 0) {
-      for (const { type, isOperational } of networkInterfaces6) {
+    const networkInterfaces5 = endpoint.maybeStateOf(GeneralDiagnosticsClient)?.networkInterfaces;
+    if (networkInterfaces5 !== void 0) {
+      for (const { type, isOperational } of networkInterfaces5) {
         if (type === GeneralDiagnostics3.InterfaceType.WiFi) {
           properties.wifiActive = (properties.wifiActive ?? false) || isOperational;
         } else if (type === GeneralDiagnostics3.InterfaceType.Ethernet) {
@@ -137901,8 +137901,8 @@ function systemApi(version2) {
 }
 function getNetworkInterfaces2() {
   const interfaces = [];
-  const networkInterfaces6 = os4.networkInterfaces();
-  for (const [name, ifaceList] of Object.entries(networkInterfaces6)) {
+  const networkInterfaces5 = os4.networkInterfaces();
+  for (const [name, ifaceList] of Object.entries(networkInterfaces5)) {
     if (!ifaceList) continue;
     for (const iface of ifaceList) {
       const family = String(iface.family);
@@ -157864,8 +157864,6 @@ var PluginManager = class {
 
 // src/services/bridges/bridge.ts
 init_dist();
-init_esm7();
-import * as os9 from "node:os";
 init_protocol3();
 
 // src/utils/json/create-bridge-server-config.ts
@@ -158178,6 +158176,41 @@ var BridgeServerNode = class extends ServerNode {
   }
 };
 
+// src/utils/ensure-commissioning-config.ts
+init_protocol3();
+var ServerNodeConfigProvider = class extends CommissioningConfigProvider {
+  #node;
+  constructor(node) {
+    super();
+    this.#node = node;
+  }
+  get values() {
+    const { commissioning, productDescription, network } = this.#node.state;
+    return {
+      ...commissioning,
+      productDescription,
+      ble: !!network.ble
+    };
+  }
+};
+function ensureCommissioningConfig(server) {
+  if (!server.env.has(CommissioningConfigProvider)) {
+    server.env.set(
+      CommissioningConfigProvider,
+      new ServerNodeConfigProvider(server)
+    );
+  }
+}
+
+// src/services/bridges/bridge.ts
+init_diagnostic_event_bus();
+
+// src/services/bridges/session-supervisor.ts
+init_dist();
+init_esm7();
+import * as os9 from "node:os";
+init_protocol3();
+
 // src/matter/mdns-address-watch.ts
 function collectAdvertisedAddresses(interfaces, netInterface, stripGlobalIpv6, ipv4Enabled = true) {
   const names = netInterface ? [netInterface] : Object.keys(interfaces);
@@ -158221,33 +158254,7 @@ async function runMdnsAddressWatchTick(deps) {
   return next;
 }
 
-// src/utils/ensure-commissioning-config.ts
-init_protocol3();
-var ServerNodeConfigProvider = class extends CommissioningConfigProvider {
-  #node;
-  constructor(node) {
-    super();
-    this.#node = node;
-  }
-  get values() {
-    const { commissioning, productDescription, network } = this.#node.state;
-    return {
-      ...commissioning,
-      productDescription,
-      ble: !!network.ble
-    };
-  }
-};
-function ensureCommissioningConfig(server) {
-  if (!server.env.has(CommissioningConfigProvider)) {
-    server.env.set(
-      CommissioningConfigProvider,
-      new ServerNodeConfigProvider(server)
-    );
-  }
-}
-
-// src/services/bridges/bridge.ts
+// src/services/bridges/session-supervisor.ts
 init_diagnostic_event_bus();
 
 // src/services/bridges/session-rotation.ts
@@ -158408,7 +158415,7 @@ function decideWedgeRotationV2(input) {
   return input.lastRotatedMsAgo == null || input.lastRotatedMsAgo > WEDGE_MIN_ROTATE_INTERVAL_MS;
 }
 
-// src/services/bridges/bridge.ts
+// src/services/bridges/session-supervisor.ts
 var imWrapMarker = /* @__PURE__ */ Symbol("hamh.wedgeImWrap");
 var commandMessageTypes = [
   MessageType.ReadRequest,
@@ -158416,46 +158423,21 @@ var commandMessageTypes = [
   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;
-var Bridge = class {
-  constructor(env, logger255, dataProvider, endpointManager, serverOptions) {
+var SessionSupervisor = class {
+  constructor(log, server, dataProvider, bridgeInfo, defaultMaxAgeHours) {
+    this.log = log;
+    this.server = server;
     this.dataProvider = dataProvider;
-    this.endpointManager = endpointManager;
-    this.serverOptions = serverOptions;
-    this.log = logger255.get(`Bridge / ${dataProvider.id}`);
-    this.server = new BridgeServerNode(
-      env,
-      this.dataProvider,
-      this.endpointManager.root,
-      this.serverOptions
-    );
-    const { basicInformation } = this.dataProvider;
-    this.log.debugCtx("Root bridge BasicInformation configured", {
-      vendorName: basicInformation.vendorName,
-      productName: basicInformation.productName,
-      productLabel: basicInformation.productLabel,
-      hardwareVersion: basicInformation.hardwareVersion,
-      hardwareVersionString: basicInformation.hardwareVersionString,
-      softwareVersion: basicInformation.softwareVersion,
-      softwareVersionString: basicInformation.softwareVersionString
-    });
+    this.bridgeInfo = bridgeInfo;
+    this.defaultMaxAgeHours = defaultMaxAgeHours;
   }
-  dataProvider;
-  endpointManager;
-  serverOptions;
   log;
   server;
-  status = {
-    code: BridgeStatus.Stopped,
-    reason: void 0
-  };
-  // Called whenever the bridge status changes. Set by BridgeService to
-  // broadcast updates via WebSocket so the frontend sees every transition
-  // (e.g. Stopped → Starting → Running).
-  onStatusChange;
-  autoForceSyncTimer = null;
+  dataProvider;
+  bridgeInfo;
+  defaultMaxAgeHours;
   deadSessionTimer = null;
   staleSessionTimers = /* @__PURE__ */ new Map();
   // Age-based session rotation (#287): track when each session opened so an
@@ -158484,13 +158466,6 @@ var Bridge = class {
   // refreshOperationalAdvertisement can't overlap and re-announce off a stale
   // snapshot.
   mdnsCheckInFlight = false;
-  // Serialize concurrent lifecycle calls so auto-recovery and a manual
-  // restartBridge can't race past each other's Starting/Stopping states.
-  startInFlight;
-  stopInFlight;
-  // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
-  // Key: entity_id, Value: JSON.stringify of entity.state
-  lastSyncedStates = /* @__PURE__ */ new Map();
   // Session lifecycle diagnostic handlers (non-destructive, logging only).
   // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
   sessionDiagHandler;
@@ -158501,17 +158476,24 @@ var Bridge = class {
   // Warns when Alexa pairs on a non-5540 port, the fabric rolls back later (#401).
   // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
   fabricAddedHandler;
-  get id() {
-    return this.dataProvider.id;
+  // after server.start(); wireSessionDiagnostics self-unwires first because
+  // factoryReset restarts without going through stop()
+  start() {
+    this.wireSessionDiagnostics();
+    this.wireFabricWarnings();
+    this.startSessionRotation();
+    this.startWedgeWatchdog();
+    this.startMdnsAddressWatch();
   }
-  get data() {
-    return this.dataProvider.withMetadata(
-      this.status,
-      this.server,
-      this.aggregator.parts.size,
-      this.endpointManager.failedEntities,
-      this.getExposedDeviceTypes()
-    );
+  // before server.cancel(); unwireSessionDiagnostics also stops the timers
+  stop() {
+    this.unwireSessionDiagnostics();
+    this.unwireFabricWarnings();
+  }
+  // bridge config changed while running
+  reconfigure() {
+    this.startSessionRotation();
+    this.startWedgeWatchdog();
   }
   getSessionInfo() {
     try {
@@ -158590,218 +158572,6 @@ var Bridge = class {
       };
     }
   }
-  get aggregator() {
-    return this.endpointManager.root;
-  }
-  /**
-   * The entity id and numeric Matter device type of every exposed endpoint,
-   * walking composed sub-endpoints. Used to warn when a device type is not
-   * supported by a commissioned controller (#365 class).
-   */
-  getExposedDeviceTypes() {
-    const out = [];
-    const collect = (ep, inheritedEntityId) => {
-      const entityId = ep.entityId ?? inheritedEntityId;
-      const deviceTypeId = ep.type?.deviceType;
-      if (typeof deviceTypeId === "number" && entityId) {
-        out.push({ entityId, deviceTypeId });
-      }
-      for (const child of ep.parts) {
-        collect(child, entityId);
-      }
-    };
-    for (const ep of this.aggregator.parts) {
-      collect(ep);
-    }
-    return out;
-  }
-  get pluginInfo() {
-    return this.endpointManager.getPluginInfo();
-  }
-  async enablePlugin(pluginName) {
-    return await this.endpointManager.enablePlugin(pluginName);
-  }
-  async disablePlugin(pluginName) {
-    return await this.endpointManager.disablePlugin(pluginName);
-  }
-  resetPlugin(pluginName) {
-    this.endpointManager.resetPlugin(pluginName);
-  }
-  getPluginConfigSchema(pluginName) {
-    return this.endpointManager.getPluginConfigSchema(pluginName);
-  }
-  async updatePluginConfig(pluginName, config8) {
-    const result = await this.endpointManager.updatePluginConfig(
-      pluginName,
-      config8
-    );
-    if (result && pluginName === "camera") {
-      await this.applyCameraTcp(config8);
-    }
-    return result;
-  }
-  // #419: cameras need Matter over TCP because the WebRTC offer exceeds the UDP
-  // message size. Match the bridge listener to the saved camera list. Changing
-  // network config takes effect on (re)start, so bounce the bridge if running.
-  async applyCameraTcp(config8) {
-    const want = parseCameraList(config8.cameras).length > 0 || !!this.dataProvider.featureFlags?.enableMatterTcp;
-    const have = !!this.server.state.network.tcp;
-    if (want === have) {
-      return;
-    }
-    this.log.info(
-      want ? "cameras configured, enabling matter over tcp (#419)" : "no cameras left, disabling matter over tcp (#419)"
-    );
-    const running = this.status.code === BridgeStatus.Running;
-    if (running) {
-      await this.stop();
-    }
-    try {
-      await this.server.set({
-        network: { tcp: want ? CAMERA_TCP_CONFIG : void 0 }
-      });
-    } catch (e) {
-      this.log.warn(
-        "Could not apply tcp live, restart matterhub to apply it:",
-        e
-      );
-    }
-    if (running) {
-      await this.start();
-    }
-  }
-  async initialize() {
-    await this.server.construction.ready.then();
-    await this.refreshDevices();
-  }
-  async dispose() {
-    await this.stop();
-  }
-  async refreshDevices() {
-    await this.endpointManager.refreshDevices();
-    const currentEntityIds = new Set(
-      [...this.aggregator.parts].map(
-        (p) => p.entityId
-      )
-    );
-    for (const entityId of this.lastSyncedStates.keys()) {
-      if (!currentEntityIds.has(entityId)) {
-        this.lastSyncedStates.delete(entityId);
-      }
-    }
-  }
-  setStatus(status3) {
-    this.status = status3;
-    this.onStatusChange?.();
-  }
-  async start() {
-    if (this.status.code === BridgeStatus.Running) {
-      return;
-    }
-    if (this.startInFlight) {
-      return this.startInFlight;
-    }
-    this.startInFlight = this.runStart().finally(() => {
-      this.startInFlight = void 0;
-    });
-    return this.startInFlight;
-  }
-  async runStart() {
-    this.lastSyncedStates.clear();
-    try {
-      this.setStatus({
-        code: BridgeStatus.Starting,
-        reason: "The bridge is starting... Please wait."
-      });
-      await this.refreshDevices();
-      logMemoryUsage(
-        this.log,
-        `after refreshDevices (${this.aggregator.parts.size} endpoints)`
-      );
-      this.endpointManager.startObserving();
-      ensureCommissioningConfig(this.server);
-      applyLegacySpecSessionParameters(
-        this.server.env.get(SessionManager),
-        this.dataProvider.featureFlags
-      );
-      await this.server.setStateOf(
-        BasicInformationServer,
-        specVersionValues(this.dataProvider.featureFlags)
-      );
-      await applyTcpFlagBeforeStart(
-        this.server,
-        this.dataProvider.featureFlags
-      );
-      await this.server.start();
-      await this.endpointManager.startPlugins();
-      this.setStatus({ code: BridgeStatus.Running });
-      this.startAutoForceSyncIfEnabled();
-      if (this.dataProvider.featureFlags?.autoForceSync) {
-        this.forceSync().catch((e) => {
-          this.log.warn("Startup force sync failed:", e);
-        });
-      }
-      this.wireSessionDiagnostics();
-      this.wireFabricWarnings();
-      this.startSessionRotation();
-      this.startWedgeWatchdog();
-      this.startMdnsAddressWatch();
-      logMemoryUsage(this.log, "bridge running");
-      diagnosticEventBus.emit("bridge_started", `Bridge started`, {
-        bridgeId: this.id,
-        bridgeName: this.dataProvider.name,
-        details: { deviceCount: this.aggregator.parts.size }
-      });
-    } catch (e) {
-      const reason = "Failed to start bridge due to error:";
-      this.log.error(reason, e);
-      await this.stop(BridgeStatus.Failed, `${reason}
-${e?.toString()}`);
-    }
-  }
-  async stop(code = BridgeStatus.Stopped, reason = "Manually stopped") {
-    if (this.stopInFlight) {
-      return this.stopInFlight;
-    }
-    this.stopInFlight = this.runStop(code, reason).finally(() => {
-      this.stopInFlight = void 0;
-    });
-    return this.stopInFlight;
-  }
-  async runStop(code, reason) {
-    this.unwireSessionDiagnostics();
-    this.unwireFabricWarnings();
-    this.stopAutoForceSync();
-    await this.closeActiveSessions();
-    await this.endpointManager.stopPlugins();
-    this.endpointManager.stopObserving();
-    try {
-      await this.server.cancel();
-    } catch (e) {
-      const errorMessage = e instanceof Error ? e.message : String(e);
-      if (!errorMessage.includes("mutex-closed")) {
-        this.log.warn("Error stopping bridge server:", e);
-      }
-    }
-    this.setStatus({ code, reason });
-    diagnosticEventBus.emit("bridge_stopped", `Bridge stopped: ${reason}`, {
-      bridgeId: this.id,
-      bridgeName: this.dataProvider.name
-    });
-  }
-  startAutoForceSyncIfEnabled() {
-    this.stopAutoForceSync();
-    const forceSyncEnabled = this.dataProvider.featureFlags?.autoForceSync ?? false;
-    if (!forceSyncEnabled) {
-      return;
-    }
-    this.autoForceSyncTimer = setInterval(() => {
-      this.forceSync().catch((e) => {
-        this.log.warn("Auto force sync failed:", e);
-      });
-    }, AUTO_FORCE_SYNC_INTERVAL_MS);
-    this.log.info(`Force sync: every ${AUTO_FORCE_SYNC_INTERVAL_MS / 1e3}s`);
-  }
   wireSessionDiagnostics() {
     this.unwireSessionDiagnostics();
     try {
@@ -158829,8 +158599,8 @@ ${e?.toString()}`);
           "subscription_changed",
           `Session ${session.id}: ${session.subscriptions.size} subs (total ${totalSubs})`,
           {
-            bridgeId: this.data.id,
-            bridgeName: this.data.name,
+            bridgeId: this.bridgeInfo().id,
+            bridgeName: this.bridgeInfo().name,
             details: {
               sessionId: session.id,
               sessionSubs: session.subscriptions.size,
@@ -158886,8 +158656,8 @@ ${e?.toString()}`);
           "session_opened",
           `Session ${newSession.id} opened (peer ${newSession.peerNodeId})`,
           {
-            bridgeId: this.data.id,
-            bridgeName: this.data.name,
+            bridgeId: this.bridgeInfo().id,
+            bridgeName: this.bridgeInfo().name,
             details: { sessionId: newSession.id }
           }
         );
@@ -158954,8 +158724,8 @@ ${e?.toString()}`);
           "session_closed",
           `Session ${session.id} closed (peer ${session.peerNodeId})`,
           {
-            bridgeId: this.data.id,
-            bridgeName: this.data.name,
+            bridgeId: this.bridgeInfo().id,
+            bridgeName: this.bridgeInfo().name,
             details: {
               sessionId: session.id,
               remainingSessions: sessions.length
@@ -159242,12 +159012,6 @@ ${e?.toString()}`);
     }
     this.fabricAddedHandler = void 0;
   }
-  stopAutoForceSync() {
-    if (this.autoForceSyncTimer) {
-      clearInterval(this.autoForceSyncTimer);
-      this.autoForceSyncTimer = null;
-    }
-  }
   // Start periodic age-based session rotation (#287). Aging out a controller's
   // session forces it to re-establish and re-subscribe, recovering a wedged
   // Alexa subscription that would otherwise stay stuck until a restart.
@@ -159429,10 +159193,9 @@ ${e?.toString()}`);
       }
     });
   }
-  // Resolve the rotation max age. Bridge config wins, then the env var. An
-  // aggregator bridge holds many devices on one controller session, so
-  // rotating it re-subscribes them all at once. Rotation is therefore opt-in
-  // here: it stays disabled unless set via config or the env var.
+  // Env var unset or garbage falls back to defaultMaxAgeHours: 0 on the
+  // aggregator bridge (rotation opt-in, one controller session holds many
+  // devices), DEFAULT_SESSION_MAX_AGE_HOURS in server mode.
   readSessionMaxAgeHours() {
     const { min, max } = SESSION_MAX_AGE_HOURS_RANGE;
     const fromConfig = this.dataProvider.sessionMaxAgeHours;
@@ -159444,14 +159207,14 @@ ${e?.toString()}`);
     }
     const raw = process.env.HAMH_MATTER_SESSION_MAX_AGE_HOURS;
     if (raw == null || raw === "") {
-      return 0;
+      return this.defaultMaxAgeHours;
     }
     const parsed = parseSessionMaxAgeHours(raw);
     if (parsed == null) {
       this.log.warn(
-        `Invalid HAMH_MATTER_SESSION_MAX_AGE_HOURS=${raw}, disabling session rotation`
+        `Invalid HAMH_MATTER_SESSION_MAX_AGE_HOURS=${raw}, ${this.defaultMaxAgeHours === 0 ? "disabling session rotation" : `falling back to ${this.defaultMaxAgeHours}h`}`
       );
-      return 0;
+      return this.defaultMaxAgeHours;
     }
     return parsed;
   }
@@ -159489,14 +159252,297 @@ ${e?.toString()}`);
     } catch {
     }
   }
+};
+
+// src/services/bridges/bridge.ts
+var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
+var Bridge = class {
+  constructor(env, logger255, dataProvider, endpointManager, serverOptions) {
+    this.dataProvider = dataProvider;
+    this.endpointManager = endpointManager;
+    this.serverOptions = serverOptions;
+    this.log = logger255.get(`Bridge / ${dataProvider.id}`);
+    this.server = new BridgeServerNode(
+      env,
+      this.dataProvider,
+      this.endpointManager.root,
+      this.serverOptions
+    );
+    this.sessions = new SessionSupervisor(
+      this.log,
+      this.server,
+      this.dataProvider,
+      () => this.data,
+      0
+    );
+    const { basicInformation } = this.dataProvider;
+    this.log.debugCtx("Root bridge BasicInformation configured", {
+      vendorName: basicInformation.vendorName,
+      productName: basicInformation.productName,
+      productLabel: basicInformation.productLabel,
+      hardwareVersion: basicInformation.hardwareVersion,
+      hardwareVersionString: basicInformation.hardwareVersionString,
+      softwareVersion: basicInformation.softwareVersion,
+      softwareVersionString: basicInformation.softwareVersionString
+    });
+  }
+  dataProvider;
+  endpointManager;
+  serverOptions;
+  log;
+  server;
+  sessions;
+  status = {
+    code: BridgeStatus.Stopped,
+    reason: void 0
+  };
+  // Called whenever the bridge status changes. Set by BridgeService to
+  // broadcast updates via WebSocket so the frontend sees every transition
+  // (e.g. Stopped → Starting → Running).
+  onStatusChange;
+  autoForceSyncTimer = null;
+  // Serialize concurrent lifecycle calls so auto-recovery and a manual
+  // restartBridge can't race past each other's Starting/Stopping states.
+  startInFlight;
+  stopInFlight;
+  // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
+  // Key: entity_id, Value: JSON.stringify of entity.state
+  lastSyncedStates = /* @__PURE__ */ new Map();
+  get id() {
+    return this.dataProvider.id;
+  }
+  get data() {
+    return this.dataProvider.withMetadata(
+      this.status,
+      this.server,
+      this.aggregator.parts.size,
+      this.endpointManager.failedEntities,
+      this.getExposedDeviceTypes()
+    );
+  }
+  get aggregator() {
+    return this.endpointManager.root;
+  }
+  /**
+   * The entity id and numeric Matter device type of every exposed endpoint,
+   * walking composed sub-endpoints. Used to warn when a device type is not
+   * supported by a commissioned controller (#365 class).
+   */
+  getExposedDeviceTypes() {
+    const out = [];
+    const collect = (ep, inheritedEntityId) => {
+      const entityId = ep.entityId ?? inheritedEntityId;
+      const deviceTypeId = ep.type?.deviceType;
+      if (typeof deviceTypeId === "number" && entityId) {
+        out.push({ entityId, deviceTypeId });
+      }
+      for (const child of ep.parts) {
+        collect(child, entityId);
+      }
+    };
+    for (const ep of this.aggregator.parts) {
+      collect(ep);
+    }
+    return out;
+  }
+  getSessionInfo() {
+    return this.sessions.getSessionInfo();
+  }
+  get pluginInfo() {
+    return this.endpointManager.getPluginInfo();
+  }
+  async enablePlugin(pluginName) {
+    return await this.endpointManager.enablePlugin(pluginName);
+  }
+  async disablePlugin(pluginName) {
+    return await this.endpointManager.disablePlugin(pluginName);
+  }
+  resetPlugin(pluginName) {
+    this.endpointManager.resetPlugin(pluginName);
+  }
+  getPluginConfigSchema(pluginName) {
+    return this.endpointManager.getPluginConfigSchema(pluginName);
+  }
+  async updatePluginConfig(pluginName, config8) {
+    const result = await this.endpointManager.updatePluginConfig(
+      pluginName,
+      config8
+    );
+    if (result && pluginName === "camera") {
+      await this.applyCameraTcp(config8);
+    }
+    return result;
+  }
+  // #419: cameras need Matter over TCP because the WebRTC offer exceeds the UDP
+  // message size. Match the bridge listener to the saved camera list. Changing
+  // network config takes effect on (re)start, so bounce the bridge if running.
+  async applyCameraTcp(config8) {
+    const want = parseCameraList(config8.cameras).length > 0 || !!this.dataProvider.featureFlags?.enableMatterTcp;
+    const have = !!this.server.state.network.tcp;
+    if (want === have) {
+      return;
+    }
+    this.log.info(
+      want ? "cameras configured, enabling matter over tcp (#419)" : "no cameras left, disabling matter over tcp (#419)"
+    );
+    const running = this.status.code === BridgeStatus.Running;
+    if (running) {
+      await this.stop();
+    }
+    try {
+      await this.server.set({
+        network: { tcp: want ? CAMERA_TCP_CONFIG : void 0 }
+      });
+    } catch (e) {
+      this.log.warn(
+        "Could not apply tcp live, restart matterhub to apply it:",
+        e
+      );
+    }
+    if (running) {
+      await this.start();
+    }
+  }
+  async initialize() {
+    await this.server.construction.ready.then();
+    await this.refreshDevices();
+  }
+  async dispose() {
+    await this.stop();
+  }
+  async refreshDevices() {
+    await this.endpointManager.refreshDevices();
+    const currentEntityIds = new Set(
+      [...this.aggregator.parts].map(
+        (p) => p.entityId
+      )
+    );
+    for (const entityId of this.lastSyncedStates.keys()) {
+      if (!currentEntityIds.has(entityId)) {
+        this.lastSyncedStates.delete(entityId);
+      }
+    }
+  }
+  setStatus(status3) {
+    this.status = status3;
+    this.onStatusChange?.();
+  }
+  async start() {
+    if (this.status.code === BridgeStatus.Running) {
+      return;
+    }
+    if (this.startInFlight) {
+      return this.startInFlight;
+    }
+    this.startInFlight = this.runStart().finally(() => {
+      this.startInFlight = void 0;
+    });
+    return this.startInFlight;
+  }
+  async runStart() {
+    this.lastSyncedStates.clear();
+    try {
+      this.setStatus({
+        code: BridgeStatus.Starting,
+        reason: "The bridge is starting... Please wait."
+      });
+      await this.refreshDevices();
+      logMemoryUsage(
+        this.log,
+        `after refreshDevices (${this.aggregator.parts.size} endpoints)`
+      );
+      this.endpointManager.startObserving();
+      ensureCommissioningConfig(this.server);
+      applyLegacySpecSessionParameters(
+        this.server.env.get(SessionManager),
+        this.dataProvider.featureFlags
+      );
+      await this.server.setStateOf(
+        BasicInformationServer,
+        specVersionValues(this.dataProvider.featureFlags)
+      );
+      await applyTcpFlagBeforeStart(
+        this.server,
+        this.dataProvider.featureFlags
+      );
+      await this.server.start();
+      await this.endpointManager.startPlugins();
+      this.setStatus({ code: BridgeStatus.Running });
+      this.startAutoForceSyncIfEnabled();
+      if (this.dataProvider.featureFlags?.autoForceSync) {
+        this.forceSync().catch((e) => {
+          this.log.warn("Startup force sync failed:", e);
+        });
+      }
+      this.sessions.start();
+      logMemoryUsage(this.log, "bridge running");
+      diagnosticEventBus.emit("bridge_started", `Bridge started`, {
+        bridgeId: this.id,
+        bridgeName: this.dataProvider.name,
+        details: { deviceCount: this.aggregator.parts.size }
+      });
+    } catch (e) {
+      const reason = "Failed to start bridge due to error:";
+      this.log.error(reason, e);
+      await this.stop(BridgeStatus.Failed, `${reason}
+${e?.toString()}`);
+    }
+  }
+  async stop(code = BridgeStatus.Stopped, reason = "Manually stopped") {
+    if (this.stopInFlight) {
+      return this.stopInFlight;
+    }
+    this.stopInFlight = this.runStop(code, reason).finally(() => {
+      this.stopInFlight = void 0;
+    });
+    return this.stopInFlight;
+  }
+  async runStop(code, reason) {
+    this.sessions.stop();
+    this.stopAutoForceSync();
+    await this.sessions.closeActiveSessions();
+    await this.endpointManager.stopPlugins();
+    this.endpointManager.stopObserving();
+    try {
+      await this.server.cancel();
+    } catch (e) {
+      const errorMessage = e instanceof Error ? e.message : String(e);
+      if (!errorMessage.includes("mutex-closed")) {
+        this.log.warn("Error stopping bridge server:", e);
+      }
+    }
+    this.setStatus({ code, reason });
+    diagnosticEventBus.emit("bridge_stopped", `Bridge stopped: ${reason}`, {
+      bridgeId: this.id,
+      bridgeName: this.dataProvider.name
+    });
+  }
+  startAutoForceSyncIfEnabled() {
+    this.stopAutoForceSync();
+    const forceSyncEnabled = this.dataProvider.featureFlags?.autoForceSync ?? false;
+    if (!forceSyncEnabled) {
+      return;
+    }
+    this.autoForceSyncTimer = setInterval(() => {
+      this.forceSync().catch((e) => {
+        this.log.warn("Auto force sync failed:", e);
+      });
+    }, AUTO_FORCE_SYNC_INTERVAL_MS);
+    this.log.info(`Force sync: every ${AUTO_FORCE_SYNC_INTERVAL_MS / 1e3}s`);
+  }
+  stopAutoForceSync() {
+    if (this.autoForceSyncTimer) {
+      clearInterval(this.autoForceSyncTimer);
+      this.autoForceSyncTimer = null;
+    }
+  }
   async update(update) {
     try {
       this.dataProvider.update(update);
       await this.refreshDevices();
       if (this.status.code === BridgeStatus.Running) {
         this.startAutoForceSyncIfEnabled();
-        this.startSessionRotation();
-        this.startWedgeWatchdog();
+        this.sessions.reconfigure();
       }
     } catch (e) {
       const reason = "Failed to update bridge due to error:";
@@ -169353,6 +169399,99 @@ var CarbonMonoxideSensorType = AirQualitySensorDevice.with(
   CarbonMonoxideConcentrationMeasurementServer2
 );
 
+// src/matter/behaviors/carbon-dioxide-concentration-measurement-server.ts
+init_home_assistant_entity_behavior();
+var CarbonDioxideConcentrationMeasurementServerBase = CarbonDioxideConcentrationMeasurementServer.with(
+  ConcentrationMeasurement3.Feature.NumericMeasurement
+);
+var CarbonDioxideConcentrationMeasurementServer2 = class extends CarbonDioxideConcentrationMeasurementServerBase {
+  async initialize() {
+    if (this.state.measuredValue === void 0) {
+      this.state.measuredValue = null;
+    }
+    if (this.state.minMeasuredValue === void 0) {
+      this.state.minMeasuredValue = null;
+    }
+    if (this.state.maxMeasuredValue === void 0) {
+      this.state.maxMeasuredValue = null;
+    }
+    if (this.state.uncertainty === void 0) {
+      this.state.uncertainty = 0;
+    }
+    if (this.state.measurementUnit === void 0) {
+      this.state.measurementUnit = ConcentrationMeasurement3.MeasurementUnit.Ppm;
+    }
+    if (this.state.measurementMedium === void 0) {
+      this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
+    }
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update(entity) {
+    if (!entity.state || !entity.state.attributes) {
+      return;
+    }
+    const state = entity.state.state;
+    let measuredValue = null;
+    if (state != null && !Number.isNaN(+state)) {
+      measuredValue = +state;
+    }
+    applyPatchState(this.state, {
+      measuredValue
+    });
+  }
+};
+
+// src/matter/endpoints/legacy/sensor/devices/co2-sensor.ts
+init_home_assistant_entity_behavior();
+var Co2AirQualityServerBase = AirQualityServer.with(
+  AirQuality3.Feature.Fair,
+  AirQuality3.Feature.Moderate,
+  AirQuality3.Feature.VeryPoor,
+  AirQuality3.Feature.ExtremelyPoor
+);
+var Co2AirQualityServer = class extends Co2AirQualityServerBase {
+  async initialize() {
+    if (this.state.airQuality === void 0) {
+      this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
+    }
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update(entity) {
+    const state = entity.state.state;
+    let airQuality = AirQuality3.AirQualityEnum.Unknown;
+    if (state != null && !Number.isNaN(+state)) {
+      const value = +state;
+      if (value <= 800) {
+        airQuality = AirQuality3.AirQualityEnum.Good;
+      } else if (value <= 1e3) {
+        airQuality = AirQuality3.AirQualityEnum.Fair;
+      } else if (value <= 1400) {
+        airQuality = AirQuality3.AirQualityEnum.Moderate;
+      } else if (value <= 2e3) {
+        airQuality = AirQuality3.AirQualityEnum.Poor;
+      } else if (value <= 5e3) {
+        airQuality = AirQuality3.AirQualityEnum.VeryPoor;
+      } else {
+        airQuality = AirQuality3.AirQualityEnum.ExtremelyPoor;
+      }
+    }
+    applyPatchState(this.state, { airQuality });
+  }
+};
+var Co2SensorType = AirQualitySensorDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  Co2AirQualityServer,
+  CarbonDioxideConcentrationMeasurementServer2
+);
+
 // src/matter/endpoints/legacy/sensor/devices/electrical-meter.ts
 init_home_assistant_entity_behavior();
 
@@ -170372,6 +170511,208 @@ var Pm1SensorType = AirQualitySensorDevice.with(
   Pm1ConcentrationMeasurementServer2
 );
 
+// src/matter/endpoints/legacy/sensor/devices/pm10-sensor.ts
+init_home_assistant_entity_behavior();
+
+// src/matter/behaviors/pm10-concentration-measurement-server.ts
+init_home_assistant_entity_behavior();
+var Pm10ConcentrationMeasurementServerBase = Pm10ConcentrationMeasurementServer.with(
+  ConcentrationMeasurement3.Feature.NumericMeasurement
+);
+var Pm10ConcentrationMeasurementServer2 = class extends Pm10ConcentrationMeasurementServerBase {
+  async initialize() {
+    if (this.state.measuredValue === void 0) {
+      this.state.measuredValue = null;
+    }
+    if (this.state.minMeasuredValue === void 0) {
+      this.state.minMeasuredValue = null;
+    }
+    if (this.state.maxMeasuredValue === void 0) {
+      this.state.maxMeasuredValue = null;
+    }
+    if (this.state.uncertainty === void 0) {
+      this.state.uncertainty = 0;
+    }
+    if (this.state.measurementUnit === void 0) {
+      this.state.measurementUnit = ConcentrationMeasurement3.MeasurementUnit.Ugm3;
+    }
+    if (this.state.measurementMedium === void 0) {
+      this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
+    }
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update(entity) {
+    if (!entity.state || !entity.state.attributes) {
+      return;
+    }
+    const state = entity.state.state;
+    let measuredValue = null;
+    if (state != null && !Number.isNaN(+state)) {
+      measuredValue = +state;
+    }
+    applyPatchState(this.state, {
+      measuredValue
+    });
+  }
+};
+
+// src/matter/endpoints/legacy/sensor/devices/pm10-sensor.ts
+var Pm10AirQualityServerBase = AirQualityServer.with(
+  AirQuality3.Feature.Fair,
+  AirQuality3.Feature.Moderate,
+  AirQuality3.Feature.VeryPoor,
+  AirQuality3.Feature.ExtremelyPoor
+);
+var Pm10AirQualityServer = class extends Pm10AirQualityServerBase {
+  async initialize() {
+    if (this.state.airQuality === void 0) {
+      this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
+    }
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update(entity) {
+    const state = entity.state.state;
+    let airQuality = AirQuality3.AirQualityEnum.Unknown;
+    if (state != null && !Number.isNaN(+state)) {
+      const value = +state;
+      if (value <= 54) {
+        airQuality = AirQuality3.AirQualityEnum.Good;
+      } else if (value <= 154) {
+        airQuality = AirQuality3.AirQualityEnum.Fair;
+      } else if (value <= 254) {
+        airQuality = AirQuality3.AirQualityEnum.Moderate;
+      } else if (value <= 354) {
+        airQuality = AirQuality3.AirQualityEnum.Poor;
+      } else if (value <= 424) {
+        airQuality = AirQuality3.AirQualityEnum.VeryPoor;
+      } else {
+        airQuality = AirQuality3.AirQualityEnum.ExtremelyPoor;
+      }
+    }
+    applyPatchState(this.state, { airQuality });
+  }
+};
+var Pm10SensorType = AirQualitySensorDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  Pm10AirQualityServer,
+  Pm10ConcentrationMeasurementServer2
+);
+
+// src/matter/endpoints/legacy/sensor/devices/pm25-sensor.ts
+init_esm();
+init_home_assistant_entity_behavior();
+
+// src/matter/behaviors/pm25-concentration-measurement-server.ts
+init_esm();
+init_home_assistant_entity_behavior();
+var logger232 = Logger.get("Pm25ConcentrationMeasurementServer");
+var Pm25ConcentrationMeasurementServerBase = Pm25ConcentrationMeasurementServer.with(
+  ConcentrationMeasurement3.Feature.NumericMeasurement
+);
+var Pm25ConcentrationMeasurementServer2 = class extends Pm25ConcentrationMeasurementServerBase {
+  async initialize() {
+    if (this.state.measuredValue === void 0) {
+      this.state.measuredValue = null;
+    }
+    if (this.state.minMeasuredValue === void 0) {
+      this.state.minMeasuredValue = null;
+    }
+    if (this.state.maxMeasuredValue === void 0) {
+      this.state.maxMeasuredValue = null;
+    }
+    if (this.state.uncertainty === void 0) {
+      this.state.uncertainty = 0;
+    }
+    if (this.state.measurementUnit === void 0) {
+      this.state.measurementUnit = ConcentrationMeasurement3.MeasurementUnit.Ugm3;
+    }
+    if (this.state.measurementMedium === void 0) {
+      this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
+    }
+    logger232.debug(
+      "Pm25ConcentrationMeasurementServer: before super.initialize()"
+    );
+    await super.initialize();
+    logger232.debug(
+      "Pm25ConcentrationMeasurementServer: after super.initialize()"
+    );
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update(entity) {
+    if (!entity.state || !entity.state.attributes) {
+      return;
+    }
+    const state = entity.state.state;
+    let measuredValue = null;
+    if (state != null && !Number.isNaN(+state)) {
+      measuredValue = +state;
+    }
+    applyPatchState(this.state, {
+      measuredValue
+    });
+  }
+};
+
+// src/matter/endpoints/legacy/sensor/devices/pm25-sensor.ts
+var logger233 = Logger.get("Pm25AirQualityServer");
+var Pm25AirQualityServerBase = AirQualityServer.with(
+  AirQuality3.Feature.Fair,
+  AirQuality3.Feature.Moderate,
+  AirQuality3.Feature.VeryPoor,
+  AirQuality3.Feature.ExtremelyPoor
+);
+var Pm25AirQualityServer = class extends Pm25AirQualityServerBase {
+  async initialize() {
+    if (this.state.airQuality === void 0) {
+      this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
+    }
+    logger233.debug("Pm25AirQualityServer: before super.initialize()");
+    await super.initialize();
+    logger233.debug("Pm25AirQualityServer: after super.initialize()");
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    this.update(homeAssistant.entity);
+    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
+  }
+  update(entity) {
+    const state = entity.state.state;
+    let airQuality = AirQuality3.AirQualityEnum.Unknown;
+    if (state != null && !Number.isNaN(+state)) {
+      const value = +state;
+      if (value <= 12) {
+        airQuality = AirQuality3.AirQualityEnum.Good;
+      } else if (value <= 35) {
+        airQuality = AirQuality3.AirQualityEnum.Fair;
+      } else if (value <= 55) {
+        airQuality = AirQuality3.AirQualityEnum.Moderate;
+      } else if (value <= 150) {
+        airQuality = AirQuality3.AirQualityEnum.Poor;
+      } else if (value <= 250) {
+        airQuality = AirQuality3.AirQualityEnum.VeryPoor;
+      } else {
+        airQuality = AirQuality3.AirQualityEnum.ExtremelyPoor;
+      }
+    }
+    applyPatchState(this.state, { airQuality });
+  }
+};
+var Pm25SensorType = AirQualitySensorDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  Pm25AirQualityServer,
+  Pm25ConcentrationMeasurementServer2
+);
+
 // src/matter/endpoints/legacy/sensor/devices/pressure-sensor.ts
 init_home_assistant_entity_behavior();
 var pressureSensorConfig = {
@@ -170590,7 +170931,7 @@ var TvocConcentrationMeasurementServer = class extends TvocConcentrationMeasurem
 };
 
 // src/matter/endpoints/legacy/sensor/devices/tvoc-sensor.ts
-var logger232 = Logger.get("TvocSensor");
+var logger234 = Logger.get("TvocSensor");
 function airQualityFromUgm3(value) {
   if (value <= 300) return AirQuality3.AirQualityEnum.Good;
   if (value <= 1e3) return AirQuality3.AirQualityEnum.Fair;
@@ -170631,17 +170972,17 @@ var TvocAirQualityServer = class extends TvocAirQualityServerBase {
     const attributes9 = entity.state.attributes;
     const deviceClass = attributes9.device_class;
     let airQuality = AirQuality3.AirQualityEnum.Unknown;
-    logger232.debug(
+    logger234.debug(
       `[${entity.entity_id}] TVOC update: state="${state}", device_class="${deviceClass}"`
     );
     if (state != null && !Number.isNaN(+state)) {
       const value = +state;
       airQuality = deviceClass === SensorDeviceClass.volatile_organic_compounds ? airQualityFromUgm3(value) : airQualityFromPpb(value);
-      logger232.debug(
+      logger234.debug(
         `[${entity.entity_id}] TVOC value=${value} (${deviceClass}) -> airQuality=${AirQuality3.AirQualityEnum[airQuality]}`
       );
     } else {
-      logger232.warn(
+      logger234.warn(
         `[${entity.entity_id}] TVOC state not a valid number: "${state}"`
       );
     }
@@ -170661,301 +171002,6 @@ init_dist();
 init_types2();
 init_diagnostic_event_bus();
 
-// src/matter/behaviors/carbon-dioxide-concentration-measurement-server.ts
-init_home_assistant_entity_behavior();
-var CarbonDioxideConcentrationMeasurementServerBase = CarbonDioxideConcentrationMeasurementServer.with(
-  ConcentrationMeasurement3.Feature.NumericMeasurement
-);
-var CarbonDioxideConcentrationMeasurementServer2 = class extends CarbonDioxideConcentrationMeasurementServerBase {
-  async initialize() {
-    if (this.state.measuredValue === void 0) {
-      this.state.measuredValue = null;
-    }
-    if (this.state.minMeasuredValue === void 0) {
-      this.state.minMeasuredValue = null;
-    }
-    if (this.state.maxMeasuredValue === void 0) {
-      this.state.maxMeasuredValue = null;
-    }
-    if (this.state.uncertainty === void 0) {
-      this.state.uncertainty = 0;
-    }
-    if (this.state.measurementUnit === void 0) {
-      this.state.measurementUnit = ConcentrationMeasurement3.MeasurementUnit.Ppm;
-    }
-    if (this.state.measurementMedium === void 0) {
-      this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
-    }
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
-  }
-  update(entity) {
-    if (!entity.state || !entity.state.attributes) {
-      return;
-    }
-    const state = entity.state.state;
-    let measuredValue = null;
-    if (state != null && !Number.isNaN(+state)) {
-      measuredValue = +state;
-    }
-    applyPatchState(this.state, {
-      measuredValue
-    });
-  }
-};
-
-// src/matter/endpoints/legacy/sensor/devices/co2-sensor.ts
-init_home_assistant_entity_behavior();
-var Co2AirQualityServerBase = AirQualityServer.with(
-  AirQuality3.Feature.Fair,
-  AirQuality3.Feature.Moderate,
-  AirQuality3.Feature.VeryPoor,
-  AirQuality3.Feature.ExtremelyPoor
-);
-var Co2AirQualityServer = class extends Co2AirQualityServerBase {
-  async initialize() {
-    if (this.state.airQuality === void 0) {
-      this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
-    }
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
-  }
-  update(entity) {
-    const state = entity.state.state;
-    let airQuality = AirQuality3.AirQualityEnum.Unknown;
-    if (state != null && !Number.isNaN(+state)) {
-      const value = +state;
-      if (value <= 800) {
-        airQuality = AirQuality3.AirQualityEnum.Good;
-      } else if (value <= 1e3) {
-        airQuality = AirQuality3.AirQualityEnum.Fair;
-      } else if (value <= 1400) {
-        airQuality = AirQuality3.AirQualityEnum.Moderate;
-      } else if (value <= 2e3) {
-        airQuality = AirQuality3.AirQualityEnum.Poor;
-      } else if (value <= 5e3) {
-        airQuality = AirQuality3.AirQualityEnum.VeryPoor;
-      } else {
-        airQuality = AirQuality3.AirQualityEnum.ExtremelyPoor;
-      }
-    }
-    applyPatchState(this.state, { airQuality });
-  }
-};
-var Co2SensorType = AirQualitySensorDevice.with(
-  BasicInformationServer2,
-  IdentifyServer2,
-  HomeAssistantEntityBehavior,
-  Co2AirQualityServer,
-  CarbonDioxideConcentrationMeasurementServer2
-);
-
-// src/matter/endpoints/legacy/sensor/devices/pm10-sensor.ts
-init_home_assistant_entity_behavior();
-
-// src/matter/behaviors/pm10-concentration-measurement-server.ts
-init_home_assistant_entity_behavior();
-var Pm10ConcentrationMeasurementServerBase = Pm10ConcentrationMeasurementServer.with(
-  ConcentrationMeasurement3.Feature.NumericMeasurement
-);
-var Pm10ConcentrationMeasurementServer2 = class extends Pm10ConcentrationMeasurementServerBase {
-  async initialize() {
-    if (this.state.measuredValue === void 0) {
-      this.state.measuredValue = null;
-    }
-    if (this.state.minMeasuredValue === void 0) {
-      this.state.minMeasuredValue = null;
-    }
-    if (this.state.maxMeasuredValue === void 0) {
-      this.state.maxMeasuredValue = null;
-    }
-    if (this.state.uncertainty === void 0) {
-      this.state.uncertainty = 0;
-    }
-    if (this.state.measurementUnit === void 0) {
-      this.state.measurementUnit = ConcentrationMeasurement3.MeasurementUnit.Ugm3;
-    }
-    if (this.state.measurementMedium === void 0) {
-      this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
-    }
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
-  }
-  update(entity) {
-    if (!entity.state || !entity.state.attributes) {
-      return;
-    }
-    const state = entity.state.state;
-    let measuredValue = null;
-    if (state != null && !Number.isNaN(+state)) {
-      measuredValue = +state;
-    }
-    applyPatchState(this.state, {
-      measuredValue
-    });
-  }
-};
-
-// src/matter/endpoints/legacy/sensor/devices/pm10-sensor.ts
-var Pm10AirQualityServerBase = AirQualityServer.with(
-  AirQuality3.Feature.Fair,
-  AirQuality3.Feature.Moderate,
-  AirQuality3.Feature.VeryPoor,
-  AirQuality3.Feature.ExtremelyPoor
-);
-var Pm10AirQualityServer = class extends Pm10AirQualityServerBase {
-  async initialize() {
-    if (this.state.airQuality === void 0) {
-      this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
-    }
-    await super.initialize();
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
-  }
-  update(entity) {
-    const state = entity.state.state;
-    let airQuality = AirQuality3.AirQualityEnum.Unknown;
-    if (state != null && !Number.isNaN(+state)) {
-      const value = +state;
-      if (value <= 54) {
-        airQuality = AirQuality3.AirQualityEnum.Good;
-      } else if (value <= 154) {
-        airQuality = AirQuality3.AirQualityEnum.Fair;
-      } else if (value <= 254) {
-        airQuality = AirQuality3.AirQualityEnum.Moderate;
-      } else if (value <= 354) {
-        airQuality = AirQuality3.AirQualityEnum.Poor;
-      } else if (value <= 424) {
-        airQuality = AirQuality3.AirQualityEnum.VeryPoor;
-      } else {
-        airQuality = AirQuality3.AirQualityEnum.ExtremelyPoor;
-      }
-    }
-    applyPatchState(this.state, { airQuality });
-  }
-};
-var Pm10SensorType = AirQualitySensorDevice.with(
-  BasicInformationServer2,
-  IdentifyServer2,
-  HomeAssistantEntityBehavior,
-  Pm10AirQualityServer,
-  Pm10ConcentrationMeasurementServer2
-);
-
-// src/matter/endpoints/legacy/sensor/devices/pm25-sensor.ts
-init_esm();
-init_home_assistant_entity_behavior();
-
-// src/matter/behaviors/pm25-concentration-measurement-server.ts
-init_esm();
-init_home_assistant_entity_behavior();
-var logger233 = Logger.get("Pm25ConcentrationMeasurementServer");
-var Pm25ConcentrationMeasurementServerBase = Pm25ConcentrationMeasurementServer.with(
-  ConcentrationMeasurement3.Feature.NumericMeasurement
-);
-var Pm25ConcentrationMeasurementServer2 = class extends Pm25ConcentrationMeasurementServerBase {
-  async initialize() {
-    if (this.state.measuredValue === void 0) {
-      this.state.measuredValue = null;
-    }
-    if (this.state.minMeasuredValue === void 0) {
-      this.state.minMeasuredValue = null;
-    }
-    if (this.state.maxMeasuredValue === void 0) {
-      this.state.maxMeasuredValue = null;
-    }
-    if (this.state.uncertainty === void 0) {
-      this.state.uncertainty = 0;
-    }
-    if (this.state.measurementUnit === void 0) {
-      this.state.measurementUnit = ConcentrationMeasurement3.MeasurementUnit.Ugm3;
-    }
-    if (this.state.measurementMedium === void 0) {
-      this.state.measurementMedium = ConcentrationMeasurement3.MeasurementMedium.Air;
-    }
-    logger233.debug(
-      "Pm25ConcentrationMeasurementServer: before super.initialize()"
-    );
-    await super.initialize();
-    logger233.debug(
-      "Pm25ConcentrationMeasurementServer: after super.initialize()"
-    );
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
-  }
-  update(entity) {
-    if (!entity.state || !entity.state.attributes) {
-      return;
-    }
-    const state = entity.state.state;
-    let measuredValue = null;
-    if (state != null && !Number.isNaN(+state)) {
-      measuredValue = +state;
-    }
-    applyPatchState(this.state, {
-      measuredValue
-    });
-  }
-};
-
-// src/matter/endpoints/legacy/sensor/devices/pm25-sensor.ts
-var logger234 = Logger.get("Pm25AirQualityServer");
-var Pm25AirQualityServerBase = AirQualityServer.with(
-  AirQuality3.Feature.Fair,
-  AirQuality3.Feature.Moderate,
-  AirQuality3.Feature.VeryPoor,
-  AirQuality3.Feature.ExtremelyPoor
-);
-var Pm25AirQualityServer = class extends Pm25AirQualityServerBase {
-  async initialize() {
-    if (this.state.airQuality === void 0) {
-      this.state.airQuality = AirQuality3.AirQualityEnum.Unknown;
-    }
-    logger234.debug("Pm25AirQualityServer: before super.initialize()");
-    await super.initialize();
-    logger234.debug("Pm25AirQualityServer: after super.initialize()");
-    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
-    this.update(homeAssistant.entity);
-    this.reactTo(homeAssistant.onChange, this.update, { offline: true });
-  }
-  update(entity) {
-    const state = entity.state.state;
-    let airQuality = AirQuality3.AirQualityEnum.Unknown;
-    if (state != null && !Number.isNaN(+state)) {
-      const value = +state;
-      if (value <= 12) {
-        airQuality = AirQuality3.AirQualityEnum.Good;
-      } else if (value <= 35) {
-        airQuality = AirQuality3.AirQualityEnum.Fair;
-      } else if (value <= 55) {
-        airQuality = AirQuality3.AirQualityEnum.Moderate;
-      } else if (value <= 150) {
-        airQuality = AirQuality3.AirQualityEnum.Poor;
-      } else if (value <= 250) {
-        airQuality = AirQuality3.AirQualityEnum.VeryPoor;
-      } else {
-        airQuality = AirQuality3.AirQualityEnum.ExtremelyPoor;
-      }
-    }
-    applyPatchState(this.state, { airQuality });
-  }
-};
-var Pm25SensorType = AirQualitySensorDevice.with(
-  BasicInformationServer2,
-  IdentifyServer2,
-  HomeAssistantEntityBehavior,
-  Pm25AirQualityServer,
-  Pm25ConcentrationMeasurementServer2
-);
-
 // src/matter/endpoints/legacy/sensor/devices/temperature-humidity-sensor.ts
 init_home_assistant_entity_behavior();
 var temperatureConfig3 = {
@@ -174410,6 +174456,9 @@ var matterDeviceTypeFactories = {
   formaldehyde_sensor: (ha) => FormaldehydeSensorType.set({ homeAssistantEntity: ha }),
   radon_sensor: (ha) => RadonSensorType.set({ homeAssistantEntity: ha }),
   pm1_sensor: (ha) => Pm1SensorType.set({ homeAssistantEntity: ha }),
+  pm25_sensor: (ha) => Pm25SensorType.set({ homeAssistantEntity: ha }),
+  pm10_sensor: (ha) => Pm10SensorType.set({ homeAssistantEntity: ha }),
+  carbon_dioxide_sensor: (ha) => Co2SensorType.set({ homeAssistantEntity: ha }),
   electrical_meter: (ha) => ElectricalMeterType.set({ homeAssistantEntity: ha }),
   // Legacy SolarPower alias, kept for existing mappings.
   electrical_sensor: (ha) => ElectricalSensorType.set({ homeAssistantEntity: ha }),
@@ -179290,20 +179339,9 @@ var BridgeEndpointManager = class extends Service {
 
 // src/services/bridges/server-mode-bridge.ts
 init_dist();
-init_esm7();
-import * as os10 from "node:os";
 init_protocol3();
 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;
 function makeWarmStartState(state, now = (/* @__PURE__ */ new Date()).toISOString()) {
   return { ...state, last_updated: now };
 }
@@ -179313,11 +179351,19 @@ var ServerModeBridge = class {
     this.endpointManager = endpointManager;
     this.server = server;
     this.log = logger255.get(`ServerModeBridge / ${dataProvider.id}`);
+    this.sessions = new SessionSupervisor(
+      this.log,
+      this.server,
+      this.dataProvider,
+      () => this.data,
+      DEFAULT_SESSION_MAX_AGE_HOURS
+    );
   }
   dataProvider;
   endpointManager;
   server;
   log;
+  sessions;
   status = {
     code: BridgeStatus.Stopped,
     reason: void 0
@@ -179326,46 +179372,9 @@ var ServerModeBridge = class {
   // broadcast updates via WebSocket so the frontend sees every transition.
   onStatusChange;
   autoForceSyncTimer = null;
-  deadSessionTimer = null;
-  staleSessionTimers = /* @__PURE__ */ new Map();
   warmStartTimer = null;
-  // Tracks when each session opened, used for age-based rotation (#287).
-  sessionStartedAt = /* @__PURE__ */ new Map();
-  rotationTimer = null;
-  maxSessionAgeMs = 0;
-  // Wedge watchdog: last inbound Interaction Model request time per session and
-  // last time the watchdog rotated it, both keyed by the long-lived session
-  // object so they clear when the session goes away.
-  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;
-  advertisedAddressSnapshot = [];
-  // Skip a tick while the previous one is still awaiting refresh, so a slow
-  // refreshOperationalAdvertisement can't overlap and re-announce off a stale
-  // snapshot.
-  mdnsCheckInFlight = false;
   // Tracks the last synced state JSON per entity to avoid pushing unchanged states.
   lastSyncedStates = /* @__PURE__ */ new Map();
-  // Session lifecycle diagnostic handlers (non-destructive, logging only).
-  // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
-  sessionDiagHandler;
-  // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
-  sessionAddedHandler;
-  // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
-  sessionDeletedHandler;
-  // Warns when Alexa pairs on a non-5540 port, the fabric rolls back later (#401).
-  // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
-  fabricAddedHandler;
   get id() {
     return this.dataProvider.id;
   }
@@ -179401,81 +179410,7 @@ var ServerModeBridge = class {
     return out;
   }
   getSessionInfo() {
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      const sessions = [...sessionManager.sessions];
-      let totalSubscriptions = 0;
-      const fabricMap = /* @__PURE__ */ new Map();
-      const sessionList = sessions.map((s) => {
-        const subCount = s.subscriptions.size;
-        totalSubscriptions += subCount;
-        const subscriptions = summarizeSubscriptions(s.subscriptions);
-        const fi = typeof s.fabric?.fabricIndex === "number" ? s.fabric.fabricIndex : null;
-        if (fi !== null) {
-          const existing = fabricMap.get(fi) ?? {
-            sessions: 0,
-            subscriptions: 0
-          };
-          existing.sessions++;
-          existing.subscriptions += subCount;
-          fabricMap.set(fi, existing);
-        }
-        const nowMs = Date.now();
-        const lastActiveMsAgo = typeof s.activeTimestamp === "number" && s.activeTimestamp > 0 ? nowMs - s.activeTimestamp : null;
-        const lastAnyActivityMsAgo = typeof s.timestamp === "number" ? nowMs - s.timestamp : null;
-        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),
-          fabricIndex: fi,
-          subscriptionCount: subCount,
-          subscriptions,
-          lastActiveMsAgo,
-          lastAnyActivityMsAgo,
-          lastImRequestMsAgo,
-          lastCommandImRequestMsAgo,
-          subscribesLast30Min: countRecent(subscribeTimes, nowMs),
-          giveUpsLast30Min: countRecent(giveUpTimes, nowMs),
-          wedgeV2WouldRotate,
-          isPeerActive: Boolean(s.isPeerActive),
-          ageMsFromOpen: startedAt != null ? nowMs - startedAt : null
-        };
-      });
-      const fabrics = [...fabricMap.entries()].map(([fabricIndex, data]) => ({
-        fabricIndex,
-        sessions: data.sessions,
-        subscriptions: data.subscriptions
-      }));
-      return {
-        sessions: sessionList,
-        totalSessions: sessions.length,
-        totalSubscriptions,
-        fabrics
-      };
-    } catch {
-      return {
-        sessions: [],
-        totalSessions: 0,
-        totalSubscriptions: 0,
-        fabrics: []
-      };
-    }
+    return this.sessions.getSessionInfo();
   }
   async initialize() {
     await this.server.construction.ready.then();
@@ -179525,11 +179460,7 @@ var ServerModeBridge = class {
           this.log.warn("Startup force sync failed:", e);
         });
       }
-      this.wireSessionDiagnostics();
-      this.wireFabricWarnings();
-      this.startSessionRotation();
-      this.startWedgeWatchdog();
-      this.startMdnsAddressWatch();
+      this.sessions.start();
       this.scheduleWarmStart();
       logMemoryUsage(this.log, "server mode bridge running");
       this.log.info("Server mode bridge started");
@@ -179545,14 +179476,10 @@ ${e?.toString()}`);
     }
   }
   async stop(code = BridgeStatus.Stopped, reason = "Manually stopped") {
-    this.stopSessionRotation();
-    this.stopWedgeWatchdog();
-    this.stopMdnsAddressWatch();
-    this.unwireSessionDiagnostics();
-    this.unwireFabricWarnings();
+    this.sessions.stop();
     this.cancelWarmStart();
     this.stopAutoForceSync();
-    await this.closeActiveSessions();
+    await this.sessions.closeActiveSessions();
     this.endpointManager.stopObserving();
     try {
       await this.server.cancel();
@@ -179578,8 +179505,7 @@ ${e?.toString()}`);
       await this.refreshDevices();
       if (this.status.code === BridgeStatus.Running) {
         this.startAutoForceSyncIfEnabled();
-        this.startSessionRotation();
-        this.startWedgeWatchdog();
+        this.sessions.reconfigure();
       }
     } catch (e) {
       const reason = "Failed to update server mode bridge due to error:";
@@ -179622,677 +179548,6 @@ ${e?.toString()}`);
     }, AUTO_FORCE_SYNC_INTERVAL_MS2);
     this.log.info(`Force sync: every ${AUTO_FORCE_SYNC_INTERVAL_MS2 / 1e3}s`);
   }
-  wireSessionDiagnostics() {
-    this.unwireSessionDiagnostics();
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      this.sessionDiagHandler = (session) => {
-        const sessions = [...sessionManager.sessions];
-        let totalSubs = 0;
-        for (const s of sessions) {
-          totalSubs += s.subscriptions.size;
-        }
-        this.log.debug(
-          `Session ${session.id} (peer ${session.peerNodeId}): subscriptions=${session.subscriptions.size} | total: sessions=${sessions.length} subscriptions=${totalSubs}`
-        );
-        diagnosticEventBus.emit(
-          "subscription_changed",
-          `Session ${session.id}: ${session.subscriptions.size} subs (total ${totalSubs})`,
-          {
-            bridgeId: this.data.id,
-            bridgeName: this.data.name,
-            details: {
-              sessionId: session.id,
-              sessionSubs: session.subscriptions.size,
-              totalSessions: sessions.length,
-              totalSubs
-            }
-          }
-        );
-        if (totalSubs === 0 && sessions.length > 0) {
-          this.log.warn(
-            `All subscriptions lost, ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
-          );
-          if (!this.deadSessionTimer) {
-            const timeoutMs = deadSessionTimeoutMs(
-              this.dataProvider.featureFlags
-            );
-            this.deadSessionTimer = setTimeout(() => {
-              this.deadSessionTimer = null;
-              this.closeDeadSessions();
-            }, timeoutMs);
-            this.log.info(
-              `Scheduled dead session cleanup in ${timeoutMs / 1e3}s`
-            );
-          }
-        } else if (totalSubs > 0 && this.deadSessionTimer) {
-          clearTimeout(this.deadSessionTimer);
-          this.deadSessionTimer = null;
-          this.log.info(
-            "Subscriptions recovered, canceled dead session cleanup"
-          );
-        }
-        if (session.subscriptions.size === 0 && !this.staleSessionTimers.has(session.id)) {
-          this.staleSessionTimers.set(
-            session.id,
-            setTimeout(() => {
-              this.staleSessionTimers.delete(session.id);
-              this.closeStaleSession(session.id);
-            }, deadSessionTimeoutMs(this.dataProvider.featureFlags))
-          );
-        } else if (session.subscriptions.size > 0 && this.staleSessionTimers.has(session.id)) {
-          clearTimeout(this.staleSessionTimers.get(session.id));
-          this.staleSessionTimers.delete(session.id);
-        }
-      };
-      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}`
-        );
-        diagnosticEventBus.emit(
-          "session_opened",
-          `Session ${newSession.id} opened (peer ${newSession.peerNodeId})`,
-          {
-            bridgeId: this.data.id,
-            bridgeName: this.data.name,
-            details: { sessionId: newSession.id }
-          }
-        );
-        for (const s of [...sessionManager.sessions]) {
-          if (s !== newSession && !s.isClosing && s.peerNodeId === newSession.peerNodeId && s.fabric?.fabricIndex === newSession.fabric?.fabricIndex && s.subscriptions.size === 0) {
-            this.log.info(
-              `Session ${s.id} (peer ${s.peerNodeId}, 0 subs) replaced by session ${newSession.id}, closing it once it goes quiet`
-            );
-            const staleId = s.id;
-            const armed = this.staleSessionTimers.get(staleId);
-            if (armed) clearTimeout(armed);
-            this.staleSessionTimers.set(
-              staleId,
-              setTimeout(() => {
-                this.staleSessionTimers.delete(staleId);
-                this.closeStaleSession(staleId, PRIMING_GRACE_MS);
-              }, replacedSessionTimeoutMs(this.dataProvider.featureFlags))
-            );
-          }
-        }
-        const quietWindowMs = staleSessionQuietWindowMs(
-          this.dataProvider.featureFlags
-        );
-        const now = Date.now();
-        const supersededIds = new Set(
-          selectSupersededSessions(
-            [...sessionManager.sessions],
-            newSession,
-            quietWindowMs,
-            now
-          )
-        );
-        const closes = [];
-        for (const s of [...sessionManager.sessions]) {
-          if (!supersededIds.has(s.id) || s.subscriptions.size === 0) continue;
-          const quietSec = Math.round((now - s.timestamp) / 1e3);
-          this.log.info(
-            `Closing superseded session ${s.id} (peer ${s.peerNodeId}, ${s.subscriptions.size} subs, quiet ${quietSec}s), replaced by session ${newSession.id}`
-          );
-          closes.push(
-            s.initiateClose().catch(
-              () => s.initiateForceClose({
-                cause: new Error("superseded session, forcing")
-              })
-            )
-          );
-        }
-        if (closes.length > 0) {
-          Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
-        }
-      };
-      this.sessionDeletedHandler = (session) => {
-        this.sessionStartedAt.delete(session.id);
-        const armed = this.staleSessionTimers.get(session.id);
-        if (armed) {
-          clearTimeout(armed);
-          this.staleSessionTimers.delete(session.id);
-        }
-        const sessions = [...sessionManager.sessions];
-        this.log.warn(
-          `Session closed: id=${session.id} peer=${session.peerNodeId} | remaining sessions=${sessions.length}`
-        );
-        diagnosticEventBus.emit(
-          "session_closed",
-          `Session ${session.id} closed (peer ${session.peerNodeId})`,
-          {
-            bridgeId: this.data.id,
-            bridgeName: this.data.name,
-            details: {
-              sessionId: session.id,
-              remainingSessions: sessions.length
-            }
-          }
-        );
-      };
-      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 {
-    }
-  }
-  // Stamp the time of every inbound Interaction Model request per session by
-  // wrapping InteractionServer.onNewExchange. The wedge watchdog reads these to
-  // tell a live-but-consuming controller from one that only keeps acking.
-  wireImRequestTracking() {
-    try {
-      const is = this.server.env.get(InteractionServer);
-      const marked = is;
-      if (marked[imWrapMarker2]) {
-        return;
-      }
-      const original = is.onNewExchange.bind(is);
-      is.onNewExchange = (exchange, message) => {
-        const session = exchange.session;
-        if (session) {
-          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);
-      };
-      marked[imWrapMarker2] = true;
-    } 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, minQuietMs = 0) {
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      for (const s of [...sessionManager.sessions]) {
-        if (s.id !== sessionId || s.isClosing || s.subscriptions.size > 0) {
-          continue;
-        }
-        const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
-        if (!staleSessionShouldClose(
-          s,
-          Math.max(
-            staleSessionQuietWindowMs(this.dataProvider.featureFlags),
-            minQuietMs
-          )
-        )) {
-          this.log.info(
-            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
-          );
-          this.staleSessionTimers.set(
-            sessionId,
-            setTimeout(() => {
-              this.staleSessionTimers.delete(sessionId);
-              this.closeStaleSession(sessionId, minQuietMs);
-            }, deadSessionTimeoutMs(this.dataProvider.featureFlags))
-          );
-          break;
-        }
-        this.log.warn(
-          `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s, no traffic for ${idleSec}s)`
-        );
-        s.initiateClose().catch(() => {
-          return s.initiateForceClose({
-            cause: new Error("graceful close failed, forcing")
-          });
-        }).catch(() => {
-        }).finally(() => this.triggerMdnsReAnnounce());
-        break;
-      }
-    } catch {
-    }
-  }
-  closeDeadSessions() {
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      const sessions = [...sessionManager.sessions];
-      const closes = [];
-      let kept = 0;
-      for (const s of sessions) {
-        if (s.isClosing || s.subscriptions.size > 0) {
-          continue;
-        }
-        if (this.staleSessionTimers.has(s.id)) {
-          continue;
-        }
-        const idleSec = Math.round((Date.now() - s.timestamp) / 1e3);
-        if (!staleSessionShouldClose(
-          s,
-          staleSessionQuietWindowMs(this.dataProvider.featureFlags)
-        )) {
-          this.log.info(
-            `Keeping session ${s.id} (peer ${s.peerNodeId}, 0 subs, last traffic ${idleSec}s ago)`
-          );
-          kept++;
-          continue;
-        }
-        this.log.warn(
-          `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s, no traffic for ${idleSec}s)`
-        );
-        closes.push(
-          s.initiateClose().catch(() => {
-            return s.initiateForceClose({
-              cause: new Error("graceful close failed, forcing")
-            });
-          })
-        );
-      }
-      if (kept > 0 && !this.deadSessionTimer) {
-        this.deadSessionTimer = setTimeout(() => {
-          this.deadSessionTimer = null;
-          this.closeDeadSessions();
-        }, deadSessionTimeoutMs(this.dataProvider.featureFlags));
-      }
-      if (closes.length > 0) {
-        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
-      }
-    } catch {
-    }
-  }
-  // Close every active session on shutdown so each controller is told to drop
-  // its CASE session instead of being left with a stale one. Mirrors the
-  // dead-session close, but covers all sessions and waits (capped) so the
-  // close actually reaches the peer before the server is canceled.
-  async closeActiveSessions() {
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      const closes = [];
-      for (const s of [...sessionManager.sessions]) {
-        if (s.isClosing) {
-          continue;
-        }
-        closes.push(
-          s.initiateClose().catch(() => {
-            return s.initiateForceClose({
-              cause: new Error("graceful close failed, forcing")
-            });
-          })
-        );
-      }
-      if (closes.length === 0) {
-        return;
-      }
-      this.log.info(`Closing ${closes.length} active session(s) on shutdown`);
-      let timer;
-      const timeout = new Promise((resolve11) => {
-        timer = setTimeout(resolve11, SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2);
-      });
-      try {
-        await Promise.race([Promise.allSettled(closes), timeout]);
-      } finally {
-        clearTimeout(timer);
-      }
-    } catch {
-    }
-  }
-  /**
-   * Force a fresh mDNS operational advertisement after session cleanup.
-   * matter.js DeviceAdvertiser only re-announces when a subscription is
-   * canceled BY THE PEER. When the server cancels after 3 delivery
-   * timeouts, no re-announcement happens and the controller may not
-   * realize it should reconnect (#266).
-   */
-  triggerMdnsReAnnounce() {
-    try {
-      const advertiser = this.server.env.get(DeviceAdvertiser);
-      advertiser.restartAdvertisement();
-      this.log.info("Triggered mDNS re-announcement after session cleanup");
-    } catch {
-    }
-  }
-  unwireSessionDiagnostics() {
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      if (this.sessionDiagHandler) {
-        sessionManager.subscriptionsChanged.off(this.sessionDiagHandler);
-      }
-      if (this.sessionAddedHandler) {
-        sessionManager.sessions.added.off(this.sessionAddedHandler);
-      }
-      if (this.sessionDeletedHandler) {
-        sessionManager.sessions.deleted.off(this.sessionDeletedHandler);
-      }
-    } catch {
-    }
-    this.sessionDiagHandler = void 0;
-    this.sessionAddedHandler = void 0;
-    this.sessionDeletedHandler = void 0;
-    if (this.deadSessionTimer) {
-      clearTimeout(this.deadSessionTimer);
-      this.deadSessionTimer = null;
-    }
-    for (const timer of this.staleSessionTimers.values()) {
-      clearTimeout(timer);
-    }
-    this.staleSessionTimers.clear();
-    this.sessionStartedAt.clear();
-  }
-  // Warn at the fabric-added event when Alexa pairs on a non-5540 port. Alexa
-  // completes AddNOC but never CASEs, so the fabric rolls back on failsafe
-  // expiry ~20s later and the committed-fabric warning path never sees it (#401).
-  wireFabricWarnings() {
-    this.unwireFabricWarnings();
-    try {
-      const fabrics = this.server.env.get(FabricManager);
-      this.fabricAddedHandler = (fabric) => {
-        const port = this.dataProvider.port;
-        if (alexaPairingPortProblem(fabric.rootVendorId, port)) {
-          this.log.warn(
-            `Fabric added by Amazon Alexa (vendor ${fabric.rootVendorId}) on port ${port}. Alexa only completes pairing on port 5540, this attempt will roll back about 20s after AddNOC. Recreate the bridge on port 5540 (#401)`
-          );
-        }
-      };
-      fabrics.events.added.on(this.fabricAddedHandler);
-    } catch {
-    }
-  }
-  unwireFabricWarnings() {
-    try {
-      const fabrics = this.server.env.get(FabricManager);
-      if (this.fabricAddedHandler) {
-        fabrics.events.added.off(this.fabricAddedHandler);
-      }
-    } catch {
-    }
-    this.fabricAddedHandler = void 0;
-  }
-  // Start the periodic age-based session rotation (#287).
-  startSessionRotation() {
-    this.stopSessionRotation();
-    const hours = this.readSessionMaxAgeHours();
-    if (hours === 0) {
-      this.log.info(
-        "Session rotation disabled (HAMH_MATTER_SESSION_MAX_AGE_HOURS=0)"
-      );
-      return;
-    }
-    this.maxSessionAgeMs = hours * 60 * 60 * 1e3;
-    this.rotationTimer = setInterval(
-      () => this.rotateAgedSessions(),
-      ROTATION_CHECK_INTERVAL_MS
-    );
-    this.log.info(
-      `Session rotation: max age ${hours}h, check every ${ROTATION_CHECK_INTERVAL_MS / 6e4}min`
-    );
-  }
-  stopSessionRotation() {
-    if (this.rotationTimer) {
-      clearInterval(this.rotationTimer);
-      this.rotationTimer = null;
-    }
-  }
-  // Opt-in wedge watchdog: reuse the rotation check cadence (5min) to look for
-  // the one session wedged on "Updating" and rotate just that one.
-  startWedgeWatchdog() {
-    this.stopWedgeWatchdog();
-    if (!this.dataProvider.featureFlags?.wedgeWatchdog) {
-      return;
-    }
-    this.wedgeWatchdogTimer = setInterval(
-      () => this.runWedgeWatchdogCheck(),
-      ROTATION_CHECK_INTERVAL_MS
-    );
-    this.log.info(
-      `Wedge watchdog: checking every ${ROTATION_CHECK_INTERVAL_MS / 6e4}min`
-    );
-  }
-  stopWedgeWatchdog() {
-    if (this.wedgeWatchdogTimer) {
-      clearInterval(this.wedgeWatchdogTimer);
-      this.wedgeWatchdogTimer = null;
-    }
-  }
-  // Rotate exactly the sessions the pure rule flags as wedged. Closing is the
-  // same graceful-then-force path age rotation uses, so a false positive just
-  // re-CASEs the controller.
-  runWedgeWatchdogCheck() {
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      const now = Date.now();
-      const closes = [];
-      for (const s of [...sessionManager.sessions]) {
-        if (s.isClosing) continue;
-        const startedAt = this.sessionStartedAt.get(s.id);
-        const sessionAgeMs = startedAt != null ? now - startedAt : 0;
-        const lastImAt = this.lastImRequestAt.get(s);
-        const lastImRequestMsAgo = lastImAt != null ? now - lastImAt : null;
-        const lastRotatedAt = this.wedgeLastRotatedAt.get(s);
-        const lastRotatedMsAgo = lastRotatedAt != null ? now - lastRotatedAt : null;
-        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
-        );
-        this.log.info(
-          `Wedge watchdog: rotating session ${s.id}, no inbound interaction for ${silenceMin}min`
-        );
-        this.wedgeLastRotatedAt.set(s, now);
-        closes.push(
-          s.initiateClose().catch(() => {
-            return s.initiateForceClose({
-              cause: new Error("wedge watchdog, forcing")
-            });
-          })
-        );
-      }
-      if (closes.length > 0) {
-        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
-      }
-    } catch {
-    }
-  }
-  // Poll the interface addresses mDNS advertises and re-announce when they
-  // change. matter.js caches the operational records at first announcement, so
-  // a dynamic ISP IPv6 prefix change keeps advertising the dead global address
-  // until a restart (#415). refreshOperationalAdvertisement re-runs the lookup.
-  startMdnsAddressWatch() {
-    this.stopMdnsAddressWatch();
-    const { netInterface, stripGlobalIpv6, ipv4Enabled } = this.readMdnsWatchSettings();
-    this.advertisedAddressSnapshot = collectAdvertisedAddresses(
-      os10.networkInterfaces(),
-      netInterface,
-      stripGlobalIpv6,
-      ipv4Enabled
-    );
-    this.mdnsAddressTimer = setInterval(() => {
-      if (this.mdnsCheckInFlight) return;
-      this.mdnsCheckInFlight = true;
-      this.checkAdvertisedAddresses().catch((e) => {
-        this.log.warn("mDNS address check failed:", e);
-      }).finally(() => {
-        this.mdnsCheckInFlight = false;
-      });
-    }, MDNS_ADDRESS_CHECK_INTERVAL_MS2);
-  }
-  stopMdnsAddressWatch() {
-    if (this.mdnsAddressTimer) {
-      clearInterval(this.mdnsAddressTimer);
-      this.mdnsAddressTimer = null;
-    }
-  }
-  // Read the mDNS settings the shared setup applied. MdnsService lives on the
-  // root env and stripGlobalIpv6 swaps in a FilteredNetwork, so both are
-  // visible from the bridge env.
-  readMdnsWatchSettings() {
-    try {
-      const mdns2 = this.server.env.get(MdnsService);
-      const stripGlobalIpv6 = this.server.env.get(Network) instanceof FilteredNetwork;
-      return {
-        netInterface: mdns2.limitedToNetInterface,
-        stripGlobalIpv6,
-        ipv4Enabled: mdns2.enableIpv4
-      };
-    } catch {
-      return { stripGlobalIpv6: false, ipv4Enabled: true };
-    }
-  }
-  async checkAdvertisedAddresses() {
-    const { netInterface, stripGlobalIpv6, ipv4Enabled } = this.readMdnsWatchSettings();
-    const advertiser = this.server.env.get(DeviceAdvertiser);
-    const fabrics = this.server.env.get(FabricManager);
-    this.advertisedAddressSnapshot = await runMdnsAddressWatchTick({
-      readInterfaces: () => os10.networkInterfaces(),
-      netInterface,
-      stripGlobalIpv6,
-      ipv4Enabled,
-      currentSnapshot: this.advertisedAddressSnapshot,
-      fabrics: () => fabrics.fabrics,
-      refresh: (fabric) => advertiser.refreshOperationalAdvertisement(fabric),
-      onChange: (prev, curr) => {
-        this.log.warn(
-          `Advertised address set changed (${prev.length} -> ${curr.length} addresses), re-announcing operational mDNS (#415)`
-        );
-      }
-    });
-  }
-  // Resolve session rotation max age. Bridge config wins, then env var,
-  // then built-in default. 0 disables, otherwise clamped to range.
-  readSessionMaxAgeHours() {
-    const { min, max } = SESSION_MAX_AGE_HOURS_RANGE;
-    const fromConfig = this.dataProvider.sessionMaxAgeHours;
-    if (fromConfig != null && Number.isFinite(fromConfig) && fromConfig >= 0) {
-      if (fromConfig === 0) return 0;
-      if (fromConfig < min) return min;
-      if (fromConfig > max) return max;
-      return fromConfig;
-    }
-    const raw = process.env.HAMH_MATTER_SESSION_MAX_AGE_HOURS;
-    const parsed = parseSessionMaxAgeHours(raw);
-    if (parsed == null) {
-      this.log.warn(
-        `Invalid HAMH_MATTER_SESSION_MAX_AGE_HOURS=${raw}, falling back to ${DEFAULT_SESSION_MAX_AGE_HOURS}h`
-      );
-      return DEFAULT_SESSION_MAX_AGE_HOURS;
-    }
-    return parsed;
-  }
-  // Gracefully close sessions older than maxSessionAgeMs so controllers
-  // re-establish CASE and re-subscribe. Stale (0-sub) sessions are handled
-  // by the existing dead-session path, so only rotate ones with subscriptions.
-  rotateAgedSessions() {
-    if (this.maxSessionAgeMs === 0) return;
-    try {
-      const sessionManager = this.server.env.get(SessionManager);
-      const now = Date.now();
-      const closes = [];
-      for (const s of [...sessionManager.sessions]) {
-        const startedAt = this.sessionStartedAt.get(s.id);
-        if (startedAt == null) continue;
-        const ageMs = now - startedAt;
-        if (ageMs < this.maxSessionAgeMs || s.isClosing || s.subscriptions.size === 0) {
-          continue;
-        }
-        const ageMin = Math.round(ageMs / 6e4);
-        this.log.info(
-          `Rotating session ${s.id} (peer ${s.peerNodeId}, age ${ageMin}min, subs ${s.subscriptions.size})`
-        );
-        closes.push(
-          s.initiateClose().catch(() => {
-            return s.initiateForceClose({
-              cause: new Error("session rotation, forcing")
-            });
-          })
-        );
-      }
-      if (closes.length > 0) {
-        Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());
-      }
-    } catch {
-    }
-  }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {
       clearInterval(this.autoForceSyncTimer);