@kosdev-code/kos-dispense-sdk 0.1.0-dev.5880 → 0.1.0-next.1008

package/{dispense-registration-manager-C4XZ_c3x.js → dispense-registration-manager-DtN0T_JG.js}

@@ -1,33 +1,5 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-import { createExtensionSchema, extensionPointId, defineExtensionPoint, createViewAwareTransform, validateWithSchema } from "@kosdev-code/kos-ui-plugin/utilities";
-import { kosModel, Kos, isKosModel, resolveServiceUrl, ServiceFactory, KosLog, KosModelContainer, KosExtensionUtils, kosChild, FetchError, ExtensionManager, EXTENSION_TROUBLE_MAPPER, EXTENSION_TROUBLE_DATA_MAPPER, getKosModelSync, kosDependency, kosTroubleAware, kosAction, kosTopicHandler, DependencyLifecycle, getKosModel, FutureManager, kosFuture, FutureHandler, EXTENSION_FEATURE_FLAG_RESOLVER, isKosDataModel, ChildModels, KosFeatureFlags, kosParentAware, createPropKey, kosStateEntry, kosStateExit, kosStateGuard, kosLoggerAware, kosStateMachine, MultipleFutureHandler, arraysEqual, getAllKosCompanionModels, EventBus, KosContextManager, destroyKosModel, SingletonKosModelRegistrationFactory, kosFutureAware, ObservableData, KosModelRegistrationFactory, KosModelRegistry as KosModelRegistry$1, RegistrationManager, registerCoreModels, registerLegacyModel } from "@kosdev-code/kos-ui-sdk";
+import { kosModel, Kos, isKosModel, resolveServiceUrl, ServiceFactory, KosLog, LogGroup, KosModelContainer, KosExtensionUtils, kosChild, FetchError, ExtensionManager, EXTENSION_TROUBLE_MAPPER, EXTENSION_TROUBLE_DATA_MAPPER, getKosModelSync, kosDependency, kosTroubleAware, kosAction, kosTopicHandler, DependencyLifecycle, getKosModel, FutureManager, kosFuture, FutureHandler, EXTENSION_FEATURE_FLAG_RESOLVER, isKosDataModel, ChildModels, KosFeatureFlags, kosParentAware, createPropKey, kosStateEntry, kosStateExit, kosStateGuard, kosLoggerAware, kosStateMachine, MultipleFutureHandler, arraysEqual, getAllKosCompanionModels, EventBus, KosContextManager, destroyKosModel, kosModelEffect, getKosCompanionModel, SingletonKosModelRegistrationFactory, kosFutureAware, ObservableData, KosModelRegistrationFactory, KosModelRegistry as KosModelRegistry$1, RegistrationManager, registerCoreModels, registerLegacyModel } from "@kosdev-code/kos-ui-sdk";
 import "react";
-const ControlPourSchema = createExtensionSchema({}, { rankable: false });
-const EXTENSION_ID = extensionPointId("cui", "control", "pour");
-const ControlPourExtension = defineExtensionPoint({
-  id: EXTENSION_ID,
-  contributionKey: "controlPour",
-  displayName: "Control Pour",
-  description: "Extension point for controlled pour plugin configurations with view support",
-  hasView: true,
-  isRankable: false,
-  schema: ControlPourSchema,
-  metadata: {
-    exportName: "ControlPourExtension",
-    category: "Dispense",
-    tags: ["pour", "control", "beverage"]
-  },
-  validate: (data, context) => {
-    validateWithSchema(ControlPourSchema, data, context);
-  },
-  transform: createViewAwareTransform()
-});
-const EXTENSION_POINT_CONTROL_POUR = EXTENSION_ID;
 var ExtensionType = /* @__PURE__ */ ((ExtensionType2) => {
   ExtensionType2["IngredientLoader"] = "kos.ingredient.loader";
   ExtensionType2["IngredientMapper"] = "kos.ingredient.mapper";
@@ -58,16 +30,21 @@ var DispenseModelType = /* @__PURE__ */ ((DispenseModelType2) => {
   DispenseModelType2["PumpContainer"] = "pump-container-model";
   return DispenseModelType2;
 })(DispenseModelType || {});
-var __getOwnPropDesc$c = Object.getOwnPropertyDescriptor;
-var __decorateClass$c = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$c(target, key) : target;
+var __getOwnPropDesc$d = Object.getOwnPropertyDescriptor;
+var __decorateClass$d = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$d(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = decorator(result) || result;
   return result;
 };
-const MODEL_TYPE$c = "ingredient-model";
+const MODEL_TYPE$d = "ingredient-model";
 let IngredientModelImpl = class {
+  id;
+  ingredientId;
+  name;
+  type;
+  data;
   constructor(modelId, {
     name,
     type,
@@ -75,11 +52,6 @@ let IngredientModelImpl = class {
     ingredientId,
     ...rest
   }) {
-    __publicField(this, "id");
-    __publicField(this, "ingredientId");
-    __publicField(this, "name");
-    __publicField(this, "type");
-    __publicField(this, "data");
     this.id = modelId;
     this.ingredientId = ingredientId;
     this.name = name;
@@ -103,19 +75,19 @@ let IngredientModelImpl = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-IngredientModelImpl = __decorateClass$c([
-  kosModel(MODEL_TYPE$c)
+IngredientModelImpl = __decorateClass$d([
+  kosModel(MODEL_TYPE$d)
 ], IngredientModelImpl);
 const Ingredient = {
   registration: {
-    [MODEL_TYPE$c]: {
+    [MODEL_TYPE$d]: {
       class: IngredientModelImpl,
       singleton: false
     }
   },
-  type: MODEL_TYPE$c,
-  predicate: isKosModel(MODEL_TYPE$c),
-  factory: Kos.Factory.create(MODEL_TYPE$c)
+  type: MODEL_TYPE$d,
+  predicate: isKosModel(MODEL_TYPE$d),
+  factory: Kos.Factory.create(MODEL_TYPE$d)
 };
 const { URL: URL$6 } = resolveServiceUrl("INGREDIENT_SERVICE");
 const { getOne: getOne$3 } = ServiceFactory.build({
@@ -127,23 +99,25 @@ const getIngredients = async () => {
   });
   return response;
 };
-var __defProp$9 = Object.defineProperty;
-var __getOwnPropDesc$b = Object.getOwnPropertyDescriptor;
-var __decorateClass$b = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$b(target, key) : target;
+var __defProp$a = Object.defineProperty;
+var __getOwnPropDesc$c = Object.getOwnPropertyDescriptor;
+var __decorateClass$c = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$c(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$9(target, key, result);
+  if (kind && result) __defProp$a(target, key, result);
   return result;
 };
-const MODEL_TYPE$b = "ingredient-container-model";
-const log$3 = KosLog.createLogger({ name: "ingredient-container-model" });
+const MODEL_TYPE$c = "ingredient-container-model";
+const log$4 = KosLog.createLogger({
+  group: LogGroup.model,
+  name: "ingredient-container-model"
+});
 let IngredientContainerModelImpl = class {
+  id;
+  ingredients;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    __publicField(this, "ingredients");
     this.id = modelId;
     this.ingredients = new KosModelContainer({
       indexMap: {
@@ -160,19 +134,18 @@ let IngredientContainerModelImpl = class {
     return this.ingredients.getIndexByKey("ingredientType", type);
   }
   async load(context) {
-    var _a;
-    log$3.debug(`loading ingredient container ${this.id}`);
+    log$4.debug(`loading ingredient container ${this.id}`);
     const allIngredients = await getIngredients();
-    if ((allIngredients == null ? void 0 : allIngredients.status) !== 200) {
+    if (allIngredients?.status !== 200) {
       throw new Error("Failed to load ingredients");
     }
     const ingredientContext = await KosExtensionUtils.executeLoaderExtension({
       context,
       extension: ExtensionType.IngredientLoader
     });
-    const ingredientData = (allIngredients == null ? void 0 : allIngredients.data) ?? {};
+    const ingredientData = allIngredients?.data ?? {};
     for (const key of Object.keys(ingredientData)) {
-      for (const ingredientData2 of ((_a = allIngredients == null ? void 0 : allIngredients.data) == null ? void 0 : _a[key]) || []) {
+      for (const ingredientData2 of allIngredients?.data?.[key] || []) {
         const data = await KosExtensionUtils.executeDataMapperExtension({
           extension: ExtensionType.IngredientMapper,
           data: ingredientData2,
@@ -198,30 +171,30 @@ let IngredientContainerModelImpl = class {
   }
   // -------------------ENTITY----------------------------
 };
-__decorateClass$b([
+__decorateClass$c([
   kosChild
 ], IngredientContainerModelImpl.prototype, "ingredients", 2);
-IngredientContainerModelImpl = __decorateClass$b([
-  kosModel(MODEL_TYPE$b)
+IngredientContainerModelImpl = __decorateClass$c([
+  kosModel(MODEL_TYPE$c)
 ], IngredientContainerModelImpl);
 const IngredientContainer = {
   registration: {
-    [MODEL_TYPE$b]: {
+    [MODEL_TYPE$c]: {
       class: IngredientContainerModelImpl,
       singleton: true
     }
   },
-  type: MODEL_TYPE$b,
-  predicate: isKosModel(MODEL_TYPE$b),
-  factory: Kos.Singleton.create(MODEL_TYPE$b)
+  type: MODEL_TYPE$c,
+  predicate: isKosModel(MODEL_TYPE$c),
+  factory: Kos.Singleton.create(MODEL_TYPE$c)
 };
 const { URL: URL$5 } = resolveServiceUrl("HOLDER_SERVICE");
 const { getAll: getAll$1, postModel: postModel$4, deleteModel: deleteModel$2 } = ServiceFactory.build({
   basePath: `${URL$5}/api/kos/holders`
 });
-const log$2 = KosLog.createLogger({
-  name: "holder-service",
-  group: "Services"
+const log$3 = KosLog.createLogger({
+  group: LogGroup.service,
+  name: "holder-service"
 });
 const getHolders = async () => {
   const response = await getAll$1({});
@@ -248,9 +221,8 @@ const unassignHolderIngredient = async (holderPath) => {
   return response;
 };
 const replaceLine = async (holderPath) => {
-  if (!holderPath)
-    throw new Error("Missing holderPath");
-  log$2.debug(
+  if (!holderPath) throw new Error("Missing holderPath");
+  log$3.debug(
     `sending POST request to /api/ext/dispense/pumpEvents/replaceLine/${holderPath}`
   );
   const response = await postModel$4({
@@ -270,7 +242,6 @@ const getAssignments = async () => {
   return response;
 };
 const sendRfidOverride = async (holderPath, overrides) => {
-  var _a, _b, _c, _d;
   const factoryJson = JSON.stringify(overrides);
   const url = `${URL$4}/api/ext/dispense/assignments`;
   try {
@@ -278,15 +249,15 @@ const sendRfidOverride = async (holderPath, overrides) => {
       model: { holderPath, factoryJson },
       urlOverride: url
     });
-    if ((response == null ? void 0 : response.status) === 200 && ((_a = response == null ? void 0 : response.data) == null ? void 0 : _a.error)) {
+    if (response?.status === 200 && response?.data?.error) {
       return [response.data.error || "unknownError", response.data];
     }
-    return [void 0, response == null ? void 0 : response.data];
+    return [void 0, response?.data];
   } catch (error) {
     if (error instanceof FetchError) {
       return [
-        ((_c = (_b = error.payload) == null ? void 0 : _b.data) == null ? void 0 : _c.error) || "unknownError",
-        (_d = error.payload) == null ? void 0 : _d.data
+        error.payload?.data?.error || "unknownError",
+        error.payload?.data
       ];
     }
   }
@@ -305,19 +276,21 @@ const deleteAssignment = async (id) => {
   const response = await deleteModel$1({ id, fos: useFos });
   return response;
 };
-var __defProp$8 = Object.defineProperty;
-var __getOwnPropDesc$a = Object.getOwnPropertyDescriptor;
-var __decorateClass$a = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$a(target, key) : target;
+var __defProp$9 = Object.defineProperty;
+var __getOwnPropDesc$b = Object.getOwnPropertyDescriptor;
+var __decorateClass$b = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$b(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$8(target, key, result);
+  if (kind && result) __defProp$9(target, key, result);
   return result;
 };
-const MODEL_TYPE$a = DispenseModelType.Holder;
-const log$1 = KosLog.createLogger({ name: "holder-model" });
+const MODEL_TYPE$b = DispenseModelType.Holder;
+const log$2 = KosLog.createLogger({
+  group: LogGroup.model,
+  name: "holder-model"
+});
 ExtensionManager[EXTENSION_TROUBLE_MAPPER].register(
   "holder",
   async (trouble) => {
@@ -337,7 +310,7 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
         const ingredientModel = pumpModel.ingredientId ? getKosModelSync(pumpModel.ingredientId).model : void 0;
         return {
           ingredientId: pumpModel.ingredientId,
-          ingredientName: (ingredientModel == null ? void 0 : ingredientModel.displayName) ?? ((ingredientModel == null ? void 0 : ingredientModel.name) || ""),
+          ingredientName: ingredientModel?.displayName ?? (ingredientModel?.name || ""),
           childPumpName: pumpModel.name
         };
       }
@@ -364,7 +337,7 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
       const ingredientId = trouble.data.ingredients[0];
       const { model } = getKosModelSync(ingredientId);
       return {
-        ingredientName: (model == null ? void 0 : model.displayName) ?? ((model == null ? void 0 : model.name) || ""),
+        ingredientName: model?.displayName ?? (model?.name || ""),
         ingredients: trouble.data.ingredients ? trouble.data.ingredients : [],
         unknonwnIngredientId: trouble.data.unknonwnIngredientId ?? ""
       };
@@ -373,14 +346,28 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
   }
 );
 class AssignmentError extends Error {
+  type;
   constructor(type, message) {
     super(message);
-    __publicField(this, "type");
     this.name = "AssignmentError";
     this.type = type;
   }
 }
 let HolderModelImpl = class {
+  id;
+  path;
+  name;
+  ingredientId;
+  ingredientType;
+  ingredientSource;
+  group;
+  slice;
+  logger;
+  data;
+  enjoyByDate;
+  attributes;
+  pumps;
+  ingredientContainer;
   constructor(modelId, {
     path,
     name,
@@ -393,20 +380,6 @@ let HolderModelImpl = class {
     enjoyByDate,
     attributes
   }, context) {
-    __publicField(this, "id");
-    __publicField(this, "path");
-    __publicField(this, "name");
-    __publicField(this, "ingredientId");
-    __publicField(this, "ingredientType");
-    __publicField(this, "ingredientSource");
-    __publicField(this, "group");
-    __publicField(this, "slice");
-    __publicField(this, "logger");
-    __publicField(this, "data");
-    __publicField(this, "enjoyByDate");
-    __publicField(this, "attributes");
-    __publicField(this, "pumps");
-    __publicField(this, "ingredientContainer");
     this.id = modelId;
     this.path = path;
     this.name = name;
@@ -449,8 +422,7 @@ let HolderModelImpl = class {
     return !!this.enjoyByDate && !this.unassigned;
   }
   get hasEnjoyByWarning() {
-    var _a;
-    return ((_a = this.troublesByType["EnjoyByTrouble"]) == null ? void 0 : _a.length) > 0;
+    return this.troublesByType["EnjoyByTrouble"]?.length > 0;
   }
   get nozzlePaths() {
     return this.pumps.data.map((pump) => pump.nozzlePath);
@@ -472,7 +444,7 @@ let HolderModelImpl = class {
     const intent = typeof props === "string" ? props : props.intent;
     const pumpPath = typeof props === "string" ? void 0 : props.pumpPath;
     const pump = pumpPath ? this.pumps.getModel(pumpPath) : this.pumps.data[0];
-    return pump == null ? void 0 : pump.performIntent({ intent });
+    return pump?.performIntent({ intent });
   }
   get pourState() {
     const state = this.pumps.data.reduce((resolvedState, pump) => {
@@ -484,8 +456,7 @@ let HolderModelImpl = class {
     return state;
   }
   get nozzlePath() {
-    var _a;
-    return (_a = this.pumps.data[0]) == null ? void 0 : _a.nozzlePath;
+    return this.pumps.data[0]?.nozzlePath;
   }
   get pumpPaths() {
     return this.pumps.data.map((pump) => pump.id);
@@ -502,11 +473,10 @@ let HolderModelImpl = class {
     });
   }
   get ingredient() {
-    var _a;
     if (!this.ingredientId) {
       return void 0;
     }
-    const ingredient = (_a = this.ingredientContainer) == null ? void 0 : _a.ingredients.getModel(
+    const ingredient = this.ingredientContainer?.ingredients.getModel(
       this.ingredientId
     );
     return ingredient;
@@ -521,11 +491,10 @@ let HolderModelImpl = class {
     }
   }
   get previousIngredient() {
-    var _a;
     if (!this.prevIngredientId) {
       return void 0;
     }
-    const ingredient = (_a = this.ingredientContainer) == null ? void 0 : _a.ingredients.getModel(
+    const ingredient = this.ingredientContainer?.ingredients.getModel(
       this.prevIngredientId
     );
     return ingredient;
@@ -540,8 +509,7 @@ let HolderModelImpl = class {
     }
   }
   get prevIngredientId() {
-    var _a, _b;
-    return (_b = (_a = this.pumps.data) == null ? void 0 : _a[0]) == null ? void 0 : _b.prevIngredientId;
+    return this.pumps.data?.[0]?.prevIngredientId;
   }
   get unassigned() {
     return (!this.ingredientId || this.ingredientId === "0") && (!this.prevIngredientId || this.prevIngredientId === "0");
@@ -595,11 +563,11 @@ let HolderModelImpl = class {
         );
       }
       kosAction(() => {
-        this.ingredientId = result == null ? void 0 : result.ingredientId;
+        this.ingredientId = result?.ingredientId;
       });
       return result;
     } catch (e) {
-      log$1.error(`Failed to perform rfid override on holder ${this.id}`, e);
+      log$2.error(`Failed to perform rfid override on holder ${this.id}`, e);
       throw e;
     }
   }
@@ -614,7 +582,7 @@ let HolderModelImpl = class {
         this.ingredientId = ingredientId;
       });
     } catch (e) {
-      log$1.error(`Failed to perform assign ingredient to holder ${this.id}`, e);
+      log$2.error(`Failed to perform assign ingredient to holder ${this.id}`, e);
       throw e;
     }
   }
@@ -648,29 +616,28 @@ let HolderModelImpl = class {
   // }
   // -------------------ENTITY----------------------------
 };
-__decorateClass$a([
+__decorateClass$b([
   kosChild
 ], HolderModelImpl.prototype, "pumps", 2);
-__decorateClass$a([
+__decorateClass$b([
   kosDependency({ modelType: IngredientContainer.type })
 ], HolderModelImpl.prototype, "ingredientContainer", 2);
-HolderModelImpl = __decorateClass$a([
-  kosModel(MODEL_TYPE$a),
+HolderModelImpl = __decorateClass$b([
+  kosModel(MODEL_TYPE$b),
   kosTroubleAware()
 ], HolderModelImpl);
 const Holder = {
   registration: {
-    [MODEL_TYPE$a]: {
+    [MODEL_TYPE$b]: {
       class: HolderModelImpl,
       singleton: false
     }
   },
-  type: MODEL_TYPE$a,
-  predicate: isKosModel(MODEL_TYPE$a),
-  factory: Kos.Factory.create(MODEL_TYPE$a)
+  type: MODEL_TYPE$b,
+  predicate: isKosModel(MODEL_TYPE$b),
+  factory: Kos.Factory.create(MODEL_TYPE$b)
 };
 const mapAssemblyHolderToModel = async (group, holderData) => {
-  var _a;
   const _ingredientId = ExtensionManager.propertyMapper.executeMapper(
     ExtensionType.HolderIngredientMapper,
     holderData
@@ -702,7 +669,7 @@ const mapAssemblyHolderToModel = async (group, holderData) => {
     ingredientId: _ingredientId || ingredientId,
     ingredientType: type || ingType,
     ingredientSource: ingSource,
-    enjoyByDate: ((_a = holderData.container) == null ? void 0 : _a.enjoyByDate) ? new Date(holderData.container.enjoyByDate) : void 0,
+    enjoyByDate: holderData.container?.enjoyByDate ? new Date(holderData.container.enjoyByDate) : void 0,
     slice: sliceData,
     group,
     attributes,
@@ -715,34 +682,33 @@ const { URL: URL$3 } = resolveServiceUrl("ASSEMBLY_SERVICE");
 const { getOne: getOne$2 } = ServiceFactory.build({
   basePath: `${URL$3}/api/kos/device/assemblies`
 });
-const log = KosLog.createLogger({
-  name: "assembly-service",
-  group: "Services"
+const log$1 = KosLog.createLogger({
+  group: LogGroup.service,
+  name: "assembly-service"
 });
 const getAssembly = async () => {
-  log.debug("sending GET for assembly");
+  log$1.debug("sending GET for assembly");
   const response = await getOne$2({});
   return response;
 };
-var __defProp$7 = Object.defineProperty;
-var __getOwnPropDesc$9 = Object.getOwnPropertyDescriptor;
-var __decorateClass$9 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$9(target, key) : target;
+var __defProp$8 = Object.defineProperty;
+var __getOwnPropDesc$a = Object.getOwnPropertyDescriptor;
+var __decorateClass$a = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$a(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$7(target, key, result);
+  if (kind && result) __defProp$8(target, key, result);
   return result;
 };
-const MODEL_TYPE$9 = "board-container-model";
+const MODEL_TYPE$a = "board-container-model";
 const TOPIC_BOARD_LINKED = "/kos/hardware/board/linked";
 const TOPIC_BOARD_UNLINKED = "/kos/hardware/board/unlinked";
 let BoardContainerModel = class {
+  id;
+  logger;
+  models;
   constructor(modelId, options, context) {
-    __publicField(this, "id");
-    __publicField(this, "logger");
-    __publicField(this, "models");
     this.id = modelId;
     this.logger = context.logger;
     this.models = new KosModelContainer({
@@ -789,45 +755,44 @@ let BoardContainerModel = class {
     }
   }
 };
-__decorateClass$9([
+__decorateClass$a([
   kosChild
 ], BoardContainerModel.prototype, "models", 2);
-__decorateClass$9([
+__decorateClass$a([
   kosTopicHandler({
     lifecycle: DependencyLifecycle.INIT,
     topic: TOPIC_BOARD_LINKED,
     websocket: true
   })
 ], BoardContainerModel.prototype, "handleBoardLinkEvent", 1);
-__decorateClass$9([
+__decorateClass$a([
   kosTopicHandler({
     lifecycle: DependencyLifecycle.INIT,
     topic: TOPIC_BOARD_UNLINKED,
     websocket: true
   })
 ], BoardContainerModel.prototype, "handleBoardUnlinkEvent", 1);
-BoardContainerModel = __decorateClass$9([
-  kosModel(MODEL_TYPE$9)
+BoardContainerModel = __decorateClass$a([
+  kosModel(MODEL_TYPE$a)
 ], BoardContainerModel);
 const boardTroubleDataMapper = async (trouble) => {
   const boardPath = trouble.data.boardPath;
   const { model } = getKosModelSync(boardPath);
   return {
-    boardName: (model == null ? void 0 : model.name) || ""
+    boardName: model?.name || ""
   };
 };
-var __defProp$6 = Object.defineProperty;
-var __getOwnPropDesc$8 = Object.getOwnPropertyDescriptor;
-var __decorateClass$8 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$8(target, key) : target;
+var __defProp$7 = Object.defineProperty;
+var __getOwnPropDesc$9 = Object.getOwnPropertyDescriptor;
+var __decorateClass$9 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$9(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$6(target, key, result);
+  if (kind && result) __defProp$7(target, key, result);
   return result;
 };
-const MODEL_TYPE$8 = DispenseModelType.PumpContainer;
+const MODEL_TYPE$9 = DispenseModelType.PumpContainer;
 var PumpIndex = /* @__PURE__ */ ((PumpIndex2) => {
   PumpIndex2["byBoard"] = "byBoard";
   PumpIndex2["byType"] = "byType";
@@ -835,9 +800,9 @@ var PumpIndex = /* @__PURE__ */ ((PumpIndex2) => {
   return PumpIndex2;
 })(PumpIndex || {});
 let PumpContainerModelImpl = class {
+  id;
+  pumps;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    __publicField(this, "pumps");
     this.id = modelId;
     this.pumps = new KosModelContainer({
       indexMap: {
@@ -883,23 +848,23 @@ let PumpContainerModelImpl = class {
   }
   // -------------------ENTITY----------------------------
 };
-__decorateClass$8([
+__decorateClass$9([
   kosChild
 ], PumpContainerModelImpl.prototype, "pumps", 2);
-PumpContainerModelImpl = __decorateClass$8([
-  kosModel(MODEL_TYPE$8)
+PumpContainerModelImpl = __decorateClass$9([
+  kosModel(MODEL_TYPE$9)
 ], PumpContainerModelImpl);
 const PumpContainer = {
   registration: {
-    [MODEL_TYPE$8]: {
+    [MODEL_TYPE$9]: {
       class: PumpContainerModelImpl,
       singleton: true
     }
   },
-  type: MODEL_TYPE$8,
-  predicate: isKosModel(MODEL_TYPE$8),
+  type: MODEL_TYPE$9,
+  predicate: isKosModel(MODEL_TYPE$9),
   factory: Kos.Singleton.create(
-    MODEL_TYPE$8
+    MODEL_TYPE$9
   )
 };
 const getPumpRelatedPaths = async (pumpPath) => {
@@ -926,7 +891,7 @@ const boardTroubleResolver = async (trouble) => {
   const pumpContainer = await getKosModel(
     PumpContainer.type
   );
-  if (pumpContainer == null ? void 0 : pumpContainer.model) {
+  if (pumpContainer?.model) {
     const boardPumps = pumpContainer.model.models.getIndexByKey(
       PumpIndex.byBoard,
       boardPath
@@ -943,15 +908,15 @@ const boardTroubleResolver = async (trouble) => {
   }
   return Array.from(new Set(result));
 };
-var __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor;
-var __decorateClass$7 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(target, key) : target;
+var __getOwnPropDesc$8 = Object.getOwnPropertyDescriptor;
+var __decorateClass$8 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$8(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = decorator(result) || result;
   return result;
 };
-const MODEL_TYPE$7 = "board-model";
+const MODEL_TYPE$8 = "board-model";
 const mapOptionsToModel = (options, model) => {
   const { type, name, path, linked, instanceId, link, ...rest } = options;
   model.type = type;
@@ -971,14 +936,14 @@ ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
   boardTroubleDataMapper
 );
 let BoardModelImpl = class {
+  id;
+  type;
+  name;
+  path;
+  linked;
+  instanceId;
+  logger;
   constructor(modelId, options, context) {
-    __publicField(this, "id");
-    __publicField(this, "type");
-    __publicField(this, "name");
-    __publicField(this, "path");
-    __publicField(this, "linked");
-    __publicField(this, "instanceId");
-    __publicField(this, "logger");
     this.id = modelId;
     this.logger = context.logger;
     mapOptionsToModel(options, this);
@@ -994,46 +959,45 @@ let BoardModelImpl = class {
     this.logger.debug(`loading board ${this.id}`);
   }
 };
-BoardModelImpl = __decorateClass$7([
-  kosModel(MODEL_TYPE$7)
+BoardModelImpl = __decorateClass$8([
+  kosModel(MODEL_TYPE$8)
 ], BoardModelImpl);
 const Board = {
   registration: {
-    [MODEL_TYPE$7]: {
+    [MODEL_TYPE$8]: {
       class: BoardModelImpl,
       singleton: false
     }
   },
-  type: MODEL_TYPE$7,
-  predicate: isKosModel(MODEL_TYPE$7),
-  factory: Kos.Factory.create(MODEL_TYPE$7)
+  type: MODEL_TYPE$8,
+  predicate: isKosModel(MODEL_TYPE$8),
+  factory: Kos.Factory.create(MODEL_TYPE$8)
 };
 const BoardContainer = {
   registration: {
-    [MODEL_TYPE$9]: {
+    [MODEL_TYPE$a]: {
       class: BoardContainerModel,
       singleton: true
     },
     ...Board.registration
   },
-  type: MODEL_TYPE$9,
-  predicate: isKosModel(MODEL_TYPE$9),
+  type: MODEL_TYPE$a,
+  predicate: isKosModel(MODEL_TYPE$a),
   factory: Kos.Singleton.create(
-    MODEL_TYPE$9
+    MODEL_TYPE$a
   )
 };
-var __defProp$5 = Object.defineProperty;
-var __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor;
-var __decorateClass$6 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(target, key) : target;
+var __defProp$6 = Object.defineProperty;
+var __getOwnPropDesc$7 = Object.getOwnPropertyDescriptor;
+var __decorateClass$7 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$7(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$5(target, key, result);
+  if (kind && result) __defProp$6(target, key, result);
   return result;
 };
-const MODEL_TYPE$6 = DispenseModelType.HolderContainer;
+const MODEL_TYPE$7 = DispenseModelType.HolderContainer;
 const TOPIC_INSERT_START = "/kos/insertion/insert/start";
 const TOPIC_INSERT_COMPLETE = "/kos/insertion/insert/complete";
 const TOPIC_INSERT_UPDATE = "/kos/insertion/insert/update";
@@ -1041,10 +1005,10 @@ const TOPIC_REMOVE = "/kos/insertion/remove";
 const TOPIC_REPLACE_LINE = "/kos/pumpEvent/replaceLine";
 const TOPIC_HOLDER_CHANGED = "/kos/handle/*";
 let HolderContainerModelImpl = class {
+  id;
+  holders;
+  logger;
   constructor(modelId, _options, context) {
-    __publicField(this, "id");
-    __publicField(this, "holders");
-    __publicField(this, "logger");
     this.id = modelId;
     this.holders = new KosModelContainer({
       indexMap: {
@@ -1059,18 +1023,21 @@ let HolderContainerModelImpl = class {
   updateModel() {
   }
   handleHolderEvents(event) {
-    var _a, _b, _c;
     KosLog.ifDebug(
-      () => this.logger.debug("Received holder change event", JSON.stringify(event))
+      () => this.logger.debug(
+        "Received holder change event",
+        JSON.stringify(event)
+      ),
+      this.logger
     );
     const holder = this.holders.getModel(event.path);
     if (holder) {
       this.logger.info(
         `Received change event for holder ${holder.path}.  Updating fuel gauge data.`
       );
-      holder.slice.currentVolMl = (_a = event.slice) == null ? void 0 : _a.currentVolMl;
-      holder.slice.maxVolMl = (_b = event.slice) == null ? void 0 : _b.maxVolMl;
-      if ((_c = event == null ? void 0 : event.container) == null ? void 0 : _c.enjoyByDate) {
+      holder.slice.currentVolMl = event.slice?.currentVolMl;
+      holder.slice.maxVolMl = event.slice?.maxVolMl;
+      if (event?.container?.enjoyByDate) {
         holder.enjoyByDate = new Date(event.container.enjoyByDate);
       } else {
         holder.enjoyByDate = void 0;
@@ -1079,12 +1046,12 @@ let HolderContainerModelImpl = class {
   }
   handleInsertion(data) {
     KosLog.ifDebug(
-      () => this.logger.debug("Received insertion event", JSON.stringify(data))
+      () => this.logger.debug("Received insertion event", JSON.stringify(data)),
+      this.logger
     );
     const wrappedData = Array.isArray(data) ? data : [data];
     wrappedData.forEach((event) => {
       kosAction(() => {
-        var _a, _b, _c;
         const ingredientId = event.ingredientId;
         const holder = this.holders.getModel(event.path);
         if (holder) {
@@ -1092,9 +1059,9 @@ let HolderContainerModelImpl = class {
             `Received insertion event for holder ${holder.path}`
           );
           holder.updateIngredient(ingredientId);
-          holder.slice.currentVolMl = (_a = event.slice) == null ? void 0 : _a.currentVolMl;
-          holder.slice.maxVolMl = (_b = event.slice) == null ? void 0 : _b.maxVolMl;
-          if ((_c = event == null ? void 0 : event.container) == null ? void 0 : _c.enjoyByDate) {
+          holder.slice.currentVolMl = event.slice?.currentVolMl;
+          holder.slice.maxVolMl = event.slice?.maxVolMl;
+          if (event?.container?.enjoyByDate) {
             holder.enjoyByDate = new Date(event.container.enjoyByDate);
           } else {
             holder.enjoyByDate = void 0;
@@ -1115,17 +1082,17 @@ let HolderContainerModelImpl = class {
   }
   // -------------------ENTITY----------------------------
 };
-__decorateClass$6([
+__decorateClass$7([
   kosChild
 ], HolderContainerModelImpl.prototype, "holders", 2);
-__decorateClass$6([
+__decorateClass$7([
   kosTopicHandler({
     topic: TOPIC_HOLDER_CHANGED,
     websocket: true,
     condition: (event, model) => model.holders.getModel(event.path) !== void 0
   })
 ], HolderContainerModelImpl.prototype, "handleHolderEvents", 1);
-__decorateClass$6([
+__decorateClass$7([
   kosTopicHandler({
     topic: [
       TOPIC_INSERT_START,
@@ -1137,23 +1104,26 @@ __decorateClass$6([
     websocket: true
   })
 ], HolderContainerModelImpl.prototype, "handleInsertion", 1);
-HolderContainerModelImpl = __decorateClass$6([
-  kosModel(MODEL_TYPE$6)
+HolderContainerModelImpl = __decorateClass$7([
+  kosModel(MODEL_TYPE$7)
 ], HolderContainerModelImpl);
 const HolderContainer = {
   registration: {
-    [MODEL_TYPE$6]: {
+    [MODEL_TYPE$7]: {
       class: HolderContainerModelImpl,
       singleton: true
     }
   },
-  type: MODEL_TYPE$6,
-  predicate: isKosModel(MODEL_TYPE$6),
+  type: MODEL_TYPE$7,
+  predicate: isKosModel(MODEL_TYPE$7),
   factory: Kos.Singleton.create(
-    MODEL_TYPE$6
+    MODEL_TYPE$7
   )
 };
-const Logger$1 = KosLog.createLogger({ name: "board-utils" });
+const Logger$1 = KosLog.createLogger({
+  group: LogGroup.model,
+  name: "board-utils"
+});
 const mapAssemblyBoardToModel = async (board) => {
   const boardExtData = await KosExtensionUtils.executeDataMapperExtension({
     extension: ExtensionType.BoardMapper,
@@ -1190,10 +1160,6 @@ const { URL: URL$2 } = resolveServiceUrl("PUMP_SERVICE");
 const { postModel: postModel$2, getOne: getOne$1 } = ServiceFactory.build({
   basePath: `${URL$2}/api/kos/holders`
 });
-KosLog.createLogger({
-  name: "pump-service",
-  group: "Services"
-});
 const sendIntent = async ({
   intent,
   pumpId,
@@ -1201,7 +1167,7 @@ const sendIntent = async ({
 }) => {
   const url = `${URL$2}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/pour/${pumpId}/${intent}`;
   const response = await postModel$2({ model: {}, urlOverride: url, tracker });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
@@ -1209,47 +1175,47 @@ const sendIntent = async ({
 const getIntentVolume = async (pumpId, intent) => {
   const url = `${URL$2}/api/ext/dispense/nozzle/nozzle/pipeline/ingredient/intent/${pumpId}/${intent}/volume`;
   const response = await getOne$1({ urlOverride: url });
-  if (!(response == null ? void 0 : response.data)) {
+  if (!response?.data) {
     return { volume: -1 };
   }
   return response.data;
 };
-var __defProp$4 = Object.defineProperty;
-var __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor;
-var __decorateClass$5 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target;
+var __defProp$5 = Object.defineProperty;
+var __getOwnPropDesc$6 = Object.getOwnPropertyDescriptor;
+var __decorateClass$6 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$6(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$4(target, key, result);
+  if (kind && result) __defProp$5(target, key, result);
   return result;
 };
-const MODEL_TYPE$5 = DispenseModelType.Pump;
+const log = KosLog.createLogger({ group: LogGroup.model, name: "pump-model" });
+const MODEL_TYPE$6 = DispenseModelType.Pump;
 ExtensionManager[EXTENSION_TROUBLE_MAPPER].register(
   "pump",
   pumpTroubleResolver
 );
 let PumpModelImpl = class {
+  id;
+  inserted;
+  type;
+  virtual;
+  ingredientId;
+  holderPath;
+  boardPath;
+  nozzlePath;
+  childPump;
+  name;
+  path;
+  prevIngredientId;
+  /**
+   * @kosApiLevel 12
+   */
+  state;
+  futureHandler;
+  currentState = PourState.IDLE;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    __publicField(this, "inserted");
-    __publicField(this, "type");
-    __publicField(this, "virtual");
-    __publicField(this, "ingredientId");
-    __publicField(this, "holderPath");
-    __publicField(this, "boardPath");
-    __publicField(this, "nozzlePath");
-    __publicField(this, "childPump");
-    __publicField(this, "name");
-    __publicField(this, "path");
-    __publicField(this, "prevIngredientId");
-    /**
-     * @kosApiLevel 12
-     */
-    __publicField(this, "state");
-    __publicField(this, "futureHandler");
-    __publicField(this, "currentState", PourState.IDLE);
     this.id = modelId;
     const {
       inserted,
@@ -1304,12 +1270,10 @@ let PumpModelImpl = class {
   }
   // -------------------LIFECYCLE----------------------------
   get pouringState() {
-    var _a;
-    return ((_a = this.future) == null ? void 0 : _a.endState) || "";
+    return this.future?.endState || "";
   }
   get isPouring() {
-    var _a;
-    return !!(this.future && !((_a = this.future) == null ? void 0 : _a.endState)) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING;
+    return !!(this.future && !this.future?.endState) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING;
   }
   get canPour() {
     return !!this.ingredientId && !this.isPouring;
@@ -1322,15 +1286,14 @@ let PumpModelImpl = class {
     }
   }
   async cancelPour() {
-    var _a;
     if (this.currentState === PourState.POURING || this.currentState === PourState.POUR_STARTING) {
       this.currentState = PourState.POUR_CANCELING;
-      await ((_a = this.future) == null ? void 0 : _a.cancelFuture());
+      await this.future?.cancelFuture();
       kosAction(() => {
         this.currentState = PourState.IDLE;
       });
     } else {
-      KosLog.warn(`Cannot cancel pour in state ${this.currentState}`);
+      log.warn(`Cannot cancel pour in state ${this.currentState}`);
     }
   }
   get future() {
@@ -1360,36 +1323,39 @@ let PumpModelImpl = class {
             this.currentState = PourState.POURING;
           });
         }
-        return result == null ? void 0 : result.data;
+        return result?.data;
       } else {
         throw new Error(`Cannot pour in state ${this.currentState}`);
       }
     } catch (e) {
-      KosLog.error(e);
+      log.error(e);
       this.currentState = PourState.IDLE;
       throw e;
     }
   }
   // -------------------ENTITY----------------------------
 };
-__decorateClass$5([
+__decorateClass$6([
   kosFuture()
 ], PumpModelImpl.prototype, "performIntent", 1);
-PumpModelImpl = __decorateClass$5([
-  kosModel(MODEL_TYPE$5)
+PumpModelImpl = __decorateClass$6([
+  kosModel(MODEL_TYPE$6)
 ], PumpModelImpl);
 const Pump = {
   registration: {
-    [MODEL_TYPE$5]: {
+    [MODEL_TYPE$6]: {
       class: PumpModelImpl,
       singleton: false
     }
   },
-  type: MODEL_TYPE$5,
-  predicate: isKosModel(MODEL_TYPE$5),
-  factory: Kos.Factory.create(MODEL_TYPE$5)
+  type: MODEL_TYPE$6,
+  predicate: isKosModel(MODEL_TYPE$6),
+  factory: Kos.Factory.create(MODEL_TYPE$6)
 };
-const Logger = KosLog.createLogger({ name: "pump-utils" });
+const Logger = KosLog.createLogger({
+  group: LogGroup.model,
+  name: "pump-utils"
+});
 const mapAssemblyPumpToModel = (nozzlePath, pump) => {
   const virtual = (pump.pumps ?? []).length > 1;
   const options = {
@@ -1411,18 +1377,17 @@ const mapAssemblyPumpToModel = (nozzlePath, pump) => {
   return pumpModel;
 };
 const assemblyPumpMap = (pumpContainer) => (holderContainer) => (nozzle) => (assemblyPump) => {
-  var _a;
   try {
     Logger.debug(`adding pump ${assemblyPump.name}`);
     const pump = mapAssemblyPumpToModel(nozzle.path, assemblyPump);
     pumpContainer.addModel(pump);
     const holderPath = pump.holderPath;
     const holder = holderContainer.holders.getModel(holderPath);
-    holder == null ? void 0 : holder.pumps.addModel(pump);
-    if (!(holder == null ? void 0 : holder.nozzlePaths.includes(nozzle.path))) {
-      holder == null ? void 0 : holder.nozzlePaths.push(nozzle.path);
+    holder?.pumps.addModel(pump);
+    if (!holder?.nozzlePaths.includes(nozzle.path)) {
+      holder?.nozzlePaths.push(nozzle.path);
     }
-    (_a = assemblyPump == null ? void 0 : assemblyPump.pumps) == null ? void 0 : _a.forEach((subPump) => {
+    assemblyPump?.pumps?.forEach((subPump) => {
       const subHolderPath = pump.holderPath;
       const subPumpData = {
         ...subPump,
@@ -1437,29 +1402,28 @@ const assemblyPumpMap = (pumpContainer) => (holderContainer) => (nozzle) => (ass
     throw error;
   }
 };
-var __defProp$3 = Object.defineProperty;
-var __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor;
-var __decorateClass$4 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target;
+var __defProp$4 = Object.defineProperty;
+var __getOwnPropDesc$5 = Object.getOwnPropertyDescriptor;
+var __decorateClass$5 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$5(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$3(target, key, result);
+  if (kind && result) __defProp$4(target, key, result);
   return result;
 };
-const MODEL_TYPE$4 = "assembly-model";
+const MODEL_TYPE$5 = "assembly-model";
 const CONTEXT_ASSEMBLY_DATA = "assembly-data";
 const CONTEXT_ASSEMBLY_RAW_DATA = "assembly-raw-data";
 let AssemblyModelImpl = class {
+  id;
+  _nozzlePaths = /* @__PURE__ */ new Set();
+  troubleContainer;
+  holderContainer;
+  boardContainer;
+  pumpContainer;
+  logger;
   constructor(modelId, _options, context) {
-    __publicField(this, "id");
-    __publicField(this, "_nozzlePaths", /* @__PURE__ */ new Set());
-    __publicField(this, "troubleContainer");
-    __publicField(this, "holderContainer");
-    __publicField(this, "boardContainer");
-    __publicField(this, "pumpContainer");
-    __publicField(this, "logger");
     this.id = modelId;
     this.holderContainer = HolderContainer.factory({});
     this.boardContainer = BoardContainer.factory({});
@@ -1506,8 +1470,7 @@ let AssemblyModelImpl = class {
     this.logger.debug(`initializing assembly ${this.id}`);
   }
   async ready() {
-    var _a;
-    (_a = this.troubleContainer) == null ? void 0 : _a.troubles.increment();
+    this.troubleContainer?.troubles.increment();
     ExtensionManager[EXTENSION_FEATURE_FLAG_RESOLVER].execute(
       ExtensionType.AssemblyFeatureFlags,
       this
@@ -1516,7 +1479,7 @@ let AssemblyModelImpl = class {
   async load(context) {
     this.logger.debug(`loading assembly ${this.id}`);
     const result = await getAssembly();
-    if ((result == null ? void 0 : result.status) === 200) {
+    if (result?.status === 200) {
       const data = await KosExtensionUtils.executeDataMapperExtension({
         extension: ExtensionType.AssemblyMapper,
         data: result.data,
@@ -1544,11 +1507,10 @@ let AssemblyModelImpl = class {
         this.logger.debug(`adding assembly ${name}`);
         this.logger.warn(`Assembly rest keys: ${Object.keys(rest).join(", ")}`);
         Object.keys(rest).forEach((key) => {
-          var _a;
           this.logger.warn(`Enabling feature flag: ${key}`);
           KosFeatureFlags.enableFeature(key);
           context.set(`assembly-feature-${key}`, rest[key]);
-          if (((_a = rest[key]["state"]) == null ? void 0 : _a["path"]) !== void 0) {
+          if (rest[key]["state"]?.["path"] !== void 0) {
             const statePath = rest[key]["state"]["path"];
             this.logger.warn(`Feature flag ${key} state path: ${statePath}`);
             context.set(`assembly-state-path-${key}`, statePath);
@@ -1580,58 +1542,58 @@ let AssemblyModelImpl = class {
     }
   }
 };
-__decorateClass$4([
+__decorateClass$5([
   kosDependency({
     modelType: "trouble-container-model"
   })
 ], AssemblyModelImpl.prototype, "troubleContainer", 2);
-__decorateClass$4([
+__decorateClass$5([
   kosChild
 ], AssemblyModelImpl.prototype, "holderContainer", 2);
-__decorateClass$4([
+__decorateClass$5([
   kosChild
 ], AssemblyModelImpl.prototype, "boardContainer", 2);
-__decorateClass$4([
+__decorateClass$5([
   kosChild
 ], AssemblyModelImpl.prototype, "pumpContainer", 2);
-AssemblyModelImpl = __decorateClass$4([
-  kosModel(MODEL_TYPE$4)
+AssemblyModelImpl = __decorateClass$5([
+  kosModel(MODEL_TYPE$5)
 ], AssemblyModelImpl);
 const Assembly = {
   registration: {
-    [MODEL_TYPE$4]: {
+    [MODEL_TYPE$5]: {
       class: AssemblyModelImpl,
       singleton: true
     }
   },
-  type: MODEL_TYPE$4,
-  predicate: isKosModel(MODEL_TYPE$4),
-  factory: Kos.Singleton.create(MODEL_TYPE$4)
+  type: MODEL_TYPE$5,
+  predicate: isKosModel(MODEL_TYPE$5),
+  factory: Kos.Singleton.create(MODEL_TYPE$5)
 };
-var __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor;
-var __decorateClass$3 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target;
+var __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor;
+var __decorateClass$4 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = decorator(result) || result;
   return result;
 };
-const MODEL_TYPE$3 = DispenseModelType.Availability;
+const MODEL_TYPE$4 = DispenseModelType.Availability;
 let AvailabilityModelImpl = class {
+  id;
+  data;
+  properties;
+  available;
+  visible;
+  groupId;
+  rawId;
+  altId;
+  type;
+  note;
+  taggedIds;
+  parentId;
+  logger;
   constructor(modelId, options, context) {
-    __publicField(this, "id");
-    __publicField(this, "data");
-    __publicField(this, "properties");
-    __publicField(this, "available");
-    __publicField(this, "visible");
-    __publicField(this, "groupId");
-    __publicField(this, "rawId");
-    __publicField(this, "altId");
-    __publicField(this, "type");
-    __publicField(this, "note");
-    __publicField(this, "taggedIds");
-    __publicField(this, "parentId");
-    __publicField(this, "logger");
     this.id = modelId;
     this.taggedIds = options.taggedIds || [];
     this.logger = context.logger;
@@ -1662,23 +1624,38 @@ let AvailabilityModelImpl = class {
   // -------------------LIFECYCLE----------------------------
   // -------------------ENTITY----------------------------
 };
-AvailabilityModelImpl = __decorateClass$3([
+AvailabilityModelImpl = __decorateClass$4([
   kosParentAware(),
-  kosModel(MODEL_TYPE$3)
+  kosModel(MODEL_TYPE$4)
 ], AvailabilityModelImpl);
 const Availability = {
   registration: {
-    [MODEL_TYPE$3]: {
+    [MODEL_TYPE$4]: {
       class: AvailabilityModelImpl,
       singleton: false
     }
   },
-  type: MODEL_TYPE$3,
-  predicate: isKosModel(MODEL_TYPE$3),
+  type: MODEL_TYPE$4,
+  predicate: isKosModel(MODEL_TYPE$4),
   factory: Kos.Factory.create(
-    MODEL_TYPE$3
+    MODEL_TYPE$4
   )
 };
+class PourContext {
+  _data = /* @__PURE__ */ new Map();
+  get(key) {
+    return this._data.get(key);
+  }
+  set(key, value) {
+    this._data.set(key, value);
+  }
+  remove(key) {
+    this._data.delete(key);
+  }
+  has(key) {
+    return this._data.has(key);
+  }
+}
 const { URL: URL$1 } = resolveServiceUrl("NOZZLE_SERVICE");
 const { postModel: postModel$1, deleteModel, getOne } = ServiceFactory.build({
   basePath: `${URL$1}/api/nozzle`
@@ -1686,11 +1663,11 @@ const { postModel: postModel$1, deleteModel, getOne } = ServiceFactory.build({
 const pourPourable = async (nozzleId, tracker) => {
   const response = await postModel$1({
     model: {},
-    urlOverride: `${URL$1}/api/ext/dispense/nozzle/${nozzleId}/pipeline/beverage/pour`,
+    urlOverride: `${URL$1}/api/ext/dispense/nozzle/${nozzleId}/pipeline/beverage/pour/selected/maxVolume`,
     ordered: true,
     tracker
   });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
@@ -1702,7 +1679,7 @@ const pourNamedPourable = async (name, nozzleId, tracker) => {
     ordered: true,
     tracker
   });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
@@ -1727,18 +1704,17 @@ const clearPourable = async (nozzleId) => {
   });
   return response;
 };
-var __defProp$2 = Object.defineProperty;
-var __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor;
-var __decorateClass$2 = (decorators, target, key, kind) => {
-  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target;
+var __defProp$3 = Object.defineProperty;
+var __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor;
+var __decorateClass$3 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$2(target, key, result);
+  if (kind && result) __defProp$3(target, key, result);
   return result;
 };
-const MODEL_TYPE$2 = DispenseModelType.Nozzle;
+const MODEL_TYPE$3 = DispenseModelType.Nozzle;
 const PROP_BEVERAGE_TOPIC_PREFIX = createPropKey(
   "beverageTopicPrefix"
 );
@@ -1747,37 +1723,18 @@ const TOPIC_NOZZLE_POUR_STARTED = "/kos/nozzle/pour/started";
 const TOPIC_NOZZLE_POUR_PROGRESS = "/kos/nozzle/pour/progress";
 const TOPIC_NOZZLE_POUR_CANCEL = "/kos/nozzle/pour/cancel";
 let NozzleModelImpl = class {
-  constructor(modelId, options) {
-    /** the unique identifier for this nozzle.*/
-    __publicField(this, "id");
-    __publicField(this, "path");
-    __publicField(this, "name");
-    __publicField(this, "_selectedBeverage");
-    __publicField(this, "_selectedBrand");
-    __publicField(this, "_additionalItems");
-    __publicField(this, "_availabilityItems");
-    __publicField(this, "futureHandler");
-    __publicField(this, "beverageTopicPrefix");
-    __publicField(this, "topicPrefix");
-    __publicField(this, "urlPrefix");
-    this.id = modelId;
-    this.path = options.path;
-    this.name = options.name;
-    this.beverageTopicPrefix = options.beverageTopicPrefix;
-    this.topicPrefix = options.topicPrefix;
-    this.urlPrefix = options.urlPrefix;
-    this._selectedBeverage = void 0;
-    this._selectedBrand = void 0;
-    this._additionalItems = [];
-    this.futureHandler = new MultipleFutureHandler(this);
-    this._availabilityItems = new KosModelContainer({
-      indexMap: {
-        byGroup: "groupId",
-        byParent: "parentId"
-      },
-      parentId: modelId
-    });
-  }
+  /** the unique identifier for this nozzle.*/
+  id;
+  path;
+  name;
+  _selectedBeverage;
+  _selectedBrand;
+  _additionalItems;
+  _availabilityItems;
+  futureHandler;
+  beverageTopicPrefix;
+  topicPrefix;
+  urlPrefix;
   /**
    * The availability nodes that can be dispensed from this nozzle.
    * This is a subset of the availability for the entire dispenser
@@ -1804,8 +1761,7 @@ let NozzleModelImpl = class {
    * @readonly
    */
   get isPouring() {
-    var _a;
-    return !!(this.futureHandler.getFuture() && !((_a = this.futureHandler.getFuture()) == null ? void 0 : _a.endState)) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
+    return !!(this.futureHandler.getFuture() && !this.futureHandler.getFuture()?.endState) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
   }
   /**
    * A derived value that indicates if the nozzle is currently available to pour a beverage.
@@ -1836,8 +1792,26 @@ let NozzleModelImpl = class {
     return this.futureHandler.getFuture();
   }
   get pourProgress() {
-    var _a;
-    return ((_a = this.future) == null ? void 0 : _a.progress) ?? 0;
+    return this.future?.progress ?? 0;
+  }
+  constructor(modelId, options) {
+    this.id = modelId;
+    this.path = options.path;
+    this.name = options.name;
+    this.beverageTopicPrefix = options.beverageTopicPrefix;
+    this.topicPrefix = options.topicPrefix;
+    this.urlPrefix = options.urlPrefix;
+    this._selectedBeverage = void 0;
+    this._selectedBrand = void 0;
+    this._additionalItems = [];
+    this.futureHandler = new MultipleFutureHandler(this);
+    this._availabilityItems = new KosModelContainer({
+      indexMap: {
+        byGroup: "groupId",
+        byParent: "parentId"
+      },
+      parentId: modelId
+    });
   }
   updateModel() {
   }
@@ -1863,7 +1837,7 @@ let NozzleModelImpl = class {
   async setSelectedPourable({ beverage, additional, context }, forceUpdate = false) {
     if (!beverage) {
       const response2 = await clearPourable(this.name);
-      if ((response2 == null ? void 0 : response2.status) !== 200) {
+      if (response2?.status !== 200) {
         throw new Error("Failed to clear pourable");
       }
       this._selectedBeverage = void 0;
@@ -1902,7 +1876,7 @@ let NozzleModelImpl = class {
     }
     const payload = selectedPayload ?? defaultPayload;
     const response = await selectPourable(this.name, payload);
-    if ((response == null ? void 0 : response.status) !== 200) {
+    if (response?.status !== 200) {
       throw new Error("Failed to select pourable");
     }
   }
@@ -1939,9 +1913,8 @@ let NozzleModelImpl = class {
   handlePouringStart() {
     this.logger.info("Pour started");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware$1(model)) {
-        (_a = model.onPourStart) == null ? void 0 : _a.call(model);
+        model.onPourStart?.();
       }
     });
   }
@@ -1954,9 +1927,8 @@ let NozzleModelImpl = class {
   handleCanceled() {
     this.logger.info("Pour canceled");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware$1(model)) {
-        (_a = model.onPourCancel) == null ? void 0 : _a.call(model);
+        model.onPourCancel?.();
       }
     });
     const evt = {
@@ -1996,7 +1968,6 @@ let NozzleModelImpl = class {
   }
   // Inherits throwOnInvalid: false from class
   async pour(tracker) {
-    var _a;
     try {
       this.transition("START_POUR");
       if (!tracker) {
@@ -2009,7 +1980,7 @@ let NozzleModelImpl = class {
         type: "free"
       };
       EventBus.publish(TOPIC_NOZZLE_POUR_STARTED, evt);
-      if ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.endState) {
+      if (result?.data?.endState) {
         this.transition("POUR_COMPLETED");
       }
       return result;
@@ -2023,7 +1994,6 @@ let NozzleModelImpl = class {
   }
   // Inherits throwOnInvalid: false from class
   async fixedPour(name, tracker) {
-    var _a;
     try {
       this.transition("START_POUR");
       if (!tracker) {
@@ -2036,7 +2006,7 @@ let NozzleModelImpl = class {
         type: "fixed"
       };
       EventBus.publish(TOPIC_NOZZLE_POUR_STARTED, evt);
-      if ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.endState) {
+      if (result?.data?.endState) {
         this.transition("POUR_COMPLETED");
       }
       return result;
@@ -2050,9 +2020,8 @@ let NozzleModelImpl = class {
   }
   // Inherits throwOnInvalid: false - silently ignore if already idle
   async cancelPour() {
-    var _a;
     this.transition("CANCEL_POUR");
-    await ((_a = this.futureHandler.getFuture()) == null ? void 0 : _a.cancelFuture());
+    await this.futureHandler.getFuture()?.cancelFuture();
     this.transition("POUR_CANCELED");
   }
   updateGroupMembers() {
@@ -2071,34 +2040,31 @@ let NozzleModelImpl = class {
   }
   async reload() {
     this.logger.info(`reloading nozzle ${this.id}`);
-    const context = KosContextManager.getContext(this.id);
-    (context == null ? void 0 : context.get(ExtensionType.AvailabilityLoader)) || {};
     const availability = await getAvailability(this.urlPrefix);
-    if ((availability == null ? void 0 : availability.status) !== 200 || !(availability == null ? void 0 : availability.data)) {
+    if (availability?.status !== 200 || !availability?.data) {
       this.logger.error("Failed to load nozzle availability");
       return;
     }
-    const update = availability == null ? void 0 : availability.data;
+    const update = availability?.data;
     if (update) {
       await this.updateAvailability(update);
     }
   }
   /** @internal */
   async load(context) {
-    var _a, _b;
     this.logger.debug(`loading nozzle ${this.id}`);
     const availability = await getAvailability(this.urlPrefix);
-    if ((availability == null ? void 0 : availability.status) !== 200) {
+    if (availability?.status !== 200) {
       throw new Error("Failed to load nozzle availability");
     }
     const beverageContext = await ExtensionManager.loader.executeLoader(
       ExtensionType.AvailabilityLoader,
       {}
     );
-    context == null ? void 0 : context.set(ExtensionType.AvailabilityLoader, beverageContext);
-    context == null ? void 0 : context.set(Nozzle.type, this);
-    for (const group of Object.keys((_a = availability.data) == null ? void 0 : _a.groups) || []) {
-      for (const beverageData of ((_b = availability.data) == null ? void 0 : _b.groups[group]) || []) {
+    context?.set(ExtensionType.AvailabilityLoader, beverageContext);
+    context?.set(Nozzle.type, this);
+    for (const group of Object.keys(availability.data?.groups) || []) {
+      for (const beverageData of availability.data?.groups[group] || []) {
         const extensionData = await ExtensionManager.dataMapper.executeMapper(
           ExtensionType.AvailabilityMapper,
           { ...beverageData, groupId: group },
@@ -2123,19 +2089,25 @@ let NozzleModelImpl = class {
   }
   async updateAvailability(update) {
     const context = KosContextManager.getContext(this.id);
-    const beverageContext = (context == null ? void 0 : context.get(ExtensionType.AvailabilityLoader)) || {};
+    const beverageContext = context?.get(ExtensionType.AvailabilityLoader) || {};
     if (update.rebuild) {
-      for (const group of Object.keys(update == null ? void 0 : update.groups) || []) {
+      this.logger.info(
+        `Received rebuild update for nozzle ${this.path}, rebuilding entire availability set`
+      );
+      for (const group of Object.keys(update?.groups) || []) {
         const deletedBeverages = this._availabilityItems.getIndexByKey("group", group).filter(
           (beverage) => !update.groups[group].find(
             (b) => `${this.id}-${group}-${b.id}` === beverage.id
           )
         );
         deletedBeverages.forEach((beverage) => {
+          this.logger.info(
+            `Removing beverage ${beverage.id} from nozzle ${this.path} due to rebuild update`
+          );
           this._availabilityItems.removeModel(beverage.id);
           destroyKosModel(beverage);
         });
-        for (const beverageData of (update == null ? void 0 : update.groups[group]) || []) {
+        for (const beverageData of update?.groups[group] || []) {
           const extensionData = await ExtensionManager.dataMapper.executeMapper(
             ExtensionType.AvailabilityMapper,
             { ...beverageData, groupId: group },
@@ -2155,8 +2127,16 @@ let NozzleModelImpl = class {
             `${this.id}-${group}-${beverageData.id}`
           );
           if (existing) {
+            if (existing.available !== beverageOptions.available) {
+              this.logger.info(
+                `Updating availability of beverage ${existing.id} in nozzle ${this.path} to ${beverageOptions.available}`
+              );
+            }
             existing.updateModel(beverageOptions);
           } else {
+            this.logger.info(
+              `Adding beverage ${beverageData.id} to nozzle ${this.path}`
+            );
             const beverage = Availability.factory(
               `${this.id}-${group}-${beverageData.id}`
             )(beverageOptions);
@@ -2165,8 +2145,11 @@ let NozzleModelImpl = class {
         }
       }
     } else {
-      for (const group of Object.keys(update == null ? void 0 : update.groups) || []) {
-        for (const beverageData of (update == null ? void 0 : update.groups[group]) || []) {
+      this.logger.info(
+        `Received delta update for nozzle ${this.path}, updating availability nodes`
+      );
+      for (const group of Object.keys(update?.groups) || []) {
+        for (const beverageData of update?.groups[group] || []) {
           const extensionData = await ExtensionManager.dataMapper.executeMapper(
             ExtensionType.AvailabilityMapper,
             { ...beverageData, groupId: group },
@@ -2187,6 +2170,11 @@ let NozzleModelImpl = class {
             `${this.id}-${group}-${beverageData.id}`
           );
           if (existing) {
+            if (existing.available !== beverageOptions.available) {
+              this.logger.info(
+                `Updating availability of beverage ${existing.id} in nozzle ${this.path} to ${beverageOptions.available}`
+              );
+            }
             existing.updateModel(beverageOptions);
           }
         }
@@ -2196,42 +2184,42 @@ let NozzleModelImpl = class {
   }
   // -------------------ENTITY----------------------------
 };
-__decorateClass$2([
+__decorateClass$3([
   kosChild
 ], NozzleModelImpl.prototype, "_availabilityItems", 2);
-__decorateClass$2([
+__decorateClass$3([
   kosStateEntry(PourState.POURING)
 ], NozzleModelImpl.prototype, "handlePouringStart", 1);
-__decorateClass$2([
+__decorateClass$3([
   kosStateExit(PourState.POURING)
 ], NozzleModelImpl.prototype, "handlePouringEnd", 1);
-__decorateClass$2([
+__decorateClass$3([
   kosStateEntry(PourState.POUR_CANCELING)
 ], NozzleModelImpl.prototype, "handleCancelStart", 1);
-__decorateClass$2([
+__decorateClass$3([
   kosStateExit(PourState.POUR_CANCELING)
 ], NozzleModelImpl.prototype, "handleCanceled", 1);
-__decorateClass$2([
+__decorateClass$3([
   kosFuture(),
   kosStateGuard({ allowedStates: [PourState.IDLE] })
 ], NozzleModelImpl.prototype, "pour", 1);
-__decorateClass$2([
+__decorateClass$3([
   kosFuture(),
   kosStateGuard({ allowedStates: [PourState.IDLE] })
 ], NozzleModelImpl.prototype, "fixedPour", 1);
-__decorateClass$2([
+__decorateClass$3([
   kosStateGuard({
     allowedStates: [PourState.POUR_STARTING, PourState.POURING]
   })
 ], NozzleModelImpl.prototype, "cancelPour", 1);
-__decorateClass$2([
+__decorateClass$3([
   kosTopicHandler({
     topic: `${PROP_BEVERAGE_TOPIC_PREFIX}/availability`,
     websocket: true
   })
 ], NozzleModelImpl.prototype, "updateAvailability", 1);
-NozzleModelImpl = __decorateClass$2([
-  kosModel({ modelTypeId: MODEL_TYPE$2, singleton: false }),
+NozzleModelImpl = __decorateClass$3([
+  kosModel({ modelTypeId: MODEL_TYPE$3, singleton: false }),
   kosLoggerAware(),
   kosStateMachine(
     {
@@ -2272,15 +2260,391 @@ NozzleModelImpl = __decorateClass$2([
 ], NozzleModelImpl);
 const Nozzle = {
   registration: {
-    [MODEL_TYPE$2]: {
+    [MODEL_TYPE$3]: {
       class: NozzleModelImpl,
       singleton: false
     }
   },
-  type: MODEL_TYPE$2,
-  predicate: isKosModel(MODEL_TYPE$2),
-  factory: Kos.Factory.create(MODEL_TYPE$2)
+  type: MODEL_TYPE$3,
+  predicate: isKosModel(MODEL_TYPE$3),
+  factory: Kos.Factory.create(MODEL_TYPE$3)
 };
+var __defProp$2 = Object.defineProperty;
+var __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __decorateClass$2 = (decorators, target, key, kind) => {
+  var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target;
+  for (var i = decorators.length - 1, decorator; i >= 0; i--)
+    if (decorator = decorators[i])
+      result = (kind ? decorator(target, key, result) : decorator(result)) || result;
+  if (kind && result) __defProp$2(target, key, result);
+  return result;
+};
+var __publicField = (obj, key, value) => __defNormalProp(obj, key + "", value);
+const MODEL_TYPE$2 = "cui-kit-state-model";
+const MODEL_CONFIG = {
+  modelTypeId: MODEL_TYPE$2,
+  singleton: false
+};
+const cuiKitId = (nozzlePath) => `cui-kit:${nozzlePath}`;
+let CuiKitStateModelImpl = class {
+  id;
+  nozzlePath;
+  initialGroup;
+  steps;
+  companionTypes;
+  currentGroup;
+  selectedBrand = null;
+  selectedBeverage = null;
+  selectedFlavors = [];
+  pourStrategy;
+  onPourComplete;
+  /** Data passed to the before-pour gate; carries `selectedBeverage`. */
+  pourContext = new PourContext();
+  /** The target of the last pour the kit started. */
+  activeTarget;
+  beforePour;
+  pressCount = 0;
+  released = true;
+  lastPourState;
+  lastPourError;
+  nozzle;
+  constructor(modelId, options) {
+    this.id = modelId;
+    this.nozzlePath = options.nozzlePath;
+    this.initialGroup = options.initialGroup ?? "brands";
+    this.steps = options.steps;
+    this.companionTypes = options.companionTypes ?? {};
+    this.pourStrategy = options.pour?.strategy;
+    this.onPourComplete = options.onPourComplete;
+    this.currentGroup = this.firstGroup;
+    if (options.steps && options.initialGroup) {
+      throw new Error(
+        "CUI Kit: pass steps or initialGroup, not both (initialGroup is replaced by steps.brands)"
+      );
+    }
+  }
+  updateModel(options) {
+    this.companionTypes = options.companionTypes ?? {};
+  }
+  // -------------------STEPS----------------------------
+  /** The steps shown, in order. */
+  get enabledSteps() {
+    if (!this.steps) {
+      return this.initialGroup === "brands" ? ["brands", "beverages", "flavors"] : ["beverages", "flavors"];
+    }
+    return [
+      ...this.steps.brands ? ["brands"] : [],
+      "beverages",
+      ...this.steps.flavors ? ["flavors"] : [],
+      ...this.steps.pour ? ["pour"] : []
+    ];
+  }
+  /** The step navigation starts at and `home()` returns to. */
+  get firstGroup() {
+    if (!this.steps) return this.initialGroup;
+    return this.steps.brands ? "brands" : "beverages";
+  }
+  /** The step `back()` moves to, or undefined when there is none. */
+  get previousGroup() {
+    if (!this.steps) {
+      return this.currentGroup === "brands" ? void 0 : this.initialGroup;
+    }
+    const steps = this.enabledSteps;
+    const index = steps.indexOf(this.currentGroup);
+    return index > 0 ? steps[index - 1] : void 0;
+  }
+  get canBack() {
+    return this.previousGroup !== void 0;
+  }
+  // -------------------LISTS----------------------------
+  get brands() {
+    return this.nozzle?.visibleBrands ?? [];
+  }
+  /** Whether the kit shows a brands step; without `steps` it follows `initialGroup`. */
+  get hasBrands() {
+    return this.enabledSteps.includes("brands");
+  }
+  get beverages() {
+    if (!this.nozzle) return [];
+    const brand = this.steps && !this.hasBrands ? void 0 : this.nozzle.selectedBrand;
+    const items = brand ? this.nozzle.getAvailabilityByParent(brand.id) : this.nozzle.getGroupAvailabilityItems("beverages");
+    return items.filter((item) => item.visible);
+  }
+  get flavors() {
+    return this.nozzle?.getGroupAvailabilityItems("flavors").filter((flavor) => flavor.visible) ?? [];
+  }
+  get brandCompanions() {
+    return this.companionsOf(this.brands, this.companionTypes.brand);
+  }
+  get beverageCompanions() {
+    return this.companionsOf(this.beverages, this.companionTypes.beverage);
+  }
+  get flavorCompanions() {
+    return this.companionsOf(this.flavors, this.companionTypes.flavor);
+  }
+  companionsOf(models, type) {
+    if (!type) return [];
+    return models.map((model) => getKosCompanionModel(model, type));
+  }
+  // -------------------SELECTION----------------------------
+  selectBrand(brand, context) {
+    this.selectedBrand = brand;
+    this.nozzle?.setSelectedBrand(brand, context);
+    this.currentGroup = "beverages";
+    this.publish("brand/selected", brand);
+  }
+  clearBrand() {
+    this.selectedBrand = null;
+    this.nozzle?.setSelectedBrand(void 0);
+    this.publish("brand/cleared", {});
+  }
+  async selectBeverage(beverage, context, forceUpdate) {
+    this.selectedBeverage = beverage;
+    this.pourContext.set("selectedBeverage", beverage);
+    await this.nozzle?.setSelectedPourable({ beverage, context }, forceUpdate);
+    if (!this.steps || this.steps.flavors) {
+      this.currentGroup = "flavors";
+    }
+    this.publish("beverage/selected", beverage);
+  }
+  async clearBeverage() {
+    this.selectedBeverage = null;
+    this.pourContext.remove("selectedBeverage");
+    await this.nozzle?.setSelectedPourable({ beverage: void 0 });
+    this.publish("beverage/cleared", {});
+  }
+  /** Toggles a flavor and sends the beverage with the resulting flavors to the nozzle. */
+  async selectFlavor(flavor, context, forceUpdate) {
+    const flavors = this.selectedFlavors.includes(flavor) ? this.selectedFlavors.filter((selected) => selected !== flavor) : [...this.selectedFlavors, flavor];
+    this.selectedFlavors = flavors;
+    const beverage = this.nozzle?.selectedPourable.beverage;
+    if (beverage) {
+      await this.nozzle.setSelectedPourable(
+        { beverage, additional: flavors, context },
+        forceUpdate
+      );
+    }
+    this.publish("flavor/selected", flavor);
+  }
+  async clearFlavors() {
+    this.selectedFlavors = [];
+    const beverage = this.nozzle?.selectedPourable.beverage;
+    if (beverage) {
+      await this.nozzle.setSelectedPourable({ beverage });
+      this.publish("flavor/cleared", {});
+    }
+  }
+  // -------------------NAVIGATION----------------------------
+  /** Moves to the previous step. Without `steps`, returns to the start and clears brand and beverage. */
+  back() {
+    if (!this.steps) {
+      if (this.currentGroup !== "brands") {
+        this.currentGroup = this.initialGroup;
+      }
+      void this.clearBeverage();
+      this.clearBrand();
+      return;
+    }
+    const previous = this.previousGroup;
+    if (previous) {
+      this.currentGroup = previous;
+    }
+  }
+  /** Returns to the first step and clears the selections. */
+  home() {
+    this.publish("home", {});
+    this.currentGroup = this.firstGroup;
+    if (this.steps) {
+      void this.clearFlavors();
+      void this.clearBeverage();
+      if (this.steps.brands) this.clearBrand();
+      return;
+    }
+    void this.clearBeverage();
+    if (this.initialGroup === "brands") {
+      this.clearBrand();
+    }
+  }
+  /** Number of `useCuiKit` hooks attached to this kit. */
+  attached = 0;
+  /**
+   * Attaches a `useCuiKit` hook. A nozzle has one kit hook; components read it through
+   * the kit's context. Returns false, and logs an error, for a second hook.
+   */
+  attach() {
+    this.attached += 1;
+    if (this.attached > 1) {
+      this.logger.error(
+        `useCuiKit is mounted ${this.attached} times for nozzle ${this.nozzlePath}; read the kit with the useCuiKitContext hook returned by initializeCuiKit`
+      );
+      return false;
+    }
+    return true;
+  }
+  detach() {
+    this.attached = Math.max(0, this.attached - 1);
+  }
+  /**
+   * Returns the kit to the first step with nothing selected, as a newly mounted kit
+   * starts. The nozzle's own selection is left as it is.
+   */
+  reset() {
+    this.currentGroup = this.firstGroup;
+    this.selectedBrand = null;
+    this.selectedBeverage = null;
+    this.selectedFlavors = [];
+    this.pourContext.remove("selectedBeverage");
+  }
+  /**
+   * Moves to the pour step. Only available when `steps.pour` is on. With `start`, also
+   * starts a pour; ignored, with a warning, when the pour needs a held button.
+   */
+  toPour(options = {}) {
+    if (!this.steps?.pour) {
+      this.logger.warn("toPour() ignored: the pour step is not enabled");
+      return;
+    }
+    this.currentGroup = "pour";
+    if (!options.start) return;
+    if (!options.fixedPourName && this.strategyFor(options)?.requiresHold) {
+      this.logger.warn(
+        "toPour({ start: true }) ignored: the pour strategy needs a held button"
+      );
+      return;
+    }
+    void this.startPour(options);
+  }
+  // -------------------POUR----------------------------
+  /** Sets the before-pour gate the kit calls before every pour. */
+  setBeforePour(callback) {
+    this.beforePour = callback;
+  }
+  /** Starts a pour without a gesture (a click-to-pour button or an automated pour). */
+  startPour(options = {}) {
+    return this.runPour(options, false);
+  }
+  /** The press half of a pour gesture; `releasePour` is the release. */
+  pressPour(options = {}) {
+    return this.runPour(options, true);
+  }
+  /** The release half of a pour gesture. */
+  releasePour(options = {}) {
+    this.released = true;
+    const target = options.target ?? this.nozzle;
+    const ended = this.strategyFor(options)?.initiateEnded?.(target);
+    void Promise.resolve(ended).then((keepPouring) => {
+      if (keepPouring !== true) {
+        this.publish("pour/cancel", {});
+      }
+    });
+  }
+  /** Cancels the pour the kit started last. */
+  async cancelPour() {
+    await (this.activeTarget ?? this.nozzle)?.cancelPour();
+    this.publish("pour/cancel", {});
+  }
+  /** The pour target whose state the kit reports: the last one poured, else the nozzle. */
+  get pourTarget() {
+    return this.activeTarget ?? this.nozzle;
+  }
+  strategyFor(options) {
+    return options.strategy ?? this.pourStrategy;
+  }
+  /**
+   * select → prepare → before-pour gate → pour. While the target is pouring nothing is
+   * selected; for a gesture, a release before the pour starts stops the sequence.
+   */
+  async runPour(options, gesture) {
+    const press = ++this.pressCount;
+    this.released = false;
+    const target = options.target ?? this.nozzle;
+    const strategy = this.strategyFor(options);
+    if (!target || !strategy && !options.fixedPourName) {
+      this.logger.error("pour ignored: no pour target or strategy");
+      return false;
+    }
+    const releasedEarly = () => gesture && (this.released || press !== this.pressCount);
+    if (options.select && !target.isPouring) {
+      await this.selectForPour(options.select);
+    }
+    if (releasedEarly()) return false;
+    await options.prepare?.(this.pourContext);
+    if (releasedEarly()) return false;
+    this.publish("pre/pour", {});
+    await this.beforePour?.(this.pourContext) || true;
+    if (releasedEarly()) return false;
+    this.activeTarget = target;
+    this.lastPourError = void 0;
+    const started = options.fixedPourName ? this.nozzle.fixedPour(options.fixedPourName) : strategy?.initiate(target);
+    void Promise.resolve(started).catch((error) => {
+      this.lastPourError = error;
+      this.logger.error(`pour failed: ${error}`);
+    });
+    this.publish("pour", {});
+    return true;
+  }
+  /**
+   * Selects a beverage, and its brand first when the kit has a brands step, and waits
+   * for the nozzle.
+   */
+  async selectForPour(beverage) {
+    const brand = this.hasBrands ? this.nozzle?.brands.find((b) => b.id === beverage.parentId) : void 0;
+    if (brand && this.selectedBrand !== brand) {
+      this.selectBrand(brand);
+    }
+    if (this.selectedBeverage !== beverage) {
+      await this.selectBeverage(beverage);
+    }
+  }
+  trackPourCompletion() {
+    const state = this.pourTarget?.currentState;
+    const previous = this.lastPourState;
+    this.lastPourState = state;
+    const completed = state === PourState.IDLE && (previous === PourState.POURING || previous === PourState.POUR_STARTING);
+    if (!completed || !this.onPourComplete) return;
+    const target = this.pourTarget;
+    const endState = target?.future?.endState;
+    setTimeout(() => {
+      this.onPourComplete?.({ endState, error: this.lastPourError });
+    }, 0);
+  }
+  publishBeverageList() {
+    this.publish("beverage/list/updated", this.beverages);
+  }
+  publish(path, body) {
+    EventBus.publish(`/kos/dispense/${this.nozzlePath}/${path}/`, body);
+  }
+  // -------------------LIFECYCLE----------------------------
+  async init() {
+    this.logger.debug(`initializing cui-kit-state ${this.id}`);
+  }
+};
+__publicField(CuiKitStateModelImpl, "Registration");
+__decorateClass$2([
+  kosDependency({
+    modelType: Nozzle.type,
+    id: createPropKey("nozzlePath")
+  })
+], CuiKitStateModelImpl.prototype, "nozzle", 2);
+__decorateClass$2([
+  kosModelEffect({
+    dependencies: (model) => [
+      model.pourTarget?.currentState
+    ]
+  })
+], CuiKitStateModelImpl.prototype, "trackPourCompletion", 1);
+__decorateClass$2([
+  kosModelEffect({
+    dependencies: (model) => [model.beverages],
+    options: { fireImmediately: true }
+  })
+], CuiKitStateModelImpl.prototype, "publishBeverageList", 1);
+CuiKitStateModelImpl = __decorateClass$2([
+  kosModel(MODEL_CONFIG),
+  kosLoggerAware()
+], CuiKitStateModelImpl);
+const CuiKitState = CuiKitStateModelImpl.Registration;
 var __defProp$1 = Object.defineProperty;
 var __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor;
 var __decorateClass$1 = (decorators, target, key, kind) => {
@@ -2288,16 +2652,15 @@ var __decorateClass$1 = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp$1(target, key, result);
+  if (kind && result) __defProp$1(target, key, result);
   return result;
 };
 const MODEL_TYPE$1 = "device-assembly-model";
 let DeviceAssemblyModelImpl = class {
+  id;
+  deviceNozzles;
+  logger;
   constructor(modelId, _options, context) {
-    __publicField(this, "id");
-    __publicField(this, "deviceNozzles");
-    __publicField(this, "logger");
     this.id = modelId;
     this.logger = context.logger;
     this.deviceNozzles = new KosModelContainer();
@@ -2315,12 +2678,11 @@ let DeviceAssemblyModelImpl = class {
   async load() {
     this.logger.debug(`loading device-assembly ${this.id}`);
     const result = await getAssembly();
-    if ((result == null ? void 0 : result.status) === 200) {
+    if (result?.status === 200) {
       const nozzles = result.data.assemblies.map((assembly) => assembly.nozzles ?? []).flat();
       nozzles.forEach((nozzleData) => {
-        var _a;
         const nozzleId = nozzleData.path;
-        const beverageTopicPrefix = ((_a = nozzleData.pipelines.find((pipeline) => pipeline.name === "beverage")) == null ? void 0 : _a.topicPrefix) || "";
+        const beverageTopicPrefix = nozzleData.pipelines.find((pipeline) => pipeline.name === "beverage")?.topicPrefix || "";
         const nozzle = Nozzle.factory(nozzleId)({
           path: nozzleData.path,
           name: nozzleData.name,
@@ -2354,20 +2716,19 @@ const pourOnTarget = async (path, tracker) => {
     ordered: true,
     tracker
   });
-  if (response == null ? void 0 : response.data) {
+  if (response?.data) {
     FutureManager.initiateFuture(response.data);
   }
   return response;
 };
-var __defProp2 = Object.defineProperty;
+var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
   var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target;
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp2(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 const MODEL_TYPE = "generic-pour-model";
@@ -2376,18 +2737,18 @@ const TOPIC_GENERIC_POUR_PROGRESS = "/kos/generic/pour/progress";
 const TOPIC_GENERIC_POUR_CANCEL = "/kos/generic/pour/cancel";
 const isPourAware = (model) => model.onPourStart !== void 0 && model.onPourCancel !== void 0 && model.onPourProgress !== void 0;
 let GenericPourModelImpl = class {
+  id;
+  /**
+   * @kosApiLevel 5
+   */
+  servicePathFactory;
+  pourType;
+  /**
+   * @kosApiLevel 5
+   */
+  selectedId;
+  state;
   constructor(modelId, options) {
-    __publicField(this, "id");
-    /**
-     * @kosApiLevel 5
-     */
-    __publicField(this, "servicePathFactory");
-    __publicField(this, "pourType");
-    /**
-     * @kosApiLevel 5
-     */
-    __publicField(this, "selectedId");
-    __publicField(this, "state");
     this.id = modelId;
     this.futureHandler = new FutureHandler(this);
     this.servicePathFactory = options.servicePathFactory;
@@ -2433,9 +2794,8 @@ let GenericPourModelImpl = class {
   handlePouringStart() {
     this.logger.info("Pour started");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware(model)) {
-        (_a = model.onPourStart) == null ? void 0 : _a.call(model);
+        model.onPourStart?.();
       }
     });
     const evt = {
@@ -2453,9 +2813,8 @@ let GenericPourModelImpl = class {
   handleCanceled() {
     this.logger.info("Pour canceled");
     getAllKosCompanionModels(this).forEach((model) => {
-      var _a;
       if (isPourAware(model)) {
-        (_a = model.onPourCancel) == null ? void 0 : _a.call(model);
+        model.onPourCancel?.();
       }
     });
     const evt = {
@@ -2465,7 +2824,6 @@ let GenericPourModelImpl = class {
   }
   // Inherits throwOnInvalid: false from class
   async pour(tracker) {
-    var _a;
     try {
       this.transition("START_POUR");
       if (!tracker) {
@@ -2473,7 +2831,7 @@ let GenericPourModelImpl = class {
       }
       const result = await pourOnTarget(this.servicePath, tracker);
       this.transition("POUR_ACTIVE");
-      if ((_a = result == null ? void 0 : result.data) == null ? void 0 : _a.endState) {
+      if (result?.data?.endState) {
         this.transition("POUR_COMPLETED");
       }
       return result;
@@ -2487,9 +2845,8 @@ let GenericPourModelImpl = class {
   }
   // Inherits throwOnInvalid: false - silently ignore if already idle
   async cancelPour() {
-    var _a;
     this.transition("CANCEL_POUR");
-    await ((_a = this.futureHandler.getFuture()) == null ? void 0 : _a.cancelFuture());
+    await this.futureHandler.getFuture()?.cancelFuture();
     this.transition("POUR_CANCELED");
   }
   // ============================================================================
@@ -2500,8 +2857,7 @@ let GenericPourModelImpl = class {
    * @readonly
    */
   get isPouring() {
-    var _a;
-    return !!(this.future && !((_a = this.future) == null ? void 0 : _a.endState)) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
+    return !!(this.future && !this.future?.endState) || this.currentState === PourState.POUR_STARTING || this.currentState === PourState.POURING || this.currentState === PourState.POUR_CANCELING;
   }
   /**
    * A derived value that indicates if the pour target is currently available to pour a beverage.
@@ -2626,9 +2982,10 @@ const kosModels = {
   ...Assembly.registration,
   ...BoardContainer.registration
 };
-const registerDispenseModels = (root) => () => {
-  registerCoreModels(root)();
+const registerDispenseModels = (root) => (options) => {
+  registerCoreModels(root)(options);
   DeviceAssembly.register();
+  CuiKitState.register();
   Object.keys(kosModels).forEach((key) => {
     const model = kosModels[key];
     registerLegacyModel(root)(key, model);
@@ -2636,8 +2993,7 @@ const registerDispenseModels = (root) => () => {
   ExtensionManager[EXTENSION_TROUBLE_DATA_MAPPER].register(
     "FirmwareUpdateInProgressTrouble",
     async (trouble) => {
-      var _a;
-      if ((_a = trouble.data) == null ? void 0 : _a.deviceId) {
+      if (trouble.data?.deviceId) {
         const { model: assemblyModel } = getKosModelSync(
           Assembly.type
         );
@@ -2660,12 +3016,16 @@ const registerDispenseModels = (root) => () => {
     legacy: RegistrationManager.model.registerLegacyModel(root)
   };
 };
+const registerCuiKitModels = (root) => (options) => registerDispenseModels(root)(options);
 const _KosModelRegistry = {
   ...KosModelRegistry$1
 };
 _KosModelRegistry.dispense = {
   models: registerDispenseModels(_KosModelRegistry)
 };
+_KosModelRegistry.cuiKit = {
+  models: registerCuiKitModels(_KosModelRegistry)
+};
 _KosModelRegistry.preload = RegistrationManager.model.preloadModel(_KosModelRegistry);
 _KosModelRegistry.model = RegistrationManager.model.register(_KosModelRegistry);
 _KosModelRegistry.companion = RegistrationManager.companion.register(_KosModelRegistry);
@@ -2673,52 +3033,54 @@ _KosModelRegistry.legacy = RegistrationManager.model.registerLegacyModel(_KosMod
 const KosModelRegistry = _KosModelRegistry;
 export {
   Assembly as A,
-  BoardContainerModel as B,
+  Board as B,
   CONTEXT_ASSEMBLY_DATA as C,
-  DispenseModelType as D,
+  DeviceAssembly as D,
   ExtensionType as E,
-  unassignHolderIngredient as F,
+  sendRfidOverride as F,
   GenericPour as G,
   Holder as H,
   Ingredient as I,
-  getAssembly as J,
+  unassignHolderIngredient as J,
   KosModelRegistry as K,
-  getIntentVolume as L,
-  sendIntent as M,
+  getAssembly as L,
+  getIntentVolume as M,
   Nozzle as N,
-  clearPourable as O,
-  Pump as P,
-  getAvailability as Q,
-  pourNamedPourable as R,
-  pourPourable as S,
+  sendIntent as O,
+  PourContext as P,
+  clearPourable as Q,
+  getAvailability as R,
+  pourNamedPourable as S,
   TOPIC_BOARD_LINKED as T,
-  selectPourable as U,
-  pourOnTarget as V,
-  CONTEXT_ASSEMBLY_RAW_DATA as a,
-  Availability as b,
-  TOPIC_BOARD_UNLINKED as c,
-  BoardContainer as d,
-  Board as e,
-  DeviceAssembly as f,
-  TOPIC_GENERIC_POUR_CANCEL as g,
-  TOPIC_GENERIC_POUR_PROGRESS as h,
-  TOPIC_GENERIC_POUR_STARTED as i,
-  HolderContainer as j,
-  IngredientContainer as k,
-  PumpContainer as l,
-  PumpIndex as m,
-  PourState as n,
-  kosModels as o,
-  ControlPourExtension as p,
-  EXTENSION_POINT_CONTROL_POUR as q,
-  registerDispenseModels as r,
-  getIngredients as s,
-  addAssignment as t,
-  assignHolderIngredient as u,
-  deleteAssignment as v,
-  getAssignments as w,
-  getHolders as x,
-  replaceLine as y,
-  sendRfidOverride as z
-};
-//# sourceMappingURL=dispense-registration-manager-C4XZ_c3x.js.map
+  pourPourable as U,
+  selectPourable as V,
+  pourOnTarget as W,
+  cuiKitId as X,
+  Availability as a,
+  BoardContainer as b,
+  BoardContainerModel as c,
+  CONTEXT_ASSEMBLY_RAW_DATA as d,
+  CuiKitState as e,
+  DispenseModelType as f,
+  HolderContainer as g,
+  IngredientContainer as h,
+  PourState as i,
+  Pump as j,
+  PumpContainer as k,
+  PumpIndex as l,
+  TOPIC_BOARD_UNLINKED as m,
+  TOPIC_GENERIC_POUR_CANCEL as n,
+  TOPIC_GENERIC_POUR_PROGRESS as o,
+  TOPIC_GENERIC_POUR_STARTED as p,
+  kosModels as q,
+  registerCuiKitModels as r,
+  registerDispenseModels as s,
+  getIngredients as t,
+  addAssignment as u,
+  assignHolderIngredient as v,
+  deleteAssignment as w,
+  getAssignments as x,
+  getHolders as y,
+  replaceLine as z
+};
+//# sourceMappingURL=dispense-registration-manager-DtN0T_JG.js.map