@riddix/hamh 2.1.0-alpha.479 → 2.1.0-alpha.480

package/dist/backend/cli.js

@@ -1290,8 +1290,8 @@ var init_DiagnosticPresentation = __esm({
 // ../../node_modules/.pnpm/@matter+general@0.16.10/node_modules/@matter/general/dist/esm/util/Promises.js
 function createPromise() {
   let resolver, rejecter;
-  const promise = new Promise((resolve5, reject) => {
-    resolver = resolve5;
+  const promise = new Promise((resolve6, reject) => {
+    resolver = resolve6;
     rejecter = reject;
   });
   if (!resolver || !rejecter) {
@@ -1304,7 +1304,7 @@ function createPromise() {
   };
 }
 function anyPromise(promises) {
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     let numberRejected = 0;
     let wasResolved = false;
     for (const entry of promises) {
@@ -1312,7 +1312,7 @@ function anyPromise(promises) {
       promise.then((value) => {
         if (!wasResolved) {
           wasResolved = true;
-          resolve5(value);
+          resolve6(value);
         }
       }).catch((reason) => {
         numberRejected++;
@@ -1335,7 +1335,7 @@ async function withTimeout(timeout, promise, cancel) {
     };
   }
   let cancelTimer;
-  const timedOut = new Promise((resolve5, reject) => {
+  const timedOut = new Promise((resolve6, reject) => {
     const timer = Time.getTimer("promise-timeout", timeout, () => {
       try {
         cancelFn();
@@ -1346,7 +1346,7 @@ async function withTimeout(timeout, promise, cancel) {
     });
     cancelTimer = () => {
       timer.stop();
-      resolve5();
+      resolve6();
     };
     timer.start();
   });
@@ -1383,7 +1383,7 @@ var init_Promises = __esm({
        * Chained MaybePromise.  Invokes the resolve function immediately if the {@link MaybePromise} is not a
        * {@link Promise}, otherwise the same as a normal {@link Promise.then}.
        */
-      then(producer, resolve5, reject) {
+      then(producer, resolve6, reject) {
         let rejected = false;
         try {
           let value;
@@ -1394,15 +1394,15 @@ var init_Promises = __esm({
           }
           if (MaybePromise.is(value)) {
             return value.then(
-              resolve5,
+              resolve6,
               reject ? (error) => {
                 rejected = true;
                 return reject?.(error);
               } : void 0
             );
           }
-          if (resolve5) {
-            return resolve5(value);
+          if (resolve6) {
+            return resolve6(value);
           }
         } catch (e) {
           if (reject && !rejected) {
@@ -1467,13 +1467,13 @@ var init_Promises = __esm({
       #isResolved = false;
       #isRejected = false;
       constructor() {
-        let resolve5;
+        let resolve6;
         let reject;
         this.#promise = new Promise((res, rej) => {
-          resolve5 = res;
+          resolve6 = res;
           reject = rej;
         });
-        this.#resolve = resolve5;
+        this.#resolve = resolve6;
         this.#reject = reject;
       }
       /**
@@ -1505,8 +1505,8 @@ var init_Promises = __esm({
           return;
         }
         this.#isResolved = this.#isRejected = false;
-        this.#promise = new Promise((resolve5, reject) => {
-          this.#resolve = resolve5;
+        this.#promise = new Promise((resolve6, reject) => {
+          this.#resolve = resolve6;
           this.#reject = reject;
         });
       }
@@ -1531,8 +1531,8 @@ var init_Promises = __esm({
         this.#isRejected = true;
         this.#reject(cause);
       }
-      then(resolve5, reject) {
-        return this.#promise.then(resolve5, reject);
+      then(resolve6, reject) {
+        return this.#promise.then(resolve6, reject);
       }
       catch(reject) {
         return this.#promise.catch(reject);
@@ -1548,16 +1548,16 @@ var init_Promises = __esm({
         let listener;
         let registered2;
         let disposables;
-        let race2 = new Promise((resolve5, reject) => {
-          listener = { resolve: resolve5, reject };
+        let race2 = new Promise((resolve6, reject) => {
+          listener = { resolve: resolve6, reject };
           for (const value of values4) {
             if (!MaybePromise.is(value)) {
-              Promise.resolve(value).then(resolve5, reject);
+              Promise.resolve(value).then(resolve6, reject);
               continue;
             }
             if ("use" in value && "off" in value && typeof value.use === "function" && typeof value.off === "function") {
               if ("value" in value && value.value) {
-                Promise.resolve(value.value).then(resolve5, reject);
+                Promise.resolve(value.value).then(resolve6, reject);
                 continue;
               }
               if (!disposables) {
@@ -1567,19 +1567,19 @@ var init_Promises = __esm({
               if ("value" in value) {
                 observer = (value2) => {
                   if (value2) {
-                    resolve5(value2);
+                    resolve6(value2);
                   }
                 };
                 disposables.push(value.useError(reject));
               } else {
-                observer = resolve5;
+                observer = resolve6;
               }
               disposables.push(value.use(observer));
               continue;
             }
             const settlement = settlementOf(value);
             if (settlement.isSettled) {
-              value.then(resolve5, reject);
+              value.then(resolve6, reject);
               continue;
             }
             settlement.listeners.add(listener);
@@ -1664,7 +1664,7 @@ var init_Cancelable = __esm({
         if (onCancel !== void 0) {
           this.onCancel = onCancel;
         }
-        this.#promise = new Promise((resolve5, reject) => {
+        this.#promise = new Promise((resolve6, reject) => {
           this.#reject = (reason) => {
             this.#isSettled = true;
             reject(errorOf(reason));
@@ -1675,7 +1675,7 @@ var init_Cancelable = __esm({
                 return;
               }
               this.#isSettled = true;
-              resolve5(value);
+              resolve6(value);
             },
             (reason) => {
               if (this.#isSettled) {
@@ -1870,9 +1870,9 @@ var init_Time = __esm({
         let timer;
         let resolver;
         return new CancelablePromise(
-          (resolve5) => {
-            resolver = resolve5;
-            timer = _Time.getTimer(name, duration3, () => resolve5());
+          (resolve6) => {
+            resolver = resolve6;
+            timer = _Time.getTimer(name, duration3, () => resolve6());
             timer.start();
           },
           () => {
@@ -2229,12 +2229,12 @@ var init_Diagnostic = __esm({
         const diagnostic = Array();
         format(details);
         return Diagnostic2("error", diagnostic);
-        function format({ id, message: message2, path: path12, cause }) {
+        function format({ id, message: message2, path: path13, cause }) {
           if (id) {
             diagnostic.push(Diagnostic2.squash("[", Diagnostic2.strong(id), "]"));
           }
-          if (path12) {
-            diagnostic.push(Diagnostic2.squash(path12, ":"));
+          if (path13) {
+            diagnostic.push(Diagnostic2.squash(path13, ":"));
           }
           const hasCause = cause !== void 0;
           if (hasCause) {
@@ -2324,12 +2324,12 @@ var init_Diagnostic = __esm({
         let message2;
         let rawStack;
         let id;
-        let path12;
+        let path13;
         if (error2 !== void 0 && error2 !== null) {
           if (typeof error2 === "string" || typeof error2 === "number") {
             return { message: `${error2}` };
           }
-          ({ message: message2, stack: rawStack, id, path: path12 } = error2);
+          ({ message: message2, stack: rawStack, id, path: path13 } = error2);
           if (message2 === void 0) {
             message2 = error2.toString();
           }
@@ -2348,7 +2348,7 @@ var init_Diagnostic = __esm({
           }
         }
         if (!rawStack) {
-          return { message: message2, id, path: path12 };
+          return { message: message2, id, path: path13 };
         }
         rawStack = rawStack.toString();
         rawStack = rawStack.replace(/^.*?\n\nError: /gs, "Error: ");
@@ -2403,7 +2403,7 @@ var init_Diagnostic = __esm({
         if (truncatedToParent) {
           stack.push(Diagnostic2.weak("(see parent frames)"));
         }
-        return { message: message2, id, path: path12, stack, stackLines };
+        return { message: message2, id, path: path13, stack, stackLines };
       }
       Diagnostic2.messageAndStackFor = messageAndStackFor;
     })(Diagnostic || (Diagnostic = {}));
@@ -3788,7 +3788,7 @@ var init_Abort = __esm({
       }
       async then(onfulfilled, onrejected) {
         if (!this.#aborted) {
-          this.#aborted = new Promise((resolve5) => this.#resolve = resolve5);
+          this.#aborted = new Promise((resolve6) => this.#resolve = resolve6);
           this.addEventListener("abort", () => this.#resolve(asError(this.signal.reason)));
         }
         return await this.#aborted.then(onfulfilled, onrejected);
@@ -3820,8 +3820,8 @@ var init_Abort = __esm({
             signal = signal.signal;
           }
           let off;
-          const aborted = new Promise((resolve5) => {
-            const onabort = () => resolve5();
+          const aborted = new Promise((resolve6) => {
+            const onabort = () => resolve6();
             signal.addEventListener("abort", onabort);
             off = () => signal.removeEventListener("abort", onabort);
           });
@@ -3848,8 +3848,8 @@ var init_Abort = __esm({
       Abort2.attempt = attempt;
       function sleep(description, abort, duration3) {
         let timer;
-        const rested = new Promise((resolve5) => {
-          timer = Time.getTimer(description, duration3, () => resolve5());
+        const rested = new Promise((resolve6) => {
+          timer = Time.getTimer(description, duration3, () => resolve6());
         });
         return race(abort, rested).finally(timer.stop.bind(timer));
       }
@@ -4645,9 +4645,9 @@ var init_Observable = __esm({
         this.#once.add(observer);
       }
       then(onfulfilled, onrejected) {
-        return new Promise((resolve5) => {
+        return new Promise((resolve6) => {
           this.once((...payload) => {
-            resolve5(payload[0]);
+            resolve6(payload[0]);
           });
         }).then(onfulfilled, onrejected);
       }
@@ -4690,14 +4690,14 @@ var init_Observable = __esm({
         if (this.#joinIteration) {
           return this.#joinIteration();
         }
-        let resolve5;
+        let resolve6;
         let iteratorCount = 1;
         function newPromise() {
-          return new Promise((r) => resolve5 = r);
+          return new Promise((r) => resolve6 = r);
         }
         let promise = newPromise();
         function observer(...args) {
-          const oldResolve = resolve5;
+          const oldResolve = resolve6;
           promise = newPromise();
           oldResolve({ value: args[0], promise });
         }
@@ -4713,7 +4713,7 @@ var init_Observable = __esm({
         };
         this.#stopIteration = () => {
           this.off(observer);
-          resolve5(void 0);
+          resolve6(void 0);
           this.#stopIteration = void 0;
           this.#removeIterator = void 0;
         };
@@ -4773,11 +4773,11 @@ var init_Observable = __esm({
         if (this.#value) {
           return Promise.resolve(this.#value).then(onfulfilled, onrejected);
         }
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           if (!this.#awaiters) {
             this.#awaiters = [];
           }
-          this.#awaiters.push({ resolve: resolve5, reject });
+          this.#awaiters.push({ resolve: resolve6, reject });
         }).then(onfulfilled, onrejected);
       }
       catch(onrejected) {
@@ -5265,8 +5265,8 @@ function Construction(subject, initializer) {
       const handleRejection = onrejected ? () => onrejected?.(crashedError()) : void 0;
       if (status3 === Lifecycle.Status.Inactive || status3 === Lifecycle.Status.Initializing) {
         if (!awaiterPromise) {
-          awaiterPromise = new Promise((resolve5, reject) => {
-            awaiterResolve = resolve5;
+          awaiterPromise = new Promise((resolve6, reject) => {
+            awaiterResolve = resolve6;
             awaiterReject = reject;
           });
         }
@@ -5429,8 +5429,8 @@ function Construction(subject, initializer) {
     },
     get closed() {
       if (closedPromise === void 0) {
-        closedPromise = new Promise((resolve5, reject) => {
-          closedResolve = resolve5;
+        closedPromise = new Promise((resolve6, reject) => {
+          closedResolve = resolve6;
           closedReject = reject;
         });
       }
@@ -5512,9 +5512,9 @@ function Construction(subject, initializer) {
       setStatus(Lifecycle.Status.Active);
     }
     if (awaiterResolve) {
-      const resolve5 = awaiterResolve;
+      const resolve6 = awaiterResolve;
       awaiterResolve = awaiterReject = void 0;
-      resolve5(subject);
+      resolve6(subject);
     }
   }
   function rejected(cause) {
@@ -6387,16 +6387,16 @@ var init_Heap = __esm({
               return;
             }
           }
-          let resolve5;
-          const ready = new Promise((r) => resolve5 = r);
+          let resolve6;
+          const ready = new Promise((r) => resolve6 = r);
           try {
-            this.added.once(resolve5);
+            this.added.once(resolve6);
             await Abort.race(abort, ready);
             if (Abort.is(abort)) {
               return;
             }
           } finally {
-            this.added.off(resolve5);
+            this.added.off(resolve6);
           }
         }
       }
@@ -7050,10 +7050,10 @@ var init_Mutex = __esm({
         if (this.#closed) {
           throw new MutexClosedError();
         }
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           this.run(async () => {
             try {
-              resolve5(await task());
+              resolve6(await task());
             } catch (e) {
               reject(asError(e));
             }
@@ -8733,11 +8733,11 @@ var init_RuntimeService = __esm({
         if (!this.#workers.size) {
           return Promise.resolve();
         }
-        return new Promise((resolve5) => {
+        return new Promise((resolve6) => {
           const listener = () => {
             if (!this.#workers.size) {
               this.#workerDeleted.off(listener);
-              resolve5();
+              resolve6();
             }
           };
           this.#workerDeleted.on(listener);
@@ -8818,16 +8818,16 @@ var init_RuntimeService = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+general@0.16.10/node_modules/@matter/general/dist/esm/environment/VariableService.js
-function addVariable(into, path12, value) {
-  if (!path12.length) {
+function addVariable(into, path13, value) {
+  if (!path13.length) {
     return;
   }
-  const firstPathEntry = path12[0];
+  const firstPathEntry = path13[0];
   if (firstPathEntry === "__proto__" || firstPathEntry === "constructor" || firstPathEntry === "prototype") {
     throw new ImplementationError(`Invalid variable path name: ${firstPathEntry}`);
   }
   let current = into[firstPathEntry];
-  if (path12.length === 1) {
+  if (path13.length === 1) {
     if (current === void 0) {
       into[firstPathEntry] = value;
     }
@@ -8836,7 +8836,7 @@ function addVariable(into, path12, value) {
   if (typeof current !== "object") {
     current = into[firstPathEntry] = {};
   }
-  addVariable(current, path12.slice(1), value);
+  addVariable(current, path13.slice(1), value);
 }
 function parseUnixStyle(values4) {
   const variables = {};
@@ -9031,16 +9031,16 @@ var init_VariableService = __esm({
         return value;
       }
       addConfigStyle(vars) {
-        const path12 = Array();
+        const path13 = Array();
         const add = (vars2) => {
           for (const name in vars2) {
             const val = vars2[name];
             if (isObject(val)) {
-              path12.push(name);
+              path13.push(name);
               add(val);
-              path12.pop();
+              path13.pop();
             } else {
-              this.set([...path12, name].join("."), val);
+              this.set([...path13, name].join("."), val);
             }
           }
         };
@@ -11045,8 +11045,8 @@ var init_AppAddress = __esm({
               host = `${host}:${definition.transport.port}`;
             }
           }
-          const path12 = definition.path ?? "/";
-          definition = `${protocol}://${host}${path12}`;
+          const path13 = definition.path ?? "/";
+          definition = `${protocol}://${host}${path13}`;
         }
         try {
           super(definition);
@@ -14290,13 +14290,13 @@ var init_Tx = __esm({
           describeList("and", ...[...others].map((other) => other.via))
         );
         this.#waitingOn = others;
-        return new Promise((resolve5) => {
+        return new Promise((resolve6) => {
           for (const other of others) {
             other.onShared(() => {
               others.delete(other);
               if (!others.size) {
                 this.#waitingOn = void 0;
-                resolve5();
+                resolve6();
               }
             }, true);
           }
@@ -16441,8 +16441,8 @@ var init_errors2 = __esm({
   "../../node_modules/.pnpm/@matter+model@0.16.10/node_modules/@matter/model/dist/esm/common/errors.js"() {
     init_esm();
     SchemaImplementationError = class extends MatterError {
-      constructor(path12, message) {
-        super(`Definition of ${path12.path ?? path12}: ${message}`);
+      constructor(path13, message) {
+        super(`Definition of ${path13.path ?? path13}: ${message}`);
       }
     };
   }
@@ -38183,10 +38183,10 @@ var init_ModelTraversal = __esm({
           if (type === void 0) {
             return;
           }
-          const path12 = type.split(".");
-          if (path12.length === 1) {
+          const path13 = type.split(".");
+          if (path13.length === 1) {
             for (const tag3 of model.allowedBaseTags) {
-              const found = this.findType(this.findParent(model), path12[0], tag3);
+              const found = this.findType(this.findParent(model), path13[0], tag3);
               if (found) {
                 return found;
               }
@@ -38194,7 +38194,7 @@ var init_ModelTraversal = __esm({
             return;
           }
           for (const tag3 of model.allowedBaseTags) {
-            const found = this.findQualifiedType(this.findParent(model), path12, tag3);
+            const found = this.findQualifiedType(this.findParent(model), path13, tag3);
             if (found) {
               return found;
             }
@@ -38335,7 +38335,7 @@ var init_ModelTraversal = __esm({
             return;
           }
           const bounds = {};
-          const resolve5 = (field22) => {
+          const resolve6 = (field22) => {
             const value = constraint[field22];
             const name = FieldValue.referenced(value);
             if (name === void 0) {
@@ -38354,11 +38354,11 @@ var init_ModelTraversal = __esm({
             }
           };
           if (field2) {
-            resolve5(field2);
+            resolve6(field2);
           } else {
-            resolve5("value");
-            resolve5("min");
-            resolve5("max");
+            resolve6("value");
+            resolve6("min");
+            resolve6("max");
           }
           if (Object.keys(bounds).length) {
             constraint = constraint.extend(Constraint.create(bounds));
@@ -38489,22 +38489,22 @@ var init_ModelTraversal = __esm({
        * This is quite complicated and would be painfully slow except in practice we don't use many qualified types and
        * those we do use resolve with few failing branches in the search once the root qualifier of the name matches.
        */
-      findQualifiedType(scope, path12, tag3) {
+      findQualifiedType(scope, path13, tag3) {
         if (!scope) {
           return;
         }
-        function resolve5(scope2, position = 0) {
-          if (position === path12.length - 1) {
-            return scope2.children.select(path12[position], tag3);
+        function resolve6(scope2, position = 0) {
+          if (position === path13.length - 1) {
+            return scope2.children.select(path13[position], tag3);
           }
-          for (const subscope of scope2.children.selectAll(path12[position])) {
-            const result = resolve5(subscope, position + 1);
+          for (const subscope of scope2.children.selectAll(path13[position])) {
+            const result = resolve6(subscope, position + 1);
             if (result) {
               return result;
             }
           }
-          if (position === 0 && scope2.tag === ElementTag.Matter && path12[0] === "Matter") {
-            const result = resolve5(scope2, position + 1);
+          if (position === 0 && scope2.tag === ElementTag.Matter && path13[0] === "Matter") {
+            const result = resolve6(scope2, position + 1);
             if (result) {
               return result;
             }
@@ -38513,7 +38513,7 @@ var init_ModelTraversal = __esm({
         return this.operation(() => {
           const queue = Array(scope);
           for (scope = queue.shift(); scope; scope = queue.shift()) {
-            const resolved = resolve5(scope);
+            const resolved = resolve6(scope);
             if (resolved) {
               return resolved;
             }
@@ -91490,9 +91490,9 @@ function encodeAttributePayload(attributePayload, options) {
   if (attributeData === void 0) {
     return TlvAttributeReport.encodeTlv({ attributeStatus });
   }
-  const { path: path12, schema: schema6, payload, dataVersion } = attributeData;
+  const { path: path13, schema: schema6, payload, dataVersion } = attributeData;
   return TlvAttributeReport.encodeTlv({
-    attributeData: { path: path12, data: schema6.encodeTlv(payload, options), dataVersion }
+    attributeData: { path: path13, data: schema6.encodeTlv(payload, options), dataVersion }
   });
 }
 function encodeEventPayload(eventPayload, options) {
@@ -91501,7 +91501,7 @@ function encodeEventPayload(eventPayload, options) {
     return TlvEventReport.encodeTlv({ eventStatus });
   }
   const {
-    path: path12,
+    path: path13,
     schema: schema6,
     payload,
     eventNumber,
@@ -91513,7 +91513,7 @@ function encodeEventPayload(eventPayload, options) {
   } = eventData;
   return TlvEventReport.encodeTlv({
     eventData: {
-      path: path12,
+      path: path13,
       data: schema6.encodeTlv(payload, options),
       priority: priority3,
       systemTimestamp,
@@ -91543,7 +91543,7 @@ function chunkAttributePayload(attributePayload) {
       `Cannot chunk an AttributePayload with just a attributeStatus: ${Diagnostic.json(attributePayload)}`
     );
   }
-  const { schema: schema6, path: path12, dataVersion, payload } = attributeData;
+  const { schema: schema6, path: path13, dataVersion, payload } = attributeData;
   if (!(schema6 instanceof ArraySchema) || !Array.isArray(payload)) {
     throw new MatterFlowError(
       `Cannot chunk an AttributePayload with attributeData that is not an array: ${Diagnostic.json(
@@ -91554,14 +91554,14 @@ function chunkAttributePayload(attributePayload) {
   const chunks = new Array();
   chunks.push({
     hasFabricSensitiveData,
-    attributeData: { schema: schema6, path: { ...path12, listIndex: void 0 }, payload: [], dataVersion }
+    attributeData: { schema: schema6, path: { ...path13, listIndex: void 0 }, payload: [], dataVersion }
   });
   payload.forEach((element2) => {
     chunks.push({
       hasFabricSensitiveData,
       attributeData: {
         schema: schema6.elementSchema,
-        path: { ...path12, listIndex: null },
+        path: { ...path13, listIndex: null },
         payload: element2,
         dataVersion
       }
@@ -92074,13 +92074,13 @@ var init_InteractionMessenger = __esm({
       static convertServerInteractionReport(report) {
         switch (report.kind) {
           case "attr-value": {
-            const { path: path12, value: payload, version: dataVersion, tlv: schema6 } = report;
+            const { path: path13, value: payload, version: dataVersion, tlv: schema6 } = report;
             if (schema6 === void 0) {
-              throw new InternalError(`Attribute ${path12.clusterId}/${path12.attributeId} not found`);
+              throw new InternalError(`Attribute ${path13.clusterId}/${path13.attributeId} not found`);
             }
             const data = {
               attributeData: {
-                path: path12,
+                path: path13,
                 payload,
                 schema: schema6,
                 dataVersion
@@ -92091,10 +92091,10 @@ var init_InteractionMessenger = __esm({
             return data;
           }
           case "attr-status": {
-            const { path: path12, status: status3, clusterStatus } = report;
+            const { path: path13, status: status3, clusterStatus } = report;
             const statusReport = {
               attributeStatus: {
-                path: path12,
+                path: path13,
                 status: { status: status3 }
               },
               hasFabricSensitiveData: false
@@ -92106,7 +92106,7 @@ var init_InteractionMessenger = __esm({
           }
           case "event-value": {
             const {
-              path: path12,
+              path: path13,
               value: payload,
               number: eventNumber,
               priority: priority3,
@@ -92115,7 +92115,7 @@ var init_InteractionMessenger = __esm({
             } = report;
             const data = {
               eventData: {
-                path: path12,
+                path: path13,
                 eventNumber,
                 priority: priority3,
                 epochTimestamp,
@@ -92128,10 +92128,10 @@ var init_InteractionMessenger = __esm({
             return data;
           }
           case "event-status": {
-            const { path: path12, status: status3, clusterStatus } = report;
+            const { path: path13, status: status3, clusterStatus } = report;
             const statusReport = {
               eventStatus: {
-                path: path12,
+                path: path13,
                 status: { status: status3 }
               },
               hasFabricSensitiveData: false
@@ -99181,14 +99181,14 @@ var init_Advertisement = __esm({
       #sleep;
       #cancelReason;
       constructor(executor) {
-        let resolve5, reject;
+        let resolve6, reject;
         super((res, rej) => {
-          resolve5 = res;
+          resolve6 = res;
           reject = rej;
         });
-        executor(this).then(resolve5, (cause) => {
+        executor(this).then(resolve6, (cause) => {
           if (cause instanceof CanceledError) {
-            resolve5();
+            resolve6();
           } else {
             reject(cause);
           }
@@ -101110,8 +101110,8 @@ function normalizeAndDecodeReadAttributeReport(data, leftoverAttributeReports) {
       if (attributeData === void 0) {
         break;
       }
-      const { path: path12, data: tlvData } = attributeData;
-      if (path12.listIndex !== void 0) {
+      const { path: path13, data: tlvData } = attributeData;
+      if (path13.listIndex !== void 0) {
         chunkedArrayDataFound = true;
         continue;
       } else if (chunkedArrayDataFound || // We found chunked elements before so this must be array initial value now
@@ -101136,25 +101136,25 @@ function expandPathsInAttributeData(data, acceptWildcardPaths = false) {
   let lastPath;
   data.forEach((value) => {
     if (value === void 0) return;
-    const { path: path12 } = value;
-    if (path12.enableTagCompression) {
+    const { path: path13 } = value;
+    if (path13.enableTagCompression) {
       if (lastPath === void 0) throw new UnexpectedDataError("Tag compression enabled, but no previous path");
-      if (path12.nodeId === void 0 && lastPath.nodeId !== void 0) path12.nodeId = lastPath.nodeId;
-      if (path12.endpointId === void 0) path12.endpointId = lastPath.endpointId;
-      if (path12.clusterId === void 0) path12.clusterId = lastPath.clusterId;
-      if (path12.attributeId === void 0) path12.attributeId = lastPath.attributeId;
+      if (path13.nodeId === void 0 && lastPath.nodeId !== void 0) path13.nodeId = lastPath.nodeId;
+      if (path13.endpointId === void 0) path13.endpointId = lastPath.endpointId;
+      if (path13.clusterId === void 0) path13.clusterId = lastPath.clusterId;
+      if (path13.attributeId === void 0) path13.attributeId = lastPath.attributeId;
       if (value.dataVersion === void 0 && lastPath.dataVersion !== void 0)
         value.dataVersion = lastPath.dataVersion;
-    } else if (path12.endpointId !== void 0 && path12.clusterId !== void 0 && path12.attributeId !== void 0) {
+    } else if (path13.endpointId !== void 0 && path13.clusterId !== void 0 && path13.attributeId !== void 0) {
       lastPath = {
-        nodeId: path12.nodeId,
-        endpointId: path12.endpointId,
-        clusterId: path12.clusterId,
-        attributeId: path12.attributeId,
+        nodeId: path13.nodeId,
+        endpointId: path13.endpointId,
+        clusterId: path13.clusterId,
+        attributeId: path13.attributeId,
         dataVersion: value.dataVersion
       };
     } else if (!acceptWildcardPaths) {
-      throw new UnexpectedDataError("Tag compression disabled, but path is incomplete: " + Diagnostic.json(path12));
+      throw new UnexpectedDataError("Tag compression disabled, but path is incomplete: " + Diagnostic.json(path13));
     }
   });
   return data;
@@ -101852,11 +101852,11 @@ var init_SustainedSubscription = __esm({
           if (this.#request.updated) {
             request.updated = this.#request.updated.bind(request);
           }
-          const closed = new Promise((resolve5) => {
+          const closed = new Promise((resolve6) => {
             request.closed = () => {
               this.#subscription = void 0;
               this.subscriptionId = ClientSubscription.NO_SUBSCRIPTION;
-              resolve5();
+              resolve6();
             };
           });
           for (const retry of this.#retries) {
@@ -103077,77 +103077,77 @@ var init_errors5 = __esm({
     init_esm3();
     init_esm2();
     SchemaViolationError = class extends StatusResponseError {
-      constructor(prefix, path12, message, code) {
-        const text = `${prefix} ${path12.path ?? path12}: ${message} (${code})`;
+      constructor(prefix, path13, message, code) {
+        const text = `${prefix} ${path13.path ?? path13}: ${message} (${code})`;
         super(text, code);
         this.message = text;
       }
     };
     ReadError = class extends SchemaViolationError {
-      constructor(path12, message, code) {
-        super("Reading", path12, message, code ?? Status2.UnsupportedRead);
+      constructor(path13, message, code) {
+        super("Reading", path13, message, code ?? Status2.UnsupportedRead);
       }
     };
     WriteError = class extends SchemaViolationError {
-      constructor(path12, message, code) {
-        super("Writing", path12, message, code ?? Status2.UnsupportedWrite);
+      constructor(path13, message, code) {
+        super("Writing", path13, message, code ?? Status2.UnsupportedWrite);
       }
     };
     InvokeError = class extends SchemaViolationError {
-      constructor(path12, message, code) {
-        super("Invoking", path12, message, code ?? Status2.UnsupportedAccess);
+      constructor(path13, message, code) {
+        super("Invoking", path13, message, code ?? Status2.UnsupportedAccess);
       }
     };
     ValidateError = class extends SchemaViolationError {
-      constructor(path12, message, code) {
-        super("Validating", path12, message, code ?? Status2.InvalidDataType);
+      constructor(path13, message, code) {
+        super("Validating", path13, message, code ?? Status2.InvalidDataType);
       }
     };
     DatatypeError = class extends ValidateError {
-      constructor(path12, type, value, code) {
+      constructor(path13, type, value, code) {
         let str = `${value}`;
         if (str.length > 60) {
           str = `${str.substring(60)}\u2026`;
         }
-        super(path12, `Value "${str}" is not ${type}`, code);
+        super(path13, `Value "${str}" is not ${type}`, code);
       }
     };
     ConstraintError = class extends ValidateError {
-      constructor(schema6, path12, message) {
-        super(path12, `Constraint "${schema6.constraint}": ${message}`, Status2.ConstraintError);
+      constructor(schema6, path13, message) {
+        super(path13, `Constraint "${schema6.constraint}": ${message}`, Status2.ConstraintError);
       }
     };
     IntegerRangeError = class extends ValidateError {
-      constructor(path12, message) {
-        super(path12, message, Status2.ConstraintError);
+      constructor(path13, message) {
+        super(path13, message, Status2.ConstraintError);
       }
     };
     UnknownEnumValueError = class extends ValidateError {
-      constructor(path12, message) {
-        super(path12, message, Status2.ConstraintError);
+      constructor(path13, message) {
+        super(path13, message, Status2.ConstraintError);
       }
     };
     ConformanceError = class extends ValidateError {
-      constructor(schema6, path12, message, choice) {
+      constructor(schema6, path13, message, choice) {
         let prefix;
         if (choice) {
           prefix = `Conformance choice "${choice}"`;
         } else {
           prefix = `Conformance "${schema6.conformance}"`;
         }
-        super(path12, `${prefix}: ${message}`, Status2.ConstraintError);
+        super(path13, `${prefix}: ${message}`, Status2.ConstraintError);
       }
     };
     EnumValueConformanceError = class extends ConformanceError {
     };
     ExpiredReferenceError = class extends SchemaViolationError {
-      constructor(path12) {
-        super("Referencing", path12, "This value is no longer available because its context has exited", Status2.Failure);
+      constructor(path13) {
+        super("Referencing", path13, "This value is no longer available because its context has exited", Status2.Failure);
       }
     };
     PhantomReferenceError = class extends SchemaViolationError {
-      constructor(path12) {
-        super("Referencing", path12, "Container was removed", Status2.Failure);
+      constructor(path13) {
+        super("Referencing", path13, "Container was removed", Status2.Failure);
       }
     };
   }
@@ -103183,8 +103183,8 @@ function Read(optionsOrSelector, ...selectors) {
     isFabricFiltered: fabricFilter,
     interactionModelRevision,
     [Diagnostic.value]: () => Diagnostic.dict({
-      attributes: attributeRequests?.length ? selectors.filter(({ kind }) => kind === "attribute").map((path12) => resolvePathForSpecifier(path12)).join(", ") : void 0,
-      events: eventRequests?.length ? selectors.filter(({ kind }) => kind === "event").map((path12) => resolvePathForSpecifier(path12)).join(", ") : void 0,
+      attributes: attributeRequests?.length ? selectors.filter(({ kind }) => kind === "attribute").map((path13) => resolvePathForSpecifier(path13)).join(", ") : void 0,
+      events: eventRequests?.length ? selectors.filter(({ kind }) => kind === "event").map((path13) => resolvePathForSpecifier(path13)).join(", ") : void 0,
       dataVersionFilters: versionFilters?.length ? versionFilters.map(
         ({ path: { endpointId, clusterId: clusterId3 }, dataVersion }) => `${endpointId}/${clusterId3}=${dataVersion}`
       ).join(", ") : void 0,
@@ -103357,8 +103357,8 @@ var init_Subscribe = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+protocol@0.16.10/node_modules/@matter/protocol/dist/esm/action/request/Write.js
-function isAclOrExtensionPath(path12) {
-  const { clusterId: clusterId3, attributeId } = path12;
+function isAclOrExtensionPath(path13) {
+  const { clusterId: clusterId3, attributeId } = path13;
   return clusterId3 === AclClusterId && (attributeId === AclAttributeId || attributeId === AclExtensionAttributeId);
 }
 function Write(optionsOrData, ...data) {
@@ -103512,29 +103512,29 @@ var init_SubscribeResult = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+protocol@0.16.10/node_modules/@matter/protocol/dist/esm/common/ExpandedPath.js
-function ExpandedPath({ path: path12, matter: matter2, base, kind }) {
+function ExpandedPath({ path: path13, matter: matter2, base, kind }) {
   if (matter2 === void 0) {
     matter2 = Matter;
   }
   if (base && "path" in base) {
     base = base.path;
   }
-  const endpointIdent = path12.endpointId ?? "*";
+  const endpointIdent = path13.endpointId ?? "*";
   base = base ? base.at(endpointIdent, "endpoint") : DataModelPath(endpointIdent, "endpoint");
   let cluster2;
-  base = base.at(identityOf(matter2, ClusterModel, path12.clusterId), "cluster");
-  if ("attributeId" in path12) {
-    base = base.at("state").at(identityOf(cluster2, AttributeModel, path12.attributeId));
-    if (path12.listIndex) {
-      return base.at(path12.listIndex, "entry");
+  base = base.at(identityOf(matter2, ClusterModel, path13.clusterId), "cluster");
+  if ("attributeId" in path13) {
+    base = base.at("state").at(identityOf(cluster2, AttributeModel, path13.attributeId));
+    if (path13.listIndex) {
+      return base.at(path13.listIndex, "entry");
     }
     return base;
   }
-  if ("commandId" in path12) {
-    return base.at(identityOf(cluster2, CommandModel, path12.commandId));
+  if ("commandId" in path13) {
+    return base.at(identityOf(cluster2, CommandModel, path13.commandId));
   }
-  if ("eventId" in path12) {
-    return base.at("events").at(identityOf(cluster2, EventModel, path12.eventId));
+  if ("eventId" in path13) {
+    return base.at("events").at(identityOf(cluster2, EventModel, path13.eventId));
   }
   return base.at("*", kind ?? "element");
   function identityOf(parent, type, id) {
@@ -103621,13 +103621,13 @@ var init_PathError = __esm({
     PathError = class extends StatusResponseError {
       #id;
       #path;
-      constructor({ path: path12, status: { id, status: status3, clusterStatus }, message }) {
+      constructor({ path: path13, status: { id, status: status3, clusterStatus }, message }) {
         if (message === void 0) {
           message = capitalize(decamelize(camelize(id), " "));
         }
         super(message, status3, clusterStatus);
         this.#id = id;
-        this.#path = path12;
+        this.#path = path13;
       }
       get id() {
         return this.#id;
@@ -103651,9 +103651,9 @@ var init_WriteResult = __esm({
     ((WriteResult2) => {
       function assertSuccess(result) {
         const errors = result.filter((attr) => attr.status !== Status2.Success).map((attr) => {
-          const path12 = ExpandedPath({ ...attr, kind: "attribute" });
+          const path13 = ExpandedPath({ ...attr, kind: "attribute" });
           const status3 = new ExpandedStatus(attr);
-          return new PathError({ path: path12, status: status3 });
+          return new PathError({ path: path13, status: status3 });
         });
         if (!errors.length) {
           return;
@@ -104105,11 +104105,11 @@ var init_AttributeReadResponse = __esm({
               (this.#versions[endpointId] ?? (this.#versions[endpointId] = {}))[clusterId3] = dataVersion;
             }
           }
-          for (const path12 of attributeRequests) {
-            if (path12.endpointId === void 0 || path12.clusterId === void 0 || path12.attributeId === void 0) {
-              this.addWildcard(path12);
+          for (const path13 of attributeRequests) {
+            if (path13.endpointId === void 0 || path13.clusterId === void 0 || path13.attributeId === void 0) {
+              this.addWildcard(path13);
             } else {
-              this.addConcrete(path12);
+              this.addConcrete(path13);
             }
           }
           if (this.#dataProducers) {
@@ -104150,8 +104150,8 @@ var init_AttributeReadResponse = __esm({
       /**
        * Validate a wildcard path and update internal state.
        */
-      addWildcard(path12) {
-        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, attributeId, wildcardPathFlags } = path12;
+      addWildcard(path13) {
+        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, attributeId, wildcardPathFlags } = path13;
         if (clusterId3 === void 0 && attributeId !== void 0 && !GlobalAttrIds.has(attributeId)) {
           throw new StatusResponseError(
             `Illegal read of wildcard cluster with non-global attribute #${attributeId}`,
@@ -104166,7 +104166,7 @@ var init_AttributeReadResponse = __esm({
           this.#addProducer(function* () {
             this.#wildcardPathFlags = wpf;
             for (const endpoint2 of this.node) {
-              yield* this.readEndpointForWildcard(endpoint2, path12);
+              yield* this.readEndpointForWildcard(endpoint2, path13);
             }
           });
           return;
@@ -104175,17 +104175,17 @@ var init_AttributeReadResponse = __esm({
         if (endpoint) {
           this.#addProducer(function() {
             this.#wildcardPathFlags = wpf;
-            return this.readEndpointForWildcard(endpoint, path12);
+            return this.readEndpointForWildcard(endpoint, path13);
           });
         }
       }
       /**
        * Validate a concrete path and update internal state.
        */
-      addConcrete(path12) {
-        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, attributeId } = path12;
+      addConcrete(path13) {
+        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, attributeId } = path13;
         if (nodeId3 !== void 0 && this.nodeId !== nodeId3) {
-          this.addStatus(path12, Status2.UnsupportedNode);
+          this.addStatus(path13, Status2.UnsupportedNode);
           return;
         }
         const endpoint = this.node[endpointId];
@@ -104193,7 +104193,7 @@ var init_AttributeReadResponse = __esm({
         const attribute2 = cluster2?.type.attributes[attributeId];
         let limits;
         if (attribute2 === void 0) {
-          const modelAttr = this.node.matter.member(path12.clusterId, [ElementTag.Cluster])?.member(path12.attributeId, [ElementTag.Attribute]);
+          const modelAttr = this.node.matter.member(path13.clusterId, [ElementTag.Cluster])?.member(path13.attributeId, [ElementTag.Attribute]);
           if (modelAttr) {
             limits = AccessControl4(modelAttr).limits;
           } else {
@@ -104216,32 +104216,32 @@ var init_AttributeReadResponse = __esm({
             case AccessControl4.Authority.Granted:
               break;
             case AccessControl4.Authority.Unauthorized:
-              this.addStatus(path12, Status2.UnsupportedAccess);
+              this.addStatus(path13, Status2.UnsupportedAccess);
               return;
             case AccessControl4.Authority.Restricted:
-              this.addStatus(path12, Status2.AccessRestricted);
+              this.addStatus(path13, Status2.AccessRestricted);
               return;
             default:
               throw new InternalError(`Unsupported authorization state ${permission}`);
           }
         }
         if (endpoint === void 0) {
-          this.addStatus(path12, Status2.UnsupportedEndpoint);
+          this.addStatus(path13, Status2.UnsupportedEndpoint);
           return;
         }
         if (cluster2 === void 0) {
-          this.addStatus(path12, Status2.UnsupportedCluster);
+          this.addStatus(path13, Status2.UnsupportedCluster);
           return;
         }
         if (attribute2 === void 0 || !cluster2.type.attributes[attribute2.id]) {
-          this.addStatus(path12, Status2.UnsupportedAttribute);
+          this.addStatus(path13, Status2.UnsupportedAttribute);
           return;
         }
         if (!limits.readable) {
-          this.addStatus(path12, Status2.UnsupportedRead);
+          this.addStatus(path13, Status2.UnsupportedRead);
           return;
         }
-        const skipVersion = this.#versions?.[path12.endpointId]?.[path12.clusterId];
+        const skipVersion = this.#versions?.[path13.endpointId]?.[path13.clusterId];
         if (skipVersion !== void 0 && skipVersion === cluster2.version) {
           this.#filteredCount++;
           return;
@@ -104264,9 +104264,9 @@ var init_AttributeReadResponse = __esm({
           const value = this.#currentState[attributeId];
           const version = cluster2.version;
           logger55.debug(
-            () => `Reading attribute ${this.node.inspectPath(path12)}=${serialize(value)} (version=${version})`
+            () => `Reading attribute ${this.node.inspectPath(path13)}=${serialize(value)} (version=${version})`
           );
-          this.#addValue(path12, value, version, this.#currentCluster.type.attributes[attributeId].tlv);
+          this.#addValue(path13, value, version, this.#currentCluster.type.attributes[attributeId].tlv);
         });
       }
       /**
@@ -104279,7 +104279,7 @@ var init_AttributeReadResponse = __esm({
        *
        * TODO - skip endpoints for which subject is unauthorized as optimization
        */
-      *readEndpointForWildcard(endpoint, path12) {
+      *readEndpointForWildcard(endpoint, path13) {
         if (endpoint.wildcardPathFlags & this.#wildcardPathFlags) {
           return;
         }
@@ -104291,15 +104291,15 @@ var init_AttributeReadResponse = __esm({
           this.#currentEndpoint = endpoint;
           this.#currentCluster = void 0;
         }
-        const { clusterId: clusterId3 } = path12;
+        const { clusterId: clusterId3 } = path13;
         if (clusterId3 === void 0) {
           for (const cluster2 of endpoint) {
-            this.readClusterForWildcard(cluster2, path12);
+            this.readClusterForWildcard(cluster2, path13);
           }
         } else {
           const cluster2 = endpoint[clusterId3];
           if (cluster2 !== void 0) {
-            this.readClusterForWildcard(cluster2, path12);
+            this.readClusterForWildcard(cluster2, path13);
           }
         }
       }
@@ -104310,7 +104310,7 @@ var init_AttributeReadResponse = __esm({
        *
        * TODO - skip clusters for which subject is unauthorized
        */
-      readClusterForWildcard(cluster2, path12) {
+      readClusterForWildcard(cluster2, path13) {
         if (cluster2.type.wildcardPathFlags & this.#wildcardPathFlags) {
           return;
         }
@@ -104318,7 +104318,7 @@ var init_AttributeReadResponse = __esm({
           this.#currentCluster = cluster2;
           this.#currentState = void 0;
         }
-        const { attributeId } = path12;
+        const { attributeId } = path13;
         const skipVersion = this.#versions?.[this.#guardedCurrentEndpoint.id]?.[cluster2.type.id];
         const filteredByVersion = skipVersion !== void 0 && skipVersion === cluster2.version;
         if (attributeId === void 0) {
@@ -104331,7 +104331,7 @@ var init_AttributeReadResponse = __esm({
             return;
           }
           for (const attribute2 of cluster2.type.attributes) {
-            this.readAttributeForWildcard(attribute2, path12);
+            this.readAttributeForWildcard(attribute2, path13);
           }
         } else {
           if (filteredByVersion) {
@@ -104340,7 +104340,7 @@ var init_AttributeReadResponse = __esm({
           }
           const attribute2 = cluster2.type.attributes[attributeId];
           if (attribute2 !== void 0) {
-            this.readAttributeForWildcard(attribute2, path12);
+            this.readAttributeForWildcard(attribute2, path13);
           }
         }
       }
@@ -104349,7 +104349,7 @@ var init_AttributeReadResponse = __esm({
        *
        * Depends on state initialized by {@link #readClusterForWildcard}.
        */
-      readAttributeForWildcard(attribute2, path12) {
+      readAttributeForWildcard(attribute2, path13) {
         if (!this.#guardedCurrentCluster.type.attributes[attribute2.id]) {
           return;
         }
@@ -104364,12 +104364,12 @@ var init_AttributeReadResponse = __esm({
         }
         const value = this.#currentState[attribute2.id];
         if (value === void 0) {
-          logger55.warn(`Attribute ${this.node.inspectPath(path12)} defined and enabled but has no value.`);
+          logger55.warn(`Attribute ${this.node.inspectPath(path13)} defined and enabled but has no value.`);
           return;
         }
         this.#addValue(
           {
-            ...path12,
+            ...path13,
             endpointId: this.#guardedCurrentEndpoint.id,
             clusterId: this.#guardedCurrentCluster.type.id,
             attributeId: attribute2.id
@@ -104399,13 +104399,13 @@ var init_AttributeReadResponse = __esm({
       /**
        * Add a status value.
        */
-      addStatus(path12, status3) {
+      addStatus(path13, status3) {
         logger55.debug(
-          () => `Error reading attribute ${this.node.inspectPath(path12)}: Status=${StatusCode[status3]}(${status3})`
+          () => `Error reading attribute ${this.node.inspectPath(path13)}: Status=${StatusCode[status3]}(${status3})`
         );
         const report = {
           kind: "attr-status",
-          path: path12,
+          path: path13,
           status: status3
         };
         this.#addReportData(report);
@@ -104414,10 +104414,10 @@ var init_AttributeReadResponse = __esm({
       /**
        * Add an attribute value.
        */
-      #addValue(path12, value, version, tlv) {
+      #addValue(path13, value, version, tlv) {
         const report = {
           kind: "attr-value",
-          path: path12,
+          path: path13,
           value,
           version,
           tlv
@@ -104460,32 +104460,32 @@ var init_AttributeSubscriptionResponse = __esm({
         }
         return this.#currentClusterDirty;
       }
-      addConcrete(path12) {
-        const { endpointId, clusterId: clusterId3, attributeId } = path12;
+      addConcrete(path13) {
+        const { endpointId, clusterId: clusterId3, attributeId } = path13;
         if (this.#dirty[endpointId]?.[clusterId3]?.has(attributeId) === void 0) {
           return;
         }
-        super.addConcrete(path12);
+        super.addConcrete(path13);
       }
-      *readEndpointForWildcard(endpoint, path12) {
+      *readEndpointForWildcard(endpoint, path13) {
         this.#currentEndpointDirty = this.#dirty[endpoint.id];
         if (this.#currentEndpointDirty === void 0) {
           return;
         }
-        yield* super.readEndpointForWildcard(endpoint, path12);
+        yield* super.readEndpointForWildcard(endpoint, path13);
       }
-      readClusterForWildcard(cluster2, path12) {
+      readClusterForWildcard(cluster2, path13) {
         this.#currentClusterDirty = this.currentEndpointDirty[cluster2.type.id];
         if (this.#currentClusterDirty === void 0) {
           return;
         }
-        super.readClusterForWildcard(cluster2, path12);
+        super.readClusterForWildcard(cluster2, path13);
       }
-      readAttributeForWildcard(attribute2, path12) {
+      readAttributeForWildcard(attribute2, path13) {
         if (!this.currentClusterDirty.has(attribute2.id)) {
           return;
         }
-        super.readAttributeForWildcard(attribute2, path12);
+        super.readAttributeForWildcard(attribute2, path13);
       }
       addStatus() {
       }
@@ -104568,9 +104568,9 @@ var init_AttributeWriteResponse = __esm({
         try {
           const _writing = __using19(_stack, this.join("writing"));
           const writeResponses = new Array();
-          for (const { path: path12, data, dataVersion } of writeRequests) {
-            if (path12.endpointId === void 0 || path12.clusterId === void 0 || path12.attributeId === void 0) {
-              const responses = await this.#processWildcard(path12, data);
+          for (const { path: path13, data, dataVersion } of writeRequests) {
+            if (path13.endpointId === void 0 || path13.clusterId === void 0 || path13.attributeId === void 0) {
+              const responses = await this.#processWildcard(path13, data);
               if (responses !== void 0) {
                 writeResponses.push(...responses);
               }
@@ -104579,7 +104579,7 @@ var init_AttributeWriteResponse = __esm({
                 throw new StatusResponseError("Group writes can not be concrete paths", StatusCode.InvalidAction);
               }
               writeResponses.push(
-                await this.#writeConcrete(path12, data, dataVersion)
+                await this.#writeConcrete(path13, data, dataVersion)
               );
             }
           }
@@ -104617,8 +104617,8 @@ var init_AttributeWriteResponse = __esm({
       /**
        * Validate a wildcard path and update internal state.
        */
-      async #processWildcard(path12, value) {
-        const { nodeId: nodeId3, endpointId } = path12;
+      async #processWildcard(path13, value) {
+        const { nodeId: nodeId3, endpointId } = path13;
         if (nodeId3 !== void 0 && nodeId3 !== this.nodeId) {
           return;
         }
@@ -104638,7 +104638,7 @@ var init_AttributeWriteResponse = __esm({
             if (groupEndpoints !== void 0 && !groupEndpoints.includes(endpoint2.id)) {
               continue;
             }
-            const response = await this.#writeEndpointForWildcard(endpoint2, path12, value);
+            const response = await this.#writeEndpointForWildcard(endpoint2, path13, value);
             if (response !== void 0) {
               responses.push(response);
             }
@@ -104653,7 +104653,7 @@ var init_AttributeWriteResponse = __esm({
         }
         const endpoint = this.node[endpointId];
         if (endpoint) {
-          const response = await this.#writeEndpointForWildcard(endpoint, path12, value);
+          const response = await this.#writeEndpointForWildcard(endpoint, path13, value);
           if (response !== void 0) {
             return [response];
           }
@@ -104662,17 +104662,17 @@ var init_AttributeWriteResponse = __esm({
       /**
        * Write to a concrete path and update internal state.
        */
-      async #writeConcrete(path12, value, version) {
-        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, attributeId } = path12;
+      async #writeConcrete(path13, value, version) {
+        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, attributeId } = path13;
         if (nodeId3 !== void 0 && this.nodeId !== nodeId3) {
-          return this.#asStatus(path12, Status2.UnsupportedNode);
+          return this.#asStatus(path13, Status2.UnsupportedNode);
         }
         const endpoint = this.node[endpointId];
         const cluster2 = endpoint?.[clusterId3];
         const attribute2 = cluster2?.type.attributes[attributeId];
         let limits;
         if (attribute2 === void 0) {
-          const modelAttr = this.node.matter.member(path12.clusterId, [ElementTag.Cluster])?.member(path12.attributeId, [ElementTag.Attribute]);
+          const modelAttr = this.node.matter.member(path13.clusterId, [ElementTag.Cluster])?.member(path13.attributeId, [ElementTag.Attribute]);
           if (modelAttr) {
             limits = AccessControl4(modelAttr).limits;
           } else {
@@ -104695,39 +104695,39 @@ var init_AttributeWriteResponse = __esm({
             case AccessControl4.Authority.Granted:
               break;
             case AccessControl4.Authority.Unauthorized:
-              return this.#asStatus(path12, Status2.UnsupportedAccess);
+              return this.#asStatus(path13, Status2.UnsupportedAccess);
             case AccessControl4.Authority.Restricted:
-              return this.#asStatus(path12, Status2.AccessRestricted);
+              return this.#asStatus(path13, Status2.AccessRestricted);
             default:
               throw new InternalError(`Unsupported authorization state ${permission}`);
           }
         }
         if (endpoint === void 0) {
-          return this.#asStatus(path12, Status2.UnsupportedEndpoint);
+          return this.#asStatus(path13, Status2.UnsupportedEndpoint);
         }
         if (cluster2 === void 0) {
-          return this.#asStatus(path12, Status2.UnsupportedCluster);
+          return this.#asStatus(path13, Status2.UnsupportedCluster);
         }
         if (attribute2 === void 0 || !cluster2.type.attributes[attribute2.id]) {
-          return this.#asStatus(path12, Status2.UnsupportedAttribute);
+          return this.#asStatus(path13, Status2.UnsupportedAttribute);
         }
         if (!limits.writable) {
           this.#errorCount++;
-          return this.#asStatus(path12, Status2.UnsupportedWrite);
+          return this.#asStatus(path13, Status2.UnsupportedWrite);
         }
         if (hasRemoteActor(this.session)) {
           if (limits.timed && !this.session.timed) {
             this.#errorCount++;
-            return this.#asStatus(path12, Status2.NeedsTimedInteraction);
+            return this.#asStatus(path13, Status2.NeedsTimedInteraction);
           }
           if (limits.fabricScoped && !this.session.fabric) {
             this.#errorCount++;
-            return this.#asStatus(path12, Status2.UnsupportedAccess);
+            return this.#asStatus(path13, Status2.UnsupportedAccess);
           }
         }
         if (version !== void 0 && version !== cluster2.version) {
           this.#errorCount++;
-          return this.#asStatus(path12, Status2.DataVersionMismatch);
+          return this.#asStatus(path13, Status2.DataVersionMismatch);
         }
         if (this.#currentEndpoint !== endpoint) {
           this.#currentEndpoint = endpoint;
@@ -104735,7 +104735,7 @@ var init_AttributeWriteResponse = __esm({
         } else if (this.#currentCluster !== cluster2) {
           this.#currentCluster = cluster2;
         }
-        return await this.writeValue(attribute2, path12, value);
+        return await this.writeValue(attribute2, path13, value);
       }
       /**
        * Starts new chunk or adds to current chunk all values from {@link endpoint} selected by {@link path}.
@@ -104745,8 +104745,8 @@ var init_AttributeWriteResponse = __esm({
        *
        * TODO - skip endpoints for which subject is unauthorized as optimization
        */
-      #writeEndpointForWildcard(endpoint, path12, value) {
-        const { clusterId: clusterId3, attributeId } = path12;
+      #writeEndpointForWildcard(endpoint, path13, value) {
+        const { clusterId: clusterId3, attributeId } = path13;
         if (clusterId3 === void 0 || attributeId === void 0) {
           throw new StatusResponseError(
             "Wildcard path write must specify a clusterId and attributeId",
@@ -104759,7 +104759,7 @@ var init_AttributeWriteResponse = __esm({
         }
         const cluster2 = endpoint[clusterId3];
         if (cluster2 !== void 0) {
-          return this.#writeClusterForWildcard(cluster2, path12, value);
+          return this.#writeClusterForWildcard(cluster2, path13, value);
         }
       }
       /**
@@ -104769,17 +104769,17 @@ var init_AttributeWriteResponse = __esm({
        *
        * TODO - skip clusters for which subject is unauthorized
        */
-      #writeClusterForWildcard(cluster2, path12, value) {
+      #writeClusterForWildcard(cluster2, path13, value) {
         if (this.#currentCluster !== cluster2) {
           this.#currentCluster = cluster2;
         }
-        const { attributeId } = path12;
+        const { attributeId } = path13;
         if (attributeId === void 0) {
           throw new StatusResponseError("Wildcard path write must specify an attributeId", StatusCode.InvalidAction);
         } else {
           const attribute2 = cluster2.type.attributes[attributeId];
           if (attribute2 !== void 0) {
-            return this.#writeAttributeForWildcard(attribute2, path12, value);
+            return this.#writeAttributeForWildcard(attribute2, path13, value);
           }
         }
       }
@@ -104788,7 +104788,7 @@ var init_AttributeWriteResponse = __esm({
        *
        * Depends on state initialized by {@link #writeClusterForWildcard}.
        */
-      #writeAttributeForWildcard(attribute2, path12, value) {
+      #writeAttributeForWildcard(attribute2, path13, value) {
         if (!this.#guardedCurrentCluster.type.attributes[attribute2.id]) {
           return;
         }
@@ -104806,7 +104806,7 @@ var init_AttributeWriteResponse = __esm({
         return this.writeValue(
           attribute2,
           {
-            ...path12,
+            ...path13,
             endpointId: this.#guardedCurrentEndpoint.id,
             clusterId: this.#guardedCurrentCluster.type.id,
             attributeId: attribute2.id
@@ -104817,15 +104817,15 @@ var init_AttributeWriteResponse = __esm({
       /**
        * Add a status value.
        */
-      #asStatus(path12, status3, clusterStatus) {
+      #asStatus(path13, status3, clusterStatus) {
         if (status3 !== Status2.Success) {
           logger56.debug(
-            () => `Error writing attribute ${this.node.inspectPath(path12)}: Status=${StatusCode[status3]}(${toHex(status3)}), ClusterStatus=${clusterStatus !== void 0 ? toHex(clusterStatus) : void 0}`
+            () => `Error writing attribute ${this.node.inspectPath(path13)}: Status=${StatusCode[status3]}(${toHex(status3)}), ClusterStatus=${clusterStatus !== void 0 ? toHex(clusterStatus) : void 0}`
           );
         }
         const report = {
           kind: "attr-status",
-          path: path12,
+          path: path13,
           status: status3,
           clusterStatus
         };
@@ -104834,8 +104834,8 @@ var init_AttributeWriteResponse = __esm({
         }
         return report;
       }
-      async writeValue(attribute2, path12, value) {
-        const { attributeId, listIndex } = path12;
+      async writeValue(attribute2, path13, value) {
+        const { attributeId, listIndex } = path13;
         if (listIndex !== void 0 && listIndex !== null) {
           throw new StatusResponseError(
             `Unsupported Write path provided: listIndex === ${listIndex}`,
@@ -104846,7 +104846,7 @@ var init_AttributeWriteResponse = __esm({
           const { tlv } = attribute2;
           if (listIndex === void 0) {
             const decoded = this.#decodeWithSchema(tlv, value);
-            logger56.debug(() => `Writing attribute ${this.node.inspectPath(path12)}=${Diagnostic.json(decoded)}`);
+            logger56.debug(() => `Writing attribute ${this.node.inspectPath(path13)}=${Diagnostic.json(decoded)}`);
             const writeState = await this.#guardedCurrentCluster.openForWrite(this.session);
             writeState[attributeId] = decoded;
             await this.session.transaction?.commit();
@@ -104860,7 +104860,7 @@ var init_AttributeWriteResponse = __esm({
             const writeState = await this.#guardedCurrentCluster.openForWrite(this.session);
             const decoded = this.#decodeWithSchema(tlv.elementSchema, value);
             logger56.debug(
-              () => `Writing attribute chunk ${this.node.inspectPath(path12)} adding ${serialize(decoded)}`
+              () => `Writing attribute chunk ${this.node.inspectPath(path13)} adding ${serialize(decoded)}`
             );
             writeState[attributeId].push(decoded);
             await this.session.transaction?.commit();
@@ -104869,12 +104869,12 @@ var init_AttributeWriteResponse = __esm({
           await this.session.transaction?.rollback();
           if (StatusResponseError.is(error)) {
             this.#errorCount++;
-            return this.#asStatus(path12, error.code, error.clusterCode);
+            return this.#asStatus(path13, error.code, error.clusterCode);
           }
           throw error;
         }
         this.#successCount++;
-        return this.#asStatus(path12, Status2.Success);
+        return this.#asStatus(path13, Status2.Success);
       }
       #decodeWithSchema(tlv, value) {
         return tlv.injectField(
@@ -104972,15 +104972,15 @@ var init_CommandInvokeResponse = __esm({
           const _invoking = __using20(_stack, this.join("invoking"));
           const multipleInvokes = invokeRequests.length > 1;
           for (const command of invokeRequests) {
-            const { commandPath: path12, commandFields, commandRef } = command;
-            if (path12.endpointId === void 0 || path12.clusterId === void 0 || path12.commandId === void 0) {
+            const { commandPath: path13, commandFields, commandRef } = command;
+            if (path13.endpointId === void 0 || path13.clusterId === void 0 || path13.commandId === void 0) {
               if (multipleInvokes) {
                 throw new StatusResponseError(
                   "Wildcard path must not be used with multiple invokes",
                   StatusCode.InvalidAction
                 );
               }
-              this.#processWildcard(path12, commandRef, commandFields);
+              this.#processWildcard(path13, commandRef, commandFields);
             } else {
               if (Subject.isGroup(this.session.subject)) {
                 throw new StatusResponseError("Group commands connot be concrete paths", StatusCode.InvalidAction);
@@ -104991,7 +104991,7 @@ var init_CommandInvokeResponse = __esm({
                   StatusCode.InvalidAction
                 );
               }
-              this.#processConcrete(path12, commandRef, commandFields);
+              this.#processConcrete(path13, commandRef, commandFields);
             }
           }
           if (this.#invokers) {
@@ -105022,8 +105022,8 @@ var init_CommandInvokeResponse = __esm({
       /**
        * Process a wildcard path and invoke commands on all endpoints that match the path.
        */
-      #processWildcard(path12, commandRef, commandFields) {
-        const { clusterId: clusterId3, endpointId, commandId: commandId3 } = path12;
+      #processWildcard(path13, commandRef, commandFields) {
+        const { clusterId: clusterId3, endpointId, commandId: commandId3 } = path13;
         const isGroupPath = Subject.isGroup(this.session.subject);
         if (isGroupPath && endpointId !== void 0) {
           throw new StatusResponseError(
@@ -105051,19 +105051,19 @@ var init_CommandInvokeResponse = __esm({
             if (groupEndpoints !== void 0 && !groupEndpoints.includes(endpoint.id)) {
               continue;
             }
-            yield* this.#processEndpointForWildcard(endpoint, path12, commandRef, commandFields);
+            yield* this.#processEndpointForWildcard(endpoint, path13, commandRef, commandFields);
           }
         });
       }
       /**
        * Invoke a command specified by a concrete path
        */
-      #processConcrete(path12, commandRef, commandFields) {
-        const { endpointId, clusterId: clusterId3, commandId: commandId3 } = path12;
+      #processConcrete(path13, commandRef, commandFields) {
+        const { endpointId, clusterId: clusterId3, commandId: commandId3 } = path13;
         const pathKey = `${endpointId}-${clusterId3}-${commandId3}`;
         if (this.#registeredPaths.has(pathKey)) {
           throw new StatusResponseError(
-            `Duplicate concrete command path ${this.node.inspectPath(path12)} on batch invoke`,
+            `Duplicate concrete command path ${this.node.inspectPath(path13)} on batch invoke`,
             StatusCode.InvalidAction
           );
         }
@@ -105082,7 +105082,7 @@ var init_CommandInvokeResponse = __esm({
         const command = cluster2?.type.commands[commandId3];
         let limits;
         if (command === void 0) {
-          const modelAttr = this.node.matter.member(path12.clusterId, [ElementTag.Cluster])?.member(path12.commandId, [ElementTag.Command]);
+          const modelAttr = this.node.matter.member(path13.clusterId, [ElementTag.Cluster])?.member(path13.commandId, [ElementTag.Command]);
           if (modelAttr) {
             limits = AccessControl4(modelAttr).limits;
           } else {
@@ -105105,34 +105105,34 @@ var init_CommandInvokeResponse = __esm({
             case AccessControl4.Authority.Granted:
               break;
             case AccessControl4.Authority.Unauthorized:
-              return this.#addStatus(path12, commandRef, Status2.UnsupportedAccess);
+              return this.#addStatus(path13, commandRef, Status2.UnsupportedAccess);
             case AccessControl4.Authority.Restricted:
-              return this.#addStatus(path12, commandRef, Status2.AccessRestricted);
+              return this.#addStatus(path13, commandRef, Status2.AccessRestricted);
             default:
               throw new InternalError(`Unsupported authorization state ${permission}`);
           }
         }
         if (endpoint === void 0) {
-          return this.#addStatus(path12, commandRef, Status2.UnsupportedEndpoint);
+          return this.#addStatus(path13, commandRef, Status2.UnsupportedEndpoint);
         }
         if (cluster2 === void 0) {
-          return this.#addStatus(path12, commandRef, Status2.UnsupportedCluster);
+          return this.#addStatus(path13, commandRef, Status2.UnsupportedCluster);
         }
         if (command === void 0 || !cluster2.type.commands[command.id]) {
-          return this.#addStatus(path12, commandRef, Status2.UnsupportedCommand);
+          return this.#addStatus(path13, commandRef, Status2.UnsupportedCommand);
         }
         if (hasRemoteActor(this.session)) {
           if (limits.largeMessage && !this.session.largeMessage) {
             this.#errorCount++;
-            return this.#addStatus(path12, commandRef, Status2.InvalidTransportType);
+            return this.#addStatus(path13, commandRef, Status2.InvalidTransportType);
           }
           if (limits.fabricScoped && !this.session.fabric) {
             this.#errorCount++;
-            return this.#addStatus(path12, commandRef, Status2.UnsupportedAccess);
+            return this.#addStatus(path13, commandRef, Status2.UnsupportedAccess);
           }
           if (limits.timed && !this.session.timed) {
             this.#errorCount++;
-            return this.#addStatus(path12, commandRef, Status2.NeedsTimedInteraction);
+            return this.#addStatus(path13, commandRef, Status2.NeedsTimedInteraction);
           }
         }
         this.#addInvoker(async function* invokeConcretePath() {
@@ -105143,7 +105143,7 @@ var init_CommandInvokeResponse = __esm({
             }
             this.#currentEndpoint = endpoint;
           }
-          await this.#invokeCommand(command, path12, commandRef, commandFields, cluster2.commands[command.id]);
+          await this.#invokeCommand(command, path13, commandRef, commandFields, cluster2.commands[command.id]);
         });
       }
       /**
@@ -105154,8 +105154,8 @@ var init_CommandInvokeResponse = __esm({
        **
        * TODO - skip endpoints for which subject is unauthorized as optimization
        */
-      async *#processEndpointForWildcard(endpoint, path12, commandRef, commandFields) {
-        const { clusterId: clusterId3 } = path12;
+      async *#processEndpointForWildcard(endpoint, path13, commandRef, commandFields) {
+        const { clusterId: clusterId3 } = path13;
         if (this.#currentEndpoint !== endpoint) {
           if (this.#chunk) {
             yield this.#chunk;
@@ -105165,7 +105165,7 @@ var init_CommandInvokeResponse = __esm({
         }
         const cluster2 = endpoint[clusterId3];
         if (cluster2 !== void 0) {
-          const { commandId: commandId3 } = path12;
+          const { commandId: commandId3 } = path13;
           const command = cluster2.type.commands[commandId3];
           if (command !== void 0) {
             if (hasRemoteActor(this.session)) {
@@ -105186,7 +105186,7 @@ var init_CommandInvokeResponse = __esm({
             await this.#invokeCommand(
               command,
               {
-                ...path12,
+                ...path13,
                 endpointId: endpoint.id
               },
               commandRef,
@@ -105216,15 +105216,15 @@ var init_CommandInvokeResponse = __esm({
       /**
        * Add a status value.
        */
-      #addStatus(path12, commandRef, status3, clusterStatus) {
+      #addStatus(path13, commandRef, status3, clusterStatus) {
         if (status3 !== StatusCode.Success) {
           logger57.info(
-            () => `Invoke error ${this.node.inspectPath(path12)}: Status=${StatusCode[status3]}(${status3}), ClusterStatus=${clusterStatus}`
+            () => `Invoke error ${this.node.inspectPath(path13)}: Status=${StatusCode[status3]}(${status3}), ClusterStatus=${clusterStatus}`
           );
         }
         const response = {
           kind: "cmd-status",
-          path: path12,
+          path: path13,
           status: status3,
           clusterStatus,
           commandRef
@@ -105234,7 +105234,7 @@ var init_CommandInvokeResponse = __esm({
         }
         this.#addResponse(response);
       }
-      async #invokeCommand(command, path12, commandRef, commandFields, invoker) {
+      async #invokeCommand(command, path13, commandRef, commandFields, invoker) {
         try {
           const { requestTlv, responseTlv } = command;
           const request = this.#decodeWithSchema(requestTlv, commandFields);
@@ -105244,12 +105244,12 @@ var init_CommandInvokeResponse = __esm({
           this.#successCount++;
           const encodedResponse = responseTlv.encodeTlv(response);
           if (encodedResponse.length === 0) {
-            this.#addStatus(path12, commandRef, StatusCode.Success);
+            this.#addStatus(path13, commandRef, StatusCode.Success);
           } else {
             this.#addResponse({
               kind: "cmd-response",
               path: {
-                ...path12,
+                ...path13,
                 commandId: command.responseId
               },
               data: encodedResponse,
@@ -105272,7 +105272,7 @@ var init_CommandInvokeResponse = __esm({
             } else {
               logger57.info(errorLogText);
             }
-            this.#addStatus(path12, commandRef, errorCode, error.clusterCode);
+            this.#addStatus(path13, commandRef, errorCode, error.clusterCode);
             return;
           }
           throw error;
@@ -105338,11 +105338,11 @@ var init_EventReadResponse = __esm({
         if (isFabricFiltered) {
           this.#filteredForFabricIndex = this.session.fabric ?? FabricIndex3.NO_FABRIC;
         }
-        for (const path12 of eventRequests) {
-          if (path12.endpointId === void 0 || path12.clusterId === void 0 || path12.eventId === void 0) {
-            this.#addWildcard(path12);
+        for (const path13 of eventRequests) {
+          if (path13.endpointId === void 0 || path13.clusterId === void 0 || path13.eventId === void 0) {
+            this.#addWildcard(path13);
           } else {
-            const status3 = this.#addConcrete(path12);
+            const status3 = this.#addConcrete(path13);
             if (status3 !== void 0) {
               yield [status3];
               this.#statusCount++;
@@ -105378,8 +105378,8 @@ var init_EventReadResponse = __esm({
       /**
        * Validate a wildcard path and update the internal state.
        */
-      #addWildcard(path12) {
-        const { nodeId: nodeId3, clusterId: clusterId3, endpointId, eventId: eventId3 } = path12;
+      #addWildcard(path13) {
+        const { nodeId: nodeId3, clusterId: clusterId3, endpointId, eventId: eventId3 } = path13;
         if (clusterId3 === void 0 && eventId3 !== void 0) {
           throw new StatusResponseError("Illegal read request with wildcard cluster ID", StatusCode.InvalidAction);
         }
@@ -105388,29 +105388,29 @@ var init_EventReadResponse = __esm({
         }
         if (endpointId === void 0) {
           for (const endpoint2 of this.node) {
-            this.#addEndpointForWildcard(endpoint2, path12);
+            this.#addEndpointForWildcard(endpoint2, path13);
           }
           return;
         }
         const endpoint = this.node[endpointId];
         if (endpoint) {
-          return this.#addEndpointForWildcard(endpoint, path12);
+          return this.#addEndpointForWildcard(endpoint, path13);
         }
       }
       /**
        * Validate a concrete path and update the internal state.
        */
-      #addConcrete(path12) {
-        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, eventId: eventId3 } = path12;
+      #addConcrete(path13) {
+        const { nodeId: nodeId3, endpointId, clusterId: clusterId3, eventId: eventId3 } = path13;
         if (nodeId3 !== void 0 && this.nodeId !== nodeId3) {
-          return this.#asStatus(path12, Status2.UnsupportedNode);
+          return this.#asStatus(path13, Status2.UnsupportedNode);
         }
         const endpoint = this.node[endpointId];
         const cluster2 = endpoint?.[clusterId3];
         const event3 = cluster2?.type.events[eventId3];
         let limits;
         if (event3 === void 0) {
-          const modelEvent = this.node.matter.member(path12.clusterId, [ElementTag.Cluster])?.member(path12.eventId, [ElementTag.Event]);
+          const modelEvent = this.node.matter.member(path13.clusterId, [ElementTag.Cluster])?.member(path13.eventId, [ElementTag.Event]);
           if (modelEvent) {
             limits = AccessControl4(modelEvent).limits;
           } else {
@@ -105433,21 +105433,21 @@ var init_EventReadResponse = __esm({
             case AccessControl4.Authority.Granted:
               break;
             case AccessControl4.Authority.Unauthorized:
-              return this.#asStatus(path12, Status2.UnsupportedAccess);
+              return this.#asStatus(path13, Status2.UnsupportedAccess);
             case AccessControl4.Authority.Restricted:
-              return this.#asStatus(path12, Status2.AccessRestricted);
+              return this.#asStatus(path13, Status2.AccessRestricted);
             default:
               throw new InternalError(`Unsupported authorization state ${permission}`);
           }
         }
         if (endpoint === void 0) {
-          return this.#asStatus(path12, Status2.UnsupportedEndpoint);
+          return this.#asStatus(path13, Status2.UnsupportedEndpoint);
         }
         if (cluster2 === void 0) {
-          return this.#asStatus(path12, Status2.UnsupportedCluster);
+          return this.#asStatus(path13, Status2.UnsupportedCluster);
         }
         if (event3 === void 0 || !cluster2.type.events[event3.id]) {
-          return this.#asStatus(path12, Status2.UnsupportedEvent);
+          return this.#asStatus(path13, Status2.UnsupportedEvent);
         }
         if (this.#currentEndpoint !== endpoint) {
           this.#currentEndpoint = endpoint;
@@ -105455,7 +105455,7 @@ var init_EventReadResponse = __esm({
         } else if (this.#currentCluster !== cluster2) {
           this.#currentCluster = cluster2;
         }
-        this.#registerEventPath(path12);
+        this.#registerEventPath(path13);
       }
       /**
        * Starts new chunk or adds to current chunk all values from {@link endpoint} selected by {@link path}.
@@ -105465,20 +105465,20 @@ var init_EventReadResponse = __esm({
        *
        * TODO - skip endpoints for which subject is unauthorized
        */
-      #addEndpointForWildcard(endpoint, path12) {
+      #addEndpointForWildcard(endpoint, path13) {
         if (this.#currentEndpoint !== endpoint) {
           this.#currentEndpoint = endpoint;
           this.#currentCluster = void 0;
         }
-        const { clusterId: clusterId3 } = path12;
+        const { clusterId: clusterId3 } = path13;
         if (clusterId3 === void 0) {
           for (const cluster2 of endpoint) {
-            this.#addClusterForWildcard(cluster2, { ...path12, endpointId: endpoint.id });
+            this.#addClusterForWildcard(cluster2, { ...path13, endpointId: endpoint.id });
           }
         } else {
           const cluster2 = endpoint[clusterId3];
           if (cluster2 !== void 0) {
-            this.#addClusterForWildcard(cluster2, { ...path12, endpointId: endpoint.id });
+            this.#addClusterForWildcard(cluster2, { ...path13, endpointId: endpoint.id });
           }
         }
       }
@@ -105489,15 +105489,15 @@ var init_EventReadResponse = __esm({
        *
        * TODO - skip endpoints for which subject is unauthorized as optimization
        */
-      #addClusterForWildcard(cluster2, path12) {
+      #addClusterForWildcard(cluster2, path13) {
         if (this.#currentCluster !== cluster2) {
           this.#currentCluster = cluster2;
         }
-        const { eventId: eventId3 } = path12;
+        const { eventId: eventId3 } = path13;
         if (eventId3 === void 0) {
           for (const event3 of cluster2.type.events) {
             this.#addEventForWildcard(event3, {
-              ...path12,
+              ...path13,
               clusterId: cluster2.type.id
             });
           }
@@ -105505,7 +105505,7 @@ var init_EventReadResponse = __esm({
           const event3 = cluster2.type.events[eventId3];
           if (event3 !== void 0) {
             this.#addEventForWildcard(event3, {
-              ...path12,
+              ...path13,
               clusterId: cluster2.type.id
             });
           }
@@ -105516,24 +105516,24 @@ var init_EventReadResponse = __esm({
        *
        * Depends on state initialized by {@link #addClusterForWildcard}.
        */
-      #addEventForWildcard(event3, path12) {
+      #addEventForWildcard(event3, path13) {
         if (!this.#guardedCurrentCluster.type.events[event3.id]) {
           return;
         }
         if (hasRemoteActor(this.session) && this.session.authorityAt(event3.limits.readLevel, this.#guardedCurrentCluster.location) !== AccessControl4.Authority.Granted) {
           return;
         }
-        this.#registerEventPath({ ...path12, eventId: event3.id });
+        this.#registerEventPath({ ...path13, eventId: event3.id });
       }
-      #createEventKey(path12) {
-        const { endpointId, clusterId: clusterId3, eventId: eventId3 } = path12;
+      #createEventKey(path13) {
+        const { endpointId, clusterId: clusterId3, eventId: eventId3 } = path13;
         return `${endpointId}:${clusterId3}:${eventId3}`;
       }
-      #registerEventPath(path12) {
-        const { eventId: eventId3 } = path12;
+      #registerEventPath(path13) {
+        const { eventId: eventId3 } = path13;
         this.#allowedEventPaths.set(
           this.#createEventKey({
-            ...path12,
+            ...path13,
             endpointId: this.#guardedCurrentEndpoint.id,
             clusterId: this.#guardedCurrentCluster.type.id,
             eventId: eventId3
@@ -105563,11 +105563,11 @@ var init_EventReadResponse = __esm({
       /**
        * Add a status value.
        */
-      #asStatus(path12, status3) {
-        logger58.debug(`Error reading event ${this.node.inspectPath(path12)}: Status=${StatusCode[status3]}(${status3})`);
+      #asStatus(path13, status3) {
+        logger58.debug(`Error reading event ${this.node.inspectPath(path13)}: Status=${StatusCode[status3]}(${status3})`);
         const report = {
           kind: "event-status",
-          path: path12,
+          path: path13,
           status: status3
         };
         return report;
@@ -109223,8 +109223,8 @@ var init_DclClient = __esm({
     };
     MatterDclResponseError = class extends MatterDclError {
       response;
-      constructor(path12, error, options) {
-        super(`Error fetching ${path12} from DCL: ${error.code} - ${error.message}`, options);
+      constructor(path13, error, options) {
+        super(`Error fetching ${path13} from DCL: ${error.code} - ${error.message}`, options);
         this.response = error;
       }
     };
@@ -109234,11 +109234,11 @@ var init_DclClient = __esm({
         this.#baseUrl = this.production ? DCL_PRODUCTION_URL : DCL_TEST_URL;
       }
       #baseUrl;
-      async #fetchPaginatedJson(path12, paginatedField, options) {
+      async #fetchPaginatedJson(path13, paginatedField, options) {
         const allItems = [];
         let nextKey;
         do {
-          const currentPath = nextKey !== void 0 ? `${path12}${path12.includes("?") ? "&" : "?"}pagination.key=${encodeURIComponent(nextKey)}` : path12;
+          const currentPath = nextKey !== void 0 ? `${path13}${path13.includes("?") ? "&" : "?"}pagination.key=${encodeURIComponent(nextKey)}` : path13;
           const response = await this.#fetchJson(currentPath, options);
           const items = response[paginatedField];
           if (items && Array.isArray(items)) {
@@ -109248,8 +109248,8 @@ var init_DclClient = __esm({
         } while (nextKey);
         return allItems;
       }
-      async #fetchJson(path12, options) {
-        const url2 = new URL(path12, this.#baseUrl).toString();
+      async #fetchJson(path13, options) {
+        const url2 = new URL(path13, this.#baseUrl).toString();
         logger70.debug(`Fetching for DCL:`, url2);
         try {
           const timeoutMs = options?.timeout ?? DEFAULT_DCL_TIMEOUT;
@@ -109261,13 +109261,13 @@ var init_DclClient = __esm({
             signal: AbortSignal.timeout(timeoutMs)
           });
           if (!response.ok) {
-            throw new MatterDclResponseError(path12, await response.json());
+            throw new MatterDclResponseError(path13, await response.json());
           }
           return await response.json();
         } catch (error) {
           MatterDclResponseError.reject(error);
           throw new MatterDclResponseError(
-            path12,
+            path13,
             {
               code: 500,
               message: error.message ?? error,
@@ -109287,8 +109287,8 @@ var init_DclClient = __esm({
         return certList.approvedRootCertificates.certs;
       }
       async fetchRootCertificateBySubject(subject, options) {
-        const path12 = `/dcl/pki/certificates/${encodeURIComponent(subject.subject)}/${encodeURIComponent(subject.subjectKeyId)}`;
-        const response = await this.#fetchJson(path12, options);
+        const path13 = `/dcl/pki/certificates/${encodeURIComponent(subject.subject)}/${encodeURIComponent(subject.subjectKeyId)}`;
+        const response = await this.#fetchJson(path13, options);
         if (!response || !response.approvedCertificates || response.approvedCertificates.subject !== subject.subject || response.approvedCertificates.subjectKeyId !== subject.subjectKeyId || response.approvedCertificates.schemaVersion !== 0) {
           throw new MatterDclError(
             `Root certificate not found for subject: ${subject.subject}, subjectKeyId: ${subject.subjectKeyId}`
@@ -109297,24 +109297,24 @@ var init_DclClient = __esm({
         return response.approvedCertificates.certs;
       }
       async fetchModelByVidPid(vid, pid, options) {
-        const path12 = `/dcl/model/models/${encodeURIComponent(vid)}/${encodeURIComponent(pid)}`;
-        const response = await this.#fetchJson(path12, options);
+        const path13 = `/dcl/model/models/${encodeURIComponent(vid)}/${encodeURIComponent(pid)}`;
+        const response = await this.#fetchJson(path13, options);
         if (!response || !response.model || response.model.vid !== vid || response.model.pid !== pid || response.model.schemaVersion !== 0) {
           throw new MatterDclError(`Model not found for VID: ${vid}, PID: ${pid}`);
         }
         return response.model;
       }
       async fetchModelVersionsByVidPid(vid, pid, options) {
-        const path12 = `/dcl/model/versions/${encodeURIComponent(vid)}/${encodeURIComponent(pid)}`;
-        const response = await this.#fetchJson(path12, options);
+        const path13 = `/dcl/model/versions/${encodeURIComponent(vid)}/${encodeURIComponent(pid)}`;
+        const response = await this.#fetchJson(path13, options);
         if (!response || !response.modelVersions || response.modelVersions.vid !== vid || response.modelVersions.pid !== pid || response.modelVersions.schemaVersion !== 0) {
           throw new MatterDclError(`Model versions not found for VID: ${vid}, PID: ${pid}`);
         }
         return response.modelVersions.softwareVersions;
       }
       async fetchModelVersionByVidPidSoftwareVersion(vid, pid, softwareVersion, options) {
-        const path12 = `/dcl/model/versions/${encodeURIComponent(vid)}/${encodeURIComponent(pid)}/${encodeURIComponent(softwareVersion)}`;
-        const response = await this.#fetchJson(path12, options);
+        const path13 = `/dcl/model/versions/${encodeURIComponent(vid)}/${encodeURIComponent(pid)}/${encodeURIComponent(softwareVersion)}`;
+        const response = await this.#fetchJson(path13, options);
         if (!response || !response.modelVersion || response.modelVersion.vid !== vid || response.modelVersion.pid !== pid || response.modelVersion.softwareVersion !== softwareVersion || response.modelVersion.schemaVersion !== 0) {
           throw new MatterDclError(
             `Model version not found for VID: ${vid}, PID: ${pid}, Software Version: ${softwareVersion}`
@@ -116101,51 +116101,51 @@ var init_ValueCaster = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+node@0.16.10/node_modules/@matter/node/dist/esm/behavior/state/validation/assertions.js
-function assertNumber(value, path12) {
+function assertNumber(value, path13) {
   if (Number.isFinite(value)) {
     return;
   }
-  throw new DatatypeError(path12, "a number", value);
+  throw new DatatypeError(path13, "a number", value);
 }
-function assertBoolean(value, path12) {
+function assertBoolean(value, path13) {
   if (typeof value === "boolean" || value === 0 || value === 1) {
     return;
   }
-  throw new DatatypeError(path12, "a boolean", value);
+  throw new DatatypeError(path13, "a boolean", value);
 }
-function assertObject(value, path12) {
+function assertObject(value, path13) {
   if (isObject(value)) {
     return;
   }
-  throw new DatatypeError(path12, "an object", value);
+  throw new DatatypeError(path13, "an object", value);
 }
-function assertNumeric(value, path12) {
+function assertNumeric(value, path13) {
   if (typeof value === "number" || typeof value === "bigint") {
     return;
   }
-  throw new DatatypeError(path12, "a number or bigint", value);
+  throw new DatatypeError(path13, "a number or bigint", value);
 }
-function assertString(value, path12) {
+function assertString(value, path13) {
   if (typeof value === "string") {
     return;
   }
-  throw new DatatypeError(path12, "a string", value);
+  throw new DatatypeError(path13, "a string", value);
 }
-function assertBytes(value, path12) {
+function assertBytes(value, path13) {
   if (Bytes.isBytes(value)) {
     return;
   }
-  throw new DatatypeError(path12, "a byte array", value);
+  throw new DatatypeError(path13, "a byte array", value);
 }
-function assertSequence(value, path12) {
+function assertSequence(value, path13) {
   if (typeof value === "string" || Bytes.isBytes(value)) {
     return;
   }
-  throw new DatatypeError(path12, "a string or byte array", value);
+  throw new DatatypeError(path13, "a string or byte array", value);
 }
-function assertArray(value, path12) {
+function assertArray(value, path13) {
   if (!Array.isArray(value)) {
-    throw new DatatypeError(path12, "an array", value);
+    throw new DatatypeError(path13, "an array", value);
   }
 }
 function createIntAssertion(name, lowerBoundInclusive, upperBoundExclusive) {
@@ -116155,13 +116155,13 @@ function createIntAssertion(name, lowerBoundInclusive, upperBoundExclusive) {
   return createVarIntAssertion(name, Number(lowerBoundInclusive), Number(upperBoundExclusive));
 }
 function createVarIntAssertion(name, min, max) {
-  return function assertInt2(value, path12) {
-    assertNumeric(value, path12);
+  return function assertInt2(value, path13) {
+    assertNumeric(value, path13);
     if (value < min) {
-      throw new IntegerRangeError(path12, `Value ${value} is below the ${name} minimum of ${min}`);
+      throw new IntegerRangeError(path13, `Value ${value} is below the ${name} minimum of ${min}`);
     }
     if (value > max) {
-      throw new IntegerRangeError(path12, `Value ${value} is above the ${name} maximum of ${max}`);
+      throw new IntegerRangeError(path13, `Value ${value} is above the ${name} maximum of ${max}`);
     }
   };
 }
@@ -117266,18 +117266,18 @@ function StructPatcher(schema6, supervisor) {
       memberArrays[key] = true;
     }
   }
-  return (changes, target, path12) => {
+  return (changes, target, path13) => {
     if (typeof changes !== "object" || changes === null || Array.isArray(changes)) {
-      throw new WriteError(path12, `patch definition ${changes} is not an object`);
+      throw new WriteError(path13, `patch definition ${changes} is not an object`);
     }
     if (typeof target !== "object" || target === null || Array.isArray(target)) {
-      throw new WriteError(path12, `cannot patch ${target} because it is not an object`);
+      throw new WriteError(path13, `cannot patch ${target} because it is not an object`);
     }
     for (let key in changes) {
       let newValue = changes[key];
       if (!(key in memberPatchers)) {
         if (!(key in memberAltKeys)) {
-          throw new WriteError(path12, `${key} is not a property of ${schema6.name}`);
+          throw new WriteError(path13, `${key} is not a property of ${schema6.name}`);
         }
         key = memberAltKeys[key];
       }
@@ -117288,17 +117288,17 @@ function StructPatcher(schema6, supervisor) {
       }
       if (memberArrays[key]) {
         if (target[key] === void 0 || target[key] === null) {
-          newValue = subpatch(newValue, [], path12.at(key));
+          newValue = subpatch(newValue, [], path13.at(key));
           target[key] = newValue;
           continue;
         }
       }
       if (target[key] === void 0 || target[key] === null) {
-        newValue = subpatch(newValue, { ...memberDefaults[key] }, path12.at(key));
+        newValue = subpatch(newValue, { ...memberDefaults[key] }, path13.at(key));
         target[key] = newValue;
         continue;
       }
-      subpatch(newValue, target[key], path12.at(key));
+      subpatch(newValue, target[key], path13.at(key));
     }
     return target;
   };
@@ -117317,28 +117317,28 @@ function ListPatcher(schema6, supervisor) {
   if (entryMetatype === Metatype.object) {
     entryDefaults = getDefaults(supervisor, entry);
   }
-  return (changes, target, path12) => {
+  return (changes, target, path13) => {
     if (typeof changes !== "object" || changes === null) {
-      throw new WriteError(path12, `patch definition ${changes} is not an object`);
+      throw new WriteError(path13, `patch definition ${changes} is not an object`);
     }
     if (!Array.isArray(target)) {
-      throw new WriteError(path12, `patch definition ${changes} is not an object`);
+      throw new WriteError(path13, `patch definition ${changes} is not an object`);
     }
     for (const indexStr in changes) {
       const index = Number.parseInt(indexStr);
       if (index < 0 || !Number.isFinite(index)) {
-        throw new WriteError(path12, `key ${index} is not a valid array index`);
+        throw new WriteError(path13, `key ${index} is not a valid array index`);
       }
       let newValue = changes[indexStr];
       if (patchEntry) {
         const oldValue = index < target.length ? target[index] : void 0;
         if (newValue === void 0 || newValue === null || oldValue === void 0 || oldValue === null) {
           if (entryDefaults && isObject(newValue)) {
-            newValue = patchEntry(newValue, { ...entryDefaults }, path12.at(index));
+            newValue = patchEntry(newValue, { ...entryDefaults }, path13.at(index));
           }
           target[index] = newValue;
         } else {
-          patchEntry(newValue, target[index], path12.at(index));
+          patchEntry(newValue, target[index], path13.at(index));
         }
       } else {
         target[index] = newValue;
@@ -117351,8 +117351,8 @@ function ListPatcher(schema6, supervisor) {
   };
 }
 function PrimitivePatcher() {
-  return (_changes, _target, path12) => {
-    throw new ImplementationError(`Cannot generate patch ${path12} because it does not define not a collection`);
+  return (_changes, _target, path13) => {
+    throw new ImplementationError(`Cannot generate patch ${path13} because it does not define not a collection`);
   };
 }
 var defaultsCache;
@@ -121501,12 +121501,12 @@ function invokeCommand(backing, command, request, session) {
   } else {
     requestDiagnostic = Diagnostic.weak("(no payload)");
   }
-  const { path: path12, endpoint } = backing;
+  const { path: path13, endpoint } = backing;
   const context = session;
   logger93.info(
     "Invoke",
     Mark.INBOUND,
-    Diagnostic.strong(`${path12.toString()}.${command.name}`),
+    Diagnostic.strong(`${path13.toString()}.${command.name}`),
     session.transaction.via,
     requestDiagnostic
   );
@@ -121544,7 +121544,7 @@ function invokeCommand(backing, command, request, session) {
           logger93.info(
             "Invoke",
             Mark.OUTBOUND,
-            Diagnostic.strong(`${path12.toString()}.${command.name}`),
+            Diagnostic.strong(`${path13.toString()}.${command.name}`),
             session.transaction.via,
             Diagnostic.dict(result2)
           );
@@ -121556,7 +121556,7 @@ function invokeCommand(backing, command, request, session) {
         logger93.info(
           "Invoke",
           Mark.OUTBOUND,
-          Diagnostic.strong(`${path12.toString()}.${command.name}`),
+          Diagnostic.strong(`${path13.toString()}.${command.name}`),
           session.transaction.via,
           Diagnostic.dict(result)
         );
@@ -121569,12 +121569,12 @@ function invokeCommand(backing, command, request, session) {
   }
   return result;
 }
-function resolvePathForNode(node, path12) {
-  const { endpointId, clusterId: clusterId3 } = path12;
-  const isUrgentString = "isUrgent" in path12 && path12.isUrgent ? "!" : "";
-  const listIndexString = "listIndex" in path12 && path12.listIndex === null ? "[ADD]" : "";
+function resolvePathForNode(node, path13) {
+  const { endpointId, clusterId: clusterId3 } = path13;
+  const isUrgentString = "isUrgent" in path13 && path13.isUrgent ? "!" : "";
+  const listIndexString = "listIndex" in path13 && path13.listIndex === null ? "[ADD]" : "";
   const postString = `${listIndexString}${isUrgentString}`;
-  const elementId = "attributeId" in path12 ? path12.attributeId : "eventId" in path12 ? path12.eventId : "commandId" in path12 ? path12.commandId : void 0;
+  const elementId = "attributeId" in path13 ? path13.attributeId : "eventId" in path13 ? path13.eventId : "commandId" in path13 ? path13.commandId : void 0;
   if (endpointId === void 0) {
     return `*.${toWildcardOrHexPath("", clusterId3)}.${toWildcardOrHexPath("", elementId)}${postString}`;
   }
@@ -121592,13 +121592,13 @@ function resolvePathForNode(node, path12) {
   }
   const clusterName = toWildcardOrHexPath(cluster2.type.name, clusterId3);
   if (elementId !== void 0) {
-    if ("eventId" in path12) {
+    if ("eventId" in path13) {
       const event3 = cluster2.type.events[elementId];
       return `${endpointName}.${clusterName}.${toWildcardOrHexPath(event3?.name ?? "?", elementId)}${postString}`;
-    } else if ("attributeId" in path12) {
+    } else if ("attributeId" in path13) {
       const attribute2 = cluster2.type.attributes[elementId];
       return `${endpointName}.${clusterName}.${toWildcardOrHexPath(attribute2?.name ?? "?", elementId)}${postString}`;
-    } else if ("commandId" in path12) {
+    } else if ("commandId" in path13) {
       const command = cluster2.type.commands[elementId];
       return `${endpointName}.${clusterName}.${toWildcardOrHexPath(command?.name ?? "?", elementId)}${postString}`;
     } else {
@@ -121699,8 +121699,8 @@ var init_ProtocolService = __esm({
           inspect() {
             return this.toString();
           },
-          inspectPath(path12) {
-            return resolvePathForNode(this, path12);
+          inspectPath(path13) {
+            return resolvePathForNode(this, path13);
           }
         };
       }
@@ -124169,11 +124169,11 @@ var init_ServerSubscription = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+node@0.16.10/node_modules/@matter/node/dist/esm/node/server/InteractionServer.js
-function validateReadAttributesPath(path12, isGroupSession = false) {
+function validateReadAttributesPath(path13, isGroupSession = false) {
   if (isGroupSession) {
     throw new StatusResponseError("Illegal read request with group session", StatusCode.InvalidAction);
   }
-  const { clusterId: clusterId3, attributeId } = path12;
+  const { clusterId: clusterId3, attributeId } = path13;
   if (clusterId3 === void 0 && attributeId !== void 0) {
     if (!GLOBAL_IDS2.has(attributeId)) {
       throw new StatusResponseError(
@@ -124183,8 +124183,8 @@ function validateReadAttributesPath(path12, isGroupSession = false) {
     }
   }
 }
-function validateReadEventPath(path12, isGroupSession = false) {
-  const { clusterId: clusterId3, eventId: eventId3 } = path12;
+function validateReadEventPath(path13, isGroupSession = false) {
+  const { clusterId: clusterId3, eventId: eventId3 } = path13;
   if (clusterId3 === void 0 && eventId3 !== void 0) {
     throw new StatusResponseError("Illegal read request with wildcard cluster ID", StatusCode.InvalidAction);
   }
@@ -124366,8 +124366,8 @@ var init_InteractionServer = __esm({
           exchange.via,
           Diagnostic.asFlags({ fabricFiltered: isFabricFiltered }),
           Diagnostic.dict({
-            attributes: `${attributeRequests?.map((path12) => this.#node.protocol.inspectPath(path12)).join(", ") ?? "none"}${dataVersionFilters?.length ? ` with ${dataVersionFilters?.length} filters` : ""}`,
-            events: `${eventRequests?.map((path12) => this.#node.protocol.inspectPath(path12)).join(", ") ?? "none"}${eventFilters?.length ? `, ${eventFilters?.length} filters` : ""}`
+            attributes: `${attributeRequests?.map((path13) => this.#node.protocol.inspectPath(path13)).join(", ") ?? "none"}${dataVersionFilters?.length ? ` with ${dataVersionFilters?.length} filters` : ""}`,
+            events: `${eventRequests?.map((path13) => this.#node.protocol.inspectPath(path13)).join(", ") ?? "none"}${eventFilters?.length ? `, ${eventFilters?.length} filters` : ""}`
           })
         ]);
         if (interactionModelRevision > Specification.INTERACTION_MODEL_REVISION) {
@@ -124476,22 +124476,22 @@ var init_InteractionServer = __esm({
             currentBatch = [];
           };
           for (const request of writeRequests) {
-            const { path: path12 } = request;
-            const listIndex = path12.listIndex;
+            const { path: path13 } = request;
+            const listIndex = path13.listIndex;
             if (listIndex === null) {
-              if (previousProcessedAttributePath?.endpointId !== path12.endpointId || previousProcessedAttributePath?.clusterId !== path12.clusterId || previousProcessedAttributePath?.attributeId !== path12.attributeId) {
+              if (previousProcessedAttributePath?.endpointId !== path13.endpointId || previousProcessedAttributePath?.clusterId !== path13.clusterId || previousProcessedAttributePath?.attributeId !== path13.attributeId) {
                 await processBatch();
                 allResponses.push({
                   kind: "attr-status",
-                  path: path12,
+                  path: path13,
                   status: Status2.Busy
                 });
                 continue;
               }
             }
             currentBatch.push(request);
-            if (path12.endpointId !== void 0 && path12.clusterId !== void 0 && path12.attributeId !== void 0) {
-              previousProcessedAttributePath = path12;
+            if (path13.endpointId !== void 0 && path13.clusterId !== void 0 && path13.attributeId !== void 0) {
+              previousProcessedAttributePath = path13;
             }
           }
           await processBatch();
@@ -124499,8 +124499,8 @@ var init_InteractionServer = __esm({
             break;
           }
           const chunkResponse = {
-            writeResponses: allResponses.map(({ path: path12, status: status3, clusterStatus }) => ({
-              path: path12,
+            writeResponses: allResponses.map(({ path: path13, status: status3, clusterStatus }) => ({
+              path: path13,
               status: { status: status3, clusterStatus }
             })),
             interactionModelRevision: Specification.INTERACTION_MODEL_REVISION
@@ -124590,16 +124590,16 @@ var init_InteractionServer = __esm({
           Mark.INBOUND,
           exchange.via,
           Diagnostic.dict({
-            attributes: attributeRequests?.length ? attributeRequests?.map((path12) => this.#node.protocol.inspectPath(path12)).join(", ") : void 0,
+            attributes: attributeRequests?.length ? attributeRequests?.map((path13) => this.#node.protocol.inspectPath(path13)).join(", ") : void 0,
             dataVersionFilters: dataVersionFilters?.length ? dataVersionFilters.map(
               ({ path: { nodeId: nodeId3, endpointId, clusterId: clusterId3 }, dataVersion }) => `${clusterPathToId({ nodeId: nodeId3, endpointId, clusterId: clusterId3 })}=${dataVersion}`
             ).join(", ") : void 0,
-            events: eventRequests?.length ? eventRequests.map((path12) => this.#node.protocol.inspectPath(path12)).join(", ") : void 0,
+            events: eventRequests?.length ? eventRequests.map((path13) => this.#node.protocol.inspectPath(path13)).join(", ") : void 0,
             eventFilters: eventFilters?.length ? eventFilters.map((filter) => `${filter.nodeId}/${filter.eventMin}`).join(", ") : void 0
           })
         ]);
-        attributeRequests?.forEach((path12) => validateReadAttributesPath(path12));
-        eventRequests?.forEach((path12) => validateReadEventPath(path12));
+        attributeRequests?.forEach((path13) => validateReadAttributesPath(path13));
+        eventRequests?.forEach((path13) => validateReadEventPath(path13));
         if (minIntervalFloorSeconds < 0) {
           throw new StatusResponseError(
             "minIntervalFloorSeconds should be greater or equal to 0",
@@ -124881,9 +124881,9 @@ var init_InteractionServer = __esm({
                 break;
               }
               case "cmd-status": {
-                const { path: path12, commandRef, status: status3, clusterStatus } = data;
+                const { path: path13, commandRef, status: status3, clusterStatus } = data;
                 await sendChunkIfNeeded({
-                  status: { commandPath: path12, status: { status: status3, clusterStatus }, commandRef }
+                  status: { commandPath: path13, status: { status: status3, clusterStatus }, commandRef }
                 });
                 break;
               }
@@ -134597,15 +134597,15 @@ var init_Discovery = __esm({
       #settled;
       #resolveSettled;
       constructor(owner, options) {
-        let resolve5, reject;
+        let resolve6, reject;
         super((resolver, rejecter) => {
-          resolve5 = resolver;
+          resolve6 = resolver;
           reject = rejecter;
         });
         this.#resolve = (result) => {
           this.#isStopped = true;
           this.#owner.env.get(ActiveDiscoveries).delete(this);
-          resolve5(result);
+          resolve6(result);
           this.#resolveSettled?.();
         };
         this.#reject = (cause) => {
@@ -134621,7 +134621,7 @@ var init_Discovery = __esm({
       }
       get settled() {
         if (this.#settled === void 0) {
-          this.#settled = new Promise((resolve5) => this.#resolveSettled = resolve5);
+          this.#settled = new Promise((resolve6) => this.#resolveSettled = resolve6);
         }
         return this.#settled;
       }
@@ -134724,7 +134724,7 @@ var init_Discovery = __esm({
         const scanners = this.#owner.env.get(ScannerSet);
         const factory = this.#owner.env.get(ClientNodeFactory);
         const promises = new Array();
-        const cancelSignal = new Promise((resolve5) => this.#stopDiscovery = resolve5);
+        const cancelSignal = new Promise((resolve6) => this.#stopDiscovery = resolve6);
         for (const scanner of scanners) {
           promises.push(
             scanner.findCommissionableDevicesContinuously(
@@ -134966,14 +134966,14 @@ var init_ApiPath = __esm({
        *
        * So generally normal UNIX/URL semantics.
        */
-      constructor(path12) {
-        if (path12 instanceof URL) {
-          path12 = path12.pathname;
+      constructor(path13) {
+        if (path13 instanceof URL) {
+          path13 = path13.pathname;
         }
-        if (!Array.isArray(path12)) {
-          path12 = path12.split("/").map(decodeURIComponent);
+        if (!Array.isArray(path13)) {
+          path13 = path13.split("/").map(decodeURIComponent);
         }
-        for (const segment of path12) {
+        for (const segment of path13) {
           if (segment === "" || segment === ".") {
             continue;
           }
@@ -134993,20 +134993,20 @@ var init_ApiPath = __esm({
       slice(start, end) {
         return new _ApiPath(this.#segments.slice(start, end));
       }
-      at(path12) {
+      at(path13) {
         if (this.isEmpty) {
-          return new _ApiPath(path12);
+          return new _ApiPath(path13);
         }
-        if (path12 instanceof URL) {
-          path12 = path12.pathname;
+        if (path13 instanceof URL) {
+          path13 = path13.pathname;
         }
-        if (Array.isArray(path12)) {
-          path12 = path12.map(encodeURIComponent).join("/");
+        if (Array.isArray(path13)) {
+          path13 = path13.map(encodeURIComponent).join("/");
         }
-        if (path12.startsWith("/")) {
-          return new _ApiPath(path12);
+        if (path13.startsWith("/")) {
+          return new _ApiPath(path13);
         }
-        return new _ApiPath(`${this.toString()}/${path12}`);
+        return new _ApiPath(`${this.toString()}/${path13}`);
       }
       toString() {
         return `${this.#segments.map(encodeURIComponent).join("/")}`;
@@ -135091,12 +135091,12 @@ var init_Envelope = __esm({
       /**
        * Validate against the schema.  Casts to appropriate types if necessary.
        */
-      validate(path12) {
-        if (!path12) {
-          path12 = DataModelPath(this.#supervisor.schema.path);
+      validate(path13) {
+        if (!path13) {
+          path13 = DataModelPath(this.#supervisor.schema.path);
         }
         this.#js = this.#supervisor.cast(this.#js);
-        this.#supervisor.validate?.(this.js, LocalActorContext.ReadOnly, { path: path12 });
+        this.#supervisor.validate?.(this.js, LocalActorContext.ReadOnly, { path: path13 });
       }
       /**
        * Convert a {@link js} value to {@link JSON}.
@@ -135336,11 +135336,11 @@ var init_PropertyResource = __esm({
         }
         return "field";
       }
-      constructor(parent, id, supervisor, path12) {
+      constructor(parent, id, supervisor, path13) {
         super(parent);
         this.id = id;
         this.supervisor = supervisor;
-        this.dataModelPath = path12;
+        this.dataModelPath = path13;
       }
       get schema() {
         return this.supervisor.schema;
@@ -135976,7 +135976,7 @@ var init_Api = __esm({
     init_ServerNodeResource();
     loggers = /* @__PURE__ */ new Map();
     ((Api2) => {
-      async function resourceFor(agent, path12) {
+      async function resourceFor(agent, path13) {
         let item;
         if ("peers" in agent.endpoint) {
           item = new ServerNodeResource(agent, void 0);
@@ -135986,7 +135986,7 @@ var init_Api = __esm({
           item = new EndpointResource(agent, void 0);
         }
         const breadcrumb = [item];
-        for (const segment of path12) {
+        for (const segment of path13) {
           const parent = breadcrumb[breadcrumb.length - 1];
           const item2 = await parent.childFor(segment);
           if (!item2) {
@@ -136401,12 +136401,12 @@ var init_HttpInterface = __esm({
         let response;
         try {
           const address = new AppAddress(request.url);
-          const path12 = this.root.subpathFor(new ApiPath(address));
-          if (!path12) {
+          const path13 = this.root.subpathFor(new ApiPath(address));
+          if (!path13) {
             return;
           }
           response = await this.node.act("http", async (agent) => {
-            const resource = await Api.resourceFor(agent, path12);
+            const resource = await Api.resourceFor(agent, path13);
             if (resource === void 0) {
               throw new StatusResponse.NotFoundError(`Path "${address.pathname}" not found`);
             }
@@ -136609,7 +136609,7 @@ var init_Reactors = __esm({
           await reactor.close();
         }
         if (this.#backings.size) {
-          return new Promise((resolve5) => this.#destructionComplete = resolve5);
+          return new Promise((resolve6) => this.#destructionComplete = resolve6);
         }
       }
       add(observable, reactor, options) {
@@ -136681,9 +136681,9 @@ var init_Reactors = __esm({
                 this.#nodeActivity = this.#endpoint.env.get(NodeActivity);
               }
               this.#activity = this.#nodeActivity.begin(this.toString());
-              this.#trampoline = new Promise((resolve5) => {
+              this.#trampoline = new Promise((resolve6) => {
                 this.#resolveTrampoline = () => {
-                  resolve5();
+                  resolve6();
                   this.#trampoline = void 0;
                 };
               });
@@ -136817,11 +136817,11 @@ var init_Reactors = __esm({
        * regardless of the emitter and listener because by necessity they do not act immediately.
        */
       #reactDeferred(args) {
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           const deferredReaction = async () => {
             try {
               const result = await this.#react(args);
-              resolve5(result);
+              resolve6(result);
             } catch (e) {
               reject(asError(e));
             }
@@ -138200,8 +138200,8 @@ var init_WebSocketInterface = __esm({
         var _stack = [];
         try {
           const address = new AppAddress(request.url);
-          const path12 = new ApiPath(address).toString();
-          if (path12 !== this.root.toString()) {
+          const path13 = new ApiPath(address).toString();
+          if (path13 !== this.root.toString()) {
             return;
           }
           const ws2 = await Abort.race(this.abort, await upgrade());
@@ -138880,8 +138880,8 @@ var init_endpoint = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+node@0.16.10/node_modules/@matter/node/dist/esm/loader/load.mjs
-function load(path12) {
-  return import(path12);
+function load(path13) {
+  return import(path13);
 }
 var init_load = __esm({
   "../../node_modules/.pnpm/@matter+node@0.16.10/node_modules/@matter/node/dist/esm/loader/load.mjs"() {
@@ -138889,8 +138889,8 @@ var init_load = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+node@0.16.10/node_modules/@matter/node/dist/esm/loader/loader.js
-function doLoad(description, exportName, path12) {
-  const cachedResult = cache5[path12];
+function doLoad(description, exportName, path13) {
+  const cachedResult = cache5[path13];
   if (cachedResult) {
     return cachedResult;
   }
@@ -138901,7 +138901,7 @@ function doLoad(description, exportName, path12) {
     failure();
   }
   try {
-    const module = load(path12);
+    const module = load(path13);
     if (MaybePromise.is(module)) {
       return module.then(extractExport, failure);
     }
@@ -143435,11 +143435,11 @@ var init_NodeJsHttpEndpoint = __esm({
             }
             break;
           case "unix":
-            const path12 = decodeURIComponent(address.hostname);
+            const path13 = decodeURIComponent(address.hostname);
             if (options.basePathForUnixSockets) {
-              opts.path = resolve(options.basePathForUnixSockets, normalize(path12));
+              opts.path = resolve(options.basePathForUnixSockets, normalize(path13));
             } else {
-              opts.path = normalize(path12);
+              opts.path = normalize(path13);
             }
             if (existsSync(opts.path)) {
               if (statSync(opts.path).isSocket()) {
@@ -143643,9 +143643,9 @@ var init_StorageBackendDisk = __esm({
       isInitialized = false;
       #writeFileBlocker = /* @__PURE__ */ new Map();
       #index = {};
-      constructor(path12, clear = false) {
+      constructor(path13, clear = false) {
         super();
-        this.#path = path12;
+        this.#path = path13;
         this.#clear = clear;
       }
       get initialized() {
@@ -143799,7 +143799,7 @@ var init_StorageBackendDisk = __esm({
               const { value: chunk, done } = await reader.read();
               if (chunk) {
                 if (!writer.write(chunk)) {
-                  await new Promise((resolve5) => writer.once("drain", resolve5));
+                  await new Promise((resolve6) => writer.once("drain", resolve6));
                 }
               }
               if (done) {
@@ -143908,9 +143908,9 @@ var init_StorageBackendJsonFile = __esm({
   "../../node_modules/.pnpm/@matter+nodejs@0.16.10/node_modules/@matter/nodejs/dist/esm/storage/fs/StorageBackendJsonFile.js"() {
     init_esm();
     StorageBackendJsonFile = class _StorageBackendJsonFile extends StorageBackendMemory {
-      constructor(path12) {
+      constructor(path13) {
         super();
-        this.path = path12;
+        this.path = path13;
       }
       /** We store changes after a value was set to the storage, but not more often than this setting (in ms). */
       static commitDelay = Seconds.one;
@@ -143922,8 +143922,8 @@ var init_StorageBackendJsonFile = __esm({
       );
       closed = false;
       resolveCommitted;
-      static async create(path12) {
-        const storage2 = new this(path12);
+      static async create(path13) {
+        const storage2 = new this(path13);
         storage2.initialize();
         return storage2;
       }
@@ -143941,8 +143941,8 @@ var init_StorageBackendJsonFile = __esm({
       }
       triggerCommit() {
         if (!this.commitTimer.isRunning) {
-          this.committed = new Promise((resolve5) => {
-            this.resolveCommitted = resolve5;
+          this.committed = new Promise((resolve6) => {
+            this.resolveCommitted = resolve6;
           });
           this.commitTimer.start();
         }
@@ -144128,8 +144128,8 @@ var init_SqliteStorage = __esm({
        */
       constructor(args) {
         super();
-        const { databaseCreator, path: path12, tableName, clear } = args;
-        this.dbPath = path12 === null ? _SqliteStorage.memoryPath : path12;
+        const { databaseCreator, path: path13, tableName, clear } = args;
+        this.dbPath = path13 === null ? _SqliteStorage.memoryPath : path13;
         this.databaseCreator = databaseCreator;
         this.database = databaseCreator(this.dbPath);
         this.tableName = tableName ?? _SqliteStorage.defaultTableName;
@@ -144513,10 +144513,10 @@ var init_NodeJsSqlite = __esm({
   "../../node_modules/.pnpm/@matter+nodejs@0.16.10/node_modules/@matter/nodejs/dist/esm/storage/sqlite/platform/NodeJsSqlite.js"() {
     init_SqliteStorage();
     NodeJsSqlite = class extends SqliteStorage {
-      constructor(path12, clear = false) {
+      constructor(path13, clear = false) {
         super({
           databaseCreator: (path22) => new DatabaseSync(path22),
-          path: path12,
+          path: path13,
           clear
         });
       }
@@ -144561,13 +144561,13 @@ var init_BunSqlite = __esm({
     init_bun_sqlite();
     init_bun();
     BunSqlite = class extends SqliteStorage {
-      constructor(path12, clear = false) {
+      constructor(path13, clear = false) {
         super({
           databaseCreator: (path22) => new Database(path22, {
             strict: true,
             create: true
           }),
-          path: path12,
+          path: path13,
           clear
         });
       }
@@ -144584,16 +144584,16 @@ var init_BunSqlite = __esm({
 });
 
 // ../../node_modules/.pnpm/@matter+nodejs@0.16.10/node_modules/@matter/nodejs/dist/esm/storage/sqlite/platform/PlatformSqlite.js
-async function PlatformSqlite(path12, clear = false) {
+async function PlatformSqlite(path13, clear = false) {
   const isBun = isBunjs();
   if (!isBun) {
     const module2 = await Promise.resolve().then(() => (init_NodeJsSqlite(), NodeJsSqlite_exports));
     const NodeJsSqlite2 = findDefaultExport(module2, "NodeJsSqlite");
-    return new NodeJsSqlite2(path12, clear);
+    return new NodeJsSqlite2(path13, clear);
   }
   const module = await Promise.resolve().then(() => (init_BunSqlite(), BunSqlite_exports));
   const BunSqlite2 = findDefaultExport(module, "BunSqlite");
-  return new BunSqlite2(path12, clear);
+  return new BunSqlite2(path13, clear);
 }
 function findDefaultExport(moduleLike, name) {
   return moduleLike[name] || moduleLike.default?.[name] || moduleLike.default;
@@ -144638,11 +144638,11 @@ var init_StorageFactory = __esm({
         if (!await exists(rootDir)) {
           await mkdir2(rootDir, { recursive: true });
         }
-        const path12 = getRealPath(type, rootDir, namespace3);
-        if (clear || await exists(path12)) {
-          return await createRawInit(type, path12, clear);
+        const path13 = getRealPath(type, rootDir, namespace3);
+        if (clear || await exists(path13)) {
+          return await createRawInit(type, path13, clear);
         }
-        const storage2 = await createRawInit(type, path12, false);
+        const storage2 = await createRawInit(type, path13, false);
         const migrationRootDir = resolve2(rootDir, ".migrations", getResultDirName(namespace3));
         for (const otherType of StorageTypes) {
           if (type === otherType) {
@@ -144669,7 +144669,7 @@ var init_StorageFactory = __esm({
                   fromType: otherType,
                   fromPath: otherPath,
                   toType: type,
-                  toPath: path12,
+                  toPath: path13,
                   result: migrationResult
                 }),
                 4
@@ -144692,14 +144692,14 @@ Error: ${errorMessage}`
         const { driver, namespace: namespace3 } = args;
         const rootDir = resolve2(args.rootDir);
         const type = getStorageType(driver);
-        const path12 = getRealPath(type, rootDir, namespace3);
-        if (!await exists(path12)) {
+        const path13 = getRealPath(type, rootDir, namespace3);
+        if (!await exists(path13)) {
           return;
         }
-        await rm3(path12, { recursive: true, force: true });
+        await rm3(path13, { recursive: true, force: true });
       }
       StorageFactory2.remove = remove;
-      async function createRaw(type, path12, clear) {
+      async function createRaw(type, path13, clear) {
         const normalizedType = type.toLowerCase();
         if (normalizedType === "sqlite") {
           if (!supportsSqlite()) {
@@ -144710,21 +144710,21 @@ Error: ${errorMessage}`
           `.replace(/\n\s+/g, "\n")
             );
           }
-          return await PlatformSqlite(path12, clear);
+          return await PlatformSqlite(path13, clear);
         }
         if (normalizedType === "file") {
-          return new StorageBackendDisk(path12, clear);
+          return new StorageBackendDisk(path13, clear);
         }
         throw new Error(`'${type}' storage type is not implemented.`);
       }
-      async function createRawInit(type, path12, clear) {
-        const storage2 = await createRaw(type, path12, clear);
+      async function createRawInit(type, path13, clear) {
+        const storage2 = await createRaw(type, path13, clear);
         await storage2.initialize();
         return storage2;
       }
-      async function hasStorage(type, path12) {
+      async function hasStorage(type, path13) {
         try {
-          const pathStat = await lstat(path12);
+          const pathStat = await lstat(path13);
           switch (type) {
             case "file":
               return pathStat.isDirectory();
@@ -144791,9 +144791,9 @@ Error: ${errorMessage}`
         }
         return result;
       }
-      async function exists(path12) {
+      async function exists(path13) {
         try {
-          await lstat(resolve2(path12));
+          await lstat(resolve2(path13));
           return true;
         } catch (err) {
           return false;
@@ -144816,7 +144816,7 @@ var init_storage4 = __esm({
 import * as dgram from "node:dgram";
 function createDgramSocket(host, port, options) {
   const socket = dgram.createSocket(options);
-  return new Promise((resolve5, reject) => {
+  return new Promise((resolve6, reject) => {
     const handleBindError = (error) => {
       try {
         socket.close();
@@ -144850,7 +144850,7 @@ function createDgramSocket(host, port, options) {
       );
       socket.removeListener("error", handleBindError);
       socket.on("error", (error) => logger138.error(error));
-      resolve5(socket);
+      resolve6(socket);
     });
   });
 }
@@ -145103,7 +145103,7 @@ var init_NodeJsUdpChannel = __esm({
         try {
           const _closing = __using38(_stack, this.#lifetime.closing());
           try {
-            await new Promise((resolve5) => this.#socket.close(resolve5));
+            await new Promise((resolve6) => this.#socket.close(resolve6));
           } catch (error) {
             if (!(error instanceof Error) || error.message !== "Not running") {
               logger138.debug("Error on closing socket", error);
@@ -145640,11 +145640,11 @@ var init_service = __esm({
       constructor(serviceName) {
         this.serviceName = serviceName;
       }
-      construction = new Promise((resolve5) => {
+      construction = new Promise((resolve6) => {
         setImmediate(() => {
           const init = this.initialize?.bind(this) ?? (async () => {
           });
-          init().then(resolve5);
+          init().then(resolve6);
         });
       });
     };
@@ -147154,7 +147154,7 @@ async function withRetry(fn, options = {}) {
         opts.maxDelayMs
       );
       opts.onRetry?.(attempt, error, delayMs);
-      await new Promise((resolve5) => setTimeout(resolve5, delayMs));
+      await new Promise((resolve6) => setTimeout(resolve6, delayMs));
     }
   }
   throw lastError;
@@ -147450,7 +147450,7 @@ BigInt.prototype.toJSON = function() {
 };
 
 // src/cli.ts
-import * as path11 from "node:path";
+import * as path12 from "node:path";
 import * as url from "node:url";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
@@ -149838,6 +149838,7 @@ function metricsApi(bridgeService, haClient, haRegistry, startTime) {
 }
 
 // src/api/plugin-api.ts
+import * as nodePath from "node:path";
 import express13 from "express";
 
 // src/plugins/plugin-installer.ts
@@ -149886,7 +149887,7 @@ var PluginInstaller = class {
       };
     }
     logger142.info(`Installing plugin: ${packageName}`);
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       execFile(
         "npm",
         ["install", packageName, "--save"],
@@ -149901,7 +149902,7 @@ var PluginInstaller = class {
               `Failed to install ${packageName}:`,
               stderr || error.message
             );
-            resolve5({
+            resolve6({
               success: false,
               packageName,
               error: stderr || error.message
@@ -149912,7 +149913,7 @@ var PluginInstaller = class {
           logger142.info(
             `Successfully installed ${packageName}@${version || "unknown"}`
           );
-          resolve5({
+          resolve6({
             success: true,
             packageName,
             version: version ?? void 0
@@ -149930,7 +149931,7 @@ var PluginInstaller = class {
       };
     }
     logger142.info(`Uninstalling plugin: ${packageName}`);
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       execFile(
         "npm",
         ["uninstall", packageName, "--save"],
@@ -149944,7 +149945,7 @@ var PluginInstaller = class {
               `Failed to uninstall ${packageName}:`,
               stderr || error.message
             );
-            resolve5({
+            resolve6({
               success: false,
               packageName,
               error: stderr || error.message
@@ -149952,7 +149953,7 @@ var PluginInstaller = class {
             return;
           }
           logger142.info(`Successfully uninstalled ${packageName}`);
-          resolve5({ success: true, packageName });
+          resolve6({ success: true, packageName });
         }
       );
     });
@@ -149985,7 +149986,20 @@ var PluginInstaller = class {
     const tgzPath = path4.join(this.pluginDir, `.upload-${Date.now()}.tgz`);
     try {
       fs4.writeFileSync(tgzPath, tgzBuffer);
-      return await this.installFromNpm(tgzPath);
+      const depsBefore = new Set(Object.keys(this.readDeps()));
+      const result = await this.installFromNpm(tgzPath);
+      if (!result.success) return result;
+      const depsAfter = this.readDeps();
+      for (const name of Object.keys(depsAfter)) {
+        if (!depsBefore.has(name)) {
+          return {
+            success: true,
+            packageName: name,
+            version: this.getInstalledVersion(name) ?? String(depsAfter[name])
+          };
+        }
+      }
+      return result;
     } catch (e) {
       const msg = e instanceof Error ? e.message : String(e);
       logger142.error("Failed to install from tgz:", msg);
@@ -149998,7 +150012,7 @@ var PluginInstaller = class {
     }
   }
   installFromNpm(target) {
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       execFile(
         "npm",
         ["install", target, "--save"],
@@ -150009,24 +150023,31 @@ var PluginInstaller = class {
         },
         (error, _stdout, stderr) => {
           if (error) {
-            resolve5({
+            resolve6({
               success: false,
               packageName: path4.basename(target),
               error: stderr || error.message
             });
             return;
           }
-          const installed = this.listInstalled();
-          const latest = installed[installed.length - 1];
-          resolve5({
+          resolve6({
             success: true,
-            packageName: latest?.name ?? path4.basename(target),
-            version: latest?.version
+            packageName: path4.basename(target)
           });
         }
       );
     });
   }
+  readDeps() {
+    try {
+      const pkgJson = path4.join(this.pluginDir, "package.json");
+      if (!fs4.existsSync(pkgJson)) return {};
+      const pkg = JSON.parse(fs4.readFileSync(pkgJson, "utf-8"));
+      return pkg.dependencies ?? {};
+    } catch {
+      return {};
+    }
+  }
   installFromLocal(localPath) {
     const resolvedPath = path4.resolve(localPath);
     if (!fs4.existsSync(resolvedPath)) {
@@ -150180,6 +150201,19 @@ var PluginRegistry = class {
 };
 
 // src/api/plugin-api.ts
+var MAX_UPLOAD_BYTES = 50 * 1024 * 1024;
+var BLOCKED_PREFIXES = [
+  "/bin",
+  "/sbin",
+  "/usr",
+  "/etc",
+  "/var",
+  "/sys",
+  "/proc",
+  "/dev",
+  "/boot",
+  "/root"
+];
 function pluginApi(bridgeService, storageLocation) {
   const router = express13.Router();
   const installer = new PluginInstaller(storageLocation);
@@ -150340,8 +150374,17 @@ function pluginApi(bridgeService, storageLocation) {
   router.post("/upload", async (req, res) => {
     try {
       const chunks = [];
+      let totalSize = 0;
       for await (const chunk of req) {
-        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
+        const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+        totalSize += buf.length;
+        if (totalSize > MAX_UPLOAD_BYTES) {
+          res.status(413).json({
+            error: `Upload exceeds ${MAX_UPLOAD_BYTES / 1024 / 1024}MB limit`
+          });
+          return;
+        }
+        chunks.push(buf);
       }
       const tgzBuffer = Buffer.concat(chunks);
       if (tgzBuffer.length === 0) {
@@ -150375,6 +150418,11 @@ function pluginApi(bridgeService, storageLocation) {
       res.status(400).json({ error: "path is required" });
       return;
     }
+    const resolved = nodePath.resolve(localPath);
+    if (BLOCKED_PREFIXES.some((p) => resolved.startsWith(p))) {
+      res.status(400).json({ error: "Path is inside a restricted system directory" });
+      return;
+    }
     try {
       const result = installer.installFromLocal(localPath);
       if (!result.success) {
@@ -150526,8 +150574,8 @@ function detectEnvironment2() {
     return "Docker";
   }
   try {
-    const fs11 = __require("node:fs");
-    if (fs11.existsSync("/.dockerenv")) {
+    const fs12 = __require("node:fs");
+    if (fs12.existsSync("/.dockerenv")) {
       return "Docker";
     }
   } catch {
@@ -150674,9 +150722,9 @@ function getDataPath() {
   }
   return process.cwd();
 }
-async function getWindowsStorageInfo(path12) {
+async function getWindowsStorageInfo(path13) {
   try {
-    const drive = `${path12.split(":")[0]}:`;
+    const drive = `${path13.split(":")[0]}:`;
     const { stdout } = await execAsync(
       `powershell -Command "Get-PSDrive -Name '${drive.replace(":", "")}' | Select-Object Used,Free | ConvertTo-Json"`
     );
@@ -150687,7 +150735,7 @@ async function getWindowsStorageInfo(path12) {
     return { total, used, free };
   } catch {
     try {
-      const drive = `${path12.split(":")[0]}:`;
+      const drive = `${path13.split(":")[0]}:`;
       const { stdout } = await execAsync(
         `wmic logicaldisk where "DeviceID='${drive}'" get Size,FreeSpace /format:csv`
       );
@@ -150704,9 +150752,9 @@ async function getWindowsStorageInfo(path12) {
     return { total: 0, used: 0, free: 0 };
   }
 }
-async function getUnixStorageInfo(path12) {
+async function getUnixStorageInfo(path13) {
   try {
-    const { stdout } = await execAsync(`df -Pk "${path12}" 2>/dev/null`);
+    const { stdout } = await execAsync(`df -Pk "${path13}" 2>/dev/null`);
     const lines = stdout.trim().split("\n");
     if (lines.length >= 2) {
       const parts = lines[1].split(/\s+/);
@@ -150988,12 +151036,12 @@ var WebApi = class extends Service {
   }
   async dispose() {
     this.wsApi.close();
-    await new Promise((resolve5, reject) => {
+    await new Promise((resolve6, reject) => {
       this.server?.close((error) => {
         if (error) {
           reject(error);
         } else {
-          resolve5();
+          resolve6();
         }
       });
     });
@@ -151015,12 +151063,12 @@ var WebApi = class extends Service {
     if (this.server) {
       return;
     }
-    this.server = await new Promise((resolve5) => {
+    this.server = await new Promise((resolve6) => {
       const server = this.app.listen(this.props.port, () => {
         this.log.info(
           `HTTP server (API ${this.props.webUiDist ? "& Web App" : "only"}) listening on port ${this.props.port}`
         );
-        resolve5(server);
+        resolve6(server);
       });
     });
     this.wsApi.attach(this.server, this.props.basePath);
@@ -151243,8 +151291,8 @@ init_dist();
 init_esm6();
 import { pickBy } from "lodash-es";
 var LegacyCustomStorage = class extends StorageBackendJsonFile {
-  constructor(log, path12) {
-    super(path12);
+  constructor(log, path13) {
+    super(path13);
     this.log = log;
     const parser = this;
     const serialize2 = parser.toJson.bind(parser);
@@ -151258,7 +151306,7 @@ var LegacyCustomStorage = class extends StorageBackendJsonFile {
         return this.removeClusters(object, Object.values(ClusterId2));
       } catch (e) {
         this.log.error(
-          `Failed to parse json file '${path12}' with content: 
+          `Failed to parse json file '${path13}' with content: 
 
 ${json}
 
@@ -151272,7 +151320,7 @@ ${json}
         this.removeClusters(object, [ClusterId2.homeAssistantEntity])
       );
       if (json.trim().length === 0) {
-        throw new Error(`Tried to write empty storage to ${path12}`);
+        throw new Error(`Tried to write empty storage to ${path13}`);
       }
       return json;
     };
@@ -151290,10 +151338,10 @@ ${json}
 
 // src/core/app/storage/custom-storage.ts
 var CustomStorage = class extends StorageBackendDisk {
-  constructor(log, path12) {
-    super(path12);
+  constructor(log, path13) {
+    super(path13);
     this.log = log;
-    this.path = path12;
+    this.path = path13;
   }
   async initialize() {
     await super.initialize();
@@ -151310,11 +151358,11 @@ var CustomStorage = class extends StorageBackendDisk {
     return await super.keys(contexts);
   }
   async migrateLegacyStorage() {
-    const path12 = this.path;
+    const path13 = this.path;
     this.log.warn(
-      `Migrating legacy storage (JSON file) to new storage (directory): ${path12}`
+      `Migrating legacy storage (JSON file) to new storage (directory): ${path13}`
     );
-    const legacyStorage = new LegacyCustomStorage(this.log, `${path12}.json`);
+    const legacyStorage = new LegacyCustomStorage(this.log, `${path13}.json`);
     legacyStorage.initialize();
     forEach(legacyStorage.data, (values4, context) => {
       forEach(values4, (value, key) => {
@@ -151322,7 +151370,7 @@ var CustomStorage = class extends StorageBackendDisk {
       });
     });
     await legacyStorage.close();
-    fs7.renameSync(`${path12}.json`, `${path12}/backup.alpha-69.json`);
+    fs7.renameSync(`${path13}.json`, `${path13}/backup.alpha-69.json`);
   }
 };
 
@@ -151724,7 +151772,7 @@ var HomeAssistantClient = class extends Service {
         url: props.url,
         retryDelayMs: 5e3
       });
-      await new Promise((resolve5) => setTimeout(resolve5, 5e3));
+      await new Promise((resolve6) => setTimeout(resolve6, 5e3));
       return this.createConnection(props);
     }
     if (reason === ERR_INVALID_AUTH) {
@@ -151762,7 +151810,7 @@ var HomeAssistantClient = class extends Service {
     };
     let state;
     while (state !== "RUNNING") {
-      await new Promise((resolve5) => setTimeout(resolve5, 5e3));
+      await new Promise((resolve6) => setTimeout(resolve6, 5e3));
       state = await getState();
     }
     this.log.infoCtx("Home Assistant is up and running", { state });
@@ -164279,6 +164327,8 @@ var ServerModeServerNode = class extends ServerNode {
 
 // src/plugins/plugin-manager.ts
 init_esm();
+import * as fs10 from "node:fs";
+import * as path11 from "node:path";
 
 // src/plugins/plugin-device-factory.ts
 init_esm();
@@ -165768,8 +165818,24 @@ var PluginManager = class {
    */
   async loadExternal(packagePath, config10) {
     try {
+      const pkgJsonPath = path11.join(packagePath, "package.json");
+      if (!fs10.existsSync(pkgJsonPath)) {
+        throw new Error(`Plugin at ${packagePath} has no package.json`);
+      }
+      let manifest;
+      try {
+        manifest = JSON.parse(fs10.readFileSync(pkgJsonPath, "utf-8"));
+      } catch {
+        throw new Error(`Plugin at ${packagePath} has invalid package.json`);
+      }
+      if (!manifest.name || typeof manifest.name !== "string") {
+        throw new Error(`Plugin at ${packagePath} package.json missing "name"`);
+      }
+      if (!manifest.main || typeof manifest.main !== "string") {
+        throw new Error(`Plugin at ${packagePath} package.json missing "main"`);
+      }
       const module = await this.runner.run(
-        packagePath,
+        manifest.name,
         "import",
         () => import(packagePath),
         15e3
@@ -165849,7 +165915,13 @@ var PluginManager = class {
         );
       }
     };
-    this.instances.set(plugin.name, { plugin, context, metadata, devices });
+    this.instances.set(plugin.name, {
+      plugin,
+      context,
+      metadata,
+      devices,
+      started: false
+    });
     logger162.info(
       `Registered plugin: ${plugin.name} v${plugin.version} (${metadata.source})`
     );
@@ -165875,6 +165947,8 @@ var PluginManager = class {
       );
       if (this.runner.isDisabled(name)) {
         instance.metadata.enabled = false;
+      } else if (this.runner.getState(name).failures === 0) {
+        instance.started = true;
       }
     }
   }
@@ -165901,13 +165975,14 @@ var PluginManager = class {
    */
   async shutdownAll(reason) {
     for (const [name, instance] of this.instances) {
-      if (instance.plugin.onShutdown) {
+      if (instance.started && instance.plugin.onShutdown) {
         await this.runner.run(
           name,
           "onShutdown",
           () => instance.plugin.onShutdown(reason)
         );
       }
+      instance.started = false;
       logger162.info(`Plugin "${name}" shut down`);
     }
     this.instances.clear();
@@ -177517,7 +177592,7 @@ var EntityIsolationService = new EntityIsolationServiceImpl();
 // src/services/bridges/bridge-endpoint-manager.ts
 var MAX_ENTITY_ID_LENGTH = 150;
 var BridgeEndpointManager = class extends Service {
-  constructor(client, registry2, mappingStorage, bridgeId, log, pluginManager, storageLocation) {
+  constructor(client, registry2, mappingStorage, bridgeId, log, pluginManager, pluginRegistry, pluginInstaller) {
     super("BridgeEndpointManager");
     this.client = client;
     this.registry = registry2;
@@ -177525,7 +177600,8 @@ var BridgeEndpointManager = class extends Service {
     this.bridgeId = bridgeId;
     this.log = log;
     this.pluginManager = pluginManager;
-    this.storageLocation = storageLocation;
+    this.pluginRegistry = pluginRegistry;
+    this.pluginInstaller = pluginInstaller;
     this.root = new AggregatorEndpoint2("aggregator");
     EntityIsolationService.registerIsolationCallback(
       bridgeId,
@@ -177646,13 +177722,12 @@ var BridgeEndpointManager = class extends Service {
     await this.pluginManager.configureAll();
   }
   async loadRegisteredPlugins() {
-    if (!this.pluginManager || !this.storageLocation) return;
-    const pluginRegistry = new PluginRegistry(this.storageLocation);
-    const installer = new PluginInstaller(this.storageLocation);
-    const registered2 = pluginRegistry.getAll();
+    if (!this.pluginManager || !this.pluginRegistry || !this.pluginInstaller)
+      return;
+    const registered2 = this.pluginRegistry.getAll();
     for (const entry of registered2) {
       if (!entry.autoLoad) continue;
-      const packagePath = installer.getPluginPath(entry.packageName);
+      const packagePath = this.pluginInstaller.getPluginPath(entry.packageName);
       try {
         await this.pluginManager.loadExternal(packagePath, entry.config);
         this.log.info(
@@ -179414,8 +179489,12 @@ var BridgeEnvironment = class _BridgeEnvironment extends EnvironmentBase {
     this.set(EntityStateProvider, new EntityStateProvider(haRegistry));
     const bridgeId = this.get(BridgeDataProvider).id;
     let pluginManager;
+    let pluginRegistry;
+    let pluginInstaller;
     if (this.storageLocation) {
       pluginManager = new PluginManager(bridgeId, this.storageLocation);
+      pluginRegistry = new PluginRegistry(this.storageLocation);
+      pluginInstaller = new PluginInstaller(this.storageLocation);
     }
     this.set(
       BridgeEndpointManager,
@@ -179426,7 +179505,8 @@ var BridgeEnvironment = class _BridgeEnvironment extends EnvironmentBase {
         bridgeId,
         this.endpointManagerLogger,
         pluginManager,
-        this.storageLocation
+        pluginRegistry,
+        pluginInstaller
       )
     );
   }
@@ -179727,7 +179807,7 @@ async function startHandler(startOptions, webUiDist) {
     try {
       await Promise.race([
         bridgeService.dispose(),
-        new Promise((resolve5) => setTimeout(resolve5, 1e4))
+        new Promise((resolve6) => setTimeout(resolve6, 1e4))
       ]);
     } catch (e) {
       console.warn("Error during graceful shutdown:", e);
@@ -179743,7 +179823,7 @@ async function startHandler(startOptions, webUiDist) {
 }
 
 // src/commands/start/start-options-builder.ts
-import fs10 from "node:fs";
+import fs11 from "node:fs";
 function startOptionsBuilder(yargs2) {
   return yargs2.env("HAMH").version(false).config(
     "config",
@@ -179752,10 +179832,10 @@ function startOptionsBuilder(yargs2) {
       if (configPath.trim() === "") {
         return {};
       }
-      if (!fs10.existsSync(configPath)) {
+      if (!fs11.existsSync(configPath)) {
         throw new Error(`Config file '${configPath}' does not exist!`);
       }
-      return JSON.parse(fs10.readFileSync(configPath, "utf-8"));
+      return JSON.parse(fs11.readFileSync(configPath, "utf-8"));
     }
   ).option("log-level", {
     type: "string",
@@ -179817,7 +179897,7 @@ function startCommand(webDist) {
 // src/cli.ts
 var dirname4 = import.meta.dirname ?? url.fileURLToPath(new URL(".", import.meta.url));
 async function cli(argv) {
-  const webDist = process.env.NODE_ENV === "development" ? void 0 : path11.join(dirname4, "../frontend");
+  const webDist = process.env.NODE_ENV === "development" ? void 0 : path12.join(dirname4, "../frontend");
   const cli2 = yargs(hideBin(argv));
   cli2.scriptName("home-assistant-matter-hub").version().strict().recommendCommands().detectLocale(false).help().command(startCommand(webDist)).demandCommand().wrap(Math.min(140, cli2.terminalWidth())).parse();
 }