@kosdev-code/kos-ui-sdk 2.1.30 → 2.1.32

package/index.js

@@ -2,9 +2,9 @@ var wu = Object.defineProperty;
 var Mu = (t, e, s) => e in t ? wu(t, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : t[e] = s;
 var l = (t, e, s) => (Mu(t, typeof e != "symbol" ? e + "" : e, s), s);
 import C from "loglevel";
-import { runInAction as X, makeAutoObservable as Pe, observable as se, makeObservable as so, action as ro, createAtom as Eu, autorun as Ds, observe as Xi, isComputedProp as _u, reaction as xs, when as Ps, ObservableMap as no, computed as ea, isObservable as Tu } from "mobx";
+import { runInAction as X, makeAutoObservable as Ae, observable as se, makeObservable as so, action as ro, createAtom as Eu, autorun as Ds, observe as Xi, isComputedProp as _u, reaction as xs, when as Ps, ObservableMap as no, computed as ea, isObservable as Tu } from "mobx";
 import { makeAutoObservable as FT, makeObservable as NT } from "mobx";
-import { createMachine as ms, invoke as De, state as Z, transition as D, action as q, interpret as ys, immediate as Pt } from "robot3";
+import { createMachine as ms, invoke as xe, state as Z, transition as D, action as q, interpret as ys, immediate as Pt } from "robot3";
 import { format as lt, parseISO as $u } from "date-fns";
 import { jsx as w, jsxs as bs, Fragment as Iu } from "@emotion/react/jsx-runtime";
 import oo from "@emotion/styled";
@@ -14,7 +14,7 @@ import mt, { createContext as As, useContext as dt, useState as _, useCallback a
 import { observer as sa } from "mobx-react-lite";
 import { observer as jT } from "mobx-react-lite";
 import { useGesture as Du } from "@use-gesture/react";
-const io = "method", xu = "topic", Rs = "url", Kr = "request-id", ao = "response-id", ra = "status", et = "dst-addr", Pu = "src-addr", Ke = "type", na = "ordered", oa = "tracker", Au = "Content-Type", Ru = "Cache-Control", ku = "requestId", Lu = process.env.KOS_LOGIN_URL || "http://localhost", Fu = process.env.KOS_APP_PORT || "8080", LM = `${Lu}:${Fu}`, kn = "{MODEL_ID}";
+const io = "method", xu = "topic", Rs = "url", Kr = "request-id", ao = "response-id", ra = "status", et = "dst-addr", Pu = "src-addr", Ve = "type", na = "ordered", oa = "tracker", Au = "Content-Type", Ru = "Cache-Control", ku = "requestId", Lu = process.env.KOS_LOGIN_URL || "http://localhost", Fu = process.env.KOS_APP_PORT || "8080", LM = `${Lu}:${Fu}`, kn = "{MODEL_ID}";
 var Vr = /* @__PURE__ */ ((t) => (t.SEND = "/ws/log/msg/send", t.RECEIVED = "/ws/log/msg/receive", t))(Vr || {}), Nu = /* @__PURE__ */ ((t) => (t.MSG_RECEIVE = "/mock/msg/receive", t))(Nu || {});
 const ia = "/kos/model/ready/";
 C.info("Initializing event bus");
@@ -750,7 +750,7 @@ class QM {
     return this.extensions;
   }
 }
-const Oe = (t = null) => (t || window.location.search.replace("?", "")).split("&").map((e) => {
+const Se = (t = null) => (t || window.location.search.replace("?", "")).split("&").map((e) => {
   const [s, r] = e.split("=");
   return [s, decodeURIComponent(r || "")];
 }).reduce((e, [s, r]) => (e[s] = r, e), {}), Xu = "studio.tools.preview", ZM = "studio.relax.store.validation", ed = "studio.log.debug", td = "studio.log.info", sd = {
@@ -763,7 +763,7 @@ const Pa = xa, nd = () => Pa.profiles || [], Wo = (t) => nd().includes(t), JM =
   const t = Wo(ed), e = Wo(td);
   return t ? "DEBUG" : e ? "INFO" : void 0;
 }, id = () => {
-  const t = Oe(), e = od(), r = t.kosLogLevel ?? e ?? window.kosLogLevel ?? process.env.KOS_LOG_LEVEL;
+  const t = Se(), e = od(), r = t.kosLogLevel ?? e ?? window.kosLogLevel ?? process.env.KOS_LOG_LEVEL;
   return r || "WARN";
 }, ad = () => window.kosMessageLogging || process.env.KOS_MESSAGE_LOGGING === "true", cd = () => window.kosMessageStudioLogging || process.env.KOS_MESSAGE_STUDIO_LOGGING === "true", Aa = "ws-log", ld = C.methodFactory, Ra = ad(), ud = cd();
 C.methodFactory = function(t, e, s) {
@@ -900,7 +900,7 @@ const gd = window.KosFeatureFlags, md = (t, e, s) => {
   X(() => {
     Object.assign(e, r);
   });
-}, ae = Symbol("SubscriptionHandlers"), F = Symbol("DependencyModels"), nr = Symbol("FutureService"), ut = Symbol("ChildModels"), or = Symbol("ParentModel"), ir = Symbol("LogConfig"), bn = Symbol("ReferenceConfig"), La = Symbol("KosModelSymbol"), At = Symbol("ModelEffects"), ht = Symbol("CompanionParentModel"), Fa = Symbol("FutureContainerSetup"), Na = Symbol(
+}, ae = Symbol("SubscriptionHandlers"), N = Symbol("DependencyModels"), nr = Symbol("FutureService"), ut = Symbol("ChildModels"), or = Symbol("ParentModel"), ir = Symbol("LogConfig"), bn = Symbol("ReferenceConfig"), La = Symbol("KosModelSymbol"), At = Symbol("ModelEffects"), ht = Symbol("CompanionParentModel"), Fa = Symbol("FutureContainerSetup"), Na = Symbol(
   "MultipleFutureContainerSetup"
 ), ar = Symbol("FutureAliases"), Ua = Symbol("TroubleAwareSetup"), ja = Symbol("LoggerSetup"), Ba = Symbol("ContainerAwareSetup"), Zr = Symbol("StateMachineSetup"), ps = Symbol("StateEntryHandlers"), cr = Symbol("StateExitHandlers"), tE = Symbol("StateActionHandlers"), Jr = Symbol("OptionsRequired"), wd = g.createLogger({ group: "decorators", name: "fsm-injection" });
 function Md(t) {
@@ -1073,7 +1073,7 @@ function Hd(t, e) {
   const r = (t.constructor.prototype[ps] || /* @__PURE__ */ new Map()).get(e);
   r && typeof t[r] == "function" && t[r]();
 }
-const Ve = (t, e) => {
+const Ge = (t, e) => {
   t[ut] = t[ut] || {}, t[ut][e] = !0;
 }, Yt = (t) => `{PROP_${String(t)}}`, sE = (t) => `{PROP_${String(t)}}`, zd = Yt("kosParentId"), po = (t) => (e) => {
   e[or] = e[or] || {};
@@ -1148,7 +1148,7 @@ function Xr(t) {
         path: s,
         handler: n
       };
-      return r[Ze].push(i), r[F] = r[F] || {}, r[F][Zo] || (r[F][Zo] = {
+      return r[Ze].push(i), r[N] = r[N] || {}, r[N][Zo] || (r[N][Zo] = {
         modelType: "browser-router-model",
         // This is the MODEL_TYPE from BrowserRouter
         lifecycle: x.INIT
@@ -1212,7 +1212,7 @@ function Wd(t) {
 }
 const dE = (t) => (e, s) => {
   e[bn] = e[bn] || {}, e[bn][s] = t;
-}, vn = g.createLogger({ name: "resolve-parameters" }), Te = ({
+}, vn = g.createLogger({ name: "resolve-parameters" }), $e = ({
   value: t,
   modelId: e,
   modelData: s
@@ -1223,7 +1223,7 @@ const dE = (t) => (e, s) => {
   if (typeof r != "string" && typeof r != "object")
     return r;
   if (typeof r == "object")
-    r = Object.keys(r).reduce((n, o) => (n[o] = Te({
+    r = Object.keys(r).reduce((n, o) => (n[o] = $e({
       value: r[o],
       modelId: e,
       modelData: s
@@ -1272,7 +1272,7 @@ function Wt(t) {
           if (!p)
             throw new Error("Service request metadata not found for method");
           try {
-            const { default: m } = await Promise.resolve().then(() => ec), b = Te({
+            const { default: m } = await Promise.resolve().then(() => ec), b = $e({
               value: p.path,
               modelId: this.id,
               modelData: this
@@ -1287,7 +1287,7 @@ function Wt(t) {
               ...(f == null ? void 0 : f.requestOptions) || {}
             }, E = {};
             Object.keys(v).length > 0 && (E.path = v), Object.keys(M).length > 0 && (E.query = M);
-            const V = (p.method || "get").toLowerCase(), j = m, [te, We] = V === "get" ? await j.get(b, E, $) : V === "post" ? await j.post(
+            const V = (p.method || "get").toLowerCase(), j = m, [te, Ee] = V === "get" ? await j.get(b, E, $) : V === "post" ? await j.post(
               b,
               E,
               k,
@@ -1307,7 +1307,9 @@ function Wt(t) {
               if (p.errorHandler)
                 switch (p.errorHandler.strategy) {
                   case "log":
-                    return console.error(`Service request error: ${te}`), p.errorHandler.onError && p.errorHandler.onError(
+                    return console.error(
+                      `Service request status ${Ee == null ? void 0 : Ee.status} error: ${te}`
+                    ), p.errorHandler.onError && p.errorHandler.onError(
                       new Error(te),
                       this
                     ), [null, p.errorHandler.defaultValue];
@@ -1321,8 +1323,8 @@ function Wt(t) {
                 }
               return [te, null];
             }
-            let Qe = We;
-            return p.transform && (Qe = p.transform(We)), [null, Qe];
+            let Qe = Ee;
+            return p.transform && (Qe = p.transform(Ee)), [null, Qe];
           } catch (m) {
             return [m.message || "Unknown error", null];
           }
@@ -1396,7 +1398,7 @@ function mE(t) {
     const s = (t == null ? void 0 : t.pathProperty) || "path";
     return e.prototype[Ua] = {
       pathProperty: s
-    }, e.prototype[F] = e.prototype[F] || {}, e.prototype[F].troubleContainer = {
+    }, e.prototype[N] = e.prototype[N] || {}, e.prototype[N].troubleContainer = {
       modelType: "trouble-container-model",
       id: "trouble-container-model",
       // TroubleContainer is a singleton
@@ -1414,7 +1416,7 @@ const ks = ({
   lifecycle: r,
   resolutionPolicy: n
 }) => (o, i) => {
-  o[F] = o[F] || {}, o[F][i] = {
+  o[N] = o[N] || {}, o[N][i] = {
     modelType: t,
     id: e,
     options: s,
@@ -1429,7 +1431,7 @@ class Jd {
     l(this, "context");
     l(this, "disposers", /* @__PURE__ */ new Map());
     l(this, "container");
-    this.futures = ic.map(/* @__PURE__ */ new Map()), this.context = "", this.defaultContext = s || "", this.container = e, Pe(this);
+    this.futures = ic.map(/* @__PURE__ */ new Map()), this.context = "", this.defaultContext = s || "", this.container = e, Ae(this);
   }
   get allFutures() {
     return Array.from(this.futures.values());
@@ -1462,7 +1464,7 @@ class mo {
     l(this, "_future");
     l(this, "container");
     l(this, "onFutureUpdate");
-    this._future = void 0, this.container = e, Pe(this);
+    this._future = void 0, this.container = e, Ae(this);
   }
   removeFuture() {
     var e;
@@ -1575,7 +1577,7 @@ function th(t, e) {
     }
   });
 }
-const je = (t) => {
+const Be = (t) => {
   const e = th(qa, t);
   return new e(t);
 };
@@ -1588,9 +1590,9 @@ class Ka {
     l(this, "_map");
     l(this, "_key");
     l(this, "data");
-    this._container = e, this._map = se.map(/* @__PURE__ */ new Map()), this._key = s, this.data = je(), this.generateIndex(), Ds(() => {
+    this._container = e, this._map = se.map(/* @__PURE__ */ new Map()), this._key = s, this.data = Be(), this.generateIndex(), Ds(() => {
       this._container.revision && this.generateIndex();
-    }), Pe(this);
+    }), Ae(this);
   }
   refresh() {
     this.generateIndex();
@@ -1653,7 +1655,7 @@ function rh(t, e, s = []) {
   );
 }
 const le = g.createLogger({ name: "kos-container-model" });
-class Ge {
+class Ye {
   constructor(e) {
     l(this, "_data");
     l(this, "_sortKey");
@@ -1678,7 +1680,7 @@ class Ge {
     ) : {}, r = (e == null ? void 0 : e.indexMap) || {};
     this._optionsMap = { ...r, ...s };
     const n = e != null && e.indexMap ? Object.keys(e.indexMap).reduce((o, i) => (o[i] = void 0, o), {}) : {};
-    this._index = se.map(n), this.idx = je(), this._parentId = e == null ? void 0 : e.parentId, this._maxCapacity = e == null ? void 0 : e.maxCapacity, this._evictionStrategy = (e == null ? void 0 : e.evictionStrategy) || "fifo", this._evictionBatchSize = (e == null ? void 0 : e.evictionBatchSize) ?? Math.max(10, Math.ceil(((e == null ? void 0 : e.maxCapacity) ?? 100) * 0.1)), this._customEvictionFilter = e == null ? void 0 : e.customEvictionFilter, this._evictionStrategy === "lru" && this._maxCapacity && (this._accessTimes = se.map(/* @__PURE__ */ new Map())), Pe(this), this.init();
+    this._index = se.map(n), this.idx = Be(), this._parentId = e == null ? void 0 : e.parentId, this._maxCapacity = e == null ? void 0 : e.maxCapacity, this._evictionStrategy = (e == null ? void 0 : e.evictionStrategy) || "fifo", this._evictionBatchSize = (e == null ? void 0 : e.evictionBatchSize) ?? Math.max(10, Math.ceil(((e == null ? void 0 : e.maxCapacity) ?? 100) * 0.1)), this._customEvictionFilter = e == null ? void 0 : e.customEvictionFilter, this._evictionStrategy === "lru" && this._maxCapacity && (this._accessTimes = se.map(/* @__PURE__ */ new Map())), Ae(this), this.init();
   }
   init() {
     Object.keys(this._optionsMap).forEach((e) => {
@@ -1752,7 +1754,7 @@ class Ge {
     }
     this.removeModel(e);
     try {
-      await Ue(s);
+      await je(s);
     } catch (r) {
       throw le.error(`Failed to destroy model ${e}:`, r), r;
     }
@@ -1775,7 +1777,7 @@ class Ge {
     }
     this.removeAll(e);
     const r = await Promise.allSettled(
-      s.map((o) => Ue(o))
+      s.map((o) => je(o))
     );
     r.forEach((o, i) => {
       o.status === "rejected" && le.error(
@@ -1974,7 +1976,7 @@ class Ge {
           parentId: this._parentId,
           strategy: this._evictionStrategy
         }
-      ), this.removeModel(s.id, !0), Ue(s).catch(
+      ), this.removeModel(s.id, !0), je(s).catch(
         (r) => le.error(`Failed to destroy evicted model ${s.id}:`, r)
       );
   }
@@ -1991,7 +1993,7 @@ class Ge {
   async clear() {
     this._data.forEach((e) => {
       const s = e.id;
-      Ue(e).then(() => {
+      je(e).then(() => {
         le.debug(`${s} destroyed, removing from map`), this.removeModel(s, !0);
       }).catch((r) => le.error(r));
     }), this.increment();
@@ -2028,7 +2030,7 @@ const Me = async (t) => {
   } else
     throw new Error("Data model must have a valid ID");
   return t;
-}, Ue = async (t) => {
+}, je = async (t) => {
   await T.getInstance().whenReady(), await T.getInstance().modelManager.initiateDestroyModel(t);
 }, yE = async (t) => {
   if (await T.getInstance().whenReady(), !t.id)
@@ -2051,7 +2053,7 @@ const Me = async (t) => {
     throw new Error("Model ID is required");
   const e = T.getInstance().modelManager.getModelById(t);
   return { model: e == null ? void 0 : e.modelData, type: e == null ? void 0 : e.modelTypeName };
-}, Be = (t) => {
+}, He = (t) => {
   if (!t)
     throw new Error("Model ID is required");
   const e = T.getInstance().modelManager.getModelById(t);
@@ -2095,7 +2097,7 @@ const Me = async (t) => {
   return Array.from(s.companionModels.all()).find(
     (n) => e(n.modelData)
   );
-}, Ae = (t) => (e) => Object.getPrototypeOf(e).modelTypeId === t, Fn = (t) => {
+}, Re = (t) => (e) => Object.getPrototypeOf(e).modelTypeId === t, Fn = (t) => {
   const e = T.getInstance().modelManager.getModelById(t.id);
   if (!e)
     throw new Error("Model not found");
@@ -2197,7 +2199,7 @@ class Va {
     l(this, "guard");
     l(this, "factory");
     l(this, "relatedModels", []);
-    this.singleton = e.singleton, this.guard = Ae(e.type), this.type = e.type, this.loader = `kos.extension.model.loader.${e.type}`, this.factory = e.factory, this.class = e.class;
+    this.singleton = e.singleton, this.guard = Re(e.type), this.type = e.type, this.loader = `kos.extension.model.loader.${e.type}`, this.factory = e.factory, this.class = e.class;
   }
   addRelatedModel(e) {
     this.relatedModels.push(e);
@@ -2209,7 +2211,7 @@ class Va {
     P.model.register({})(this.registration()), this.registerRelatedModels();
   }
 }
-class Se extends Va {
+class Ce extends Va {
   constructor(e) {
     super({
       ...e,
@@ -2221,7 +2223,7 @@ class Se extends Va {
     const s = this.factory(e);
     return {
       get: () => {
-        const r = Be(e);
+        const r = He(e);
         if (!r)
           throw new Error("Model not found with id " + e);
         if (this.guard(r))
@@ -2269,7 +2271,7 @@ class Se extends Va {
     };
   }
 }
-class Re extends Va {
+class ke extends Va {
   constructor(e) {
     super({
       ...e,
@@ -2281,7 +2283,7 @@ class Re extends Va {
     const e = this.factory;
     return {
       get: () => {
-        const r = Be(this.type);
+        const r = He(this.type);
         if (!r)
           throw new Error("Model not found with id " + this.type);
         if (this.guard(r))
@@ -2341,7 +2343,7 @@ function uh(t, e, s) {
   const r = (o = t[or]) == null ? void 0 : o.parentId;
   if (!r)
     return;
-  const n = Te({
+  const n = $e({
     value: r,
     modelData: s,
     modelId: e
@@ -2355,14 +2357,14 @@ function dh(t) {
   });
 }
 function hh(t, e) {
-  const s = t[F] || {};
+  const s = t[N] || {};
   Object.entries(s).forEach(([r, n]) => {
-    const o = Te({
+    const o = $e({
       value: n.id || n.modelType,
       modelData: t,
       modelId: e
     }), i = Object.entries((n == null ? void 0 : n.options) || {}).reduce(
-      (a, [c, u]) => (a[c] = Te({
+      (a, [c, u]) => (a[c] = $e({
         value: u,
         modelData: t,
         modelId: e
@@ -2555,7 +2557,7 @@ function mh(t, e) {
     ...a,
     // If parentId is not provided, use the modelId (first constructor parameter)
     parentId: a.parentId || e
-  }, d = new Ge(u);
+  }, d = new Ye(u);
   t[r] = d, t[ut] || (t[ut] = {}), t[ut][r] = d, n && (t.getModel = (h) => d.getModel(h), t.addModel = (h) => {
     d.addModel(h);
   }, t.removeModel = (h) => {
@@ -2653,7 +2655,7 @@ function yh(t, e) {
 }
 function bh(t) {
   try {
-    return Pe(t);
+    return Ae(t);
   } catch (e) {
     return Nn.error("Failed to make observable:", e), t;
   }
@@ -2677,16 +2679,16 @@ function R(t) {
   return (e) => {
     var o, i;
     const s = e, r = typeof t == "string" ? { modelTypeId: t, autoRegister: !1 } : { autoRegister: !1, ...t };
-    s.prototype.modelTypeId = r.modelTypeId, s.prototype[La] = !0, (o = s.prototype)[ae] ?? (o[ae] = {}), (i = s.prototype)[F] ?? (i[F] = {}), r.optionsRequired && (s.prototype[Jr] = !0), g.ifDebug(() => {
+    s.prototype.modelTypeId = r.modelTypeId, s.prototype[La] = !0, (o = s.prototype)[ae] ?? (o[ae] = {}), (i = s.prototype)[N] ?? (i[N] = {}), r.optionsRequired && (s.prototype[Jr] = !0), g.ifDebug(() => {
       g.debug(`Registering model with id ${r.modelTypeId}`);
     });
     const n = new Proxy(s, vh);
     if (r.singleton !== void 0) {
       let a;
-      r.singleton ? a = new Re({
+      r.singleton ? a = new ke({
         class: n,
         type: r.modelTypeId
-      }) : a = new Se({
+      }) : a = new Ce({
         class: n,
         type: r.modelTypeId
       }), Object.defineProperty(n, "Registration", {
@@ -3208,7 +3210,7 @@ const Qa = (t, e, s) => {
   }), cancel: () => {
     r && clearTimeout(r);
   } };
-}, IE = (t) => typeof t.toJSON == "function", dr = (t) => t[F] !== void 0, Za = (t) => t.revision !== void 0 && t.index !== void 0, Wh = (t) => {
+}, IE = (t) => typeof t.toJSON == "function", dr = (t) => t[N] !== void 0, Za = (t) => t.revision !== void 0 && t.index !== void 0, Wh = (t) => {
   if (t) {
     if (dr(t))
       return t;
@@ -3221,7 +3223,7 @@ const Qa = (t, e, s) => {
   }
 }, Qh = (t, e) => {
   var f;
-  const s = e.id || e.modelType, r = Te({
+  const s = e.id || e.modelType, r = $e({
     value: s,
     modelData: t.modelData,
     modelId: t.modelId
@@ -3231,7 +3233,7 @@ const Qa = (t, e, s) => {
   );
   const o = Object.keys((e == null ? void 0 : e.options) || {}).reduce((p, m) => {
     const b = e.options[m];
-    return p[m] = Te({
+    return p[m] = $e({
       value: b,
       modelData: t.modelData,
       modelId: t.modelId
@@ -3333,7 +3335,7 @@ const Qa = (t, e, s) => {
   }
 }, Zh = (t, e = x.READY) => {
   var n;
-  const s = ((n = t.modelData) == null ? void 0 : n[F]) || {};
+  const s = ((n = t.modelData) == null ? void 0 : n[N]) || {};
   return Object.keys(s).length === 0 ? (g.debug(`${t.modelId} has no dependencies.  Returning`), []) : Object.keys(s).filter((o) => s[o].lifecycle === e).map((o) => {
     const i = s[o], a = Qh(t, i);
     if (!a.success || !a.dependentModel)
@@ -3533,7 +3535,7 @@ function tf(t, e, s, r) {
     configurable: !0,
     get() {
       var a, c, u;
-      const n = ((a = r.getChildren) == null ? void 0 : a.call(r)) || [], o = ((c = r.companionManager) == null ? void 0 : c.all()) || [], i = r.modelData[F] || {};
+      const n = ((a = r.getChildren) == null ? void 0 : a.call(r)) || [], o = ((c = r.companionManager) == null ? void 0 : c.all()) || [], i = r.modelData[N] || {};
       return {
         id: s,
         type: e,
@@ -3668,7 +3670,7 @@ const of = g.createLogger({ name: "model-active-machine" }), af = (t) => {
     [y.INACTIVE]: Z(
       D(L.GO_ACTIVE, y.ACTIVATING)
     ),
-    [y.ACTIVATING]: De(
+    [y.ACTIVATING]: xe(
       () => (t.activeStatus = y.ACTIVATING, t.activate()),
       D(
         "done",
@@ -3688,7 +3690,7 @@ const of = g.createLogger({ name: "model-active-machine" }), af = (t) => {
     [y.ACTIVE]: Z(
       D(L.GO_INACTIVE, y.DEACTIVATING)
     ),
-    [y.DEACTIVATING]: De(
+    [y.DEACTIVATING]: xe(
       () => (t.activeStatus = y.DEACTIVATING, t.deactivate()),
       D(
         "done",
@@ -3746,7 +3748,7 @@ const of = g.createLogger({ name: "model-active-machine" }), af = (t) => {
       D(L.CREATE, y.CREATED)
     ),
     [y.CREATED]: Z(Pt(y.INITIALIZING)),
-    [y.INITIALIZING]: De(
+    [y.INITIALIZING]: xe(
       () => (oe(() => {
         t.status = y.INITIALIZING;
       }), t.init()),
@@ -3768,7 +3770,7 @@ const of = g.createLogger({ name: "model-active-machine" }), af = (t) => {
       )
     ),
     [y.INITIALIZED]: Z(Pt(y.LOADING)),
-    [y.LOADING]: De(
+    [y.LOADING]: xe(
       () => (oe(() => {
         t.status = y.LOADING;
       }), t.load()),
@@ -3791,7 +3793,7 @@ const of = g.createLogger({ name: "model-active-machine" }), af = (t) => {
       Pt(y.READYING),
       D(L.UNLOAD, y.UNLOADING)
     ),
-    [y.RESETTING]: De(
+    [y.RESETTING]: xe(
       () => {
         var n;
         return oe(() => {
@@ -3806,7 +3808,7 @@ const of = g.createLogger({ name: "model-active-machine" }), af = (t) => {
         })
       )
     ),
-    [y.READYING]: De(
+    [y.READYING]: xe(
       () => (oe(() => {
         t.status = y.READYING;
       }), t.ready()),
@@ -3952,7 +3954,7 @@ class Xa {
           break;
         }
       }
-    if (e || (e = (s = Be(
+    if (e || (e = (s = He(
       Ja
     )) == null ? void 0 : s.model), !e)
       throw this.logger.error(
@@ -4089,7 +4091,7 @@ class Xa {
 function OE(t, e) {
   if (!Ln(t))
     return;
-  const s = Be(Ja);
+  const s = He(Ja);
   if (!(s != null && s.model))
     throw e.error(
       "Cannot register HTTP routes: BrowserRouter not found. Make sure to include BrowserRouter in your model dependencies or create an instance."
@@ -4262,7 +4264,7 @@ async function Vs(t, e, s, r, n) {
     ...s
   };
   n && (c.body = JSON.stringify(n));
-  const u = await Le(a, c);
+  const u = await Fe(a, c);
   return u.status < 200 || u.status >= 400 ? [`${u.statusText || yf}`, null] : [null, (await u.json()).data];
 }
 function tt() {
@@ -4279,9 +4281,9 @@ function tt() {
     )
   };
 }
-const ke = tt(), ec = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Le = tt(), ec = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  default: ke
+  default: Le
 }, Symbol.toStringTag, { value: "Module" })), ot = g.createLogger({
   name: "kos-service-request-manager",
   group: "Model"
@@ -4290,7 +4292,7 @@ function bf(t, e) {
   return !t.condition || t.condition(e);
 }
 function vf(t, e) {
-  return Te({
+  return $e({
     value: t.path,
     modelId: e.id,
     modelData: e
@@ -4298,7 +4300,7 @@ function vf(t, e) {
 }
 function wf(t, e) {
   if (t.pathParams)
-    return Te({
+    return $e({
       value: typeof t.pathParams == "function" ? t.pathParams(e) : t.pathParams,
       modelId: e.id,
       modelData: e
@@ -4306,7 +4308,7 @@ function wf(t, e) {
 }
 function Mf(t, e) {
   if (t.queryParams)
-    return Te({
+    return $e({
       value: typeof t.queryParams == "function" ? t.queryParams(e) : t.queryParams,
       modelId: e.id,
       modelData: e
@@ -4314,7 +4316,7 @@ function Mf(t, e) {
 }
 function Ef(t, e) {
   if (t.body)
-    return Te({
+    return $e({
       value: typeof t.body == "function" ? t.body(e) : t.body,
       modelId: e.id,
       modelData: e
@@ -4497,7 +4499,7 @@ class If {
    * Make HTTP request using existing KOS API client
    */
   async makeRequest(e, s, r, n) {
-    const o = ke;
+    const o = Le;
     switch (s) {
       case "get":
         return await o.get(e, r);
@@ -4669,7 +4671,7 @@ const Sf = ({
 `, n += `${Rs}:${t}
 `, n += `${Kr}:${e}
 `, r && (n += `${et}:${r}
-`), n += `${Ke}:kos.studio.request
+`), n += `${Ve}:kos.studio.request
 `, n += `
 `, n;
 }, Cf = ({
@@ -4688,7 +4690,7 @@ const Sf = ({
 `, r && (i += `${et}:${r}
 `), n && (i += `${na}:true
 `), o && (i += `${oa}:${o}
-`), i += `${Ke}:fos.http.request
+`), i += `${Ve}:fos.http.request
 `, i += `
 `, i;
 }, Df = ({
@@ -4711,7 +4713,7 @@ const Sf = ({
 `), a && Object.keys(a).forEach((u) => {
     c += `${u}:${a[u]}
 `;
-  }), c += `${Ke}:${i ? "fos" : "kos"}.http.request
+  }), c += `${Ve}:${i ? "fos" : "kos"}.http.request
 `, c += `
 `, c;
 }, yt = (t, e) => {
@@ -4781,7 +4783,7 @@ const xf = ({
   return r += `${Rs}:${t}
 `, r += `${Kr}:${e}
 `, r += `${et}:${s}
-`, r += `${Ke}:kos.studio.request
+`, r += `${Ve}:kos.studio.request
 `, r += `
 `, r;
 }, Pf = ({
@@ -4793,7 +4795,7 @@ const xf = ({
   let n = `${Kr}:${t}
 `;
   return n += `${et}:${e}
-`, n += `${Ke}:${s}
+`, n += `${Ve}:${s}
 `, r && Object.keys(r).forEach((o) => {
     n += `${o}:${r[o]}
 `;
@@ -4817,7 +4819,7 @@ const xf = ({
 `, e && (n += `${ao}:${e}
 `), n += `${ra}:${s}
 `, n += `${et}:${r}
-`, n += `${Ke}:kos.studio.response
+`, n += `${Ve}:kos.studio.response
 `, n += `
 `, n;
 }, CE = (t, e) => {
@@ -4837,7 +4839,7 @@ const xf = ({
 }) => {
   let e = `topic:${t}
 `;
-  return e += `${Ke}:kos.broker.send
+  return e += `${Ve}:kos.broker.send
 `, e += `
 `, e;
 }, kf = ({
@@ -4851,7 +4853,7 @@ const xf = ({
 `;
   return o += `${et}:${e}
 `, o += `${Pu}:${r}
-`, o += `${Ke}:${s ?? "kos.message.request"}
+`, o += `${Ve}:${s ?? "kos.message.request"}
 `, o += `${ra}:${n}
 `, o += `${Au}:application/json
 `, o += `${Ru}:no-cache
@@ -4867,7 +4869,7 @@ const xf = ({
 `;
   return e && (n += `${ao}:${e}
 `), n += `${et}:${s}
-`, n += `${Ke}:${r ?? "kos.message.request"}
+`, n += `${Ve}:${r ?? "kos.message.request"}
 `, n += `
 `, n;
 }, xE = ({
@@ -5335,7 +5337,7 @@ class ci {
     });
   }
 }
-const Vf = Oe();
+const Vf = Se();
 Vf.fos && (window.kosUseFos = !0);
 const li = process.env.KOS_FOS_PORT;
 window.kosUseFos = !!(window.kosUseFos || process.env.KOS_USE_FOS === "true");
@@ -5419,7 +5421,7 @@ class vs {
   _sendSubscriptionMessage(e, s, r = !1, n = !1, o) {
     var f, p, m, b;
     rt.debug(`${s} to topic ${e}`);
-    const i = Oe(), a = i == null ? void 0 : i.connId, c = o ?? a ?? ((f = window == null ? void 0 : window.kosBridge) == null ? void 0 : f.call(window, "connId"));
+    const i = Se(), a = i == null ? void 0 : i.connId, c = o ?? a ?? ((f = window == null ? void 0 : window.kosBridge) == null ? void 0 : f.call(window, "connId"));
     rt.debug(`subscribing with connId ${c}`);
     const u = c ? `dst-addr:${c}
 ` : "", d = r ? `subscribe:${e}` : n ? `type:fos.broker
@@ -5569,7 +5571,7 @@ class Yf {
         bridge: e.bridge,
         destinationAddress: o
       });
-      this.disposers.push(i);
+      n ? this.activatableDisposers.push(i) : this.disposers.push(i);
     } else {
       this.log.debug(`Subscribing to EventBus topic: ${s}`);
       const { unsubscribe: i } = O(s, r);
@@ -6151,7 +6153,7 @@ class rp {
     )), h;
   }
 }
-const N = C.getLogger("kos-model"), np = "kos.extension.model.loader";
+const F = C.getLogger("kos-model"), np = "kos.extension.model.loader";
 class op {
   constructor({ modelTypeName: e, id: s, modelData: r }) {
     l(this, "_id");
@@ -6162,6 +6164,7 @@ class op {
     l(this, "modelTypeName");
     l(this, "initialized");
     l(this, "loaded");
+    l(this, "_isLoadExecuting");
     l(this, "offlineQueue");
     l(this, "subscriptionManager");
     l(this, "effectManager");
@@ -6174,9 +6177,9 @@ class op {
     l(this, "companionManager");
     l(this, "childResolver");
     l(this, "fsm");
-    this._id = typeof s < "u" ? `${s}` : e, this.modelTypeName = e, this.initialized = !1, this.loaded = !1, this.modelData = r, this._status = y.CREATED, this._activeStatus = y.INACTIVE, this._onlineStatus = y.OFFLINE;
+    this._id = typeof s < "u" ? `${s}` : e, this.modelTypeName = e, this.initialized = !1, this.loaded = !1, this._isLoadExecuting = !1, this.modelData = r, this._status = y.CREATED, this._activeStatus = y.INACTIVE, this._onlineStatus = y.OFFLINE;
     const n = rp.createAll(this);
-    this.fsm = n.fsm, this.offlineQueue = n.offlineQueue, this.companionManager = n.companionManager, this.childResolver = n.childResolver, this.serviceResponses = n.serviceResponseStore, n.effectManager && (this.effectManager = n.effectManager), n.subscriptionManager && (this.subscriptionManager = n.subscriptionManager), n.httpRouteManager && (this.httpRouteManager = n.httpRouteManager), n.onlineLifecycleManager && (this.onlineLifecycleManager = n.onlineLifecycleManager), n.serviceRequestManager && (this.serviceRequestManager = n.serviceRequestManager), Pe(this, {
+    this.fsm = n.fsm, this.offlineQueue = n.offlineQueue, this.companionManager = n.companionManager, this.childResolver = n.childResolver, this.serviceResponses = n.serviceResponseStore, n.effectManager && (this.effectManager = n.effectManager), n.subscriptionManager && (this.subscriptionManager = n.subscriptionManager), n.httpRouteManager && (this.httpRouteManager = n.httpRouteManager), n.onlineLifecycleManager && (this.onlineLifecycleManager = n.onlineLifecycleManager), n.serviceRequestManager && (this.serviceRequestManager = n.serviceRequestManager), Ae(this, {
       fsm: !1,
       effectManager: !1,
       subscriptionManager: !1,
@@ -6229,33 +6232,33 @@ class op {
   }
   async deactivate() {
     var e, s, r;
-    N.debug(
+    F.debug(
       `deactivating model ${this.modelTypeName} with id ${this.modelId}`
     );
     try {
       const n = J.getContext(this.modelId);
-      await ((s = (e = this.modelData) == null ? void 0 : e.deactivate) == null ? void 0 : s.call(e, n)), N.debug(
+      await ((s = (e = this.modelData) == null ? void 0 : e.deactivate) == null ? void 0 : s.call(e, n)), F.debug(
         `Model ${this.modelTypeName} with id ${this.modelId} deactivated`
       ), (r = this.subscriptionManager) == null || r.deactivate();
     } catch (n) {
-      throw N.debug(`Model ${this.modelId}  failed to deactivated`), n;
+      throw F.debug(`Model ${this.modelId}  failed to deactivated`), n;
     }
   }
   async activate() {
     var e, s, r, n;
-    N.debug(`activating model ${this.modelTypeName} with id ${this.modelId}`), await Ks(this, x.ACTIVATE);
+    F.debug(`activating model ${this.modelTypeName} with id ${this.modelId}`), await Ks(this, x.ACTIVATE);
     try {
       await ((e = this.serviceRequestManager) == null ? void 0 : e.executeForLifecycle(
         x.ACTIVATE
       ));
       const o = J.getContext(this.modelId);
-      await ((r = (s = this.modelData) == null ? void 0 : s.activate) == null ? void 0 : r.call(s, o)), this.initializeStateMachineForLifecycle(x.ACTIVATE), N.debug(
+      await ((r = (s = this.modelData) == null ? void 0 : s.activate) == null ? void 0 : r.call(s, o)), this.initializeStateMachineForLifecycle(x.ACTIVATE), F.debug(
         `Model ${this.modelTypeName} with id ${this.modelId} subscribing to all topics`
-      ), (n = this.subscriptionManager) == null || n.registerAll(x.ACTIVATE), this.createLifecycleCompanions(x.ACTIVATE), N.debug(
+      ), (n = this.subscriptionManager) == null || n.registerAll(x.ACTIVATE), this.createLifecycleCompanions(x.ACTIVATE), F.debug(
         `Model ${this.modelTypeName} with id ${this.modelId} activated`
       );
     } catch (o) {
-      throw N.debug(`Model ${this.modelId}  failed to activate`), o;
+      throw F.debug(`Model ${this.modelId}  failed to activate`), o;
     }
   }
   async whenLoaded() {
@@ -6269,7 +6272,7 @@ class op {
       {
         condition: () => this.loaded,
         onMatch: () => {
-          N.debug(`Model ${this.modelId} is loaded`);
+          F.debug(`Model ${this.modelId} is loaded`);
         }
       }
     ]);
@@ -6285,7 +6288,7 @@ class op {
       {
         condition: () => this.initialized,
         onMatch: () => {
-          N.debug(`Model ${this.modelId} is initialized`);
+          F.debug(`Model ${this.modelId} is initialized`);
         }
       }
     ]);
@@ -6301,7 +6304,7 @@ class op {
       {
         condition: () => this.status === y.READY,
         onMatch: () => {
-          N.debug(`Model ${this.modelId} is ready`);
+          F.debug(`Model ${this.modelId} is ready`);
         }
       }
     ]);
@@ -6309,13 +6312,13 @@ class op {
   async ready() {
     var e, s, r, n;
     if (this.fsm.current === y.READY) {
-      N.debug(
+      F.debug(
         `already readying model ${this.modelTypeName} with id ${this.modelId} returning`
       );
       return;
     }
     try {
-      N.debug(`readying model ${this.modelTypeName} with id ${this.modelId}`), await Ks(this, x.READY), await Xh(
+      F.debug(`readying model ${this.modelTypeName} with id ${this.modelId}`), await Ks(this, x.READY), await Xh(
         this,
         Wa.READY,
         x.READY
@@ -6323,7 +6326,7 @@ class op {
         x.READY
       ));
       const o = J.getContext(this.modelId);
-      await ((r = (s = this.modelData) == null ? void 0 : s.ready) == null ? void 0 : r.call(s, o)), this.offlineQueue.flush(), this.initializeStateMachineForLifecycle(x.READY), (n = this.subscriptionManager) == null || n.registerAll(x.READY), this.createLifecycleCompanions(x.READY), N.debug(`Model ${this.modelId} is ready`);
+      await ((r = (s = this.modelData) == null ? void 0 : s.ready) == null ? void 0 : r.call(s, o)), this.offlineQueue.flush(), this.initializeStateMachineForLifecycle(x.READY), (n = this.subscriptionManager) == null || n.registerAll(x.READY), this.createLifecycleCompanions(x.READY), F.debug(`Model ${this.modelId} is ready`);
       const i = {
         modelId: this.modelId,
         modelType: this.modelTypeName
@@ -6333,7 +6336,7 @@ class op {
         i
       ), G(Hh(this.modelTypeName), i);
     } catch (o) {
-      throw N.error(o), Error(o);
+      throw F.error(o), Error(o);
     }
   }
   async load() {
@@ -6341,34 +6344,41 @@ class op {
     const e = this[ht];
     e && await e.whenLoaded();
     const { modelTypeName: s, modelId: r } = this;
-    if (this.fsm.current === y.LOADED || this.fsm.current === y.LOADING) {
-      N.debug(
-        `Model ${s} with id ${r} already loaded or loading`
+    if (this.fsm.current === y.LOADED) {
+      F.debug(`Model ${s} with id ${r} already loaded`);
+      return;
+    }
+    if (this._isLoadExecuting) {
+      F.debug(
+        `Model ${s} with id ${r} is currently executing load`
       );
       return;
     }
-    N.debug(`Loading model ${s} with id ${r}`), await Ks(this, x.LOAD);
+    this._isLoadExecuting = !0;
     try {
+      F.debug(`Loading model ${s} with id ${r}`), await Ks(this, x.LOAD);
       const d = J.getContext(r), h = `${np}.${s}`, f = await I.loader.executeLoader(
         h,
         {}
       );
-      f && (N.info(
+      f && (F.info(
         `Setting loaded context for ${r}, type: ${s}`
       ), d == null || d.set(h, f)), await ((n = this.serviceRequestManager) == null ? void 0 : n.executeForLifecycle(
         x.LOAD
       )), await ((i = (o = this.modelData) == null ? void 0 : o.load) == null ? void 0 : i.call(o, d)), oe(() => {
         this.loaded = !0;
-      }), N.debug(
+      }), F.debug(
         `Model ${s} with id ${r} successfully loaded`
       ), this.initializeStateMachineForLifecycle(x.LOAD), (a = this.subscriptionManager) == null || a.registerAll(x.LOAD), (c = this.httpRouteManager) == null || c.registerAll(), (u = this.effectManager) == null || u.setup(), this.createLifecycleCompanions(x.LOAD);
     } catch (d) {
-      throw N.error(`Model ${r} failed to load`, d), d;
+      throw F.error(`Model ${r} failed to load`, d), d;
+    } finally {
+      this._isLoadExecuting = !1;
     }
   }
   async unload() {
     var e, s, r, n, o, i, a;
-    N.debug(`unloading model ${this.modelTypeName} with id ${this.modelId}`);
+    F.debug(`unloading model ${this.modelTypeName} with id ${this.modelId}`);
     try {
       const c = this.getChildren().map((d) => {
         var h;
@@ -6384,9 +6394,9 @@ class op {
         }
         d.stateHistory && (d.stateHistory = []);
       }
-      N.debug(`Model ${this.modelTypeName} with id ${this.modelId} unloaded`), (o = this.effectManager) == null || o.disposeAll(), (i = this.subscriptionManager) == null || i.disposeAll(), (a = this.httpRouteManager) == null || a.dispose();
+      F.debug(`Model ${this.modelTypeName} with id ${this.modelId} unloaded`), (o = this.effectManager) == null || o.disposeAll(), (i = this.subscriptionManager) == null || i.disposeAll(), (a = this.httpRouteManager) == null || a.dispose();
     } catch (c) {
-      throw N.debug(`Model ${this.modelId}  failed to unload`), c;
+      throw F.debug(`Model ${this.modelId}  failed to unload`), c;
     }
   }
   async init() {
@@ -6394,18 +6404,18 @@ class op {
     const e = this[ht];
     e && await e.whenInitialized();
     const { modelId: s, modelTypeName: r } = this, n = J.getContext(s);
-    N.debug(`Initializing model ${r} with id ${s}`), await Ks(this, x.INIT);
+    F.debug(`Initializing model ${r} with id ${s}`), await Ks(this, x.INIT);
     try {
       await ((o = this.serviceRequestManager) == null ? void 0 : o.executeForLifecycle(
         x.INIT
-      )), await ((a = (i = this.modelData) == null ? void 0 : i.init) == null ? void 0 : a.call(i, n)), this.initialized = !0, N.debug(`Model ${r} with id ${s} initialized`), (c = this.onlineLifecycleManager) == null || c.register(), this.initializeStateMachineForLifecycle(x.INIT), this.registerSubscribers(x.INIT), this.createLifecycleCompanions(x.INIT);
+      )), await ((a = (i = this.modelData) == null ? void 0 : i.init) == null ? void 0 : a.call(i, n)), this.initialized = !0, F.debug(`Model ${r} with id ${s} initialized`), (c = this.onlineLifecycleManager) == null || c.register(), this.initializeStateMachineForLifecycle(x.INIT), this.registerSubscribers(x.INIT), this.createLifecycleCompanions(x.INIT);
     } catch (u) {
-      throw N.error(`Model ${s} failed to initialize`, u), u;
+      throw F.error(`Model ${s} failed to initialize`, u), u;
     }
   }
   async registerSubscribers(e) {
     var s;
-    N.debug(
+    F.debug(
       `registering subscribers in ${this.modelTypeName} with id ${this.modelId}`
     ), (s = this.subscriptionManager) == null || s.registerAll(e);
   }
@@ -6427,13 +6437,13 @@ class op {
   }
   async online() {
     var s, r;
-    N.debug(`online model ${this.modelTypeName} with id ${this.modelId}`), this.registerSubscribers();
+    F.debug(`online model ${this.modelTypeName} with id ${this.modelId}`), this.registerSubscribers();
     const e = J.getContext(this.modelId);
     await ((r = (s = this.modelData) == null ? void 0 : s.online) == null ? void 0 : r.call(s, e)), this.createLifecycleCompanions(x.ONLINE);
   }
   async offline() {
     var s, r, n;
-    N.debug(`offline model ${this.modelTypeName} with id ${this.modelId}`), (s = this.subscriptionManager) == null || s.disposeAll();
+    F.debug(`offline model ${this.modelTypeName} with id ${this.modelId}`), (s = this.subscriptionManager) == null || s.disposeAll();
     const e = J.getContext(this.modelId);
     await ((n = (r = this.modelData) == null ? void 0 : r.offline) == null ? void 0 : n.call(r, e));
   }
@@ -6911,7 +6921,7 @@ const up = (t) => {
       "initializing"
       /* INITIALIZING */
     )),
-    initializing: De(
+    initializing: xe(
       () => t.init(),
       D(
         "done",
@@ -6923,7 +6933,7 @@ const up = (t) => {
       "loading"
       /* LOADING */
     )),
-    loading: De(
+    loading: xe(
       () => t.load(),
       D(
         "done",
@@ -6942,7 +6952,7 @@ const up = (t) => {
         /* UNLOADING */
       )
     ),
-    readying: De(
+    readying: xe(
       () => t.ready(),
       D(
         "done",
@@ -6954,7 +6964,7 @@ const up = (t) => {
         })
       )
     ),
-    reloading: De(
+    reloading: xe(
       () => t.reload(),
       D(
         "done",
@@ -7001,10 +7011,10 @@ const up = (t) => {
     (o) => C.debug(o.machine.current)
   ), online: s };
 }, Q = g.createLogger({ name: "kos-core" }), dp = () => {
-  const t = Oe(), e = t == null ? void 0 : t.alias, s = process.env.KOS_CONNECTION_ALIAS;
+  const t = Se(), e = t == null ? void 0 : t.alias, s = process.env.KOS_CONNECTION_ALIAS;
   return e || s || void 0;
 }, hp = () => {
-  const t = window.location.protocol, e = Oe(), s = e == null ? void 0 : e.host;
+  const t = window.location.protocol, e = Se(), s = e == null ? void 0 : e.host;
   let r;
   try {
     r = new URL(s).protocol === "https:" ? "wss://" : "ws://";
@@ -7012,7 +7022,7 @@ const up = (t) => {
   }
   return r || (t === "https:" ? "wss://" : "ws://");
 }, fp = () => {
-  const t = window.location.hostname, e = process.env.KOS_HOST, s = Oe(), r = s == null ? void 0 : s.host;
+  const t = window.location.hostname, e = process.env.KOS_HOST, s = Se(), r = s == null ? void 0 : s.host;
   let n;
   try {
     n = new URL(r).hostname;
@@ -7020,7 +7030,7 @@ const up = (t) => {
   }
   return n ?? e ?? t;
 }, pp = () => {
-  const t = window.location.port, e = process.env.KOS_PORT, s = Oe(), r = s == null ? void 0 : s.host;
+  const t = window.location.port, e = process.env.KOS_PORT, s = Se(), r = s == null ? void 0 : s.host;
   let n;
   try {
     n = new URL(r).port;
@@ -7057,7 +7067,7 @@ class T {
     l(this, "_reloading");
     l(this, "_unloading");
     l(this, "connectionAlias");
-    this.initialized = !1, this.connectionAlias = e, this.loaded = !1, this.isOnline = !1, this.status = fr.CREATED, this.authState = "logged_out", this._reloading = !1, this._unloading = !1, Pe(this), O("token", (a) => {
+    this.initialized = !1, this.connectionAlias = e, this.loaded = !1, this.isOnline = !1, this.status = fr.CREATED, this.authState = "logged_out", this._reloading = !1, this._unloading = !1, Ae(this), O("token", (a) => {
       a && (this.transport.token = a.body);
     }), O(hr.CONNECTED, async () => {
       await this.whenReady(), this.fsmService.service.send(St.GO_ONLINE);
@@ -7454,8 +7464,8 @@ const Ws = g.createLogger({ name: "kos-fetch" }), Tp = process.env.KOS_WS_TIMEOU
           if (k === "multipart/form-data" && typeof E == "string")
             try {
               const te = JSON.parse(E);
-              te.fields && Object.entries(te.fields).forEach(([We, Qe]) => {
-                j.append(We, Qe);
+              te.fields && Object.entries(te.fields).forEach(([Ee, Qe]) => {
+                j.append(Ee, Qe);
               }), te.files && Ws.warn(
                 "File reconstruction in FormData not fully implemented"
               );
@@ -7491,10 +7501,10 @@ const Ws = g.createLogger({ name: "kos-fetch" }), Tp = process.env.KOS_WS_TIMEOU
     b == null || b.send(d);
   });
 };
-let me = "kos:", Le = Op;
+let me = "kos:", Fe = Op;
 if (process.env.KOS_MOCK_FETCH === "true") {
   const t = process.env.KOS_PORT || "9999";
-  Le = fetch, me = `http://localhost:${t}`;
+  Fe = fetch, me = `http://localhost:${t}`;
 }
 const Sp = g.createLogger({
   name: "kos-model-visitor",
@@ -7688,7 +7698,7 @@ const Pp = g.createLogger({ name: "kos-service-request" }), ye = (t) => ({ isMoc
       m = await f.json();
     } catch {
     }
-    throw new $e(
+    throw new Ie(
       `There was a problem retrieving the model; returned status ${f.status}`,
       m
     );
@@ -7724,7 +7734,7 @@ const Pp = g.createLogger({ name: "kos-service-request" }), ye = (t) => ({ isMoc
       b = await p.json();
     } catch {
     }
-    throw new $e(
+    throw new Ie(
       `There was a problem retrieving the model; returned status ${p.status}`,
       b
     );
@@ -7758,14 +7768,14 @@ const Pp = g.createLogger({ name: "kos-service-request" }), ye = (t) => ({ isMoc
       b = await p.json();
     } catch {
     }
-    throw new $e(
+    throw new Ie(
       `There was a problem retrieving the model; returned status ${p.status}`,
       b
     );
   }
   return await p.json();
 };
-class $e extends Error {
+class Ie extends Error {
   constructor(s, r) {
     super(s);
     l(this, "payload");
@@ -7802,7 +7812,7 @@ const pi = (t, e, s) => async ({
       b = await p.json();
     } catch {
     }
-    throw new $e(
+    throw new Ie(
       `There was a problem sending the POST data; returned status ${p.status}`,
       b
     );
@@ -7838,7 +7848,7 @@ const pi = (t, e, s) => async ({
       v = await m.json();
     } catch {
     }
-    throw new $e(
+    throw new Ie(
       `There was a problem modifying the model; returned status ${m.status}`,
       v
     );
@@ -7889,7 +7899,7 @@ const pi = (t, e, s) => async ({
     modifyModelPath: i,
     mock: a = !1
   }) => {
-    const c = a ? fetch : Le;
+    const c = a ? fetch : Fe;
     return {
       /**
        * Retrieves a list of entities managed by the KOS Server.
@@ -8031,7 +8041,7 @@ class Up {
     l(this, "_context");
     l(this, "_parent");
     l(this, "_id");
-    this._id = e, this._context = new no({}), this._parent = "", Pe(this);
+    this._id = e, this._context = new no({}), this._parent = "", Ae(this);
   }
   setParent(e) {
     oe(() => {
@@ -8047,10 +8057,10 @@ class Up {
   get parentModel() {
     var e;
     if (this._parent)
-      return (e = Be(this._parent)) == null ? void 0 : e.model;
+      return (e = He(this._parent)) == null ? void 0 : e.model;
   }
   get companionModels() {
-    const e = Be(this._id);
+    const e = He(this._id);
     return e != null && e.model ? ih(e.model) : [];
   }
   get(e) {
@@ -8123,7 +8133,7 @@ class rc {
     l(this, "_customEvictionFilter");
     this._data = se.map(/* @__PURE__ */ new Map()), this._sortKey = e == null ? void 0 : e.sortKey, this._revision = 1, this._optionsMap = (e == null ? void 0 : e.indexMap) || {};
     const s = e != null && e.indexMap ? Object.keys(e.indexMap).reduce((r, n) => (r[n] = void 0, r), {}) : {};
-    this._index = se.map(s), this.idx = je(), this._maxCapacity = e == null ? void 0 : e.maxCapacity, this._evictionStrategy = (e == null ? void 0 : e.evictionStrategy) || "fifo", this._evictionBatchSize = (e == null ? void 0 : e.evictionBatchSize) ?? Math.max(10, Math.ceil(((e == null ? void 0 : e.maxCapacity) ?? 100) * 0.1)), this._customEvictionFilter = e == null ? void 0 : e.customEvictionFilter, this._evictionStrategy === "lru" && this._maxCapacity && (this._accessTimes = se.map(/* @__PURE__ */ new Map())), Pe(this, {}), this.init();
+    this._index = se.map(s), this.idx = Be(), this._maxCapacity = e == null ? void 0 : e.maxCapacity, this._evictionStrategy = (e == null ? void 0 : e.evictionStrategy) || "fifo", this._evictionBatchSize = (e == null ? void 0 : e.evictionBatchSize) ?? Math.max(10, Math.ceil(((e == null ? void 0 : e.maxCapacity) ?? 100) * 0.1)), this._customEvictionFilter = e == null ? void 0 : e.customEvictionFilter, this._evictionStrategy === "lru" && this._maxCapacity && (this._accessTimes = se.map(/* @__PURE__ */ new Map())), Ae(this, {}), this.init();
   }
   init() {
     Object.keys(this._optionsMap).forEach((e) => {
@@ -8287,7 +8297,7 @@ class rc {
    * @private
    */
   _logDataCapacityWarning(e) {
-    nt.warn(
+    nt.info(
       `Data container capacity exceeded (${this._data.size}/${this._maxCapacity}). Evicting ${e} items using ${this._evictionStrategy} strategy. This may indicate missing cleanup handlers or data inconsistency.`
     );
   }
@@ -8346,7 +8356,7 @@ class rc {
     e.forEach((s) => {
       var n;
       const r = this._data.get(s);
-      nt.warn(`Evicting data item: ${s}`, {
+      nt.info(`Evicting data item: ${s}`, {
         itemId: s,
         itemType: r ? (n = r.constructor) == null ? void 0 : n.name : "unknown",
         strategy: this._evictionStrategy
@@ -8407,7 +8417,7 @@ class YE {
     };
   }
   get predicate() {
-    return Ae(this.type);
+    return Re(this.type);
   }
 }
 class WE {
@@ -8431,13 +8441,13 @@ class WE {
     };
   }
   get predicate() {
-    return Ae(this.type);
+    return Re(this.type);
   }
 }
 class jp {
   constructor() {
     l(this, "_token");
-    Pe(this), O("token", (e) => {
+    Ae(this), O("token", (e) => {
       this.token = e == null ? void 0 : e.body;
     });
   }
@@ -8593,7 +8603,7 @@ const nc = g.createLogger({ name: "intent-service" }), QE = (t) => {
     });
   } else
     nc.info(`No subscribers for intent ${t.type}. Intent not sent.`), e([null, { body: void 0, payload: void 0 }]);
-}), Ne = g.createLogger({ name: "app-startup-service" });
+}), Ue = g.createLogger({ name: "app-startup-service" });
 async function Hp(t, e = {}) {
   const {
     timeout: s = 3e4,
@@ -8601,16 +8611,16 @@ async function Hp(t, e = {}) {
     requirePostStarted: n = !1
   } = e;
   if (t.length === 0)
-    return Ne.warn("No app IDs provided to waitForAppsToStart"), !0;
-  Ne.debug(`Waiting for apps to start: ${t.join(", ")}`);
+    return Ue.warn("No app IDs provided to waitForAppsToStart"), !0;
+  Ue.debug(`Waiting for apps to start: ${t.join(", ")}`);
   try {
     const o = t.map((c) => `/kos/app/started/${c}`), i = await ho(o, {
       getCurrentState: async () => {
         try {
           const { default: c } = await Promise.resolve().then(() => ec), [u, d] = await c.get("/api/kos/apps/started");
-          return u ? (Ne.error("Error fetching started apps:", u), []) : d;
+          return u ? (Ue.error("Error fetching started apps:", u), []) : d;
         } catch (c) {
-          Ne.error("Failed to fetch app startup status:", c);
+          Ue.error("Failed to fetch app startup status:", c);
         }
         return [];
       },
@@ -8625,14 +8635,14 @@ async function Hp(t, e = {}) {
     });
     if (a.length > 0) {
       const c = `Apps not started: ${a.join(", ")}`;
-      if (Ne.error(c), r)
+      if (Ue.error(c), r)
         throw new Error(`App startup timeout: ${c}`);
       return !1;
     }
-    return Ne.info(`All apps started successfully: ${t.join(", ")}`), !0;
+    return Ue.info(`All apps started successfully: ${t.join(", ")}`), !0;
   } catch (o) {
     const i = `Failed to wait for apps to start: ${t.join(", ")}`;
-    if (Ne.error(i, o), r)
+    if (Ue.error(i, o), r)
       throw new Error(
         `${i} - ${o instanceof Error ? o.message : String(o)}`
       );
@@ -8645,7 +8655,7 @@ async function JE(t, e = {}) {
 async function XE(t, e = !1) {
   const s = {};
   try {
-    const r = await Le("kos:///api/kos/apps/started");
+    const r = await Fe("kos:///api/kos/apps/started");
     if (!r.ok)
       return t.forEach((i) => s[i] = !1), s;
     const n = await r.json(), o = (n == null ? void 0 : n.data) ?? [];
@@ -8654,23 +8664,23 @@ async function XE(t, e = !1) {
       s[i] = (a == null ? void 0 : a.started) === !0 && (!e || (a == null ? void 0 : a.postStarted) === !0);
     });
   } catch (r) {
-    Ne.error("Failed to check app startup status:", r), t.forEach((n) => s[n] = !1);
+    Ue.error("Failed to check app startup status:", r), t.forEach((n) => s[n] = !1);
   }
   return s;
 }
 async function e_() {
   try {
-    const t = await Le("kos:///api/kos/apps/started");
+    const t = await Fe("kos:///api/kos/apps/started");
     if (!t.ok)
       return [];
     const e = await t.json();
     return (e == null ? void 0 : e.data) ?? [];
   } catch (t) {
-    return Ne.error("Failed to fetch started apps:", t), [];
+    return Ue.error("Failed to fetch started apps:", t), [];
   }
 }
 const mi = Ps, oc = ea, oe = X, ee = Ds, zp = xs, ic = se, ac = "Not Assigned", t_ = "kos.trouble.added", s_ = "kos.trouble.removed";
-var xe = /* @__PURE__ */ ((t) => (t.TroubleRank = "kos.trouble.rank.mapper", t.TroubleColor = "kos.trouble.color.mapper", t.TroubleRole = "kos.trouble.role.mapper", t))(xe || {}), pr = /* @__PURE__ */ ((t) => (t.TIME_CHANGE = "/kos/internal/time/time", t.DAY_CHANGE = "/kos/internal/time/day", t.TIMEZONE_CHANGE = "/kos/internal/time/timezone", t))(pr || {});
+var Pe = /* @__PURE__ */ ((t) => (t.TroubleRank = "kos.trouble.rank.mapper", t.TroubleColor = "kos.trouble.color.mapper", t.TroubleRole = "kos.trouble.role.mapper", t))(Pe || {}), pr = /* @__PURE__ */ ((t) => (t.TIME_CHANGE = "/kos/internal/time/time", t.DAY_CHANGE = "/kos/internal/time/day", t.TIMEZONE_CHANGE = "/kos/internal/time/timezone", t))(pr || {});
 const cc = g.createLogger({
   name: "config-bean-service",
   group: "Services"
@@ -8764,7 +8774,7 @@ let wr = class {
       modifyConfigBean: s = Gp,
       getConfigBean: r = Yp
     } = e;
-    this._modifyConfigBean = s, this._getConfigBean = r, this.props = je(), this.prevProps = je();
+    this._modifyConfigBean = s, this._getConfigBean = r, this.props = Be(), this.prevProps = Be();
   }
   /**
    * Gets current configuration property values.
@@ -8885,11 +8895,11 @@ dc([
 wr = dc([
   R(Mo)
 ], wr);
-const Mr = new Se({
+const Mr = new Ce({
   class: wr,
   type: Mo
 }), Eo = ({ path: t, lazy: e, serviceBasePath: s }) => (r, n) => {
-  r[F] = r[F] || {}, r[F][n] = {
+  r[N] = r[N] || {}, r[N][n] = {
     modelType: Mr.type,
     id: `${Mr.type}-${t}`,
     options: {
@@ -9335,7 +9345,7 @@ const ue = {
   let r = { system: e, measure: s };
   return typeof t == "string" ? r = { ...r, unit: t } : r = { ...r, ...t }, r;
 }, mc = (t, e, s) => {
-  const { model: r } = Be(
+  const { model: r } = He(
     ue.type
   );
   if (!r)
@@ -9364,7 +9374,7 @@ function yi(t, e, s) {
   }
 }
 const o_ = (t, e, s, r) => {
-  const n = mc(t, e, s), o = Er({ source: e }), { model: i } = Be(
+  const n = mc(t, e, s), o = Er({ source: e }), { model: i } = He(
     ue.type
   );
   if (!i)
@@ -9912,7 +9922,7 @@ function i_(t) {
     serviceBasePath: a
   } = t, c = r;
   return c && (typeof c != "function" && typeof c.from == "string" && (c.from = { unit: c.from }), typeof c != "function" && typeof c.to == "string" && (c.to = { unit: c.to })), (u, d) => {
-    u[F] = u[F] || {}, u[F][d] = {
+    u[N] = u[N] || {}, u[N][d] = {
       modelType: Zt.type,
       id: `${e}-${s}`,
       options: {
@@ -9996,7 +10006,7 @@ let _r = class {
     Object.assign(this, e), this.logger = s.logger, this.id = t, this.futureId = e.id, this.namespace = e.namespace || "kos", this._cancelFuture = Sg, mi(
       () => this.status === ft.Success || this.status === ft.Fail,
       () => {
-        On.info(`Future ${this.id} has completed with status ${this.status}`), Ue(this);
+        On.info(`Future ${this.id} has completed with status ${this.status}`), je(this);
       }
     );
   }
@@ -10206,7 +10216,7 @@ Mc([
 Tr = Mc([
   R(Ec)
 ], Tr);
-const _c = new Re({
+const _c = new ke({
   class: Tr,
   type: Ec
 }), Ng = "future-container-model", pt = Ls(Ng), Tc = (t) => vc(Fs)(t), Ug = (t) => {
@@ -10239,7 +10249,7 @@ let Es = class {
     l(this, "createModel");
     l(this, "deleteModel");
     const { deleteFuture: r = Ig, addFuture: n = Og } = e;
-    this.logger = s.logger, this._deleteFuture = r, this._addFuture = n, this.id = t, this._futures = new Ge(), this.createModel = this.createFuture, this.deleteModel = this.removeFuture;
+    this.logger = s.logger, this._deleteFuture = r, this._addFuture = n, this.id = t, this._futures = new Ye(), this.createModel = this.createFuture, this.deleteModel = this.removeFuture;
   }
   /**
    * @category Computed
@@ -10373,7 +10383,7 @@ let Es = class {
   }
 };
 $o([
-  Ve
+  Ge
 ], Es.prototype, "_futures", 2);
 $o([
   H({
@@ -10437,7 +10447,7 @@ let _s = class {
     l(this, "logger");
     l(this, "namespace");
     l(this, "data");
-    this.id = t, this.logger = s.logger, this.data = je(), this.namespace = e.namespace || "studio";
+    this.id = t, this.logger = s.logger, this.data = Be(), this.namespace = e.namespace || "studio";
   }
   /**
    * @internal
@@ -10493,11 +10503,11 @@ Io([
 _s = Io([
   R(Cc)
 ], _s);
-const Dc = new Se({
+const Dc = new Ce({
   class: _s,
   type: Cc
 });
-var we = "INUMBER", Jt = "IOP1", Xt = "IOP2", es = "IOP3", He = "IVAR", gt = "IVARNAME", Ut = "IFUNCALL", sn = "IFUNDEF", de = "IEXPR", Oo = "IEXPREVAL", bt = "IMEMBER", rn = "IENDSTATEMENT", jt = "IARRAY";
+var we = "INUMBER", Jt = "IOP1", Xt = "IOP2", es = "IOP3", ze = "IVAR", gt = "IVARNAME", Ut = "IFUNCALL", sn = "IFUNDEF", de = "IEXPR", Oo = "IEXPREVAL", bt = "IMEMBER", rn = "IENDSTATEMENT", jt = "IARRAY";
 function A(t, e) {
   this.type = t, this.value = e ?? 0;
 }
@@ -10507,7 +10517,7 @@ A.prototype.toString = function() {
     case Jt:
     case Xt:
     case es:
-    case He:
+    case ze:
     case gt:
     case rn:
       return this.value;
@@ -10526,7 +10536,7 @@ A.prototype.toString = function() {
 function nn(t) {
   return new A(Jt, t);
 }
-function Ye(t) {
+function We(t) {
   return new A(Xt, t);
 }
 function xc(t) {
@@ -10539,7 +10549,7 @@ function Bn(t, e, s, r, n) {
       Array.isArray(f.value) ? o.push.apply(o, Bn(f.value.map(function(m) {
         return new A(we, m);
       }).concat(new A(jt, f.value.length)), e, s, r, n)) : o.push(f);
-    else if (p === He && n.hasOwnProperty(f.value))
+    else if (p === ze && n.hasOwnProperty(f.value))
       f = new A(we, n[f.value]), o.push(f);
     else if (p === Xt && o.length > 1)
       c = o.pop(), a = o.pop(), d = s[f.value], f = new A(we, d(a.value, c.value)), o.push(f);
@@ -10566,10 +10576,10 @@ function Bn(t, e, s, r, n) {
 function Pc(t, e, s) {
   for (var r = [], n = 0; n < t.length; n++) {
     var o = t[n], i = o.type;
-    if (i === He && o.value === e)
+    if (i === ze && o.value === e)
       for (var a = 0; a < s.tokens.length; a++) {
         var c = s.tokens[a], u;
-        c.type === Jt ? u = nn(c.value) : c.type === Xt ? u = Ye(c.value) : c.type === es ? u = xc(c.value) : u = new A(c.type, c.value), r.push(u);
+        c.type === Jt ? u = nn(c.value) : c.type === Xt ? u = We(c.value) : c.type === es ? u = xc(c.value) : u = new A(c.type, c.value), r.push(u);
       }
     else
       i === de ? r.push(new A(de, Pc(o.value, e, s))) : r.push(o);
@@ -10579,16 +10589,16 @@ function Pc(t, e, s) {
 function at(t, e, s) {
   var r = [], n, o, i, a, c, u;
   if (So(t))
-    return Fe(t, s);
+    return Ne(t, s);
   for (var d = t.length, h = 0; h < d; h++) {
     var f = t[h], p = f.type;
     if (p === we || p === gt)
       r.push(f.value);
     else if (p === Xt)
-      o = r.pop(), n = r.pop(), f.value === "and" ? r.push(n ? !!at(o, e, s) : !1) : f.value === "or" ? r.push(n ? !0 : !!at(o, e, s)) : f.value === "=" ? (a = e.binaryOps[f.value], r.push(a(n, at(o, e, s), s))) : (a = e.binaryOps[f.value], r.push(a(Fe(n, s), Fe(o, s))));
+      o = r.pop(), n = r.pop(), f.value === "and" ? r.push(n ? !!at(o, e, s) : !1) : f.value === "or" ? r.push(n ? !0 : !!at(o, e, s)) : f.value === "=" ? (a = e.binaryOps[f.value], r.push(a(n, at(o, e, s), s))) : (a = e.binaryOps[f.value], r.push(a(Ne(n, s), Ne(o, s))));
     else if (p === es)
-      i = r.pop(), o = r.pop(), n = r.pop(), f.value === "?" ? r.push(at(n ? o : i, e, s)) : (a = e.ternaryOps[f.value], r.push(a(Fe(n, s), Fe(o, s), Fe(i, s))));
-    else if (p === He)
+      i = r.pop(), o = r.pop(), n = r.pop(), f.value === "?" ? r.push(at(n ? o : i, e, s)) : (a = e.ternaryOps[f.value], r.push(a(Ne(n, s), Ne(o, s), Ne(i, s))));
+    else if (p === ze)
       if (f.value in e.functions)
         r.push(e.functions[f.value]);
       else if (f.value in e.unaryOps && e.parser.isOperatorEnabled(f.value))
@@ -10601,10 +10611,10 @@ function at(t, e, s) {
           throw new Error("undefined variable: " + f.value);
       }
     else if (p === Jt)
-      n = r.pop(), a = e.unaryOps[f.value], r.push(a(Fe(n, s)));
+      n = r.pop(), a = e.unaryOps[f.value], r.push(a(Ne(n, s)));
     else if (p === Ut) {
       for (u = f.value, c = []; u-- > 0; )
-        c.unshift(Fe(r.pop(), s));
+        c.unshift(Ne(r.pop(), s));
       if (a = r.pop(), a.apply && a.call)
         r.push(a.apply(void 0, c));
       else
@@ -10640,7 +10650,7 @@ function at(t, e, s) {
   }
   if (r.length > 1)
     throw new Error("invalid Expression (parity)");
-  return r[0] === 0 ? 0 : Fe(r[0], s);
+  return r[0] === 0 ? 0 : Ne(r[0], s);
 }
 function Wg(t, e, s) {
   return So(t) ? t : {
@@ -10653,7 +10663,7 @@ function Wg(t, e, s) {
 function So(t) {
   return t && t.type === Oo;
 }
-function Fe(t, e) {
+function Ne(t, e) {
   return So(t) ? t.value(e) : t;
 }
 function Co(t, e) {
@@ -10668,7 +10678,7 @@ function Co(t, e) {
         s.push("(" + r + " ? " + n + " : " + o + ")");
       else
         throw new Error("invalid Expression");
-    else if (h === He || h === gt)
+    else if (h === ze || h === gt)
       s.push(d.value);
     else if (h === Jt)
       r = s.pop(), i = d.value, i === "-" || i === "+" ? s.push("(" + i + r + ")") : e ? i === "not" ? s.push("(!" + r + ")") : i === "!" ? s.push("fac(" + r + ")") : s.push(i + "(" + r + ")") : i === "!" ? s.push("(" + r + "!)") : s.push("(" + i + " " + r + ")");
@@ -10706,31 +10716,31 @@ function Do(t, e, s) {
   s = s || {};
   for (var r = !!s.withMembers, n = null, o = 0; o < t.length; o++) {
     var i = t[o];
-    i.type === He || i.type === gt ? !r && !xt(e, i.value) ? e.push(i.value) : (n !== null && (xt(e, n) || e.push(n)), n = i.value) : i.type === bt && r && n !== null ? n += "." + i.value : i.type === de ? Do(i.value, e, s) : n !== null && (xt(e, n) || e.push(n), n = null);
+    i.type === ze || i.type === gt ? !r && !xt(e, i.value) ? e.push(i.value) : (n !== null && (xt(e, n) || e.push(n)), n = i.value) : i.type === bt && r && n !== null ? n += "." + i.value : i.type === de ? Do(i.value, e, s) : n !== null && (xt(e, n) || e.push(n), n = null);
   }
   n !== null && !xt(e, n) && e.push(n);
 }
-function _e(t, e) {
+function Te(t, e) {
   this.tokens = t, this.parser = e, this.unaryOps = e.unaryOps, this.binaryOps = e.binaryOps, this.ternaryOps = e.ternaryOps, this.functions = e.functions;
 }
-_e.prototype.simplify = function(t) {
-  return t = t || {}, new _e(Bn(this.tokens, this.unaryOps, this.binaryOps, this.ternaryOps, t), this.parser);
+Te.prototype.simplify = function(t) {
+  return t = t || {}, new Te(Bn(this.tokens, this.unaryOps, this.binaryOps, this.ternaryOps, t), this.parser);
 };
-_e.prototype.substitute = function(t, e) {
-  return e instanceof _e || (e = this.parser.parse(String(e))), new _e(Pc(this.tokens, t, e), this.parser);
+Te.prototype.substitute = function(t, e) {
+  return e instanceof Te || (e = this.parser.parse(String(e))), new Te(Pc(this.tokens, t, e), this.parser);
 };
-_e.prototype.evaluate = function(t) {
+Te.prototype.evaluate = function(t) {
   return t = t || {}, at(this.tokens, this, t);
 };
-_e.prototype.toString = function() {
+Te.prototype.toString = function() {
   return Co(this.tokens, !1);
 };
-_e.prototype.symbols = function(t) {
+Te.prototype.symbols = function(t) {
   t = t || {};
   var e = [];
   return Do(this.tokens, e, t), e;
 };
-_e.prototype.variables = function(t) {
+Te.prototype.variables = function(t) {
   t = t || {};
   var e = [];
   Do(this.tokens, e, t);
@@ -10739,13 +10749,13 @@ _e.prototype.variables = function(t) {
     return !(r in s);
   });
 };
-_e.prototype.toJSFunction = function(t, e) {
+Te.prototype.toJSFunction = function(t, e) {
   var s = this, r = new Function(t, "with(this.functions) with (this.ternaryOps) with (this.binaryOps) with (this.unaryOps) { return " + Co(this.simplify(e).tokens, !0) + "; }");
   return function() {
     return r.apply(s, arguments);
   };
 };
-var Ts = "TEOF", B = "TOP", on = "TNUMBER", Ac = "TSTRING", ze = "TPAREN", Bt = "TBRACKET", an = "TCOMMA", xo = "TNAME", Po = "TSEMICOLON";
+var Ts = "TEOF", B = "TOP", on = "TNUMBER", Ac = "TSTRING", qe = "TPAREN", Bt = "TBRACKET", an = "TCOMMA", xo = "TNAME", Po = "TSEMICOLON";
 function Rc(t, e, s) {
   this.type = t, this.value = e, this.index = s;
 }
@@ -10788,7 +10798,7 @@ Y.prototype.isString = function() {
 };
 Y.prototype.isParen = function() {
   var t = this.expression.charAt(this.pos);
-  return t === "(" || t === ")" ? (this.current = this.newToken(ze, t), this.pos++, !0) : !1;
+  return t === "(" || t === ")" ? (this.current = this.newToken(qe, t), this.pos++, !0) : !1;
 };
 Y.prototype.isBracket = function() {
   var t = this.expression.charAt(this.pos);
@@ -11015,13 +11025,13 @@ z.prototype.parseAtom = function(t) {
     return n.value in e;
   }
   if (this.accept(xo) || this.accept(B, s))
-    t.push(new A(He, this.current.value));
+    t.push(new A(ze, this.current.value));
   else if (this.accept(on))
     t.push(new A(we, this.current.value));
   else if (this.accept(Ac))
     t.push(new A(we, this.current.value));
-  else if (this.accept(ze, "("))
-    this.parseExpression(t), this.expect(ze, ")");
+  else if (this.accept(qe, "("))
+    this.parseExpression(t), this.expect(qe, ")");
   else if (this.accept(Bt, "["))
     if (this.accept(Bt, "]"))
       t.push(new A(jt, 0));
@@ -11041,7 +11051,7 @@ z.prototype.pushExpression = function(t, e) {
     t.push(e[s]);
 };
 z.prototype.parseUntilEndStatement = function(t, e) {
-  return this.accept(Po) ? (this.nextToken && this.nextToken.type !== Ts && !(this.nextToken.type === ze && this.nextToken.value === ")") && e.push(new A(rn)), this.nextToken.type !== Ts && this.parseExpression(e), t.push(new A(de, e)), !0) : !1;
+  return this.accept(Po) ? (this.nextToken && this.nextToken.type !== Ts && !(this.nextToken.type === qe && this.nextToken.value === ")") && e.push(new A(rn)), this.nextToken.type !== Ts && this.parseExpression(e), t.push(new A(de, e)), !0) : !1;
 };
 z.prototype.parseArrayList = function(t) {
   for (var e = 0; !this.accept(Bt, "]"); )
@@ -11057,14 +11067,14 @@ z.prototype.parseVariableAssignmentExpression = function(t) {
         throw new Error("function definition is not permitted");
       for (var n = 0, o = e.value + 1; n < o; n++) {
         var i = r - n;
-        t[i].type === He && (t[i] = new A(gt, t[i].value));
+        t[i].type === ze && (t[i] = new A(gt, t[i].value));
       }
       this.parseVariableAssignmentExpression(s), t.push(new A(de, s)), t.push(new A(sn, e.value));
       continue;
     }
-    if (e.type !== He && e.type !== bt)
+    if (e.type !== ze && e.type !== bt)
       throw new Error("expected variable for assignment");
-    this.parseVariableAssignmentExpression(s), t.push(new A(gt, e.value)), t.push(new A(de, s)), t.push(Ye("="));
+    this.parseVariableAssignmentExpression(s), t.push(new A(gt, e.value)), t.push(new A(de, s)), t.push(We("="));
   }
 };
 z.prototype.parseConditionalExpression = function(t) {
@@ -11076,34 +11086,34 @@ z.prototype.parseConditionalExpression = function(t) {
 z.prototype.parseOrExpression = function(t) {
   for (this.parseAndExpression(t); this.accept(B, "or"); ) {
     var e = [];
-    this.parseAndExpression(e), t.push(new A(de, e)), t.push(Ye("or"));
+    this.parseAndExpression(e), t.push(new A(de, e)), t.push(We("or"));
   }
 };
 z.prototype.parseAndExpression = function(t) {
   for (this.parseComparison(t); this.accept(B, "and"); ) {
     var e = [];
-    this.parseComparison(e), t.push(new A(de, e)), t.push(Ye("and"));
+    this.parseComparison(e), t.push(new A(de, e)), t.push(We("and"));
   }
 };
 var Zg = ["==", "!=", "<", "<=", ">=", ">", "in"];
 z.prototype.parseComparison = function(t) {
   for (this.parseAddSub(t); this.accept(B, Zg); ) {
     var e = this.current;
-    this.parseAddSub(t), t.push(Ye(e.value));
+    this.parseAddSub(t), t.push(We(e.value));
   }
 };
 var Jg = ["+", "-", "||"];
 z.prototype.parseAddSub = function(t) {
   for (this.parseTerm(t); this.accept(B, Jg); ) {
     var e = this.current;
-    this.parseTerm(t), t.push(Ye(e.value));
+    this.parseTerm(t), t.push(We(e.value));
   }
 };
 var Xg = ["*", "/", "%"];
 z.prototype.parseTerm = function(t) {
   for (this.parseFactor(t); this.accept(B, Xg); ) {
     var e = this.current;
-    this.parseFactor(t), t.push(Ye(e.value));
+    this.parseFactor(t), t.push(We(e.value));
   }
 };
 z.prototype.parseFactor = function(t) {
@@ -11113,10 +11123,10 @@ z.prototype.parseFactor = function(t) {
   }
   if (this.save(), this.accept(B, s)) {
     if (this.current.value !== "-" && this.current.value !== "+") {
-      if (this.nextToken.type === ze && this.nextToken.value === "(") {
+      if (this.nextToken.type === qe && this.nextToken.value === "(") {
         this.restore(), this.parseExponential(t);
         return;
-      } else if (this.nextToken.type === Po || this.nextToken.type === an || this.nextToken.type === Ts || this.nextToken.type === ze && this.nextToken.value === ")") {
+      } else if (this.nextToken.type === Po || this.nextToken.type === an || this.nextToken.type === Ts || this.nextToken.type === qe && this.nextToken.value === ")") {
         this.restore(), this.parseAtom(t);
         return;
       }
@@ -11128,7 +11138,7 @@ z.prototype.parseFactor = function(t) {
 };
 z.prototype.parseExponential = function(t) {
   for (this.parsePostfixExpression(t); this.accept(B, "^"); )
-    this.parseFactor(t), t.push(Ye("^"));
+    this.parseFactor(t), t.push(We("^"));
 };
 z.prototype.parsePostfixExpression = function(t) {
   for (this.parseFunctionCall(t); this.accept(B, "!"); )
@@ -11143,8 +11153,8 @@ z.prototype.parseFunctionCall = function(t) {
     var r = this.current;
     this.parseAtom(t), t.push(nn(r.value));
   } else
-    for (this.parseMemberExpression(t); this.accept(ze, "("); )
-      if (this.accept(ze, ")"))
+    for (this.parseMemberExpression(t); this.accept(qe, "("); )
+      if (this.accept(qe, ")"))
         t.push(new A(Ut, 0));
       else {
         var n = this.parseArgumentList(t);
@@ -11152,7 +11162,7 @@ z.prototype.parseFunctionCall = function(t) {
       }
 };
 z.prototype.parseArgumentList = function(t) {
-  for (var e = 0; !this.accept(ze, ")"); )
+  for (var e = 0; !this.accept(qe, ")"); )
     for (this.parseExpression(t), ++e; this.accept(an); )
       this.parseExpression(t), ++e;
   return e;
@@ -11167,7 +11177,7 @@ z.prototype.parseMemberExpression = function(t) {
     } else if (e.value === "[") {
       if (!this.tokens.isOperatorEnabled("["))
         throw new Error('unexpected "[]", arrays are disabled');
-      this.parseExpression(t), this.expect(Bt, "]"), t.push(Ye("["));
+      this.parseExpression(t), this.expect(Bt, "]"), t.push(We("["));
     } else
       throw new Error("unexpected symbol: " + e.value);
   }
@@ -11465,7 +11475,7 @@ vt.prototype.parse = function(t) {
     new Y(this, t),
     { allowMemberAccess: this.options.allowMemberAccess }
   );
-  return s.parseExpression(e), s.expect(Ts, "EOF"), new _e(e, this);
+  return s.parseExpression(e), s.expect(Ts, "EOF"), new Te(e, this);
 };
 vt.prototype.evaluate = function(t, e) {
   return this.parse(t).evaluate(e);
@@ -11561,7 +11571,7 @@ let $r = class {
     // Use ObservableData for results to handle dynamic properties properly
     l(this, "_results");
     l(this, "_contextRevision", 0);
-    this.id = t, this.logger = s.logger, this._data = je(), this._results = je(), this.parser = new vt();
+    this.id = t, this.logger = s.logger, this._data = Be(), this._results = Be(), this.parser = new vt();
   }
   /**
    * Get the current context data that expressions are evaluated against.
@@ -11798,7 +11808,7 @@ $r = Gm([
 const Zm = $r.Registration, Jm = g.createLogger({
   name: "kos-log-manager-service",
   group: "Services"
-}), Xm = "/api/kos/logs/overrides", Lc = async () => (Jm.debug("sending GET for  kos-log-manager"), await ke.get(Xm)), u_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}), Xm = "/api/kos/logs/overrides", Lc = async () => (Jm.debug("sending GET for  kos-log-manager"), await Le.get(Xm)), u_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   getLogOverrides: Lc
 }, Symbol.toStringTag, { value: "Module" }));
@@ -11964,7 +11974,7 @@ cn([
 Ht = cn([
   R(Fc)
 ], Ht);
-const oy = new Re({
+const oy = new ke({
   class: Ht,
   type: Fc
 }), { URL: js } = ye(), { postModel: Ro, getOne: iy } = he.build({
@@ -12098,7 +12108,7 @@ const Hn = {
     }
   },
   type: os,
-  predicate: Ae(os),
+  predicate: Re(os),
   factory: ge.Singleton.create(os)
 };
 var hy = Object.defineProperty, fy = Object.getOwnPropertyDescriptor, Hc = (t, e, s, r) => {
@@ -12112,7 +12122,7 @@ let Ir = class {
     l(this, "id");
     l(this, "logger");
     l(this, "_models");
-    this.id = t, this.logger = s.logger, this._models = new Ge({
+    this.id = t, this.logger = s.logger, this._models = new Ye({
       parentId: t,
       sortKey: "blockNum"
     });
@@ -12141,7 +12151,7 @@ let Ir = class {
   }
 };
 Hc([
-  Ve
+  Ge
 ], Ir.prototype, "_models", 2);
 Ir = Hc([
   R(zc)
@@ -12151,9 +12161,9 @@ const py = g.createLogger({
   group: "Services"
 }), qc = () => {
   var r;
-  const t = Oe(), s = (t == null ? void 0 : t.connId) || ((r = window == null ? void 0 : window.kosBridge) == null ? void 0 : r.call(window, "connId"));
+  const t = Se(), s = (t == null ? void 0 : t.connId) || ((r = window == null ? void 0 : window.kosBridge) == null ? void 0 : r.call(window, "connId"));
   return g.error(`getKosConnectionId: ${s}`), s;
-}, ts = qc(), gy = "/api/kos/logs/node/{nodeId}/streams", Kc = async () => (py.debug("sending GET for  log-stream-container"), await ke.get(
+}, ts = qc(), gy = "/api/kos/logs/node/{nodeId}/streams", Kc = async () => (py.debug("sending GET for  log-stream-container"), await Le.get(
   gy,
   {
     path: {
@@ -12164,7 +12174,7 @@ const py = g.createLogger({
     destinationAddress: ts
   }
 )), Vc = async (t, e = "primary") => {
-  await ke.post(
+  await Le.post(
     "/api/kos/logs/node/{nodeId}/{stream}/subscribe",
     {
       path: {
@@ -12178,7 +12188,7 @@ const py = g.createLogger({
     }
   );
 }, Gc = async (t) => {
-  await ke.post(
+  await Le.post(
     "/api/kos/logs/node/{nodeId}/{stream}/unsubscribe",
     { path: { nodeId: "primary", stream: t } },
     void 0,
@@ -12187,7 +12197,7 @@ const py = g.createLogger({
     }
   );
 }, my = async () => {
-  await ke.post(
+  await Le.post(
     "/api/kos/logs/overrides",
     {},
     {
@@ -12200,7 +12210,7 @@ const py = g.createLogger({
       destinationAddress: ts
     }
   );
-}, Yc = async (t) => await ke.get(
+}, Yc = async (t) => await Le.get(
   "/api/kos/logs/node/{nodeId}/{stream}/blocks",
   {
     path: {
@@ -12211,7 +12221,7 @@ const py = g.createLogger({
   {
     destinationAddress: ts
   }
-), Wc = async (t, e) => await ke.get(
+), Wc = async (t, e) => await Le.get(
   "/api/kos/logs/node/{nodeId}/{stream}/blocks/{blockId}",
   {
     path: {
@@ -12284,10 +12294,10 @@ let zn = class {
 zn = by([
   R(Qc)
 ], zn);
-const Or = new Se({
+const Or = new Ce({
   class: zn,
   type: Qc
-}), ko = new Se({
+}), ko = new Ce({
   class: Ir,
   type: zc
 });
@@ -12457,12 +12467,12 @@ let Sr = class {
   }
 };
 Zc([
-  Ve
+  Ge
 ], Sr.prototype, "_blocks", 2);
 Sr = Zc([
   R(Jc)
 ], Sr);
-const yr = new Se({
+const yr = new Ce({
   class: Sr,
   type: Jc
 });
@@ -12472,7 +12482,7 @@ var My = Object.defineProperty, Ey = Object.getOwnPropertyDescriptor, wt = (t, e
   return r && n && My(e, s, n), n;
 };
 const Xc = "log-stream-container-model", _y = "/kos/logs/subscription/addBlock/*", Ty = "/kos/logs/subscription/updateBlock/*", $y = "/kos/logs/subscription/removeBlock/*", Iy = "/kos/logs/subscription/lines/*", el = "/kos/logs/streams/add/*";
-let qe = class {
+let Ke = class {
   constructor(t, e, s) {
     /** Unique identifier for the container model instance */
     l(this, "id");
@@ -12481,7 +12491,7 @@ let qe = class {
     /** Currently selected log stream for UI display purposes */
     l(this, "selectedStream");
     l(this, "_models");
-    this.id = t, this.logger = s.logger, this._models = new Ge({ parentId: t }), this.selectedStream = void 0;
+    this.id = t, this.logger = s.logger, this._models = new Ye({ parentId: t }), this.selectedStream = void 0;
   }
   getModel(t) {
     return this._models.getModel(t);
@@ -12566,43 +12576,43 @@ let qe = class {
   }
 };
 wt([
-  Ve
-], qe.prototype, "_models", 2);
+  Ge
+], Ke.prototype, "_models", 2);
 wt([
   H({
     topic: [el],
     websocket: !0
   })
-], qe.prototype, "handleStreamAdded", 1);
+], Ke.prototype, "handleStreamAdded", 1);
 wt([
   H({
     topic: [_y],
     websocket: !0
   })
-], qe.prototype, "handleAddBlock", 1);
+], Ke.prototype, "handleAddBlock", 1);
 wt([
   H({
     topic: [$y],
     websocket: !0
   })
-], qe.prototype, "handleRemoveBlock", 1);
+], Ke.prototype, "handleRemoveBlock", 1);
 wt([
   H({
     topic: [Ty],
     websocket: !0
   })
-], qe.prototype, "handleUpdateBlock", 1);
+], Ke.prototype, "handleUpdateBlock", 1);
 wt([
   H({
     topic: [Iy],
     websocket: !0
   })
-], qe.prototype, "handleLogLine", 1);
-qe = wt([
+], Ke.prototype, "handleLogLine", 1);
+Ke = wt([
   R(Xc)
-], qe);
-const un = new Re({
-  class: qe,
+], Ke);
+const un = new ke({
+  class: Ke,
   type: Xc
 });
 un.addRelatedModel(yr);
@@ -12878,7 +12888,7 @@ const Dr = {
     }
   },
   type: is,
-  predicate: Ae(is),
+  predicate: Re(is),
   factory: ge.Factory.create(is)
 };
 var ol = Object.defineProperty, By = Object.getOwnPropertyDescriptor, Hy = (t, e, s) => e in t ? ol(t, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : t[e] = s, Lo = (t, e, s, r) => {
@@ -12888,32 +12898,32 @@ var ol = Object.defineProperty, By = Object.getOwnPropertyDescriptor, Hy = (t, e
 }, zy = (t, e, s) => (Hy(t, e + "", s), s);
 function Oi(t) {
   return I.propertyMapper.hasMapper(
-    xe.TroubleRank
+    Pe.TroubleRank
   ) ? I.propertyMapper.executeMapper(
-    xe.TroubleRank,
+    Pe.TroubleRank,
     t
   ) : Dy(t);
 }
 function Si(t) {
   return (I.propertyMapper.hasMapper(
-    xe.TroubleColor
+    Pe.TroubleColor
   ) ? I.propertyMapper.executeMapper(
-    xe.TroubleColor,
+    Pe.TroubleColor,
     t
   ) : xy(t)).toLowerCase();
 }
 function Ci(t) {
   return (I.propertyMapper.hasMapper(
-    xe.TroubleRole
+    Pe.TroubleRole
   ) ? I.propertyMapper.executeMapper(
-    xe.TroubleRole,
+    Pe.TroubleRole,
     t
   ) : Py(t)).toLowerCase();
 }
 const qy = "trouble-container-model";
-class Ee {
+class _e {
 }
-l(Ee, "INDEX_TROUBLES_BY_IFACE", "byIface"), l(Ee, "INDEX_TROUBLES_BY_TYPE", "byType"), l(Ee, "INDEX_TROUBLES_BY_GROUP", "byGroup"), l(Ee, "INDEX_TROUBLES_BY_DEFERRED", "byDeferred"), l(Ee, "SORT_KEY_RANK", "rank"), l(Ee, "TROUBLES_DEFERRED", "true");
+l(_e, "INDEX_TROUBLES_BY_IFACE", "byIface"), l(_e, "INDEX_TROUBLES_BY_TYPE", "byType"), l(_e, "INDEX_TROUBLES_BY_GROUP", "byGroup"), l(_e, "INDEX_TROUBLES_BY_DEFERRED", "byDeferred"), l(_e, "SORT_KEY_RANK", "rank"), l(_e, "TROUBLES_DEFERRED", "true");
 let qt = class {
   constructor(t, e) {
     l(this, "id");
@@ -12942,7 +12952,7 @@ let qt = class {
   }
   handleTroubleRemoved(t) {
     const e = `trouble-${t}`, s = this.troubles.getModel(e);
-    this.troubles.removeModel(e), s && Ue(s);
+    this.troubles.removeModel(e), s && je(s);
   }
   handleTroubleAdded(t) {
     const e = {
@@ -12977,12 +12987,12 @@ qt = Lo([
     containerProperty: "troubles",
     containerOptions: {
       indexMap: {
-        [Ee.INDEX_TROUBLES_BY_IFACE]: ky,
-        [Ee.INDEX_TROUBLES_BY_TYPE]: "type",
-        [Ee.INDEX_TROUBLES_BY_GROUP]: "group",
-        [Ee.INDEX_TROUBLES_BY_DEFERRED]: "deferred"
+        [_e.INDEX_TROUBLES_BY_IFACE]: ky,
+        [_e.INDEX_TROUBLES_BY_TYPE]: "type",
+        [_e.INDEX_TROUBLES_BY_GROUP]: "group",
+        [_e.INDEX_TROUBLES_BY_DEFERRED]: "deferred"
       },
-      sortKey: Ee.SORT_KEY_RANK
+      sortKey: _e.SORT_KEY_RANK
     }
   })
 ], qt);
@@ -13156,7 +13166,7 @@ fn([
 Kt = fn([
   R(al)
 ], Kt);
-const Kn = new Re({
+const Kn = new ke({
   class: Kt,
   type: al
 });
@@ -13184,7 +13194,7 @@ const Dn = g.createLogger({
     signal: t
   });
   if (!s)
-    throw t != null && t.aborted ? (Dn.debug("Request was aborted"), new $e("Request was aborted")) : (Dn.error("Failed to fetch software-info", e), new $e("Failed to fetch software-info"));
+    throw t != null && t.aborted ? (Dn.debug("Request was aborted"), new Ie("Request was aborted")) : (Dn.error("Failed to fetch software-info", e), new Ie("Failed to fetch software-info"));
   return s;
 }, Zy = Qy(Fo), p_ = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -13242,7 +13252,7 @@ let Vn = class {
         this.nodes = r;
       });
     } catch (t) {
-      t instanceof $e && this.logger.error("Failed to fetch software-info", t);
+      t instanceof Ie && this.logger.error("Failed to fetch software-info", t);
     }
   }
 };
@@ -13257,7 +13267,7 @@ const Gn = {
     }
   },
   type: as,
-  predicate: Ae(as),
+  predicate: Re(as),
   factory: ge.Factory.create(
     as
   )
@@ -13346,7 +13356,7 @@ const Pr = {
     }
   },
   type: cs,
-  predicate: Ae(cs),
+  predicate: Re(cs),
   factory: ge.Factory.create(cs)
 };
 var ob = Object.defineProperty, ib = Object.getOwnPropertyDescriptor, dl = (t, e, s, r) => {
@@ -13412,7 +13422,7 @@ const hl = {
     }
   },
   type: ls,
-  predicate: Ae(ls),
+  predicate: Re(ls),
   factory: ge.Factory.create(ls)
 }, { URL: ab } = ye(), { getAll: cb } = he.build({
   basePath: `${ab}/api/state-prop`
@@ -13428,7 +13438,7 @@ const hl = {
   name: "translation-service",
   group: "Services"
 }), db = () => {
-  const t = window.location.origin, e = Oe();
+  const t = window.location.origin, e = Se();
   return (e == null ? void 0 : e.host) || t;
 }, hb = async (t, e) => {
   gs.debug(`Loading translations from: ${t}`);
@@ -13665,7 +13675,7 @@ const Qn = {
     }
   },
   type: us,
-  predicate: Ae(us),
+  predicate: Re(us),
   factory: ge.Factory.create(us)
 };
 var yb = Object.defineProperty, bb = Object.getOwnPropertyDescriptor, yl = (t, e, s, r) => {
@@ -13702,7 +13712,7 @@ let Rr = class {
     /** Array tracking registered namespace identifiers */
     l(this, "namespaces", []);
     l(this, "_models");
-    this.id = t, this.lang = e.lang || "en", this.descriptor = e.descriptor, this._defaultNamespace = e.defaultNamespace, this.descriptorUrl = e.descriptorUrl, this.rootUrl = e.rootUrl, this.resolver = e.resolver || wb.bind(this), s.kosContext.set(pl, this.resolver), this.logger = s.logger, this._models = new Ge({
+    this.id = t, this.lang = e.lang || "en", this.descriptor = e.descriptor, this._defaultNamespace = e.defaultNamespace, this.descriptorUrl = e.descriptorUrl, this.rootUrl = e.rootUrl, this.resolver = e.resolver || wb.bind(this), s.kosContext.set(pl, this.resolver), this.logger = s.logger, this._models = new Ye({
       parentId: t
     });
   }
@@ -13783,7 +13793,7 @@ let Rr = class {
   }
 };
 yl([
-  Ve
+  Ge
 ], Rr.prototype, "_models", 2);
 Rr = yl([
   R(ds)
@@ -13796,7 +13806,7 @@ const Je = {
     }
   },
   type: ds,
-  predicate: Ae(ds),
+  predicate: Re(ds),
   factory: ge.Singleton.create(ds)
 }, b_ = {
   set(t, e) {
@@ -13878,9 +13888,9 @@ Uo([
 Is = Uo([
   R(bl.type)
 ], Is);
-const Ai = Oe(), Ib = Ai.debug === "true" || Ai.debug === !0, Ob = "/api/system/canvas", vl = async (t, e) => {
+const Ai = Se(), Ib = Ai.debug === "true" || Ai.debug === !0, Ob = "/api/system/canvas", vl = async (t, e) => {
   const r = `${me}${e || Ob}`;
-  await Le(r, {
+  await Fe(r, {
     method: "POST",
     headers: {
       hide: Ib ? "false" : "true"
@@ -14059,7 +14069,7 @@ wl([
 kr = wl([
   R(Ml)
 ], kr);
-const El = new Se({
+const El = new Ce({
   class: kr,
   type: Ml
 });
@@ -15324,7 +15334,7 @@ let Xe = class {
     // Note: BrowserRouter is automatically injected when using HTTP decorators!
     l(this, "pattern");
     l(this, "data");
-    this.id = t, this.logger = s.logger, this._endpointRenderers = new Ge();
+    this.id = t, this.logger = s.logger, this._endpointRenderers = new Ye();
   }
   addNamedEndpoint(t, e) {
     this._endpointRenderers.getModel(t) && this.logger.warn(`Endpoint "${t}" already exists. Overwriting.`);
@@ -15421,7 +15431,7 @@ let Xe = class {
   }
 };
 ss([
-  Ve
+  Ge
 ], Xe.prototype, "_endpointRenderers", 2);
 ss([
   en("/api/ui/canvas/patterns")
@@ -15438,7 +15448,7 @@ ss([
 Xe = ss([
   R(Ol)
 ], Xe);
-const Os = new Re({
+const Os = new ke({
   class: Xe,
   type: Ol
 }), { URL: Bo } = ye(), { getOne: Sl } = he.build({
@@ -15451,7 +15461,7 @@ const Os = new Re({
     });
     return [void 0, t == null ? void 0 : t.data.serialNumber];
   } catch (t) {
-    if (t instanceof $e)
+    if (t instanceof Ie)
       return Nr.error(`Error fetching device serial number: ${t.payload.error}`), [t.payload.error, void 0];
   }
   return ["unknownError", void 0];
@@ -15463,7 +15473,7 @@ const Os = new Re({
     });
     return t ? [void 0, t.data] : ["unknownError", void 0];
   } catch (t) {
-    if (t instanceof $e)
+    if (t instanceof Ie)
       return Nr.error(`Error fetching device serial number: ${t.payload.error}`), [t.payload.error, void 0];
   }
   return ["unknownError", void 0];
@@ -15684,7 +15694,7 @@ xl([
 Ur = xl([
   R(Pl)
 ], Ur);
-const Zn = new Re({
+const Zn = new ke({
   class: Ur,
   type: Pl
 });
@@ -15741,7 +15751,7 @@ let Jn = class {
 Jn = ev([
   R(Al)
 ], Jn);
-const Rl = new Se({
+const Rl = new Ce({
   class: Jn,
   type: Al
 }), { URL: tv } = ye(), { getAll: sv } = he.build({
@@ -15755,7 +15765,7 @@ const Rl = new Se({
     const t = await sv({});
     return [void 0, t == null ? void 0 : t.data];
   } catch (t) {
-    if (t instanceof $e)
+    if (t instanceof Ie)
       return Li.error(`Error fetching log file size: ${t.payload.error}`), [t.payload.error, void 0];
   }
   return ["unknownError", void 0];
@@ -15776,7 +15786,7 @@ let jr = class {
     /** Context logger for debugging and network interface operations */
     l(this, "logger");
     l(this, "_models");
-    this.id = t, this.logger = s.logger, this._models = new Ge({
+    this.id = t, this.logger = s.logger, this._models = new Ye({
       parentId: t,
       indexMap: {
         byCategory: "category"
@@ -15831,12 +15841,12 @@ let jr = class {
   }
 };
 Ll([
-  Ve
+  Ge
 ], jr.prototype, "_models", 2);
 jr = Ll([
   R(Fl)
 ], jr);
-const Br = new Re({
+const Br = new ke({
   class: jr,
   type: Fl
 });
@@ -15911,7 +15921,7 @@ Xn = cv([
   po(),
   R(Ul)
 ], Xn);
-const eo = new Se({
+const eo = new Ce({
   class: Xn,
   type: Ul
 });
@@ -15926,7 +15936,7 @@ let Ss = class {
     l(this, "id");
     l(this, "logger");
     l(this, "_models");
-    this.id = t, this.logger = s.logger, this._models = new Ge({
+    this.id = t, this.logger = s.logger, this._models = new Ye({
       parentId: t
     });
   }
@@ -15992,7 +16002,7 @@ let Ss = class {
   }
 };
 Ho([
-  Ve
+  Ge
 ], Ss.prototype, "_models", 2);
 Ho([
   H({
@@ -16003,7 +16013,7 @@ Ho([
 Ss = Ho([
   R(jl)
 ], Ss);
-const Cs = new Re({
+const Cs = new ke({
   class: Ss,
   type: jl
 });
@@ -16085,7 +16095,7 @@ zl([
 Hr = zl([
   R(ql)
 ], Hr);
-const Kl = new Se({
+const Kl = new Ce({
   class: Hr,
   type: ql
 });
@@ -16103,7 +16113,7 @@ let Vt = class {
     l(this, "_activeUpdate");
     l(this, "logger");
     l(this, "_models");
-    this.id = t, this.logger = s.logger, this._models = new Ge({ parentId: t });
+    this.id = t, this.logger = s.logger, this._models = new Ye({ parentId: t });
   }
   getModel(t) {
     return this._models.getModel(t);
@@ -16175,7 +16185,7 @@ pn([
   ks({ modelType: Cs.type })
 ], Vt.prototype, "storageService", 2);
 pn([
-  Ve
+  Ge
 ], Vt.prototype, "_models", 2);
 pn([
   Wd({ dependencies: (t) => [t.isUsbInserted] })
@@ -16183,7 +16193,7 @@ pn([
 Vt = pn([
   R(Vl)
 ], Vt);
-const zr = new Re({
+const zr = new ke({
   class: Vt,
   type: Vl
 });
@@ -16222,22 +16232,22 @@ const bv = () => ({ ...{
     companion: P.companion.register(t),
     legacy: P.model.registerLegacyModel(t)
   };
-}, Ie = {};
-Ie.core = {
-  models: vv(Ie)
+}, Oe = {};
+Oe.core = {
+  models: vv(Oe)
 };
-Ie.preload = P.model.preloadModel(Ie);
-Ie.model = P.model.register(Ie);
-Ie.companion = P.companion.register(Ie);
-Ie.legacy = P.model.registerLegacyModel(Ie);
-const ji = Ie;
+Oe.preload = P.model.preloadModel(Oe);
+Oe.model = P.model.register(Oe);
+Oe.companion = P.companion.register(Oe);
+Oe.legacy = P.model.registerLegacyModel(Oe);
+const ji = Oe;
 class I_ {
   /**
    * Maps the rank property of the trouble into the {@link TroubleModel}
    * */
   registerTroubleRankMapper(e) {
     return I.propertyMapper.registerPropertyMapper(
-      xe.TroubleRank,
+      Pe.TroubleRank,
       e
     ), this;
   }
@@ -16246,7 +16256,7 @@ class I_ {
    * */
   registerTroubleRoleMapper(e) {
     return I.propertyMapper.registerPropertyMapper(
-      xe.TroubleRole,
+      Pe.TroubleRole,
       e
     ), this;
   }
@@ -16255,7 +16265,7 @@ class I_ {
    * */
   registerTroubleColorMapper(e) {
     return I.propertyMapper.registerPropertyMapper(
-      xe.TroubleColor,
+      Pe.TroubleColor,
       e
     ), this;
   }
@@ -16278,7 +16288,7 @@ const O_ = async (t, e) => {
         await s.updateState(`${r}${n}`, void 0);
     },
     unsubscribe: () => {
-      Ue(s);
+      je(s);
     }
   };
 }, Yl = "kos:service:region", Wl = "regionId", wv = `${Yl}-${Wl}`, Mv = async (t) => {
@@ -16644,7 +16654,7 @@ function tu(t = {}) {
   };
 }
 const R_ = ({ path: t }) => (e, s) => {
-  e[F] = e[F] || {}, e[F][s] = {
+  e[N] = e[N] || {}, e[N][s] = {
     modelType: Pr.type,
     id: `${Pr.type}-${t}`,
     options: {
@@ -16656,7 +16666,7 @@ const R_ = ({ path: t }) => (e, s) => {
 function k_(t) {
   const { path: e, attribute: s } = t;
   return (r, n) => {
-    r[F] = r[F] || {}, r[F][n] = {
+    r[N] = r[N] || {}, r[N][n] = {
       modelType: hl.type,
       id: `${e}-${s}`,
       options: {
@@ -16668,7 +16678,7 @@ function k_(t) {
   };
 }
 const Lt = g.createLogger({ name: "services", group: "Services" }), L_ = async (t, e) => Av(t, e, `${me}/api/server/login`), Av = async (t, e, s = `${me}/api/login`) => {
-  const r = await Le(`${s}`, {
+  const r = await Fe(`${s}`, {
     method: "POST",
     destinationAddress: "",
     body: JSON.stringify({
@@ -16682,7 +16692,7 @@ const Lt = g.createLogger({ name: "services", group: "Services" }), L_ = async (
   }
   return await r.json();
 }, F_ = async (t) => Rv(t, `${me}/api/server/startPasswordReset`, ""), Rv = async (t, e = `${me}/api/startPasswordReset`, s = "server") => {
-  const r = await Le(`${e}?email=${t}`, {
+  const r = await Fe(`${e}?email=${t}`, {
     method: "POST",
     destinationAddress: s
   });
@@ -16698,7 +16708,7 @@ const Lt = g.createLogger({ name: "services", group: "Services" }), L_ = async (
       "*"
     )}`
   );
-  const r = await Le(`${s}`, {
+  const r = await Fe(`${s}`, {
     method: "POST",
     destinationAddress: "",
     body: JSON.stringify({
@@ -16726,7 +16736,7 @@ const Lt = g.createLogger({ name: "services", group: "Services" }), L_ = async (
       "*"
     )}`
   );
-  const n = await Le(`${r}`, {
+  const n = await Fe(`${r}`, {
     method: "POST",
     destinationAddress: "",
     body: JSON.stringify({
@@ -16951,7 +16961,7 @@ const zv = {
   );
 }, q_ = (t) => Yv({
   filter: (s) => {
-    const r = Be(s.id);
+    const r = He(s.id);
     return (r == null ? void 0 : r.type) === t;
   }
 })[0], Wv = g.createLogger({ name: "kos-model-loader" }), Qv = () => /* @__PURE__ */ w("div", {}), Zv = ({ fallback: t, children: e, ...s }) => /* @__PURE__ */ w(Kv, { children: /* @__PURE__ */ w(Hv, { fallback: t, children: /* @__PURE__ */ w(Su, { children: /* @__PURE__ */ w(Jv, { ...s, children: e }) }) }) }), Jv = (t) => {
@@ -17090,14 +17100,14 @@ const ne = (t) => {
           m == null || m.fsm.transitionTo(L.GO_INACTIVE, y.INACTIVE).then(() => {
             if (n) {
               const b = h.id;
-              Ue(h).then(() => {
+              je(h).then(() => {
                 ct.delete(b), p == null || p();
               });
             }
           });
         }
       } else
-        n && h && Ue(h).then(() => {
+        n && h && je(h).then(() => {
           ct.delete(e), p == null || p();
         });
     };
@@ -17165,7 +17175,7 @@ function J_({ children: t }) {
   return /* @__PURE__ */ w(aw.Provider, { value: cu, children: t });
 }
 const lu = As(void 0), cw = () => {
-  const t = window.location.origin, e = Oe();
+  const t = window.location.origin, e = Se();
   return (e == null ? void 0 : e.host) || t;
 }, X_ = ({
   children: t,
@@ -17186,8 +17196,8 @@ const lu = As(void 0), cw = () => {
         return V.value;
       }).filter((V) => !!V).reverse().reduce((V, j) => {
         const te = j.path;
-        return Object.keys(j.namespaces).forEach((We) => {
-          const Qe = j.namespaces[We];
+        return Object.keys(j.namespaces).forEach((Ee) => {
+          const Qe = j.namespaces[Ee];
           Qe.basePath = te;
         }), {
           ...V,
@@ -17803,14 +17813,14 @@ function wT({
   }).format(a);
   return o ? o == "MMDDYY" ? `${c} ${d} ${u}` : o === "DDMMYY" ? `${d} ${c} ${u}` : o === "YYMMDD" ? `${u} ${c} ${d}` : `${u} ${d} ${c}` : new Intl.DateTimeFormat(t, n).format(a);
 }
-function Ce(t) {
+function De(t) {
   return t.toString().length === 2 ? new Date(Date.parse(`01 Jan 20${t}`)).getFullYear() : t;
 }
 function MT(t) {
   return typeof t == "string" ? new Date(Date.parse(`01 ${t.substring(0, 3)} 2023`)).getMonth() + 1 : t;
 }
 function jw(t, e, s) {
-  const r = Ce(e), n = new Date(r, t, 1).getDay(), o = new Date(r, t + 1, 0).getDate();
+  const r = De(e), n = new Date(r, t, 1).getDay(), o = new Date(r, t + 1, 0).getDate();
   return [...Array(42).keys()].map((a) => a < n || a > o + n - 1 ? { label: "", value: 0, disabled: !0 } : s[a - n]);
 }
 function sr(t, e, s) {
@@ -17886,7 +17896,7 @@ function Kw(t, e = "en-US") {
   );
 }
 function fu(t, e) {
-  const s = Ce(t);
+  const s = De(t);
   return W(
     () => Lw(s, e),
     [e, s]
@@ -17967,7 +17977,7 @@ function ET({
     daysArray: V,
     daysOptionsArray: j,
     calendarDayArray: te,
-    dayNamesArray: We
+    dayNamesArray: Ee
   } = Hw({
     locale: t,
     year: d,
@@ -17992,7 +18002,7 @@ function ET({
       setMonth: b,
       setDay: M,
       nextMonth: () => {
-        const ie = m < 11 ? Ce(d) : Ce(d + 1), fe = m < 11 ? m + 1 : 0;
+        const ie = m < 11 ? De(d) : De(d + 1), fe = m < 11 ? m + 1 : 0;
         if (!sr(ie, fe, v)) {
           const st = rr(ie, fe);
           M(st);
@@ -18000,7 +18010,7 @@ function ET({
         fe === 0 && h(ie), b(fe);
       },
       previousMonth: () => {
-        const ie = Ce(m === 0 ? d - 1 : d), fe = m === 0 ? 11 : m - 1;
+        const ie = De(m === 0 ? d - 1 : d), fe = m === 0 ? 11 : m - 1;
         if (!sr(ie, fe, v)) {
           const st = rr(ie, fe);
           M(st);
@@ -18008,20 +18018,20 @@ function ET({
         fe === 11 && h(ie), b(fe);
       },
       nextYear: () => {
-        const ie = d < f[1] ? d + 1 : f[0], fe = Ce(ie);
+        const ie = d < f[1] ? d + 1 : f[0], fe = De(ie);
         if (sr(fe, m, v))
           h(ie);
         else {
-          const st = rr(Ce(d + 1), m);
+          const st = rr(De(d + 1), m);
           M(st), h(ie);
         }
       },
       previousYear: () => {
-        const ie = d > f[0] ? d - 1 : f[0], fe = Ce(ie);
+        const ie = d > f[0] ? d - 1 : f[0], fe = De(ie);
         if (sr(fe, m, v))
           h(ie);
         else {
-          const st = rr(Ce(d - 1), m);
+          const st = rr(De(d - 1), m);
           M(st), h(ie);
         }
       }
@@ -18037,7 +18047,7 @@ function ET({
       monthsOptionsArray: E,
       daysArray: V,
       daysOptionsArray: j,
-      calendarDayNames: We,
+      calendarDayNames: Ee,
       calendarDayArray: te,
       formattedDate: Qe
     }
@@ -18508,7 +18518,7 @@ const Qi = g.createLogger({
 }), gM = "/api/kos/studio/properties", bu = async (t) => {
   if (Qi.debug("sending GET for  studio-properties"), !t)
     throw Qi.error("connectionId is undefined"), new Error("connectionId is undefined");
-  return await ke.get(
+  return await Le.get(
     gM,
     {},
     {
@@ -18540,7 +18550,7 @@ let to = class {
     l(this, "logger");
     /** Observable data store for Studio properties */
     l(this, "data");
-    this.id = t, this.logger = s.logger, this.data = je(), this.connectionId = e.connectionId;
+    this.id = t, this.logger = s.logger, this.data = Be(), this.connectionId = e.connectionId;
   }
   // -------------------LIFECYCLE----------------------------
   /**
@@ -18609,7 +18619,7 @@ let to = class {
 to = yM([
   R(vu)
 ], to);
-const RT = new Se({
+const RT = new Ce({
   class: to,
   type: vu
 });
@@ -18634,7 +18644,7 @@ export {
   Zw as DateDisplayFormat,
   GM as DateHelpers,
   x as DependencyLifecycle,
-  F as DependencyModels,
+  N as DependencyModels,
   it as DependencyResolutionPolicy,
   Zn as Device,
   M_ as DeviceServices,
@@ -18655,7 +18665,7 @@ export {
   vg as FUTURE_MODEL_TYPE,
   ac as FUTURE_NOT_ASSIGNED,
   pd as FeatureFlagService,
-  $e as FetchError,
+  Ie as FetchError,
   ar as FutureAliases,
   pt as FutureContainerFactory,
   zg as FutureContainerModel,
@@ -18673,7 +18683,7 @@ export {
   io as HEADER_METHOD,
   na as HEADER_ORDERED,
   Kr as HEADER_REQUEST_ID,
-  Ke as HEADER_REQUEST_TYPE,
+  Ve as HEADER_REQUEST_TYPE,
   ao as HEADER_RESPONSE_ID,
   Pu as HEADER_SOURCE_ADDR,
   xu as HEADER_TOPIC,
@@ -18693,7 +18703,7 @@ export {
   Up as KosContextBean,
   J as KosContextManager,
   T as KosCore,
-  xe as KosCoreModelPropertyMapper,
+  Pe as KosCoreModelPropertyMapper,
   rc as KosDataContainer,
   aE as KosDependencyTypes,
   Zm as KosExpressionEvaluator,
@@ -18708,7 +18718,7 @@ export {
   Nu as KosMockEvents,
   op as KosModel,
   z_ as KosModelCollectionProvider,
-  Ge as KosModelContainer,
+  Ye as KosModelContainer,
   qo as KosModelContext,
   L as KosModelEvents,
   lr as KosModelFactory,
@@ -18716,7 +18726,7 @@ export {
   Jv as KosModelLoaderDisplay,
   lp as KosModelManager,
   Kv as KosModelProvider,
-  Se as KosModelRegistrationFactory,
+  Ce as KosModelRegistrationFactory,
   ji as KosModelRegistry,
   y as KosModelState,
   La as KosModelSymbol,
@@ -18755,7 +18765,7 @@ export {
   Rl as NetworkInterface,
   Br as NetworkInterfaceContainer,
   E_ as NetworkInterfaceServices,
-  je as ObservableData,
+  Be as ObservableData,
   Jr as OptionsRequired,
   Kn as Ota,
   aT as OutsideAlerter,
@@ -18778,7 +18788,7 @@ export {
   ra as STATUS,
   he as ServiceFactory,
   Rt as ServiceRequestHandlers,
-  Re as SingletonKosModelRegistrationFactory,
+  ke as SingletonKosModelRegistrationFactory,
   Gn as SoftwareInfo,
   au as SoftwareInfoContext,
   Q_ as SoftwareInfoProvider,
@@ -18816,7 +18826,7 @@ export {
   Ua as TroubleAwareSetup,
   $s as TroubleContainer,
   f_ as TroubleServices,
-  Ee as Troubles,
+  _e as Troubles,
   Kl as UsbUpdate,
   zr as UsbUpdateContainer,
   T_ as UsbUpdateServices,
@@ -18867,7 +18877,7 @@ export {
   Wu as debounce,
   Vd as del,
   Ig as deleteFuture,
-  Ue as destroyKosModel,
+  je as destroyKosModel,
   Wp as evaluateScopes,
   Xh as executeChildrenModelLifecycle,
   Ks as executeDependentModelLifecycle,
@@ -18891,7 +18901,7 @@ export {
   wT as getFormattedDate,
   MT as getFormattedMonth,
   du as getFormattedMonthsArray,
-  Ce as getFormattedYear,
+  De as getFormattedYear,
   Uw as getFormattedYearsArray,
   a_ as getFutures,
   Gd as getHttpRouteHandlers,
@@ -18899,7 +18909,7 @@ export {
   fb as getKosLocalizationDescriptor,
   ad as getKosMessageLogging,
   nh as getKosModel,
-  Be as getKosModelSync,
+  He as getKosModelSync,
   vE as getKosModelType,
   Np as getKosSessionKey,
   rr as getLastDayOfMonth,
@@ -18909,7 +18919,7 @@ export {
   ii as getMessageBody,
   Fw as getMonthsArray,
   EE as getObservableCompanions,
-  Oe as getQueryParams,
+  Se as getQueryParams,
   UE as getServiceResponse,
   e_ as getStartedApps,
   hb as getTranslations,
@@ -18929,7 +18939,7 @@ export {
   dr as isKosDataModel,
   Ha as isKosExecutionContext,
   JM as isKosLoggingEnabled,
-  Ae as isKosModel,
+  Re as isKosModel,
   Za as isKosModelContainer,
   Fn as isKosModelReady,
   Ia as isLeapYear,
@@ -18940,7 +18950,7 @@ export {
   sr as isValidDate,
   oe as kosAction,
   ee as kosAutoEffect,
-  Ve as kosChild,
+  Ge as kosChild,
   rE as kosCompanion,
   jT as kosComponent,
   oc as kosComputed,
@@ -18950,7 +18960,7 @@ export {
   nE as kosContext,
   ks as kosDependency,
   zp as kosEffect,
-  Le as kosFetch,
+  Fe as kosFetch,
   tu as kosFuture,
   oE as kosFutureAware,
   uE as kosLogger,