@ecopoesis/homebridge-dmx 0.2.0 → 0.3.0

package/dist/platform.d.ts

@@ -8,6 +8,7 @@ export declare class DmxPlatform implements DynamicPlatformPlugin {
     readonly accessories: PlatformAccessory[];
     private cfg;
     private controllers;
+    private registry;
     constructor(log: Logger, config: PlatformConfig, api: API);
     private makeController;
     /** Called by Homebridge for each cached accessory at startup. */

package/dist/platform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,YAAY,CAAC;AAQpB,qBAAa,WAAY,YAAW,qBAAqB;aASrC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAV1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAC;IACtD,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAEtD,OAAO,CAAC,GAAG,CAA6B;IACxC,OAAO,CAAC,WAAW,CAAsC;gBAGvC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAgC1B,OAAO,CAAC,cAAc;IAStB,iEAAiE;IACjE,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAKtD,OAAO,CAAC,eAAe;CA0DxB"}
+{"version":3,"file":"platform.d.ts","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,GAAG,EACH,cAAc,EACd,qBAAqB,EACrB,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,OAAO,EACR,MAAM,YAAY,CAAC;AASpB,qBAAa,WAAY,YAAW,qBAAqB;aAUrC,GAAG,EAAE,MAAM;aACX,MAAM,EAAE,cAAc;aACtB,GAAG,EAAE,GAAG;IAX1B,SAAgB,OAAO,EAAE,OAAO,OAAO,CAAC;IACxC,SAAgB,cAAc,EAAE,OAAO,cAAc,CAAC;IACtD,SAAgB,WAAW,EAAE,iBAAiB,EAAE,CAAM;IAEtD,OAAO,CAAC,GAAG,CAA6B;IACxC,OAAO,CAAC,WAAW,CAAsC;IACzD,OAAO,CAAC,QAAQ,CAAuB;gBAGrB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,GAAG;IAgC1B,OAAO,CAAC,cAAc;IAStB,iEAAiE;IACjE,kBAAkB,CAAC,SAAS,EAAE,iBAAiB,GAAG,IAAI;IAKtD,OAAO,CAAC,eAAe;CA0DxB"}

package/dist/platform.js

@@ -6,6 +6,7 @@
 import { loadConfig } from './config.js';
 import { StickController } from './controller.js';
 import { StickFixture } from './platformAccessory.js';
+import { StateRegistry } from './stateRegistry.js';
 import { ZoneFixture } from './zoneAccessory.js';
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
 export class DmxPlatform {
@@ -17,6 +18,7 @@ export class DmxPlatform {
     accessories = [];
     cfg = null;
     controllers = new Map();
+    registry = new StateRegistry();
     constructor(log, config, api) {
         this.log = log;
         this.config = config;
@@ -72,13 +74,13 @@ export class DmxPlatform {
             if (existing) {
                 this.log.debug(`wiring cached accessory ${fx.id}`);
                 existing.context.fixture = { id: fx.id, controllerId: fx.controller.id };
-                new StickFixture(this, existing, fx, controller);
+                new StickFixture(this, existing, fx, controller, this.registry);
             }
             else {
                 this.log.info(`registering new accessory: ${fx.name} (${fx.id})`);
                 const accessory = new this.api.platformAccessory(fx.name, uuid);
                 accessory.context.fixture = { id: fx.id, controllerId: fx.controller.id };
-                new StickFixture(this, accessory, fx, controller);
+                new StickFixture(this, accessory, fx, controller, this.registry);
                 this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
                 this.accessories.push(accessory);
             }
@@ -91,13 +93,13 @@ export class DmxPlatform {
             if (existing) {
                 this.log.debug(`wiring cached zone ${zone.id}`);
                 existing.context.zone = { id: zone.id };
-                new ZoneFixture(this, existing, zone, this.controllers);
+                new ZoneFixture(this, existing, zone, this.controllers, this.registry);
             }
             else {
                 this.log.info(`registering new zone: ${zone.name} (${zone.id}, ${zone.members.length} members)`);
                 const accessory = new this.api.platformAccessory(zone.name, uuid);
                 accessory.context.zone = { id: zone.id };
-                new ZoneFixture(this, accessory, zone, this.controllers);
+                new ZoneFixture(this, accessory, zone, this.controllers, this.registry);
                 this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
                 this.accessories.push(accessory);
             }

package/dist/platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platform.js","sourceRoot":"","sources":["../src/platform.ts"],"names":[],"mappings":"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"}

package/dist/platformAccessory.d.ts

@@ -2,17 +2,17 @@ import type { PlatformAccessory } from 'homebridge';
 import { Fixture } from './config.js';
 import { StickController } from './controller.js';
 import type { DmxPlatform } from './platform.js';
+import { StateRegistry } from './stateRegistry.js';
 export declare class StickFixture {
     private readonly platform;
     private readonly accessory;
     private readonly fixture;
     private readonly controller;
-    /** Current HomeKit state we'll send to the Stick on the next push. */
-    private state;
-    /** Debounce timer for HomeKit's multi-characteristic dispatch
-     *  (Hue/Saturation/Brightness arrive as 3 separate set calls). */
+    private readonly registry;
     private pending;
-    constructor(platform: DmxPlatform, accessory: PlatformAccessory, fixture: Fixture, controller: StickController);
+    private bulb;
+    constructor(platform: DmxPlatform, accessory: PlatformAccessory, fixture: Fixture, controller: StickController, registry: StateRegistry);
+    private pushFromRegistry;
     private schedule;
 }
 //# sourceMappingURL=platformAccessory.d.ts.map

package/dist/platformAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,qBAAa,YAAY;IASrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAX7B,sEAAsE;IACtE,OAAO,CAAC,KAAK,CAAqD;IAElE;sEACkE;IAClE,OAAO,CAAC,OAAO,CAA+B;gBAG3B,QAAQ,EAAE,WAAW,EACrB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,eAAe;IA6D9C,OAAO,CAAC,QAAQ;CAcjB"}
+{"version":3,"file":"platformAccessory.d.ts","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAEV,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,qBAAa,YAAY;IAKrB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAR3B,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,IAAI,CAAU;gBAGH,QAAQ,EAAE,WAAW,EACrB,SAAS,EAAE,iBAAiB,EAC5B,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,eAAe,EAC3B,QAAQ,EAAE,aAAa;IAoE1C,OAAO,CAAC,gBAAgB;IAaxB,OAAO,CAAC,QAAQ;CAcjB"}

package/dist/platformAccessory.js

@@ -1,80 +1,109 @@
 // StickFixture — one HomeKit Lightbulb accessory per patched fixture.
+//
+// State is owned by the platform-wide StateRegistry. We read on .onGet,
+// write on .onSet, and subscribe to changes so the HomeKit-displayed
+// values track the registry (e.g. when a zone updates this fixture).
 import { CHARACTERISTIC_UPDATE_DELAY_MS } from './settings.js';
 export class StickFixture {
     platform;
     accessory;
     fixture;
     controller;
-    /** Current HomeKit state we'll send to the Stick on the next push. */
-    state = { on: false, brightness: 100 };
-    /** Debounce timer for HomeKit's multi-characteristic dispatch
-     *  (Hue/Saturation/Brightness arrive as 3 separate set calls). */
+    registry;
     pending = null;
-    constructor(platform, accessory, fixture, controller) {
+    bulb;
+    constructor(platform, accessory, fixture, controller, registry) {
         this.platform = platform;
         this.accessory = accessory;
         this.fixture = fixture;
         this.controller = controller;
+        this.registry = registry;
         const C = platform.Characteristic;
         const info = accessory.getService(platform.Service.AccessoryInformation);
         info?.setCharacteristic(C.Manufacturer, 'Stick-DE3 DMX')
             ?.setCharacteristic(C.Model, fixture.profile.name)
             ?.setCharacteristic(C.SerialNumber, fixture.id);
-        const bulb = accessory.getService(platform.Service.Lightbulb)
-            ?? accessory.addService(platform.Service.Lightbulb, fixture.name);
-        bulb.setCharacteristic(C.Name, fixture.name);
+        this.bulb =
+            accessory.getService(platform.Service.Lightbulb)
+                ?? accessory.addService(platform.Service.Lightbulb, fixture.name);
+        this.bulb.setCharacteristic(C.Name, fixture.name);
         const chars = fixture.profile.model.characteristics;
-        bulb.getCharacteristic(C.On)
-            .onGet(() => this.state.on)
-            .onSet((v) => { this.state.on = Boolean(v); this.schedule(); });
+        this.bulb.getCharacteristic(C.On)
+            .onGet(() => registry.get(fixture.id).on)
+            .onSet((v) => {
+            registry.update(fixture.id, { on: Boolean(v) });
+            this.schedule();
+        });
         if (chars.includes('Brightness')) {
-            bulb.getCharacteristic(C.Brightness)
-                .onGet(() => this.state.brightness)
+            this.bulb.getCharacteristic(C.Brightness)
+                .onGet(() => registry.get(fixture.id).brightness)
                 .onSet((v) => {
-                this.state.brightness = Number(v);
+                registry.update(fixture.id, { brightness: Number(v) });
                 this.schedule();
             });
         }
         if (chars.includes('Hue')) {
-            bulb.getCharacteristic(C.Hue)
-                .onGet(() => this.state.hue ?? 0)
+            this.bulb.getCharacteristic(C.Hue)
+                .onGet(() => registry.get(fixture.id).hue ?? 0)
                 .onSet((v) => {
-                this.state.hue = Number(v);
-                // setting hue implies color mode (sat>0); leave saturation as-is
+                registry.update(fixture.id, { hue: Number(v) });
                 this.schedule();
             });
         }
         if (chars.includes('Saturation')) {
-            bulb.getCharacteristic(C.Saturation)
-                .onGet(() => this.state.saturation ?? 0)
+            this.bulb.getCharacteristic(C.Saturation)
+                .onGet(() => registry.get(fixture.id).saturation ?? 0)
                 .onSet((v) => {
-                this.state.saturation = Number(v);
+                registry.update(fixture.id, { saturation: Number(v) });
                 this.schedule();
             });
         }
         if (chars.includes('ColorTemperature')) {
-            bulb.getCharacteristic(C.ColorTemperature)
-                .onGet(() => this.state.colorTemperatureMireds ?? 200)
+            this.bulb.getCharacteristic(C.ColorTemperature)
+                .onGet(() => registry.get(fixture.id).colorTemperatureMireds ?? 200)
                 .onSet((v) => {
-                this.state.colorTemperatureMireds = Number(v);
-                // CCT mode: HomeKit toggles between color and white modes; we mirror
-                // by zeroing saturation when CCT is changed.
-                this.state.saturation = 0;
+                // CCT change implies white mode; zero saturation.
+                registry.update(fixture.id, {
+                    colorTemperatureMireds: Number(v),
+                    saturation: 0,
+                });
                 this.schedule();
             });
         }
+        // Refresh HomeKit characteristics whenever this fixture's state changes
+        // in the registry (e.g. via a zone set, or another channel of itself).
+        registry.onChange((changedId) => {
+            if (changedId !== fixture.id)
+                return;
+            this.pushFromRegistry();
+        });
+    }
+    pushFromRegistry() {
+        const s = this.registry.get(this.fixture.id);
+        const C = this.platform.Characteristic;
+        const chars = this.fixture.profile.model.characteristics;
+        this.bulb.updateCharacteristic(C.On, s.on);
+        if (chars.includes('Brightness'))
+            this.bulb.updateCharacteristic(C.Brightness, s.brightness);
+        if (chars.includes('Hue') && s.hue != null)
+            this.bulb.updateCharacteristic(C.Hue, s.hue);
+        if (chars.includes('Saturation') && s.saturation != null)
+            this.bulb.updateCharacteristic(C.Saturation, s.saturation);
+        if (chars.includes('ColorTemperature') && s.colorTemperatureMireds != null) {
+            this.bulb.updateCharacteristic(C.ColorTemperature, s.colorTemperatureMireds);
+        }
     }
     schedule() {
         if (this.pending)
             clearTimeout(this.pending);
         this.pending = setTimeout(() => {
             this.pending = null;
-            const s = this.state;
+            const s = this.registry.get(this.fixture.id);
             this.platform.log.info(`[${this.fixture.id}] HK set: on=${s.on} br=${s.brightness}` +
                 (s.hue != null ? ` h=${s.hue}` : '') +
                 (s.saturation != null ? ` s=${s.saturation}` : '') +
                 (s.colorTemperatureMireds != null ? ` ct=${s.colorTemperatureMireds}` : ''));
-            this.controller.setFixture(this.fixture, this.state);
+            this.controller.setFixture(this.fixture, s);
         }, CHARACTERISTIC_UPDATE_DELAY_MS);
     }
 }

package/dist/platformAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"platformAccessory.js","sourceRoot":"","sources":["../src/platformAccessory.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,wEAAwE;AACxE,qEAAqE;AACrE,qEAAqE;AAYrE,OAAO,EAAE,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAG/D,MAAM,OAAO,YAAY;IAKJ;IACA;IACA;IACA;IACA;IARX,OAAO,GAA0B,IAAI,CAAC;IACtC,IAAI,CAAU;IAEtB,YACmB,QAAqB,EACrB,SAA4B,EAC5B,OAAgB,EAChB,UAA2B,EAC3B,QAAuB;QAJvB,aAAQ,GAAR,QAAQ,CAAa;QACrB,cAAS,GAAT,SAAS,CAAmB;QAC5B,YAAO,GAAP,OAAO,CAAS;QAChB,eAAU,GAAV,UAAU,CAAiB;QAC3B,aAAQ,GAAR,QAAQ,CAAe;QAExC,MAAM,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC;QAClC,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACzE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,YAAY,EAAE,eAAe,CAAC;YACpD,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;YAClD,EAAE,iBAAiB,CAAC,CAAC,CAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI;YACP,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;mBAC7C,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEpE,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAElD,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;aAC9B,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;aACxC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,CAAC,CAAC,CAAC;QAEL,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC;iBACtC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC;iBAChD,KAAK,CAAC,CAAC,CAAsB,EAAE,EAAE;gBAChC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC;iBAC/B,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;iBAC9C,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAChD,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC;iBACtC,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC;iBACrD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACvD,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,IAAI,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB,CAAC;iBAC5C,KAAK,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,sBAAsB,IAAI,GAAG,CAAC;iBACnE,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,kDAAkD;gBAClD,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE;oBAC1B,sBAAsB,EAAE,MAAM,CAAC,CAAC,CAAC;oBACjC,UAAU,EAAE,CAAC;iBACd,CAAC,CAAC;gBACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;QAED,wEAAwE;QACxE,uEAAuE;QACvE,QAAQ,CAAC,QAAQ,CAAC,CAAC,SAAS,EAAE,EAAE;YAC9B,IAAI,SAAS,KAAK,OAAO,CAAC,EAAE;gBAAE,OAAO;YACrC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,gBAAgB;QACtB,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC7C,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC;QACzD,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC3C,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC;YAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;QAC7F,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;QACzF,IAAI,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,UAAU,IAAI,IAAI;YAAE,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;QACrH,IAAI,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,sBAAsB,IAAI,IAAI,EAAE,CAAC;YAC3E,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,sBAAsB,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAEO,QAAQ;QACd,IAAI,IAAI,CAAC,OAAO;YAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,MAAM,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CACpB,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,UAAU,EAAE;gBAC5D,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpC,CAAC,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,CAAC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC5E,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC9C,CAAC,EAAE,8BAA8B,CAAC,CAAC;IACrC,CAAC;CACF"}

package/dist/stateRegistry.d.ts

@@ -0,0 +1,21 @@
+import { HomeKitLightState } from './color/types.js';
+export type StateChangeListener = (fixtureId: string) => void;
+export declare class StateRegistry {
+    private states;
+    private listeners;
+    get(id: string): HomeKitLightState;
+    /** Replace a fixture's state and fire change listeners. */
+    set(id: string, state: HomeKitLightState): void;
+    /** Merge a partial update into a fixture's state, returning the new full
+     *  state. Fires listeners. */
+    update(id: string, patch: Partial<HomeKitLightState>): HomeKitLightState;
+    onChange(cb: StateChangeListener): () => void;
+}
+/** Bucket members' values; return the value with the largest bucket. Ties
+ *  break in favour of the value held by the first member in
+ *  alphabetical-id order. */
+export declare function pickMajority<T>(items: Array<{
+    id: string;
+    v: T;
+}>): T | undefined;
+//# sourceMappingURL=stateRegistry.d.ts.map

package/dist/stateRegistry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stateRegistry.d.ts","sourceRoot":"","sources":["../src/stateRegistry.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,MAAM,MAAM,mBAAmB,GAAG,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;AAI9D,qBAAa,aAAa;IACxB,OAAO,CAAC,MAAM,CAAwC;IACtD,OAAO,CAAC,SAAS,CAAkC;IAEnD,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,iBAAiB;IAIlC,2DAA2D;IAC3D,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,GAAG,IAAI;IAK/C;kCAC8B;IAC9B,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAAG,iBAAiB;IAMxE,QAAQ,CAAC,EAAE,EAAE,mBAAmB,GAAG,MAAM,IAAI;CAI9C;AAED;;6BAE6B;AAC7B,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,CAAC,CAAA;CAAE,CAAC,GAAG,CAAC,GAAG,SAAS,CAoBjF"}

package/dist/stateRegistry.js

@@ -0,0 +1,65 @@
+// StateRegistry — central store of every fixture's HomeKit-visible state.
+//
+// Every StickFixture and ZoneFixture reads/writes through here. Whenever a
+// fixture's state changes, listeners fire so zones can refresh their own
+// HomeKit characteristics (and vice versa: setting a zone updates each
+// member's state in the registry, which fires events, which prompt the
+// per-fixture accessories to update their HomeKit-displayed state).
+//
+// Majority rule for zone state: see pickMajority() — count occurrences of
+// each value across (alphabetically-sorted) members; largest count wins;
+// ties are broken in favour of the value held by the alphabetically-first
+// member.
+const DEFAULT_STATE = { on: false, brightness: 100 };
+export class StateRegistry {
+    states = new Map();
+    listeners = new Set();
+    get(id) {
+        return this.states.get(id) ?? { ...DEFAULT_STATE };
+    }
+    /** Replace a fixture's state and fire change listeners. */
+    set(id, state) {
+        this.states.set(id, { ...state });
+        for (const l of this.listeners)
+            l(id);
+    }
+    /** Merge a partial update into a fixture's state, returning the new full
+     *  state. Fires listeners. */
+    update(id, patch) {
+        const next = { ...this.get(id), ...patch };
+        this.set(id, next);
+        return next;
+    }
+    onChange(cb) {
+        this.listeners.add(cb);
+        return () => this.listeners.delete(cb);
+    }
+}
+/** Bucket members' values; return the value with the largest bucket. Ties
+ *  break in favour of the value held by the first member in
+ *  alphabetical-id order. */
+export function pickMajority(items) {
+    if (items.length === 0)
+        return undefined;
+    const sorted = items.slice().sort((a, b) => a.id.localeCompare(b.id));
+    const counts = new Map();
+    for (let i = 0; i < sorted.length; i++) {
+        const v = sorted[i].v;
+        const rec = counts.get(v);
+        if (rec)
+            rec.count++;
+        else
+            counts.set(v, { count: 1, firstIdx: i });
+    }
+    let bestV = sorted[0].v;
+    let bestRec = counts.get(bestV);
+    for (const [v, rec] of counts) {
+        if (rec.count > bestRec.count ||
+            (rec.count === bestRec.count && rec.firstIdx < bestRec.firstIdx)) {
+            bestV = v;
+            bestRec = rec;
+        }
+    }
+    return bestV;
+}
+//# sourceMappingURL=stateRegistry.js.map

package/dist/stateRegistry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stateRegistry.js","sourceRoot":"","sources":["../src/stateRegistry.ts"],"names":[],"mappings":"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"}

package/dist/zoneAccessory.d.ts

@@ -1,14 +1,30 @@
 import type { PlatformAccessory } from 'homebridge';
-import { Zone } from './config.js';
+import { Fixture, Zone } from './config.js';
 import { StickController } from './controller.js';
 import type { DmxPlatform } from './platform.js';
+import { StateRegistry } from './stateRegistry.js';
 export declare class ZoneFixture {
     private readonly platform;
     private readonly zone;
     private readonly controllers;
-    private state;
+    private readonly registry;
     private pending;
-    constructor(platform: DmxPlatform, accessory: PlatformAccessory, zone: Zone, controllers: Map<string, StickController>);
-    private schedule;
+    private refreshPending;
+    private bulb;
+    constructor(platform: DmxPlatform, accessory: PlatformAccessory, zone: Zone, controllers: Map<string, StickController>, registry: StateRegistry);
+    /** Compute majority state across members, per characteristic. */
+    private majorityState;
+    /** A HomeKit set on the zone: build the new state from the current
+     *  majority + the patch the user is applying, write it into every
+     *  member, and trigger the controller after a small debounce so
+     *  multi-characteristic dispatch coalesces. */
+    private applyToMembers;
+    /** Debounced controller dispatch. Sends current registry state for each
+     *  member to the appropriate StickController. */
+    private scheduleDispatch;
+    /** Debounced refresh: when members change, push the new majority to
+     *  the zone's HomeKit characteristics. */
+    private scheduleRefresh;
 }
+export type _MemberRef = Fixture;
 //# sourceMappingURL=zoneAccessory.d.ts.map

package/dist/zoneAccessory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoneAccessory.d.ts","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAEV,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEnC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,qBAAa,WAAW;IAKpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAP9B,OAAO,CAAC,KAAK,CAAqD;IAClE,OAAO,CAAC,OAAO,CAA+B;gBAG3B,QAAQ,EAAE,WAAW,EACtC,SAAS,EAAE,iBAAiB,EACX,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC;IAkD5D,OAAO,CAAC,QAAQ;CAuBjB"}
+{"version":3,"file":"zoneAccessory.d.ts","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAEV,iBAAiB,EAElB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAgB,MAAM,oBAAoB,CAAC;AAEjE,qBAAa,WAAW;IAMpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAEzB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAT3B,OAAO,CAAC,OAAO,CAA+B;IAC9C,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,IAAI,CAAU;gBAGH,QAAQ,EAAE,WAAW,EACtC,SAAS,EAAE,iBAAiB,EACX,IAAI,EAAE,IAAI,EACV,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,EACzC,QAAQ,EAAE,aAAa;IAmD1C,iEAAiE;IACjE,OAAO,CAAC,aAAa;IAWrB;;;mDAG+C;IAC/C,OAAO,CAAC,cAAc;IAWtB;qDACiD;IACjD,OAAO,CAAC,gBAAgB;IAuBxB;8CAC0C;IAC1C,OAAO,CAAC,eAAe;CAqBxB;AAGD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC"}

package/dist/zoneAccessory.js

@@ -1,83 +1,146 @@
-// ZoneFixture — virtual HomeKit Lightbulb that dispatches to a set of
-// member fixtures. Setting any characteristic of the zone updates the
-// zone's local state, then calls controller.setFixture for each member
-// using the zone's current state. The single controller debounce
-// coalesces all member updates into one subprocess transaction.
+// ZoneFixture — virtual HomeKit Lightbulb that aggregates a set of member
+// fixtures.
 //
-// Per-member HomeKit accessories are NOT updated automatically. The user
-// has accepted this trade-off: last command wins, and partial overrides
-// of group commands are fine.
+// Reads: each .onGet returns the MAJORITY value of that characteristic
+// across the zone's members. Ties are broken in favour of the value held
+// by the alphabetically-first member. This gives a deterministic display
+// even when members are in split states.
+//
+// Writes: each .onSet updates every member's state in the registry (which
+// fires per-member change events so the individual fixture accessories
+// refresh their own HomeKit displays), then triggers the controller for
+// each member so the DMX wire reflects the change.
+//
+// When ANY member's state changes (by any path), the zone's HomeKit
+// characteristics push the new majority — so zones containing overlapping
+// members stay coherent with each other.
 import { CHARACTERISTIC_UPDATE_DELAY_MS } from './settings.js';
+import { pickMajority } from './stateRegistry.js';
 export class ZoneFixture {
     platform;
     zone;
     controllers;
-    state = { on: false, brightness: 100 };
+    registry;
     pending = null;
-    constructor(platform, accessory, zone, controllers) {
+    refreshPending = null;
+    bulb;
+    constructor(platform, accessory, zone, controllers, registry) {
         this.platform = platform;
         this.zone = zone;
         this.controllers = controllers;
+        this.registry = registry;
         const C = platform.Characteristic;
         const info = accessory.getService(platform.Service.AccessoryInformation);
         info?.setCharacteristic(C.Manufacturer, 'DMX')
             ?.setCharacteristic(C.Model, `Zone (${zone.members.length} fixtures)`)
             ?.setCharacteristic(C.SerialNumber, `zone-${zone.id}`);
-        const bulb = accessory.getService(platform.Service.Lightbulb)
-            ?? accessory.addService(platform.Service.Lightbulb, zone.name);
-        bulb.setCharacteristic(C.Name, zone.name);
-        // Always expose On.
-        bulb.getCharacteristic(C.On)
-            .onGet(() => this.state.on)
-            .onSet((v) => { this.state.on = Boolean(v); this.schedule(); });
+        this.bulb =
+            accessory.getService(platform.Service.Lightbulb)
+                ?? accessory.addService(platform.Service.Lightbulb, zone.name);
+        this.bulb.setCharacteristic(C.Name, zone.name);
         const has = (k) => zone.characteristics.includes(k);
+        this.bulb.getCharacteristic(C.On)
+            .onGet(() => this.majorityState().on)
+            .onSet((v) => this.applyToMembers({ on: Boolean(v) }));
         if (has('Brightness')) {
-            bulb.getCharacteristic(C.Brightness)
-                .onGet(() => this.state.brightness)
-                .onSet((v) => {
-                this.state.brightness = Number(v);
-                this.schedule();
-            });
+            this.bulb.getCharacteristic(C.Brightness)
+                .onGet(() => this.majorityState().brightness)
+                .onSet((v) => this.applyToMembers({ brightness: Number(v) }));
         }
         if (has('Hue')) {
-            bulb.getCharacteristic(C.Hue)
-                .onGet(() => this.state.hue ?? 0)
-                .onSet((v) => { this.state.hue = Number(v); this.schedule(); });
+            this.bulb.getCharacteristic(C.Hue)
+                .onGet(() => this.majorityState().hue ?? 0)
+                .onSet((v) => this.applyToMembers({ hue: Number(v) }));
         }
         if (has('Saturation')) {
-            bulb.getCharacteristic(C.Saturation)
-                .onGet(() => this.state.saturation ?? 0)
-                .onSet((v) => { this.state.saturation = Number(v); this.schedule(); });
+            this.bulb.getCharacteristic(C.Saturation)
+                .onGet(() => this.majorityState().saturation ?? 0)
+                .onSet((v) => this.applyToMembers({ saturation: Number(v) }));
         }
         if (has('ColorTemperature')) {
-            bulb.getCharacteristic(C.ColorTemperature)
-                .onGet(() => this.state.colorTemperatureMireds ?? 200)
-                .onSet((v) => {
-                this.state.colorTemperatureMireds = Number(v);
-                this.state.saturation = 0;
-                this.schedule();
-            });
+            this.bulb.getCharacteristic(C.ColorTemperature)
+                .onGet(() => this.majorityState().colorTemperatureMireds ?? 200)
+                .onSet((v) => this.applyToMembers({
+                colorTemperatureMireds: Number(v),
+                saturation: 0,
+            }));
+        }
+        // Refresh on any member change.
+        const memberIds = new Set(zone.members.map((m) => m.id));
+        registry.onChange((id) => {
+            if (memberIds.has(id))
+                this.scheduleRefresh();
+        });
+    }
+    /** Compute majority state across members, per characteristic. */
+    majorityState() {
+        const ss = this.zone.members.map((m) => ({ id: m.id, state: this.registry.get(m.id) }));
+        return {
+            on: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.on }))) ?? false,
+            brightness: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.brightness }))) ?? 100,
+            hue: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.hue }))),
+            saturation: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.saturation }))),
+            colorTemperatureMireds: pickMajority(ss.map((s) => ({ id: s.id, v: s.state.colorTemperatureMireds }))),
+        };
+    }
+    /** A HomeKit set on the zone: build the new state from the current
+     *  majority + the patch the user is applying, write it into every
+     *  member, and trigger the controller after a small debounce so
+     *  multi-characteristic dispatch coalesces. */
+    applyToMembers(patch) {
+        const next = { ...this.majorityState(), ...patch };
+        // Push the next state into every member's registry entry. This fires
+        // per-fixture change events so the individual StickFixture accessories
+        // refresh their own HomeKit displays.
+        for (const m of this.zone.members) {
+            this.registry.update(m.id, next);
         }
+        this.scheduleDispatch();
     }
-    schedule() {
+    /** Debounced controller dispatch. Sends current registry state for each
+     *  member to the appropriate StickController. */
+    scheduleDispatch() {
         if (this.pending)
             clearTimeout(this.pending);
         this.pending = setTimeout(() => {
             this.pending = null;
-            const s = this.state;
+            const s = this.majorityState();
             this.platform.log.info(`[zone:${this.zone.id}] HK set: on=${s.on} br=${s.brightness}` +
                 (s.hue != null ? ` h=${s.hue}` : '') +
                 (s.saturation != null ? ` s=${s.saturation}` : '') +
                 (s.colorTemperatureMireds != null ? ` ct=${s.colorTemperatureMireds}` : '') +
                 ` → ${this.zone.members.length} members`);
-            // Dispatch the zone's state to each member via that member's controller.
             for (const m of this.zone.members) {
                 const c = this.controllers.get(m.controller.id);
                 if (!c) {
                     this.platform.log.error(`zone "${this.zone.id}": no controller for "${m.id}"`);
                     continue;
                 }
-                c.setFixture(m, this.state);
+                c.setFixture(m, this.registry.get(m.id));
+            }
+        }, CHARACTERISTIC_UPDATE_DELAY_MS);
+    }
+    /** Debounced refresh: when members change, push the new majority to
+     *  the zone's HomeKit characteristics. */
+    scheduleRefresh() {
+        if (this.refreshPending)
+            clearTimeout(this.refreshPending);
+        this.refreshPending = setTimeout(() => {
+            this.refreshPending = null;
+            const s = this.majorityState();
+            const C = this.platform.Characteristic;
+            this.bulb.updateCharacteristic(C.On, s.on);
+            if (this.zone.characteristics.includes('Brightness')) {
+                this.bulb.updateCharacteristic(C.Brightness, s.brightness);
+            }
+            if (this.zone.characteristics.includes('Hue') && s.hue != null) {
+                this.bulb.updateCharacteristic(C.Hue, s.hue);
+            }
+            if (this.zone.characteristics.includes('Saturation') && s.saturation != null) {
+                this.bulb.updateCharacteristic(C.Saturation, s.saturation);
+            }
+            if (this.zone.characteristics.includes('ColorTemperature') && s.colorTemperatureMireds != null) {
+                this.bulb.updateCharacteristic(C.ColorTemperature, s.colorTemperatureMireds);
             }
         }, CHARACTERISTIC_UPDATE_DELAY_MS);
     }

package/dist/zoneAccessory.js.map

@@ -1 +1 @@
-{"version":3,"file":"zoneAccessory.js","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,sEAAsE;AACtE,uEAAuE;AACvE,iEAAiE;AACjE,gEAAgE;AAChE,EAAE;AACF,yEAAyE;AACzE,wEAAwE;AACxE,8BAA8B;AAY9B,OAAO,EAAE,8BAA8B,EAAE,MAAM,eAAe,CAAC;AAE/D,MAAM,OAAO,WAAW;IAKH;IAEA;IACA;IAPX,KAAK,GAAsB,EAAE,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;IAC1D,OAAO,GAA0B,IAAI,CAAC;IAE9C,YACmB,QAAqB,EACtC,SAA4B,EACX,IAAU,EACV,WAAyC;QAHzC,aAAQ,GAAR,QAAQ,CAAa;QAErB,SAAI,GAAJ,IAAI,CAAM;QACV,gBAAW,GAAX,WAAW,CAA8B;QAE1D,MAAM,CAAC,GAAG,QAAQ,CAAC,cAAc,CAAC;QAClC,MAAM,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACzE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,YAAY,EAAE,KAAK,CAAC;YAC1C,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,IAAI,CAAC,OAAO,CAAC,MAAM,YAAY,CAAC;YACtE,EAAE,iBAAiB,CAAC,CAAC,CAAC,YAAY,EAAE,QAAQ,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAE3D,MAAM,IAAI,GACR,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC;eAC7C,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAE1C,oBAAoB;QACpB,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC;aACzB,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;aAC1B,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE,MAAM,GAAG,GAAG,CAAC,CAAmB,EAAW,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE/E,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC;iBACjC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC;iBAClC,KAAK,CAAC,CAAC,CAAsB,EAAE,EAAE;gBAChC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClC,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,IAAI,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACf,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC;iBAC1B,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;iBAChC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,UAAU,CAAC;iBACjC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC;iBACvC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,gBAAgB,CAAC;iBACvC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,sBAAsB,IAAI,GAAG,CAAC;iBACrD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBACX,IAAI,CAAC,KAAK,CAAC,sBAAsB,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAC9C,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC;gBAC1B,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC;IAEO,QAAQ;QACd,IAAI,IAAI,CAAC,OAAO;YAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC7B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CACpB,SAAS,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,UAAU,EAAE;gBAC9D,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACpC,CAAC,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClD,CAAC,CAAC,CAAC,sBAAsB,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3E,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,UAAU,CACzC,CAAC;YACF,yEAAyE;YACzE,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;gBAClC,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBAChD,IAAI,CAAC,CAAC,EAAE,CAAC;oBACP,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,EAAE,yBAAyB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;oBAC/E,SAAS;gBACX,CAAC;gBACD,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC,EAAE,8BAA8B,CAAC,CAAC;IACrC,CAAC;CACF"}
+{"version":3,"file":"zoneAccessory.js","sourceRoot":"","sources":["../src/zoneAccessory.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ecopoesis/homebridge-dmx",
   "displayName": "DMX",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Homebridge platform for DMX controllers (currently Nicolaudie Stick-DE3)",
   "license": "Apache-2.0",
   "type": "module",

package/src/platform.ts

@@ -17,6 +17,7 @@ import type {
 import { Controller, LoadedConfig, loadConfig, RawConfig } from './config.js';
 import { StickController } from './controller.js';
 import { StickFixture } from './platformAccessory.js';
+import { StateRegistry } from './stateRegistry.js';
 import { ZoneFixture } from './zoneAccessory.js';
 import { PLATFORM_NAME, PLUGIN_NAME } from './settings.js';
 
@@ -27,6 +28,7 @@ export class DmxPlatform implements DynamicPlatformPlugin {
 
   private cfg: LoadedConfig | null = null;
   private controllers = new Map<string, StickController>();
+  private registry = new StateRegistry();
 
   constructor(
     public readonly log: Logger,
@@ -96,12 +98,12 @@ export class DmxPlatform implements DynamicPlatformPlugin {
       if (existing) {
         this.log.debug(`wiring cached accessory ${fx.id}`);
         existing.context.fixture = { id: fx.id, controllerId: fx.controller.id };
-        new StickFixture(this, existing, fx, controller);
+        new StickFixture(this, existing, fx, controller, this.registry);
       } else {
         this.log.info(`registering new accessory: ${fx.name} (${fx.id})`);
         const accessory = new this.api.platformAccessory(fx.name, uuid);
         accessory.context.fixture = { id: fx.id, controllerId: fx.controller.id };
-        new StickFixture(this, accessory, fx, controller);
+        new StickFixture(this, accessory, fx, controller, this.registry);
         this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
         this.accessories.push(accessory);
       }
@@ -115,12 +117,12 @@ export class DmxPlatform implements DynamicPlatformPlugin {
       if (existing) {
         this.log.debug(`wiring cached zone ${zone.id}`);
         existing.context.zone = { id: zone.id };
-        new ZoneFixture(this, existing, zone, this.controllers);
+        new ZoneFixture(this, existing, zone, this.controllers, this.registry);
       } else {
         this.log.info(`registering new zone: ${zone.name} (${zone.id}, ${zone.members.length} members)`);
         const accessory = new this.api.platformAccessory(zone.name, uuid);
         accessory.context.zone = { id: zone.id };
-        new ZoneFixture(this, accessory, zone, this.controllers);
+        new ZoneFixture(this, accessory, zone, this.controllers, this.registry);
         this.api.registerPlatformAccessories(PLUGIN_NAME, PLATFORM_NAME, [accessory]);
         this.accessories.push(accessory);
       }

package/src/platformAccessory.ts

@@ -1,4 +1,8 @@
 // StickFixture — one HomeKit Lightbulb accessory per patched fixture.
+//
+// State is owned by the platform-wide StateRegistry. We read on .onGet,
+// write on .onSet, and subscribe to changes so the HomeKit-displayed
+// values track the registry (e.g. when a zone updates this fixture).
 
 import type {
   CharacteristicValue,
@@ -11,20 +15,18 @@ import { HomeKitLightState } from './color/types.js';
 import { StickController } from './controller.js';
 import type { DmxPlatform } from './platform.js';
 import { CHARACTERISTIC_UPDATE_DELAY_MS } from './settings.js';
+import { StateRegistry } from './stateRegistry.js';
 
 export class StickFixture {
-  /** Current HomeKit state we'll send to the Stick on the next push. */
-  private state: HomeKitLightState = { on: false, brightness: 100 };
-
-  /** Debounce timer for HomeKit's multi-characteristic dispatch
-   *  (Hue/Saturation/Brightness arrive as 3 separate set calls). */
   private pending: NodeJS.Timeout | null = null;
+  private bulb: Service;
 
   constructor(
     private readonly platform: DmxPlatform,
     private readonly accessory: PlatformAccessory,
     private readonly fixture: Fixture,
     private readonly controller: StickController,
+    private readonly registry: StateRegistry,
   ) {
     const C = platform.Characteristic;
     const info = accessory.getService(platform.Service.AccessoryInformation);
@@ -32,71 +34,91 @@ export class StickFixture {
         ?.setCharacteristic(C.Model, fixture.profile.name)
         ?.setCharacteristic(C.SerialNumber, fixture.id);
 
-    const bulb: Service =
+    this.bulb =
       accessory.getService(platform.Service.Lightbulb)
       ?? accessory.addService(platform.Service.Lightbulb, fixture.name);
 
-    bulb.setCharacteristic(C.Name, fixture.name);
+    this.bulb.setCharacteristic(C.Name, fixture.name);
 
     const chars = fixture.profile.model.characteristics;
 
-    bulb.getCharacteristic(C.On)
-      .onGet(() => this.state.on)
-      .onSet((v) => { this.state.on = Boolean(v); this.schedule(); });
+    this.bulb.getCharacteristic(C.On)
+      .onGet(() => registry.get(fixture.id).on)
+      .onSet((v) => {
+        registry.update(fixture.id, { on: Boolean(v) });
+        this.schedule();
+      });
 
     if (chars.includes('Brightness')) {
-      bulb.getCharacteristic(C.Brightness)
-        .onGet(() => this.state.brightness)
+      this.bulb.getCharacteristic(C.Brightness)
+        .onGet(() => registry.get(fixture.id).brightness)
         .onSet((v: CharacteristicValue) => {
-          this.state.brightness = Number(v);
+          registry.update(fixture.id, { brightness: Number(v) });
           this.schedule();
         });
     }
-
     if (chars.includes('Hue')) {
-      bulb.getCharacteristic(C.Hue)
-        .onGet(() => this.state.hue ?? 0)
+      this.bulb.getCharacteristic(C.Hue)
+        .onGet(() => registry.get(fixture.id).hue ?? 0)
         .onSet((v) => {
-          this.state.hue = Number(v);
-          // setting hue implies color mode (sat>0); leave saturation as-is
+          registry.update(fixture.id, { hue: Number(v) });
           this.schedule();
         });
     }
-
     if (chars.includes('Saturation')) {
-      bulb.getCharacteristic(C.Saturation)
-        .onGet(() => this.state.saturation ?? 0)
+      this.bulb.getCharacteristic(C.Saturation)
+        .onGet(() => registry.get(fixture.id).saturation ?? 0)
         .onSet((v) => {
-          this.state.saturation = Number(v);
+          registry.update(fixture.id, { saturation: Number(v) });
           this.schedule();
         });
     }
-
     if (chars.includes('ColorTemperature')) {
-      bulb.getCharacteristic(C.ColorTemperature)
-        .onGet(() => this.state.colorTemperatureMireds ?? 200)
+      this.bulb.getCharacteristic(C.ColorTemperature)
+        .onGet(() => registry.get(fixture.id).colorTemperatureMireds ?? 200)
         .onSet((v) => {
-          this.state.colorTemperatureMireds = Number(v);
-          // CCT mode: HomeKit toggles between color and white modes; we mirror
-          // by zeroing saturation when CCT is changed.
-          this.state.saturation = 0;
+          // CCT change implies white mode; zero saturation.
+          registry.update(fixture.id, {
+            colorTemperatureMireds: Number(v),
+            saturation: 0,
+          });
           this.schedule();
         });
     }
+
+    // Refresh HomeKit characteristics whenever this fixture's state changes
+    // in the registry (e.g. via a zone set, or another channel of itself).
+    registry.onChange((changedId) => {
+      if (changedId !== fixture.id) return;
+      this.pushFromRegistry();
+    });
+  }
+
+  private pushFromRegistry(): void {
+    const s = this.registry.get(this.fixture.id);
+    const C = this.platform.Characteristic;
+    const chars = this.fixture.profile.model.characteristics;
+    this.bulb.updateCharacteristic(C.On, s.on);
+    if (chars.includes('Brightness')) this.bulb.updateCharacteristic(C.Brightness, s.brightness);
+    if (chars.includes('Hue') && s.hue != null) this.bulb.updateCharacteristic(C.Hue, s.hue);
+    if (chars.includes('Saturation') && s.saturation != null) this.bulb.updateCharacteristic(C.Saturation, s.saturation);
+    if (chars.includes('ColorTemperature') && s.colorTemperatureMireds != null) {
+      this.bulb.updateCharacteristic(C.ColorTemperature, s.colorTemperatureMireds);
+    }
   }
 
   private schedule(): void {
     if (this.pending) clearTimeout(this.pending);
     this.pending = setTimeout(() => {
       this.pending = null;
-      const s = this.state;
+      const s = this.registry.get(this.fixture.id);
       this.platform.log.info(
         `[${this.fixture.id}] HK set: on=${s.on} br=${s.brightness}` +
         (s.hue != null ? ` h=${s.hue}` : '') +
         (s.saturation != null ? ` s=${s.saturation}` : '') +
         (s.colorTemperatureMireds != null ? ` ct=${s.colorTemperatureMireds}` : ''),
       );
-      this.controller.setFixture(this.fixture, this.state);
+      this.controller.setFixture(this.fixture, s);
     }, CHARACTERISTIC_UPDATE_DELAY_MS);
   }
 }

package/src/stateRegistry.ts

@@ -0,0 +1,71 @@
+// StateRegistry — central store of every fixture's HomeKit-visible state.
+//
+// Every StickFixture and ZoneFixture reads/writes through here. Whenever a
+// fixture's state changes, listeners fire so zones can refresh their own
+// HomeKit characteristics (and vice versa: setting a zone updates each
+// member's state in the registry, which fires events, which prompt the
+// per-fixture accessories to update their HomeKit-displayed state).
+//
+// Majority rule for zone state: see pickMajority() — count occurrences of
+// each value across (alphabetically-sorted) members; largest count wins;
+// ties are broken in favour of the value held by the alphabetically-first
+// member.
+
+import { HomeKitLightState } from './color/types.js';
+
+export type StateChangeListener = (fixtureId: string) => void;
+
+const DEFAULT_STATE: HomeKitLightState = { on: false, brightness: 100 };
+
+export class StateRegistry {
+  private states = new Map<string, HomeKitLightState>();
+  private listeners = new Set<StateChangeListener>();
+
+  get(id: string): HomeKitLightState {
+    return this.states.get(id) ?? { ...DEFAULT_STATE };
+  }
+
+  /** Replace a fixture's state and fire change listeners. */
+  set(id: string, state: HomeKitLightState): void {
+    this.states.set(id, { ...state });
+    for (const l of this.listeners) l(id);
+  }
+
+  /** Merge a partial update into a fixture's state, returning the new full
+   *  state. Fires listeners. */
+  update(id: string, patch: Partial<HomeKitLightState>): HomeKitLightState {
+    const next: HomeKitLightState = { ...this.get(id), ...patch };
+    this.set(id, next);
+    return next;
+  }
+
+  onChange(cb: StateChangeListener): () => void {
+    this.listeners.add(cb);
+    return () => this.listeners.delete(cb);
+  }
+}
+
+/** Bucket members' values; return the value with the largest bucket. Ties
+ *  break in favour of the value held by the first member in
+ *  alphabetical-id order. */
+export function pickMajority<T>(items: Array<{ id: string; v: T }>): T | undefined {
+  if (items.length === 0) return undefined;
+  const sorted = items.slice().sort((a, b) => a.id.localeCompare(b.id));
+  const counts = new Map<T, { count: number; firstIdx: number }>();
+  for (let i = 0; i < sorted.length; i++) {
+    const v = sorted[i].v;
+    const rec = counts.get(v);
+    if (rec) rec.count++;
+    else counts.set(v, { count: 1, firstIdx: i });
+  }
+  let bestV: T = sorted[0].v;
+  let bestRec = counts.get(bestV)!;
+  for (const [v, rec] of counts) {
+    if (rec.count > bestRec.count ||
+        (rec.count === bestRec.count && rec.firstIdx < bestRec.firstIdx)) {
+      bestV = v;
+      bestRec = rec;
+    }
+  }
+  return bestV;
+}

package/src/zoneAccessory.ts

@@ -1,12 +1,19 @@
-// ZoneFixture — virtual HomeKit Lightbulb that dispatches to a set of
-// member fixtures. Setting any characteristic of the zone updates the
-// zone's local state, then calls controller.setFixture for each member
-// using the zone's current state. The single controller debounce
-// coalesces all member updates into one subprocess transaction.
+// ZoneFixture — virtual HomeKit Lightbulb that aggregates a set of member
+// fixtures.
 //
-// Per-member HomeKit accessories are NOT updated automatically. The user
-// has accepted this trade-off: last command wins, and partial overrides
-// of group commands are fine.
+// Reads: each .onGet returns the MAJORITY value of that characteristic
+// across the zone's members. Ties are broken in favour of the value held
+// by the alphabetically-first member. This gives a deterministic display
+// even when members are in split states.
+//
+// Writes: each .onSet updates every member's state in the registry (which
+// fires per-member change events so the individual fixture accessories
+// refresh their own HomeKit displays), then triggers the controller for
+// each member so the DMX wire reflects the change.
+//
+// When ANY member's state changes (by any path), the zone's HomeKit
+// characteristics push the new majority — so zones containing overlapping
+// members stay coherent with each other.
 
 import type {
   CharacteristicValue,
@@ -14,21 +21,24 @@ import type {
   Service,
 } from 'homebridge';
 
-import { Zone } from './config.js';
+import { Fixture, Zone } from './config.js';
 import { HKCharacteristic, HomeKitLightState } from './color/types.js';
 import { StickController } from './controller.js';
 import type { DmxPlatform } from './platform.js';
 import { CHARACTERISTIC_UPDATE_DELAY_MS } from './settings.js';
+import { StateRegistry, pickMajority } from './stateRegistry.js';
 
 export class ZoneFixture {
-  private state: HomeKitLightState = { on: false, brightness: 100 };
   private pending: NodeJS.Timeout | null = null;
+  private refreshPending: NodeJS.Timeout | null = null;
+  private bulb: Service;
 
   constructor(
     private readonly platform: DmxPlatform,
     accessory: PlatformAccessory,
     private readonly zone: Zone,
     private readonly controllers: Map<string, StickController>,
+    private readonly registry: StateRegistry,
   ) {
     const C = platform.Characteristic;
     const info = accessory.getService(platform.Service.AccessoryInformation);
@@ -36,53 +46,83 @@ export class ZoneFixture {
         ?.setCharacteristic(C.Model, `Zone (${zone.members.length} fixtures)`)
         ?.setCharacteristic(C.SerialNumber, `zone-${zone.id}`);
 
-    const bulb: Service =
+    this.bulb =
       accessory.getService(platform.Service.Lightbulb)
       ?? accessory.addService(platform.Service.Lightbulb, zone.name);
 
-    bulb.setCharacteristic(C.Name, zone.name);
-
-    // Always expose On.
-    bulb.getCharacteristic(C.On)
-      .onGet(() => this.state.on)
-      .onSet((v) => { this.state.on = Boolean(v); this.schedule(); });
+    this.bulb.setCharacteristic(C.Name, zone.name);
 
     const has = (k: HKCharacteristic): boolean => zone.characteristics.includes(k);
 
+    this.bulb.getCharacteristic(C.On)
+      .onGet(() => this.majorityState().on)
+      .onSet((v) => this.applyToMembers({ on: Boolean(v) }));
+
     if (has('Brightness')) {
-      bulb.getCharacteristic(C.Brightness)
-        .onGet(() => this.state.brightness)
-        .onSet((v: CharacteristicValue) => {
-          this.state.brightness = Number(v);
-          this.schedule();
-        });
+      this.bulb.getCharacteristic(C.Brightness)
+        .onGet(() => this.majorityState().brightness)
+        .onSet((v: CharacteristicValue) => this.applyToMembers({ brightness: Number(v) }));
     }
     if (has('Hue')) {
-      bulb.getCharacteristic(C.Hue)
-        .onGet(() => this.state.hue ?? 0)
-        .onSet((v) => { this.state.hue = Number(v); this.schedule(); });
+      this.bulb.getCharacteristic(C.Hue)
+        .onGet(() => this.majorityState().hue ?? 0)
+        .onSet((v) => this.applyToMembers({ hue: Number(v) }));
     }
     if (has('Saturation')) {
-      bulb.getCharacteristic(C.Saturation)
-        .onGet(() => this.state.saturation ?? 0)
-        .onSet((v) => { this.state.saturation = Number(v); this.schedule(); });
+      this.bulb.getCharacteristic(C.Saturation)
+        .onGet(() => this.majorityState().saturation ?? 0)
+        .onSet((v) => this.applyToMembers({ saturation: Number(v) }));
     }
     if (has('ColorTemperature')) {
-      bulb.getCharacteristic(C.ColorTemperature)
-        .onGet(() => this.state.colorTemperatureMireds ?? 200)
-        .onSet((v) => {
-          this.state.colorTemperatureMireds = Number(v);
-          this.state.saturation = 0;
-          this.schedule();
-        });
+      this.bulb.getCharacteristic(C.ColorTemperature)
+        .onGet(() => this.majorityState().colorTemperatureMireds ?? 200)
+        .onSet((v) => this.applyToMembers({
+          colorTemperatureMireds: Number(v),
+          saturation: 0,
+        }));
+    }
+
+    // Refresh on any member change.
+    const memberIds = new Set(zone.members.map((m) => m.id));
+    registry.onChange((id) => {
+      if (memberIds.has(id)) this.scheduleRefresh();
+    });
+  }
+
+  /** Compute majority state across members, per characteristic. */
+  private majorityState(): HomeKitLightState {
+    const ss = this.zone.members.map((m) => ({ id: m.id, state: this.registry.get(m.id) }));
+    return {
+      on:                       pickMajority(ss.map((s) => ({ id: s.id, v: s.state.on }))) ?? false,
+      brightness:               pickMajority(ss.map((s) => ({ id: s.id, v: s.state.brightness }))) ?? 100,
+      hue:                      pickMajority(ss.map((s) => ({ id: s.id, v: s.state.hue }))),
+      saturation:               pickMajority(ss.map((s) => ({ id: s.id, v: s.state.saturation }))),
+      colorTemperatureMireds:   pickMajority(ss.map((s) => ({ id: s.id, v: s.state.colorTemperatureMireds }))),
+    };
+  }
+
+  /** A HomeKit set on the zone: build the new state from the current
+   *  majority + the patch the user is applying, write it into every
+   *  member, and trigger the controller after a small debounce so
+   *  multi-characteristic dispatch coalesces. */
+  private applyToMembers(patch: Partial<HomeKitLightState>): void {
+    const next = { ...this.majorityState(), ...patch };
+    // Push the next state into every member's registry entry. This fires
+    // per-fixture change events so the individual StickFixture accessories
+    // refresh their own HomeKit displays.
+    for (const m of this.zone.members) {
+      this.registry.update(m.id, next);
     }
+    this.scheduleDispatch();
   }
 
-  private schedule(): void {
+  /** Debounced controller dispatch. Sends current registry state for each
+   *  member to the appropriate StickController. */
+  private scheduleDispatch(): void {
     if (this.pending) clearTimeout(this.pending);
     this.pending = setTimeout(() => {
       this.pending = null;
-      const s = this.state;
+      const s = this.majorityState();
       this.platform.log.info(
         `[zone:${this.zone.id}] HK set: on=${s.on} br=${s.brightness}` +
         (s.hue != null ? ` h=${s.hue}` : '') +
@@ -90,15 +130,41 @@ export class ZoneFixture {
         (s.colorTemperatureMireds != null ? ` ct=${s.colorTemperatureMireds}` : '') +
         ` → ${this.zone.members.length} members`,
       );
-      // Dispatch the zone's state to each member via that member's controller.
       for (const m of this.zone.members) {
         const c = this.controllers.get(m.controller.id);
         if (!c) {
           this.platform.log.error(`zone "${this.zone.id}": no controller for "${m.id}"`);
           continue;
         }
-        c.setFixture(m, this.state);
+        c.setFixture(m, this.registry.get(m.id));
+      }
+    }, CHARACTERISTIC_UPDATE_DELAY_MS);
+  }
+
+  /** Debounced refresh: when members change, push the new majority to
+   *  the zone's HomeKit characteristics. */
+  private scheduleRefresh(): void {
+    if (this.refreshPending) clearTimeout(this.refreshPending);
+    this.refreshPending = setTimeout(() => {
+      this.refreshPending = null;
+      const s = this.majorityState();
+      const C = this.platform.Characteristic;
+      this.bulb.updateCharacteristic(C.On, s.on);
+      if (this.zone.characteristics.includes('Brightness')) {
+        this.bulb.updateCharacteristic(C.Brightness, s.brightness);
+      }
+      if (this.zone.characteristics.includes('Hue') && s.hue != null) {
+        this.bulb.updateCharacteristic(C.Hue, s.hue);
+      }
+      if (this.zone.characteristics.includes('Saturation') && s.saturation != null) {
+        this.bulb.updateCharacteristic(C.Saturation, s.saturation);
+      }
+      if (this.zone.characteristics.includes('ColorTemperature') && s.colorTemperatureMireds != null) {
+        this.bulb.updateCharacteristic(C.ColorTemperature, s.colorTemperatureMireds);
       }
     }, CHARACTERISTIC_UPDATE_DELAY_MS);
   }
 }
+
+// Silence "Fixture imported but unused" — kept for potential future use.
+export type _MemberRef = Fixture;