@kosdev-code/kos-freestyle-sdk 0.1.0-dev.5170 → 0.1.0-dev.5179

package/{service-Rmefh9Kc.js → service-_jG-Kd3m.js}

@@ -1,36 +1,55 @@
-var Pt = Object.defineProperty;
-var vt = (e, t, r) => t in e ? Pt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
-var i = (e, t, r) => (vt(e, typeof t != "symbol" ? t + "" : t, r), r);
-import { resolveServiceUrl as A, ServiceFactory as w, KosLog as $, createPropKey as x, kosStateProp as E, kosConfigProperty as b, kosStateEntry as be, kosStateExit as Tt, kosStateGuard as Pe, kosFuture as I, kosModel as f, kosLoggerAware as re, kosCompanion as xe, kosFutureAware as Ue, kosStateMachine as _t, DependencyLifecycle as je, KosModelContainer as It, kosChild as qe, kosModelEffect as ve, EventBus as Z, KosModelRegistrationFactory as C, SingletonKosModelRegistrationFactory as Te, FetchError as _e, FutureManager as y, FutureEndState as U, FutureHandler as Ge, kosParentAware as Ve, KosFeatureFlags as ue, getKosCompanionModel as $t, getKosModelSync as R, kosContainerAware as Ct, KosContextManager as Ot, kosAction as W, KOS_MODEL_ID as O, kosMultipleFutureAware as Et, kosTopicHandler as St, modelTypeEventTopicFactory as At, RegistrationManager as m, registerCoreModels as wt, Trouble as Mt, ExtensionManager as ce, EXTENSION_TROUBLE_DATA_MAPPER as de, createClient as V, kosServiceRequest as H } from "@kosdev-code/kos-ui-sdk";
-import { PourState as d, Assembly as He, KosModelRegistry as Rt, registerDispenseModels as Dt, Nozzle as Lt, Pump as Ft, Holder as zt, PumpContainer as Nt, PumpIndex as xt } from "@kosdev-code/kos-dispense-sdk";
-const { URL: Be } = A("ICE_AGITATOR_SERVICE"), { postModel: Ut } = w.build({
-  basePath: `${Be}/api/ext/freestyle/ice`
+var vt = Object.defineProperty;
+var Tt = (e, t, r) => t in e ? vt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r;
+var i = (e, t, r) => (Tt(e, typeof t != "symbol" ? t + "" : t, r), r);
+import { resolveServiceUrl as A, ServiceFactory as w, KosLog as $, createPropKey as U, kosStateProp as O, kosConfigProperty as b, kosStateEntry as be, kosStateExit as _t, kosStateGuard as Pe, kosFuture as I, kosModel as f, kosLoggerAware as V, kosCompanion as ve, kosFutureAware as xe, kosStateMachine as It, DependencyLifecycle as Ue, KosModelContainer as $t, kosChild as qe, kosModelEffect as Te, EventBus as k, KosModelRegistrationFactory as E, SingletonKosModelRegistrationFactory as _e, FetchError as Ie, FutureManager as y, FutureEndState as q, FutureHandler as Ge, kosParentAware as je, KosFeatureFlags as ue, getKosCompanionModel as Ct, getKosModelSync as R, kosContainerAware as Ot, KosContextManager as Et, kosAction as Z, KOS_MODEL_ID as C, kosMultipleFutureAware as St, kosTopicHandler as At, modelTypeEventTopicFactory as wt, RegistrationManager as m, registerCoreModels as Mt, Trouble as Rt, ExtensionManager as ce, EXTENSION_TROUBLE_DATA_MAPPER as de, createClient as H, kosServiceRequest as B } from "@kosdev-code/kos-ui-sdk";
+import { PourState as d, Assembly as Ve, KosModelRegistry as Dt, registerDispenseModels as Ft, Nozzle as Lt, Pump as zt, Holder as Nt, PumpContainer as xt, PumpIndex as Ut } from "@kosdev-code/kos-dispense-sdk";
+const { URL: He } = A("ICE_AGITATOR_SERVICE"), { postModel: qt } = w.build({
+  basePath: `${He}/api/ext/freestyle/ice`
 });
 $.createLogger({
   name: "carb-tank-service",
   group: "Services"
 });
-const jt = async (e, t) => {
-  const r = await Ut({
+const Gt = async (e, t) => {
+  const r = await qt({
     model: {},
     tracker: t,
-    urlOverride: `${Be}/api/handle/${e}/test`
+    urlOverride: `${He}/api/handle/${e}/test`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 };
-var Ke = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Gt = (e, t, r) => t in e ? Ke(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, P = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? qt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Be = Object.defineProperty, jt = Object.getOwnPropertyDescriptor, Vt = (e, t, r) => t in e ? Be(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, P = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? jt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Ke(t, r, a), a;
-}, Vt = (e, t, r) => (Gt(e, t + "", r), r);
-const Ht = "carb-agitator-model", Ie = x("statePath");
+  return o && a && Be(t, r, a), a;
+}, Ht = (e, t, r) => (Vt(e, t + "", r), r);
+const Bt = "carb-agitator-model", $e = U("statePath");
 let g = class {
+  /**
+   * Creates a new carb agitator model instance.
+   *
+   * @param modelId - Unique identifier for this instance
+   * @param options - Configuration options including name
+   * @param context - KOS creation context providing assembly paths
+   */
   constructor(e, t, r) {
+    /**
+     * Unique identifier for this carb agitator instance.
+     */
     i(this, "id");
+    /**
+     * Display name for this carb agitator.
+     */
     i(this, "name");
+    /**
+     * Device path for carb tank operations.
+     */
     i(this, "path");
+    /**
+     * State path for accessing probe and filling status.
+     */
     i(this, "statePath");
     i(this, "highProbeWet");
     i(this, "lowProbeWet");
@@ -41,23 +60,62 @@ let g = class {
     const o = r.kosContext.get("assembly-state-path-carbTank");
     this.statePath = o;
   }
+  /**
+   * Gets the carb holder associated with this agitator.
+   *
+   * Retrieves the first holder from the "carb" group in the parent assembly.
+   *
+   * @returns The carb holder model, or undefined if not found
+   */
   get holder() {
     var t;
     return (t = this.getCompanionParent()) == null ? void 0 : t.getHoldersByGroup("carb")[0];
   }
+  /**
+   * Gets the pump associated with the carb holder.
+   *
+   * Returns the first pump from the holder's pump collection.
+   *
+   * @returns The pump model, or undefined if holder or pump not available
+   */
   get pump() {
     var e;
     return (e = this.holder) == null ? void 0 : e.pumps.data[0];
   }
+  /**
+   * Indicates whether the carb tank is currently being filled.
+   *
+   * @returns true if the filling state property indicates active filling
+   */
   get isFilling() {
     return !!this.filling.value;
   }
+  /**
+   * Indicates whether the carb tank has been initialized.
+   *
+   * @returns true if the carb tank enabled configuration is set to true
+   */
   get isCarbInitialized() {
     return !!this.enabled.value;
   }
+  /**
+   * Indicates whether carb tank activation is allowed.
+   *
+   * Activation is only allowed when the carb tank is not already enabled.
+   *
+   * @returns true if the carb tank can be activated
+   */
   get canActivate() {
     return !this.enabled.value;
   }
+  /**
+   * Indicates whether the workflow can proceed past carb initialization.
+   *
+   * The workflow can proceed when the state machine is in either INITIALIZED
+   * (carb tank activated) or SKIPPED (user chose to bypass carbonation).
+   *
+   * @returns true if ready to proceed with beverage operations
+   */
   get canProceed() {
     return this.isInState(
       "INITIALIZED"
@@ -82,6 +140,15 @@ let g = class {
   async activateCarbTank() {
     this.transition("ACTIVATE"), this.enabled.updateProperty(!0), this.transition("ACTIVATION_COMPLETE");
   }
+  /**
+   * Deactivates the carb tank and resets to uninitialized state.
+   *
+   * This method:
+   * 1. Updates the enabled configuration property to false
+   * 2. Transitions back to UNINITIALIZED state
+   *
+   * Can be called from any state.
+   */
   async deactivateCarbTank() {
     this.enabled.updateProperty(!1), this.transition("RESET");
   }
@@ -91,31 +158,37 @@ let g = class {
   reset() {
     this.enabled.updateProperty(!1), this.transition("RESET");
   }
+  /**
+   * Toggles the carb tank between enabled and disabled states.
+   *
+   * If currently enabled, calls {@link deactivateCarbTank}.
+   * If currently disabled, calls {@link activateCarbTank}.
+   */
   toggleCarbTank() {
     this.enabled.value ? this.deactivateCarbTank() : this.activateCarbTank();
   }
   handleTestCarbTank(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`testing carb tank:  ${this.id}`), jt(this.path, e);
+    return this.logger.info(`testing carb tank:  ${this.id}`), Gt(this.path, e);
   }
 };
-Vt(g, "Registration");
+Ht(g, "Registration");
 P([
-  E({
-    path: Ie,
+  O({
+    path: $e,
     attribute: "highProbeWet"
   })
 ], g.prototype, "highProbeWet", 2);
 P([
-  E({
-    path: Ie,
+  O({
+    path: $e,
     attribute: "lowProbeWet"
   })
 ], g.prototype, "lowProbeWet", 2);
 P([
-  E({
-    path: Ie,
+  O({
+    path: $e,
     attribute: "filling"
   })
 ], g.prototype, "filling", 2);
@@ -132,7 +205,7 @@ P([
   )
 ], g.prototype, "handleActivationStart", 1);
 P([
-  Tt(
+  _t(
     "ACTIVATING"
     /* ACTIVATING */
   )
@@ -174,11 +247,11 @@ P([
   I()
 ], g.prototype, "handleTestCarbTank", 1);
 g = P([
-  f({ modelTypeId: Ht, singleton: !1 }),
-  re(),
-  xe({ mode: "composition", lifecycle: je.LOAD }),
-  Ue(),
-  _t(
+  f({ modelTypeId: Bt, singleton: !1 }),
+  V(),
+  ve({ mode: "composition", lifecycle: Ue.LOAD }),
+  xe(),
+  It(
     {
       initial: "UNINITIALIZED",
       states: {
@@ -215,19 +288,19 @@ g = P([
     }
   )
 ], g);
-const Ye = g.Registration;
-var Bt = Object.defineProperty, Kt = Object.getOwnPropertyDescriptor, We = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Kt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+const Ke = g.Registration;
+var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, Ye = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Yt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Bt(t, r, a), a;
+  return o && a && Kt(t, r, a), a;
 };
-const Ze = "cartridge-agitator-container-model";
-let k = class {
+const We = "cartridge-agitator-container-model";
+let J = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
     i(this, "_models");
-    this.id = e, this.logger = r.logger, this._models = new It({
+    this.id = e, this.logger = r.logger, this._models = new $t({
       parentId: e
     });
   }
@@ -258,35 +331,35 @@ let k = class {
     );
   }
 };
-We([
+Ye([
   qe
-], k.prototype, "_models", 2);
-k = We([
-  f(Ze)
-], k);
-const { URL: ke } = A("CARTRIDGE_AGITATOR_SERVICE"), { postModel: Yt } = w.build({
-  basePath: `${ke}/api/ext/freestyle/freestyle/ice`
-}), Wt = async (e, t) => {
-  const r = await Yt({
+], J.prototype, "_models", 2);
+J = Ye([
+  f(We)
+], J);
+const { URL: Ze } = A("CARTRIDGE_AGITATOR_SERVICE"), { postModel: Wt } = w.build({
+  basePath: `${Ze}/api/ext/freestyle/freestyle/ice`
+}), Zt = async (e, t) => {
+  const r = await Wt({
     model: {},
     tracker: t,
-    urlOverride: `${ke}/api/handle/${e}/test`
+    urlOverride: `${Ze}/api/handle/${e}/test`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r.data;
 };
-var Zt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, ae = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? kt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var kt = Object.defineProperty, Jt = Object.getOwnPropertyDescriptor, ae = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Jt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Zt(t, r, a), a;
+  return o && a && kt(t, r, a), a;
 };
-const Je = "cartridge-agitator-model";
-class J {
+const ke = "cartridge-agitator-model";
+class Q {
 }
-i(J, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), i(J, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
-const Jt = x("statePath");
-let F = class {
+i(Q, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/agitation-started"), i(Q, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/agitation-ended");
+const Qt = U("statePath");
+let L = class {
   constructor(e, t) {
     i(this, "id");
     i(this, "agitating");
@@ -301,48 +374,48 @@ let F = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating cartridge-agitator ${this.id}`), Wt(this.path, e);
+    return this.logger.info(`agitating cartridge-agitator ${this.id}`), Zt(this.path, e);
   }
   handleAgitation() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), Z.publish(J.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating cartridge-agitator ${this.id}`), k.publish(Q.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.future) == null ? void 0 : e.futureId
-    })) : Z.publish(J.TOPIC_AGITATION_ENDED, {
+    })) : k.publish(Q.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
 };
 ae([
-  E({ path: Jt, attribute: "agitating" })
-], F.prototype, "agitating", 2);
+  O({ path: Qt, attribute: "agitating" })
+], L.prototype, "agitating", 2);
 ae([
   I()
-], F.prototype, "testAgitate", 1);
+], L.prototype, "testAgitate", 1);
 ae([
-  ve({
+  Te({
     dependencies: (e) => [e.isAgitating]
   })
-], F.prototype, "handleAgitation", 1);
-F = ae([
-  f(Je),
-  Ue(),
-  re()
-], F);
-const Qe = new C({
-  class: F,
-  type: Je
-}), $e = new Te({
-  class: k,
-  type: Ze
+], L.prototype, "handleAgitation", 1);
+L = ae([
+  f(ke),
+  xe(),
+  V()
+], L);
+const Je = new E({
+  class: L,
+  type: ke
+}), Ce = new _e({
+  class: J,
+  type: We
 });
-$e.addRelatedModel(Qe);
-var Xe = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, Xt = (e, t, r) => t in e ? Xe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, oe = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Qt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+Ce.addRelatedModel(Je);
+var Qe = Object.defineProperty, Xt = Object.getOwnPropertyDescriptor, er = (e, t, r) => t in e ? Qe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, oe = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Xt(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Xe(t, r, a), a;
-}, er = (e, t, r) => (Xt(e, t + "", r), r);
-const tr = "cgp-pump-model", Ce = x("statePath");
+  return o && a && Qe(t, r, a), a;
+}, tr = (e, t, r) => (er(e, t + "", r), r);
+const rr = "cgp-pump-model", Oe = U("statePath");
 let D = class {
   constructor(e, t) {
     i(this, "highProbeWet");
@@ -357,66 +430,66 @@ let D = class {
     return this.state.path;
   }
 };
-er(D, "Registration");
+tr(D, "Registration");
 oe([
-  E({
-    path: Ce,
+  O({
+    path: Oe,
     attribute: "highProbeWet"
   })
 ], D.prototype, "highProbeWet", 2);
 oe([
-  E({
-    path: Ce,
+  O({
+    path: Oe,
     attribute: "lowProbeWet"
   })
 ], D.prototype, "lowProbeWet", 2);
 oe([
-  E({
-    path: Ce,
+  O({
+    path: Oe,
     attribute: "filling"
   })
 ], D.prototype, "filling", 2);
 D = oe([
-  f({ modelTypeId: tr, singleton: !1 }),
-  xe({
+  f({ modelTypeId: rr, singleton: !1 }),
+  ve({
     mode: "composition"
   }),
-  re()
+  V()
 ], D);
-const rr = D.Registration, { URL: j } = A("FCM-PUMP_SERVICE"), { postModel: B } = w.build({
-  basePath: `${j}/api/fcm-pump`
+const ar = D.Registration, { URL: G } = A("FCM-PUMP_SERVICE"), { postModel: K } = w.build({
+  basePath: `${G}/api/fcm-pump`
 }), h = $.createLogger({
   name: "fcm-pump-service",
   group: "Services"
-}), ar = async (e) => {
+}), or = async (e) => {
   var t, r, o, a, n;
   h.debug(
     `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
   );
   try {
-    const s = await B({
+    const s = await K({
       model: {},
-      urlOverride: `${j}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
+      urlOverride: `${G}/api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`
     });
     return h.debug("performElectricalTest - response:", s), ((s == null ? void 0 : s.status) === 200 || (s == null ? void 0 : s.status) === 499) && ((t = s.data) != null && t.error) ? [s.data.error || "unknownError", s.data] : [void 0, s == null ? void 0 : s.data];
   } catch (s) {
     if (h.error(
       `performElectricalTest - sending POST request to /api/ext/freestyle/fcm/diagnostics/${e}/electricalTest`,
       s
-    ), s instanceof _e) {
+    ), s instanceof Ie) {
       const u = ((o = (r = s.payload) == null ? void 0 : r.data) == null ? void 0 : o.error) || ((a = s.payload) == null ? void 0 : a.error) || "unknownError";
       return [u, ((n = s.payload) == null ? void 0 : n.data) || { error: u }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
-}, or = async (e, t) => {
+}, ir = async (e, t) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/preCalibrate`
   );
   try {
-    const r = await B({
+    const r = await K({
       model: {},
-      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
+      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/preCalibrate`,
       tracker: t
     });
     return h.debug("performPreCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -427,20 +500,20 @@ const rr = D.Registration, { URL: j } = A("FCM-PUMP_SERVICE"), { postModel: B }
     );
     const o = {
       id: t || "",
-      endState: U.Fail,
+      endState: q.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
     return y.initiateFuture(o), o;
   }
-}, ir = async (e, t) => {
+}, sr = async (e, t) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/calibrate`
   );
   try {
-    const r = await B({
+    const r = await K({
       model: {},
-      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
+      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/calibrate`,
       tracker: t
     });
     return h.debug("performPreCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -451,20 +524,20 @@ const rr = D.Registration, { URL: j } = A("FCM-PUMP_SERVICE"), { postModel: B }
     );
     const o = {
       id: t || "",
-      endState: U.Fail,
+      endState: q.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
     return y.initiateFuture(o), o;
   }
-}, sr = async (e, t, r) => {
+}, nr = async (e, t, r) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/verify/${t}`
   );
   try {
-    const o = await B({
+    const o = await K({
       model: {},
-      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
+      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/verify/${t}`,
       tracker: r
     });
     return h.debug("performVerify - response:", o), o != null && o.data && y.initiateFuture(o.data), o == null ? void 0 : o.data;
@@ -475,22 +548,22 @@ const rr = D.Registration, { URL: j } = A("FCM-PUMP_SERVICE"), { postModel: B }
     );
     const a = {
       id: r || "",
-      endState: U.Fail,
+      endState: q.Fail,
       tracker: r,
       reason: "Failed to resolve trouble"
     };
     return y.initiateFuture(a), a;
   }
-}, nr = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", lr = async (e, t, r) => {
+}, lr = (e) => e ? e.data === "success" || !e.data ? "success" : e.data : "error", ur = async (e, t, r) => {
   h.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
   );
   try {
-    const o = await B({
+    const o = await K({
       model: {},
-      urlOverride: `${j}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
+      urlOverride: `${G}/api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`
     });
-    return h.debug("performPreCalibrate - response:", o), nr(o == null ? void 0 : o.data);
+    return h.debug("performPreCalibrate - response:", o), lr(o == null ? void 0 : o.data);
   } catch (o) {
     h.error(
       `performPreCalibrate - sending POST request to /api/ext/freestyle/fcm/calibration/${e}/complete/${t}/${r}`,
@@ -499,12 +572,12 @@ const rr = D.Registration, { URL: j } = A("FCM-PUMP_SERVICE"), { postModel: B }
     return;
   }
 };
-var ur = Object.defineProperty, cr = Object.getOwnPropertyDescriptor, ie = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? cr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var cr = Object.defineProperty, dr = Object.getOwnPropertyDescriptor, ie = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? dr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && ur(t, r, a), a;
+  return o && a && cr(t, r, a), a;
 };
-const et = "fcm-pump-model", dr = $.createLogger({ name: "fcm-pump-model" });
+const Xe = "fcm-pump-model", pr = $.createLogger({ name: "fcm-pump-model" });
 let z = class {
   constructor(e, t, r) {
     i(this, "id");
@@ -532,23 +605,23 @@ let z = class {
     return this.pumpModel.performIntent(e);
   }
   async performElectricalTest() {
-    const [e, t] = await ar(this.pumpModel.path);
-    return e && dr.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
+    const [e, t] = await or(this.pumpModel.path);
+    return e && pr.error(`Failed to perform electrical test on pump ${this.id}`, e), t;
   }
   getChildren() {
     return [...this.futureHandler.allFutures];
   }
   async performPreCalibrate(e) {
-    return or(this.pumpModel.path, e);
+    return ir(this.pumpModel.path, e);
   }
   async performCalibrate(e) {
-    return ir(this.pumpModel.path, e);
+    return sr(this.pumpModel.path, e);
   }
   async performVerify(e, t) {
-    return sr(this.pumpModel.path, e, t);
+    return nr(this.pumpModel.path, e, t);
   }
   async performComplete(e, t) {
-    return lr(this.pumpModel.path, e, t);
+    return ur(this.pumpModel.path, e, t);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -568,19 +641,19 @@ ie([
   I()
 ], z.prototype, "performVerify", 1);
 z = ie([
-  f(et)
+  f(Xe)
 ], z);
-const pr = new C({
+const gr = new E({
   class: z,
-  type: et
+  type: Xe
 });
-var gr = Object.defineProperty, hr = Object.getOwnPropertyDescriptor, tt = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? hr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var hr = Object.defineProperty, fr = Object.getOwnPropertyDescriptor, et = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? fr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && gr(t, r, a), a;
+  return o && a && hr(t, r, a), a;
 };
-const rt = "freestyle-assembly-model", fr = "iceAgitator", mr = "carbTank", yr = "remoteTrays";
-let Q = class {
+const tt = "freestyle-assembly-model", mr = "iceAgitator", yr = "carbTank", br = "remoteTrays";
+let X = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "_carbTankModel");
@@ -642,45 +715,45 @@ let Q = class {
   }
   // -------------------LIFECYCLE----------------------------
   get supportsRemoteTrays() {
-    return ue.isFeatureEnabled(yr);
+    return ue.isFeatureEnabled(br);
   }
   get supportsIce() {
-    return ue.isFeatureEnabled(fr);
+    return ue.isFeatureEnabled(mr);
   }
   get supportsCarb() {
-    return ue.isFeatureEnabled(mr);
+    return ue.isFeatureEnabled(yr);
   }
   async init() {
     this.logger.debug(`initializing freestyle-assembly ${this.id}`);
   }
   async ready() {
-    const e = $t(
+    const e = Ct(
       this.assembly,
-      Ye.type
+      Ke.type
     );
     this._carbTankModel = e;
   }
 };
-tt([
+et([
   qe
-], Q.prototype, "_remoteTrays", 2);
-Q = tt([
-  Ve(),
-  f(rt)
-], Q);
-const ge = new Te({
-  class: Q,
-  type: rt
+], X.prototype, "_remoteTrays", 2);
+X = et([
+  je(),
+  f(tt)
+], X);
+const ge = new _e({
+  class: X,
+  type: tt
 });
-var br = Object.defineProperty, Pr = Object.getOwnPropertyDescriptor, at = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Pr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Pr = Object.defineProperty, vr = Object.getOwnPropertyDescriptor, rt = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? vr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && br(t, r, a), a;
+  return o && a && Pr(t, r, a), a;
 };
-const ot = "remote-tray-model";
-x("holderPath");
-const vr = x("configPath");
-let X = class {
+const at = "remote-tray-model";
+U("holderPath");
+const Tr = U("configPath");
+let ee = class {
   constructor(e, t, r) {
     /** Unique identifier for the remote tray instance */
     i(this, "id");
@@ -770,49 +843,49 @@ let X = class {
     this.logger.debug(`loading remote-tray ${this.id}`);
   }
 };
-at([
+rt([
   b({
-    path: vr,
+    path: Tr,
     attribute: "enabled"
   })
-], X.prototype, "remoteTrayEnabled", 2);
-X = at([
-  f(ot)
-], X);
-const q = new C({
-  class: X,
-  type: ot
+], ee.prototype, "remoteTrayEnabled", 2);
+ee = rt([
+  f(at)
+], ee);
+const j = new E({
+  class: ee,
+  type: at
 });
-var Tr = Object.getOwnPropertyDescriptor, _r = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Tr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var _r = Object.getOwnPropertyDescriptor, Ir = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? _r(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const it = "remote-tray-container-model";
+const ot = "remote-tray-container-model";
 let he = class {
   constructor(e) {
     i(this, "id");
     this.id = e;
   }
 };
-he = _r([
-  f(it),
-  re(),
-  Ct()
+he = Ir([
+  f(ot),
+  V(),
+  Ot()
 ], he);
-const Oe = new Te({
+const Ee = new _e({
   class: he,
-  type: it
+  type: ot
 });
-Oe.addRelatedModel(q);
-var Ir = Object.getOwnPropertyDescriptor, $r = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Ir(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+Ee.addRelatedModel(j);
+var $r = Object.getOwnPropertyDescriptor, Cr = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? $r(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const st = "freestyle-holder-model";
-function Cr(e) {
-  const t = Ot.getContext(e), r = t == null ? void 0 : t.get(
+const it = "freestyle-holder-model";
+function Or(e) {
+  const t = Et.getContext(e), r = t == null ? void 0 : t.get(
     ge.type
   );
   if (!r) {
@@ -821,7 +894,7 @@ function Cr(e) {
   }
   return r;
 }
-async function Or(e, t) {
+async function Er(e, t) {
   if (!e || !t)
     return;
   const r = await e[t]();
@@ -844,20 +917,20 @@ let fe = class {
     if (!this.holder.data.agitated)
       return;
     this.future = void 0;
-    const e = Cr(this.id);
+    const e = Or(this.id);
     if (!e)
       return;
     if (!e.defaultCartridgeAgitator) {
       this.logger.error("Agitator not found");
       return;
     }
-    return this.future = await Or(
+    return this.future = await Er(
       e.defaultCartridgeAgitator,
       "testAgitate"
     ), this.future;
   }
   get isRemote() {
-    const e = `${q.type}-${this.holder.path}`, t = R(e);
+    const e = `${j.type}-${this.holder.path}`, t = R(e);
     return t != null && t.model ? !!t.model.remoteTrayEnabled.value : !1;
   }
   // -------------------LIFECYCLE----------------------------
@@ -868,19 +941,19 @@ let fe = class {
     this.logger.debug(`loading freestyle-holder ${this.id}`);
   }
 };
-fe = $r([
-  f(st)
+fe = Cr([
+  f(it)
 ], fe);
-const Ae = new C({
+const Ae = new E({
   class: fe,
-  type: st
-}), { URL: Er } = A("FREESTYLE-NOZZLE_SERVICE"), { getOne: Sr } = w.build({
-  basePath: `${Er}/api/freestyle-nozzle`
-}), Y = $.createLogger({
+  type: it
+}), { URL: Sr } = A("FREESTYLE-NOZZLE_SERVICE"), { getOne: Ar } = w.build({
+  basePath: `${Sr}/api/freestyle-nozzle`
+}), W = $.createLogger({
   name: "freestyle-nozzle-service",
   group: "Services"
 });
-class Ar extends Error {
+class wr extends Error {
   constructor(t) {
     super(t), this.name = "NutritionInfoError";
   }
@@ -890,29 +963,29 @@ class we extends Error {
     super(t), this.name = "InvalidRequestError";
   }
 }
-const wr = async (e, t, r, o = "http://localhost:8081") => {
-  if (Y.debug("sending GET for freestyle-nozzle"), !t)
-    throw Y.error("Invalid freestyle-nozzle request: beverageId is required"), new we("No beverageId provided");
+const Mr = async (e, t, r, o = "http://localhost:8081") => {
+  if (W.debug("sending GET for freestyle-nozzle"), !t)
+    throw W.error("Invalid freestyle-nozzle request: beverageId is required"), new we("No beverageId provided");
   if (!r || r.length === 0)
-    throw Y.error("Invalid freestyle-nozzle request: volumes are required"), new we("No volumes provided");
-  const a = await Sr({
+    throw W.error("Invalid freestyle-nozzle request: volumes are required"), new we("No volumes provided");
+  const a = await Ar({
     urlOverride: `${o}${e}/pipeline/beverage/engine/nutrition/${t}?volumes=${r.join(
       ","
     )}`
   });
   if (!(a != null && a.data))
-    throw Y.error("Failed to retrieve freestyle-nozzle data"), new Error("Failed to retrieve freestyle-nozzle data");
+    throw W.error("Failed to retrieve freestyle-nozzle data"), new Error("Failed to retrieve freestyle-nozzle data");
   if (a.data.error)
-    throw new Ar(a.data.error);
+    throw new wr(a.data.error);
   return a.data;
 };
-var Mr = Object.defineProperty, Rr = Object.getOwnPropertyDescriptor, nt = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Rr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Rr = Object.defineProperty, Dr = Object.getOwnPropertyDescriptor, st = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Dr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Mr(t, r, a), a;
+  return o && a && Rr(t, r, a), a;
 };
-const lt = "freestyle-nozzle-model";
-let ee = class {
+const nt = "freestyle-nozzle-model";
+let te = class {
   constructor(e, t, r) {
     i(this, "id");
     i(this, "logger");
@@ -937,12 +1010,12 @@ let ee = class {
       );
       const e = this.nozzleModel.selectedPourable.beverage.rawId, t = this.nozzleModel.urlPrefix;
       try {
-        const r = await wr(
+        const r = await Mr(
           t,
           e,
           this._cupSizes
         );
-        W(() => {
+        Z(() => {
           this._nutritionInfo = r;
         });
       } catch (r) {
@@ -961,22 +1034,22 @@ let ee = class {
     this.logger.debug(`loading freestyle-nozzle ${this.id}`);
   }
 };
-nt([
-  ve({
+st([
+  Te({
     dependencies: (e) => [
       e.selectedPourable.beverage
     ]
   })
-], ee.prototype, "handleBeverageSelection", 1);
-ee = nt([
-  Ve(),
-  f(lt)
-], ee);
-const Me = new C({
-  class: ee,
-  type: lt
-}), { URL: ut } = A("PUMP_SERVICE"), { postModel: Dr } = w.build({
-  basePath: `${ut}/api/ext/freestyle/microCalibration`
+], te.prototype, "handleBeverageSelection", 1);
+te = st([
+  je(),
+  f(nt)
+], te);
+const Me = new E({
+  class: te,
+  type: nt
+}), { URL: lt } = A("PUMP_SERVICE"), { postModel: Fr } = w.build({
+  basePath: `${lt}/api/ext/freestyle/microCalibration`
 }), pe = $.createLogger({
   name: "freestyle-pump-service",
   group: "Services"
@@ -986,28 +1059,28 @@ const Me = new C({
     `replacePump - sending POST request to /api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
   );
   try {
-    const u = await Dr({
+    const u = await Fr({
       model: {},
-      urlOverride: `${ut}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
+      urlOverride: `${lt}/api/ext/freestyle/microCalibration/cal/${e}/code/${t}`
     });
     return pe.debug("replacePump - response:", u), ((u == null ? void 0 : u.status) === 200 || (u == null ? void 0 : u.status) === 499) && ((r = u.data) != null && r.error) ? [u.data.error || "unknownError", u.data] : [void 0, u == null ? void 0 : u.data];
   } catch (u) {
     if (pe.error(
       `replacePump - sending POST request to /api/cal/${e}/code/${t}`,
       u
-    ), u instanceof _e) {
+    ), u instanceof Ie) {
       const S = ((a = (o = u.payload) == null ? void 0 : o.data) == null ? void 0 : a.error) || ((n = u.payload) == null ? void 0 : n.error) || "unknownError";
       return [S, ((s = u.payload) == null ? void 0 : s.data) || { error: S }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
 };
-var Fr = Object.getOwnPropertyDescriptor, zr = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Fr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var zr = Object.getOwnPropertyDescriptor, Nr = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? zr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const ct = "freestyle-pump-model";
+const ut = "freestyle-pump-model";
 let me = class {
   constructor(e, t, r) {
     i(this, "id");
@@ -1021,61 +1094,61 @@ let me = class {
     return t && this.logger.error(`Failed to replace the pump, ${this.pump.id}`, t), [t, r];
   }
 };
-me = zr([
-  f(ct)
+me = Nr([
+  f(ut)
 ], me);
-const Re = new C({
+const Re = new E({
   class: me,
-  type: ct
-}), { URL: L } = A("ICE_AGITATOR_SERVICE"), { getAll: dt, postModel: se } = w.build({
-  basePath: `${L}/api/ext/freestyle/ice`
-}), pt = $.createLogger({
+  type: ut
+}), { URL: F } = A("ICE_AGITATOR_SERVICE"), { getAll: ct, postModel: se } = w.build({
+  basePath: `${F}/api/ext/freestyle/ice`
+}), dt = $.createLogger({
   name: "ice-agitator-service",
   group: "Services"
-}), Nr = async (e) => (pt.debug("sending GET for ice types"), await dt({
-  urlOverride: `${L}/api/handle/${e}/types`
-})), xr = async (e, t) => (pt.debug("sending POST for ice types"), await se({
-  urlOverride: `${L}/api/handle/${e}/type/${t}`,
+}), xr = async (e) => (dt.debug("sending GET for ice types"), await ct({
+  urlOverride: `${F}/api/handle/${e}/types`
+})), Ur = async (e, t) => (dt.debug("sending POST for ice types"), await se({
+  urlOverride: `${F}/api/handle/${e}/type/${t}`,
   model: {}
-})), Ur = async (e) => await dt({
-  urlOverride: `${L}/api/kos/config/details/${e}/4`
-}), jr = async (e, t) => {
+})), qr = async (e) => await ct({
+  urlOverride: `${F}/api/kos/config/details/${e}/4`
+}), Gr = async (e, t) => {
   const r = await se({
     model: {},
     tracker: t,
-    urlOverride: `${L}/api/handle/${e}/pour`
+    urlOverride: `${F}/api/handle/${e}/pour`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, qr = async (e, t) => {
+}, jr = async (e, t) => {
   const r = await se({
     model: {},
     tracker: t,
-    urlOverride: `${L}/api/handle/${e}/test/agitation`
+    urlOverride: `${F}/api/handle/${e}/test/agitation`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
-}, Gr = async (e, t) => {
+}, Vr = async (e, t) => {
   const r = await se({
     model: {},
     tracker: t,
-    urlOverride: `${L}/api/handle/${e}/test/gate`
+    urlOverride: `${F}/api/handle/${e}/test/gate`
   });
   if (!(r != null && r.data))
     throw new Error("No response from server");
   return r == null ? void 0 : r.data;
 };
-var Vr = Object.defineProperty, Hr = Object.getOwnPropertyDescriptor, p = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Hr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Hr = Object.defineProperty, Br = Object.getOwnPropertyDescriptor, p = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Br(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && Vr(t, r, a), a;
+  return o && a && Hr(t, r, a), a;
 };
-class te {
+class re {
 }
-i(te, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), i(te, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
-const gt = "ice-agitator-model", ht = x("statePath");
+i(re, "TOPIC_AGITATION_STARTED", "/kos/events/ddk/ice-agitation-started"), i(re, "TOPIC_AGITATION_ENDED", "/kos/events/ddk/ice-agitation-ended");
+const pt = "ice-agitator-model", gt = U("statePath");
 let c = class {
   constructor(e, t, r) {
     i(this, "id");
@@ -1097,7 +1170,7 @@ let c = class {
     i(this, "_allIceTypes");
     i(this, "logger");
     i(this, "currentState", d.IDLE);
-    i(this, "resetDefaultValues", async () => await Ur(this.path));
+    i(this, "resetDefaultValues", async () => await qr(this.path));
     this.id = e, this.name = t.name, this.path = t.path, this.statePath = t.statePath, this._allIceTypes = [], this.logger = r.logger;
   }
   get iceTypes() {
@@ -1128,7 +1201,7 @@ let c = class {
     return this.currentState === d.IDLE;
   }
   updateIfCurrent(e, t) {
-    this.currentState === e && W(() => {
+    this.currentState === e && Z(() => {
       this.currentState = t;
     });
   }
@@ -1137,7 +1210,7 @@ let c = class {
       if (this.currentState === d.IDLE) {
         if (this.updateIfCurrent(d.IDLE, d.POUR_STARTING), !e)
           throw new Error("No tracker provided");
-        const t = await jr(this.path, e);
+        const t = await Gr(this.path, e);
         return this.updateIfCurrent(d.POUR_STARTING, d.POURING), t != null && t.endState && this.updateIfCurrent(d.POURING, d.IDLE), t;
       } else
         throw new Error(`Cannot pour in state ${this.currentState}`);
@@ -1150,7 +1223,7 @@ let c = class {
    * */
   async cancelIceDispense() {
     var e;
-    this.currentState === d.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), W(() => {
+    this.currentState === d.POURING || this.currentState === d.POUR_STARTING ? (this.currentState = d.POUR_CANCELING, await ((e = this.pourFuture) == null ? void 0 : e.cancelFuture()), Z(() => {
       this.currentState = d.IDLE;
     })) : this.logger.warn(
       `Cannot cancel ice dispense in state ${this.currentState}`
@@ -1159,45 +1232,45 @@ let c = class {
   async testAgitate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`agitating ice-agitator ${this.id}`), qr(this.path, e);
+    return this.logger.info(`agitating ice-agitator ${this.id}`), jr(this.path, e);
   }
   async testGate(e) {
     if (!e)
       throw new Error("No tracker provided");
-    return this.logger.info(`testing ice gate:  ${this.id}`), Gr(this.path, e);
+    return this.logger.info(`testing ice gate:  ${this.id}`), Vr(this.path, e);
   }
   handleAgitationChange() {
     var e;
-    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), Z.publish(te.TOPIC_AGITATION_STARTED, {
+    this.isAgitating ? (this.logger.info(`agitating ice-agitator ${this.id}`), k.publish(re.TOPIC_AGITATION_STARTED, {
       path: this.path,
       futureId: (e = this.futureHandler.future) == null ? void 0 : e.futureId
-    })) : Z.publish(te.TOPIC_AGITATION_ENDED, {
+    })) : k.publish(re.TOPIC_AGITATION_ENDED, {
       path: this.path
     });
   }
   async updateIceType(e) {
-    await xr(this.path, e);
+    await Ur(this.path, e);
   }
   async init() {
     this.logger.debug(`initializing ice-agitator ${this.id}`);
   }
   async load() {
     this.logger.debug(`loading ice-agitator ${this.id}`);
-    const e = await Nr(this.path);
-    (e == null ? void 0 : e.status) === 200 && W(() => {
+    const e = await xr(this.path);
+    (e == null ? void 0 : e.status) === 200 && Z(() => {
       this._allIceTypes = e.data || [];
     });
   }
 };
 p([
   b({
-    path: O,
+    path: C,
     attribute: "settings.volWithoutIceMl"
   })
 ], c.prototype, "volWithoutIceMl", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "settings.durationSec",
     converter: {
       to: "second"
@@ -1206,49 +1279,49 @@ p([
 ], c.prototype, "durationSec", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "enableIceChuteClear"
   })
 ], c.prototype, "enableIceChuteClear", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "iceChuteClearDurationMs"
   })
 ], c.prototype, "iceChuteClearDurationMs", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "iceChuteClearIntervalSec"
   })
 ], c.prototype, "iceChuteClearIntervalSec", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "iceChuteClearRetryIntervalSec"
   })
 ], c.prototype, "iceChuteClearRetryIntervalSec", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "maxDispenseSec"
   })
 ], c.prototype, "maxDispenseSec", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "type"
   })
 ], c.prototype, "type", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "settings.dilutionOffset"
   })
 ], c.prototype, "dilutionOffset", 2);
 p([
   b({
-    path: O,
+    path: C,
     attribute: "settings.inactivitySec",
     converter: {
       to: "minute"
@@ -1256,10 +1329,10 @@ p([
   })
 ], c.prototype, "inactivitySec", 2);
 p([
-  E({ path: ht, attribute: "agitating" })
+  O({ path: gt, attribute: "agitating" })
 ], c.prototype, "agitating", 2);
 p([
-  E({ path: ht, attribute: "iceChuteOpen" })
+  O({ path: gt, attribute: "iceChuteOpen" })
 ], c.prototype, "iceChuteOpen", 2);
 p([
   I({ alias: "pour" })
@@ -1273,24 +1346,24 @@ p([
   })
 ], c.prototype, "testGate", 1);
 p([
-  ve({
+  Te({
     dependencies: (e) => [e.isAgitating]
   })
 ], c.prototype, "handleAgitationChange", 1);
 c = p([
-  f(gt),
-  Et()
+  f(pt),
+  St()
 ], c);
-const ft = new C({
+const ht = new E({
   class: c,
-  type: gt
+  type: pt
 });
-var Br = Object.getOwnPropertyDescriptor, Kr = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? Br(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var Kr = Object.getOwnPropertyDescriptor, Yr = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? Kr(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = s(a) || a);
   return a;
 };
-const mt = "lfcv-pump-model";
+const ft = "lfcv-pump-model";
 let ye = class {
   constructor(e, t, r) {
     i(this, "id");
@@ -1321,30 +1394,30 @@ let ye = class {
     this.logger.debug(`loading lfcv-pump ${this.id}`);
   }
 };
-ye = Kr([
-  f(mt)
+ye = Yr([
+  f(ft)
 ], ye);
-const Yr = new C({
+const Wr = new E({
   class: ye,
-  type: mt
-}), { URL: Wr } = A("LFCV-PUMP_SERVICE"), { getAll: Zr } = w.build({
-  basePath: `${Wr}/api/lfcv-pump`
-}), kr = $.createLogger({
+  type: ft
+}), { URL: Zr } = A("LFCV-PUMP_SERVICE"), { getAll: kr } = w.build({
+  basePath: `${Zr}/api/lfcv-pump`
+}), Jr = $.createLogger({
   name: "lfcv-pump-service",
   group: "Services"
-}), Ta = async () => (kr.debug("sending GET for lfcv-pump"), await Zr({})), { URL: K } = A("SPM-PUMP_SERVICE"), { postModel: ne } = w.build({
-  basePath: `${K}/api/spm-pump`
+}), Ia = async () => (Jr.debug("sending GET for lfcv-pump"), await kr({})), { URL: Y } = A("SPM-PUMP_SERVICE"), { postModel: ne } = w.build({
+  basePath: `${Y}/api/spm-pump`
 }), T = $.createLogger({
   name: "spm-pump-service",
   group: "Services"
-}), Jr = async (e, t) => {
+}), Qr = async (e, t) => {
   T.debug(
     `performPreCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`
   );
   try {
     const r = await ne({
       model: {},
-      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
+      urlOverride: `${Y}/api/ext/freestyle/microCalibration/pour/${e}/preCalibrate`,
       tracker: t
     });
     return T.debug("performPreCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -1355,20 +1428,20 @@ const Yr = new C({
     );
     const o = {
       id: t || "",
-      endState: U.Fail,
+      endState: q.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
     return y.initiateFuture(o), o;
   }
-}, Qr = async (e, t) => {
+}, Xr = async (e, t) => {
   T.debug(
     `performCalibrate - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/calibrate`
   );
   try {
     const r = await ne({
       model: {},
-      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
+      urlOverride: `${Y}/api/ext/freestyle/microCalibration/pour/${e}/calibrate`,
       tracker: t
     });
     return T.debug("performCalibrate - response:", r), r != null && r.data && y.initiateFuture(r.data), r == null ? void 0 : r.data;
@@ -1379,13 +1452,13 @@ const Yr = new C({
     );
     const o = {
       id: t || "",
-      endState: U.Fail,
+      endState: q.Fail,
       tracker: t,
       reason: "Failed to resolve trouble"
     };
     return y.initiateFuture(o), o;
   }
-}, Xr = async (e, t, r, o) => {
+}, ea = async (e, t, r, o) => {
   T.debug(
     `performVerify - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/verify`
   );
@@ -1399,7 +1472,7 @@ const Yr = new C({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
+      urlOverride: `${Y}/api/ext/freestyle/microCalibration/pour/${e}/verify`,
       tracker: o
     });
     return T.debug("performVerify - response:", a), a != null && a.data && y.initiateFuture(a.data), a == null ? void 0 : a.data;
@@ -1410,13 +1483,13 @@ const Yr = new C({
     );
     const n = {
       id: o || "",
-      endState: U.Fail,
+      endState: q.Fail,
       tracker: o,
       reason: "Failed to resolve trouble"
     };
     return y.initiateFuture(n), n;
   }
-}, ea = async (e, t, r, o) => {
+}, ta = async (e, t, r, o) => {
   var a, n, s, u, S;
   T.debug(
     `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`
@@ -1431,26 +1504,26 @@ const Yr = new C({
         // newCalibrationValue: 0,
         // pouredCalibrationVolume: 0,
       },
-      urlOverride: `${K}/api/ext/freestyle/microCalibration/pour/${e}/complete`
+      urlOverride: `${Y}/api/ext/freestyle/microCalibration/pour/${e}/complete`
     });
     return T.debug("performComplete - response:", l), ((l == null ? void 0 : l.status) === 200 || (l == null ? void 0 : l.status) === 499) && ((a = l.data) != null && a.error) ? [l.data.error || "unknownError", l.data] : [void 0, l == null ? void 0 : l.data];
   } catch (l) {
     if (T.error(
       `performComplete - sending POST request to /api/ext/freestyle/microCalibration/pour/${e}/complete`,
       l
-    ), l instanceof _e) {
+    ), l instanceof Ie) {
       const v = ((s = (n = l.payload) == null ? void 0 : n.data) == null ? void 0 : s.error) || ((u = l.payload) == null ? void 0 : u.error) || "unknownError";
       return [v, ((S = l.payload) == null ? void 0 : S.data) || { error: v }];
     }
   }
   return ["unknownError", { error: "unknownError" }];
 };
-var ta = Object.defineProperty, ra = Object.getOwnPropertyDescriptor, le = (e, t, r, o) => {
-  for (var a = o > 1 ? void 0 : o ? ra(t, r) : t, n = e.length - 1, s; n >= 0; n--)
+var ra = Object.defineProperty, aa = Object.getOwnPropertyDescriptor, le = (e, t, r, o) => {
+  for (var a = o > 1 ? void 0 : o ? aa(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && ta(t, r, a), a;
+  return o && a && ra(t, r, a), a;
 };
-const yt = "spm-pump-model";
+const mt = "spm-pump-model";
 let N = class {
   constructor(e, t, r) {
     i(this, "id");
@@ -1478,16 +1551,16 @@ let N = class {
     return this.futureHandler.future;
   }
   async performPreCalibrate(e) {
-    return Jr(this.pump.path, e);
+    return Qr(this.pump.path, e);
   }
   async performCalibrate(e) {
-    return Qr(this.pump.path, e);
+    return Xr(this.pump.path, e);
   }
   async performVerify(e, t, r) {
-    return Xr(this.pump.path, e, t, r);
+    return ea(this.pump.path, e, t, r);
   }
   async performComplete(e, t, r) {
-    return ea(this.pump.path, e, t, r);
+    return ta(this.pump.path, e, t, r);
   }
   // -------------------LIFECYCLE----------------------------
   async init() {
@@ -1507,34 +1580,57 @@ le([
   I()
 ], N.prototype, "performVerify", 1);
 N = le([
-  f(yt)
+  f(mt)
 ], N);
-const aa = new C({
+const oa = new E({
   class: N,
-  type: yt
+  type: mt
 });
-var oa = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, Ee = (e, t, r, o) => {
+var yt = Object.defineProperty, ia = Object.getOwnPropertyDescriptor, sa = (e, t, r) => t in e ? yt(e, t, { enumerable: !0, configurable: !0, writable: !0, value: r }) : e[t] = r, Se = (e, t, r, o) => {
   for (var a = o > 1 ? void 0 : o ? ia(t, r) : t, n = e.length - 1, s; n >= 0; n--)
     (s = e[n]) && (a = (o ? s(t, r, a) : s(a)) || a);
-  return o && a && oa(t, r, a), a;
-};
-const Se = "agitation-required-trouble-model", sa = (e) => {
+  return o && a && yt(t, r, a), a;
+}, na = (e, t, r) => (sa(e, t + "", r), r);
+const bt = "agitation-required-trouble-model", la = (e) => {
   if (e.data.agitationRequired)
-    return Se;
-}, na = "InsufficientAgitationTrouble";
-let G = class {
-  constructor(e, t, r) {
+    return bt;
+}, ua = "InsufficientAgitationTrouble";
+let x = class {
+  /**
+   * Creates a new AgitationRequiredTrouble model instance.
+   *
+   * @param modelId - Unique identifier for this model instance (typically matches parent trouble ID)
+   */
+  constructor(e) {
+    /**
+     * Unique identifier for this model instance.
+     */
     i(this, "id");
-    i(this, "logger");
-    i(this, "trouble");
     i(this, "_deferred");
     i(this, "_holdersLoaded", !1);
     i(this, "agitateBeforePour");
-    this.id = e, this.logger = r.logger, this._deferred = !1, this.trouble = t.companionParent;
+    this.id = e, this._deferred = !1;
   }
+  /**
+   * Resolves the agitation trouble by delegating to the parent trouble model.
+   *
+   * Resolution typically involves completing the agitation process and clearing
+   * the trouble state once carbonation or mixing levels are acceptable.
+   *
+   * @returns Promise resolving to the future response from the parent trouble's resolution
+   */
   async resolve() {
     return this.trouble.resolve();
   }
+  /**
+   * Gets the holder model associated with this agitation trouble.
+   *
+   * The holder is the physical container (cartridge holder, ingredient holder, etc.)
+   * that requires agitation. Returns undefined if the holder model hasn't been
+   * loaded yet through the Assembly model initialization.
+   *
+   * @returns The holder model or undefined if not yet loaded
+   */
   get holder() {
     const e = this.trouble.data.holderPaths[0], t = R(e);
     if (!(!this._holdersLoaded && !t.model))
@@ -1546,52 +1642,82 @@ let G = class {
       R(e).model && (this._holdersLoaded = !0);
     }
   }
+  /**
+   * Determines if trouble resolution should be deferred until agitation completes.
+   *
+   * Trouble resolution is deferred when:
+   * 1. The holder has active insufficient agitation troubles
+   * 2. The `agitateBeforePour` configuration is enabled
+   *
+   * This ensures that operations requiring agitation (prime, purge, or other
+   * holder-related troubles) wait for proper carbonation or mixing before
+   * being marked as resolved.
+   *
+   * @returns true if trouble resolution should wait for agitation to complete
+   */
   get shouldDefer() {
     var o, a;
     if (!this.holder)
       return !0;
-    const t = (((o = this.holder) == null ? void 0 : o.troublesByType[na]) || []).length > 0;
+    const t = (((o = this.holder) == null ? void 0 : o.troublesByType[ua]) || []).length > 0;
     return !!((a = this.agitateBeforePour) != null && a.value) && t;
   }
+  /**
+   * Gets the current deferral state of this trouble.
+   *
+   * @returns true if this trouble resolution is currently deferred
+   */
   get deferred() {
     return this._deferred;
   }
+  /**
+   * Marks this trouble as deferred, preventing immediate resolution.
+   *
+   * Called by the trouble system to indicate that trouble resolution
+   * should wait for agitation to complete before being marked as resolved.
+   */
   defer() {
     this._deferred = !0;
   }
+  /**
+   * Clears the deferral state, allowing trouble resolution to proceed.
+   *
+   * Typically called after agitation has completed and the trouble can
+   * now be safely resolved.
+   */
   clearDefer() {
     this._deferred = !1;
   }
 };
-Ee([
+na(x, "Registration");
+Se([
   b({
     path: "app:kosdev.ddk:app",
     attribute: "ncui.agitateBeforePour"
   })
-], G.prototype, "agitateBeforePour", 2);
-Ee([
-  St({
-    topic: At(He.type),
-    lifecycle: je.INIT
+], x.prototype, "agitateBeforePour", 2);
+Se([
+  At({
+    topic: wt(Ve.type),
+    lifecycle: Ue.INIT
   })
-], G.prototype, "updateHolder", 1);
-G = Ee([
-  f(Se)
-], G);
-const la = new C({
-  class: G,
-  type: Se
-}), ua = ["iceAgitator"], ca = {
-  iceAgitator: ft.factory
-}, da = $.createLogger({ name: "freestyle-assembly-data-mapper" }), _a = async (e) => {
-  const t = $e.instance().options({}).build(), r = Oe.instance().options({}).build(), o = e.assemblies.reduce((s, u) => {
+], x.prototype, "updateHolder", 1);
+x = Se([
+  f({ modelTypeId: bt, singleton: !1 }),
+  V(),
+  ve({ mode: "composition", parentProperty: "trouble" })
+], x);
+const ca = x.Registration, da = ["iceAgitator"], pa = {
+  iceAgitator: ht.factory
+}, ga = $.createLogger({ name: "freestyle-assembly-data-mapper" }), $a = async (e) => {
+  const t = Ce.instance().options({}).build(), r = Ee.instance().options({}).build(), o = e.assemblies.reduce((s, u) => {
     var S;
-    return ua.forEach((l) => {
+    return da.forEach((l) => {
       var M;
       const v = u[l];
       if (v) {
-        const bt = ca[l](v.path);
-        s[l] = bt({
+        const Pt = pa[l](v.path);
+        s[l] = Pt({
           name: v.name,
           path: v.path,
           statePath: ((M = v.state) == null ? void 0 : M.path) || ""
@@ -1599,7 +1725,7 @@ const la = new C({
       }
     }), (S = u.cartridgeAgitators) == null || S.forEach((l) => {
       var M;
-      const v = Qe.instance(
+      const v = Je.instance(
         l.path
       ).options({
         name: l.name,
@@ -1608,8 +1734,8 @@ const la = new C({
       }).build();
       t.addModel(v);
     }), u.remoteTrays && u.remoteTrays.forEach((l) => {
-      da.info(`Found remote tray ${l.name} with path ${l.path}`);
-      const v = `${q.type}-${l.holderPath}`, M = q.instance(v).options({
+      ga.info(`Found remote tray ${l.name} with path ${l.path}`);
+      const v = `${j.type}-${l.holderPath}`, M = j.instance(v).options({
         holderPath: l.holderPath,
         configPath: l.path,
         name: l.name
@@ -1624,17 +1750,17 @@ const la = new C({
     supportsCarb: n,
     supportsIce: a
   };
-}, pa = (e) => () => (wt(e)(), Dt(e)(), Me.register(), ge.register(), ft.register(), Ye.register(), $e.register(), aa.register(), pr.register(), Yr.register(), rr.register(), Re.register(), Ae.register(), q.register(), Oe.register(), m.companion.register(e)(
+}, ha = (e) => () => (Mt(e)(), Ft(e)(), Me.register(), ge.register(), ht.register(), Ke.register(), Ce.register(), oa.register(), gr.register(), Wr.register(), ar.register(), Re.register(), Ae.register(), j.register(), Ee.register(), m.companion.register(e)(
   Lt.type,
   Me.type
 ), m.companion.register(e)(
-  He.type,
+  Ve.type,
   ge.type
-), la.register(), m.companion.register(e)(
-  Mt.type,
-  sa
-), m.companion.register(e)(Ft.type, Re.type), m.companion.register(e)(
-  zt.type,
+), ca.register(), m.companion.register(e)(
+  Rt.type,
+  la
+), m.companion.register(e)(zt.type, Re.type), m.companion.register(e)(
+  Nt.type,
   Ae.type
 ), ce[de].register(
   "EnjoyByTrouble",
@@ -1654,11 +1780,11 @@ const la = new C({
   // This is the trouble type
   async (t) => {
     const { model: r } = R(
-      Nt.type
+      xt.type
     );
     return r ? {
       superPumps: r.models.getIndexByKey(
-        xt.byType,
+        Ut.byType,
         "microSuper"
       ).map((n) => n.name).join(", ")
     } : {};
@@ -1688,102 +1814,102 @@ const la = new C({
   companion: m.companion.register(e),
   legacy: m.model.registerLegacyModel(e)
 }), _ = {
-  ...Rt
+  ...Dt
 };
 _.freestyle = {
-  models: pa(_)
+  models: ha(_)
 };
 _.preload = m.model.preloadModel(_);
 _.model = m.model.register(_);
 _.companion = m.companion.register(_);
 _.legacy = m.model.registerLegacyModel(_);
-const Ia = _;
-function ga(e) {
-  return H(e);
+const Ca = _;
+function fa(e) {
+  return B(e);
 }
-const De = V(), $a = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const De = H(), Oa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   api: De,
   default: De,
-  kosServiceRequest: ga
+  kosServiceRequest: fa
 }, Symbol.toStringTag, { value: "Module" }));
-function ha(e) {
-  return H(e);
+function ma(e) {
+  return B(e);
 }
-const Le = V(), Ca = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Fe = H(), Ea = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  api: Le,
-  default: Le,
-  kosServiceRequest: ha
+  api: Fe,
+  default: Fe,
+  kosServiceRequest: ma
 }, Symbol.toStringTag, { value: "Module" }));
-function fa(e) {
-  return H(e);
+function ya(e) {
+  return B(e);
 }
-const Fe = V(), Oa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Le = H(), Sa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  api: Fe,
-  default: Fe,
-  kosServiceRequest: fa
+  api: Le,
+  default: Le,
+  kosServiceRequest: ya
 }, Symbol.toStringTag, { value: "Module" }));
-function ma(e) {
-  return H(e);
+function ba(e) {
+  return B(e);
 }
-const ze = V(), Ea = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const ze = H(), Aa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   api: ze,
   default: ze,
-  kosServiceRequest: ma
+  kosServiceRequest: ba
 }, Symbol.toStringTag, { value: "Module" }));
-function ya(e) {
-  return H(e);
+function Pa(e) {
+  return B(e);
 }
-const Ne = V(), Sa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const Ne = H(), wa = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   api: Ne,
   default: Ne,
-  kosServiceRequest: ya
+  kosServiceRequest: Pa
 }, Symbol.toStringTag, { value: "Module" }));
 export {
-  na as A,
-  Qr as B,
-  Ye as C,
-  ea as D,
-  Jr as E,
-  pr as F,
-  Xr as G,
-  _a as H,
-  te as I,
-  fr as J,
-  Ia as K,
-  Yr as L,
-  Ar as N,
-  Oe as R,
-  aa as S,
-  $e as a,
-  J as b,
-  Qe as c,
-  rr as d,
+  ua as A,
+  Xr as B,
+  Ke as C,
+  ta as D,
+  Qr as E,
+  gr as F,
+  ea as G,
+  $a as H,
+  re as I,
+  mr as J,
+  Ca as K,
+  Wr as L,
+  wr as N,
+  Ee as R,
+  oa as S,
+  Ce as a,
+  Q as b,
+  Je as c,
+  ar as d,
   ge as e,
   Ae as f,
   Me as g,
   Re as h,
-  ft as i,
-  la as j,
-  Ca as k,
-  Oa as l,
-  Ea as m,
-  Sa as n,
-  q as o,
-  ir as p,
-  lr as q,
-  pa as r,
-  $a as s,
-  ar as t,
-  or as u,
-  sr as v,
+  ht as i,
+  ca as j,
+  Ea as k,
+  Sa as l,
+  Aa as m,
+  wa as n,
+  j as o,
+  sr as p,
+  ur as q,
+  ha as r,
+  Oa as s,
+  or as t,
+  ir as u,
+  nr as v,
   we as w,
-  wr as x,
+  Mr as x,
   Lr as y,
-  Ta as z
+  Ia as z
 };
-//# sourceMappingURL=service-Rmefh9Kc.js.map
+//# sourceMappingURL=service-_jG-Kd3m.js.map