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

package/{pump-provider-BAQXIUuP.cjs → pump-provider-B4WR3LiY.cjs}

@@ -1,14 +1,8 @@
 "use strict";
-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;
-};
 const jsxRuntime = require("@emotion/react/jsx-runtime");
 const kosUiSdk = require("@kosdev-code/kos-ui-sdk");
-const dispenseRegistrationManager = require("./dispense-registration-manager-ukk4OBeX.cjs");
 const React = require("react");
+const dispenseRegistrationManager = require("./dispense-registration-manager-CfWgJqfq.cjs");
 const useAssembly = () => {
   const modelId = dispenseRegistrationManager.Assembly.type;
   const result = kosUiSdk.useKosModel({
@@ -108,8 +102,7 @@ const useBeverages = ({
   const [beverages, setBeverages] = React.useState([]);
   const [selectedBeverage, setSelectedBeverage] = React.useState(null);
   const companions = React.useMemo(() => {
-    if (!companionType)
-      return [];
+    if (!companionType) return [];
     return beverages.map(
       (brand) => kosUiSdk.getKosCompanionModel(brand, companionType)
     );
@@ -117,30 +110,29 @@ const useBeverages = ({
   const selectBeverage = React.useCallback(
     async (beverage, context, forceUpdate) => {
       setSelectedBeverage(beverage);
-      await (nozzle == null ? void 0 : nozzle.setSelectedPourable({ beverage, context }, forceUpdate));
-      onBeverageSelected == null ? void 0 : onBeverageSelected(beverage);
+      await nozzle?.setSelectedPourable({ beverage, context }, forceUpdate);
+      onBeverageSelected?.(beverage);
     },
     [nozzle, onBeverageSelected]
   );
   const clearBeverage = React.useCallback(async () => {
     setSelectedBeverage(null);
-    await (nozzle == null ? void 0 : nozzle.setSelectedPourable({ beverage: void 0 }));
-    onClearBeverage == null ? void 0 : onClearBeverage();
+    await nozzle?.setSelectedPourable({ beverage: void 0 });
+    onClearBeverage?.();
   }, [nozzle, onClearBeverage]);
   React.useEffect(() => {
     const disposer = kosUiSdk.kosAutoEffect(() => {
-      if (!nozzle)
-        return;
+      if (!nozzle) return;
       const selectedBrand = nozzle.selectedBrand;
       if (!selectedBrand) {
         const allBeverages = nozzle.getGroupAvailabilityItems("beverages").filter((beverage) => beverage.visible);
         setBeverages(allBeverages ?? []);
-        onBeverageListUpdated == null ? void 0 : onBeverageListUpdated(allBeverages);
+        onBeverageListUpdated?.(allBeverages);
         return;
       }
       const beverages2 = nozzle.getAvailabilityByParent(selectedBrand.id).filter((b) => b.visible);
       setBeverages(beverages2 ?? []);
-      onBeverageListUpdated == null ? void 0 : onBeverageListUpdated(beverages2);
+      onBeverageListUpdated?.(beverages2);
     });
     return () => {
       disposer();
@@ -154,6 +146,7 @@ const useBeverages = ({
     clearBeverage
   };
 };
+const log$4 = kosUiSdk.KosLog.createLogger({ group: kosUiSdk.LogGroup.ui, name: "use-brands" });
 const useBrands = ({
   onBrandSelected,
   onBrandCleared,
@@ -163,32 +156,28 @@ const useBrands = ({
   const [selectedBrand, setSelectedBrand] = React.useState(null);
   const [brands, setBrands] = React.useState([]);
   const companions = React.useMemo(() => {
-    if (!companionType)
-      return [];
+    if (!companionType) return [];
     return brands.map((brand) => kosUiSdk.getKosCompanionModel(brand, companionType));
   }, [brands, companionType]);
   const selectBrand = React.useCallback(
     async (brand, context, forceUpdate) => {
       setSelectedBrand(brand);
       if (forceUpdate) {
-        kosUiSdk.KosLog.warn(
-          `forceUpdate is not currently supported when setting brand`
-        );
+        log$4.warn(`forceUpdate is not currently supported when setting brand`);
       }
-      nozzle == null ? void 0 : nozzle.setSelectedBrand(brand, context);
-      onBrandSelected == null ? void 0 : onBrandSelected(brand);
+      nozzle?.setSelectedBrand(brand, context);
+      onBrandSelected?.(brand);
     },
     [nozzle, onBrandSelected]
   );
   const clearBrand = React.useCallback(() => {
     setSelectedBrand(null);
-    nozzle == null ? void 0 : nozzle.setSelectedBrand(void 0);
-    onBrandCleared == null ? void 0 : onBrandCleared();
+    nozzle?.setSelectedBrand(void 0);
+    onBrandCleared?.();
   }, [nozzle, onBrandCleared]);
   React.useEffect(() => {
     const disposer = kosUiSdk.kosAutoEffect(() => {
-      if (!nozzle)
-        return;
+      if (!nozzle) return;
       setBrands(nozzle.visibleBrands);
     });
     return () => {
@@ -203,336 +192,232 @@ const useBrands = ({
     clearBrand
   };
 };
-class PourContext {
-  constructor() {
-    __publicField(this, "_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 logger$7 = kosUiSdk.KosLog.createLogger({
-  name: "HoldToPourStrategy",
-  group: "kos-hooks"
+  group: kosUiSdk.LogGroup.ui,
+  name: "HoldToPourIntentStrategy"
+});
+const HoldToPourIntentStrategy = {
+  name: "HoldToPourIntentStrategy",
+  requiresHold: true,
+  async initiate(model, intent) {
+    if (!model?.canPour) {
+      logger$7.debug(`${model?.id} cannot pour.  Returning early.`);
+      return;
+    }
+    if (intent) {
+      logger$7.debug(`performing intent: ${intent}`);
+      await model?.performIntent(intent);
+    } else {
+      logger$7.debug("no intent provided.  Returning early.");
+    }
+  },
+  async initiateEnded(nozzle) {
+    await nozzle?.cancelPour();
+  }
+};
+const logger$6 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "HoldToPourStrategy"
 });
 const HoldToPourStrategy = {
   name: "HoldToPourStrategy",
+  requiresHold: true,
   async initiate(nozzle) {
-    if (!(nozzle == null ? void 0 : nozzle.canPour)) {
-      logger$7.debug(`Nozzle ${nozzle == null ? void 0 : nozzle.id} cannot pour.  Returning early.`);
+    if (!nozzle?.canPour) {
+      logger$6.debug(`Nozzle ${nozzle?.id} cannot pour.  Returning early.`);
       return;
     }
-    await (nozzle == null ? void 0 : nozzle.pour());
+    await nozzle?.pour();
   },
   async initiateEnded(nozzle) {
-    await (nozzle == null ? void 0 : nozzle.cancelPour());
+    await nozzle?.cancelPour();
   }
 };
-const logger$6 = kosUiSdk.KosLog.createLogger({
-  name: "useNozzlePour",
-  group: "kos-hooks"
+const logger$5 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "TapOrHoldIntentStrategy"
 });
-const useNozzlePour = ({
-  onPour,
-  onPourCancel,
-  onBeforePour,
-  onBeforePourRejected,
-  pourContext,
-  strategy = HoldToPourStrategy
-}) => {
-  const { model: nozzle } = useNozzleContext();
-  const [context, _setContext] = React.useState(
-    pourContext || new PourContext()
-  );
-  const handlePour = React.useCallback(async () => {
-    const canPour = onBeforePour ? await (onBeforePour == null ? void 0 : onBeforePour(context)) : true;
-    if (canPour) {
-      logger$6.debug(
-        `[${strategy == null ? void 0 : strategy.name}] - Pour initiated for nozzle ${nozzle == null ? void 0 : nozzle.id}.`
-      );
-      strategy == null ? void 0 : strategy.initiate(nozzle);
-      onPour == null ? void 0 : onPour();
+class TapOrHoldIntentStrategy {
+  intent;
+  name = "TapOrHoldIntentStrategy";
+  isHold = false;
+  disposer = null;
+  constructor(intent) {
+    this.intent = intent;
+  }
+  async initiate(model, intent = this.intent) {
+    this.isHold = false;
+    this.disposer = setTimeout(() => {
+      this.isHold = true;
+    }, 250);
+    if (model?.isPouring && !this.isHold) {
+      logger$5.debug(`additional tap detected.  cancelling pour`);
+      await model.cancelPour();
+      return;
+    }
+    if (!model?.canPour) {
+      logger$5.debug(`${model?.id} cannot pour.  Returning early.`);
+      return;
+    }
+    if (intent) {
+      logger$5.debug(`performing intent: ${intent}`);
+      await model?.performIntent(intent);
     } else {
-      logger$6.debug(
-        `[${strategy == null ? void 0 : strategy.name}] - Did not pass onBeforePour gate for nozzle ${nozzle == null ? void 0 : nozzle.id}.  Cancelling pour.`
-      );
-      onBeforePourRejected == null ? void 0 : onBeforePourRejected();
+      logger$5.debug("no intent provided.  Returning early.");
     }
-  }, [
-    onPour,
-    nozzle,
-    strategy,
-    onBeforePour,
-    onPourCancel,
-    context,
-    onBeforePourRejected
-  ]);
-  const handleCancelPour = React.useCallback(() => {
-    var _a;
-    logger$6.debug(
-      `[${strategy == null ? void 0 : strategy.name}] - Pour initiate ended called for nozzle ${nozzle == null ? void 0 : nozzle.id}.`
-    );
-    (_a = strategy == null ? void 0 : strategy.initiateEnded) == null ? void 0 : _a.call(strategy, nozzle);
-    onPourCancel == null ? void 0 : onPourCancel();
-  }, [onPourCancel, nozzle, strategy]);
-  const forceCancelPour = React.useCallback(() => {
-    logger$6.debug(`Force cancelling pour for nozzle ${nozzle == null ? void 0 : nozzle.id}.`);
-    nozzle == null ? void 0 : nozzle.cancelPour();
-    onPourCancel == null ? void 0 : onPourCancel();
-  }, [onPourCancel, nozzle]);
-  const handleUpdateContext = React.useCallback(
-    (key, value) => {
-      context.set(key, value);
-    },
-    [context]
-  );
-  const handleRemoveFromContext = React.useCallback(
-    (key) => {
-      context.remove(key);
-    },
-    [context]
-  );
-  const handlers = kosUiSdk.usePressGesture({
-    onPressed: handlePour,
-    onRelease: handleCancelPour
-  });
-  return {
-    handlers: handlers.dom,
-    cancel: forceCancelPour,
-    updatePourContext: handleUpdateContext,
-    removeFromPourContext: handleRemoveFromContext,
-    status: nozzle
-  };
+  }
+  async initiateEnded(nozzle) {
+    if (this.disposer) clearTimeout(this.disposer);
+    this.disposer = null;
+    if (!this.isHold) {
+      logger$5.debug("Tap detected.  don't cancel and return.");
+      return true;
+    }
+    await nozzle?.cancelPour();
+    return false;
+  }
+}
+const logger$4 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "TapToPourIntentStrategy"
+});
+const TapToPourIntentStrategy = {
+  name: "TapToPourIntentStrategy",
+  async initiate(model, intent) {
+    if (model?.isPouring) {
+      logger$4.debug(`Nozzle ${model?.id} is already pouring.  cancelling pour`);
+      await model.cancelPour();
+      return;
+    }
+    if (!model?.canPour) {
+      logger$4.debug(`Nozzle ${model?.id} cannot pour.  Returning early.`);
+      return;
+    }
+    if (intent) {
+      logger$4.debug(`performing intent: ${intent}`);
+      await model?.performIntent(intent);
+    } else {
+      logger$4.debug("no intent provided.  Returning early.");
+    }
+  },
+  async initiateEnded(_nozzle) {
+    return true;
+  }
 };
-const useFlavors = ({
-  onFlavorSelected,
-  onFlavorCleared,
-  companionType
-}) => {
-  const { model: nozzle } = useNozzleContext();
-  const flavors = React.useMemo(
-    () => (nozzle == null ? void 0 : nozzle.getGroupAvailabilityItems("flavors").filter((f) => f.visible)) ?? [],
-    [nozzle]
-  );
-  const companions = React.useMemo(() => {
-    if (!companionType)
-      return [];
-    return flavors.map(
-      (flavor) => kosUiSdk.getKosCompanionModel(flavor, companionType)
-    );
-  }, [flavors, companionType]);
-  const [selectedFlavors, setSelectedFlavors] = React.useState([]);
-  const selectFlavor = React.useCallback(
-    async (flavor, context, forceUpdate) => {
-      setSelectedFlavors(
-        (previous) => (previous == null ? void 0 : previous.includes(flavor)) ? [...previous.filter((p) => p !== flavor)] : [...previous ?? [], flavor]
-      );
-      if (nozzle == null ? void 0 : nozzle.selectedPourable) {
-        const { beverage } = nozzle.selectedPourable;
-        await nozzle.setSelectedPourable(
-          {
-            beverage,
-            additional: selectedFlavors ?? [],
-            context
-          },
-          forceUpdate
-        );
-      }
-      onFlavorSelected == null ? void 0 : onFlavorSelected(flavor, selectedFlavors ?? []);
-    },
-    [nozzle, onFlavorSelected, selectedFlavors]
-  );
-  const clear = React.useCallback(async () => {
-    setSelectedFlavors([]);
-    if (nozzle == null ? void 0 : nozzle.selectedPourable) {
-      const { beverage } = nozzle.selectedPourable;
-      nozzle.setSelectedPourable({ beverage });
-      onFlavorCleared == null ? void 0 : onFlavorCleared();
+const logger$3 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "HoldToPourStrategy"
+});
+const TapToPourStrategy = {
+  name: "TapToPourStrategy",
+  async initiate(nozzle) {
+    if (nozzle?.isPouring) {
+      logger$3.debug(`Nozzle ${nozzle?.id} is already pouring.  cancelling pour`);
+      await nozzle.cancelPour();
+      return;
     }
-  }, [nozzle, onFlavorCleared]);
-  return {
-    flavors,
-    flavorCompanions: companions,
-    selectFlavor,
-    selectedFlavors,
-    clearFlavors: clear
-  };
+    if (!nozzle?.canPour) {
+      logger$3.debug(`Nozzle ${nozzle?.id} cannot pour.  Returning early.`);
+      return;
+    }
+    await nozzle?.pour();
+  },
+  async initiateEnded(_nozzle) {
+    return true;
+  }
 };
 const DISPENSE_GROUP_BRAND = "brands";
 const DISPENSE_GROUP_BEVERAGE = "beverages";
 const DISPENSE_GROUP_FLAVOR = "flavors";
-const log$2 = kosUiSdk.KosLog.createLogger({ name: "use-cui-kit" });
+const log$3 = kosUiSdk.KosLog.createLogger({ group: kosUiSdk.LogGroup.ui, name: "use-cui-kit" });
 const useCuiKit = ({
-  initialGroup = DISPENSE_GROUP_BRAND,
+  initialGroup,
+  steps,
   options = {}
 }) => {
-  var _a, _b, _c;
-  const [currentGroup, setCurrentGroup] = React.useState(initialGroup);
   const { model: nozzle } = useNozzleContext();
   const timersRef = React.useRef([]);
-  const updatePourContext = React.useRef();
-  const removeFromPourContext = React.useRef();
-  const onBrandSelected = React.useCallback(
-    (model) => {
-      setCurrentGroup(DISPENSE_GROUP_BEVERAGE);
-      const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/brand/selected/`;
-      kosUiSdk.EventBus.publish(topic, model);
-    },
-    [nozzle == null ? void 0 : nozzle.path]
-  );
-  const onBrandCleared = React.useCallback(() => {
-    const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/brand/cleared/`;
-    kosUiSdk.EventBus.publish(topic, {});
-  }, [nozzle == null ? void 0 : nozzle.path]);
-  const onBeverageListUpdated = React.useCallback(
-    (beverages2) => {
-      const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/beverage/list/updated/`;
-      kosUiSdk.EventBus.publish(topic, beverages2);
-    },
-    [nozzle == null ? void 0 : nozzle.path]
-  );
-  const onBeverageSelected = React.useCallback(
-    (model) => {
-      var _a2;
-      setCurrentGroup(DISPENSE_GROUP_FLAVOR);
-      (_a2 = updatePourContext.current) == null ? void 0 : _a2.call(updatePourContext, "selectedBeverage", model);
-      const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/beverage/selected/`;
-      kosUiSdk.EventBus.publish(topic, model);
-    },
-    [nozzle == null ? void 0 : nozzle.path]
-  );
-  const onBeverageCleared = React.useCallback(() => {
-    var _a2;
-    const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/beverage/cleared/`;
-    (_a2 = removeFromPourContext.current) == null ? void 0 : _a2.call(removeFromPourContext, "selectedBeverage");
-    kosUiSdk.EventBus.publish(topic, {});
-  }, [nozzle == null ? void 0 : nozzle.path]);
-  const onFlavorSelected = React.useCallback(
-    (model) => {
-      const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/flavor/selected/`;
-      kosUiSdk.EventBus.publish(topic, model);
-    },
-    [nozzle == null ? void 0 : nozzle.path]
-  );
-  const onFlavorCleared = React.useCallback(() => {
-    const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/flavor/cleared/`;
-    kosUiSdk.EventBus.publish(topic, {});
-  }, [nozzle == null ? void 0 : nozzle.path]);
-  const onPour = React.useCallback(() => {
-    const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/pour/`;
-    kosUiSdk.EventBus.publish(topic, {});
-  }, [nozzle == null ? void 0 : nozzle.path]);
-  const handleBeforePour = React.useCallback(
-    async (context) => {
-      const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/pre/pour/`;
-      kosUiSdk.EventBus.publish(topic, {});
-      return await (onBeforePour == null ? void 0 : onBeforePour(context)) || true;
+  const kit = React.useMemo(() => {
+    if (!nozzle) return void 0;
+    try {
+      return dispenseRegistrationManager.CuiKitState.instance(dispenseRegistrationManager.cuiKitId(nozzle.path)).options({
+        nozzlePath: nozzle.path,
+        initialGroup: steps ? initialGroup : initialGroup ?? DISPENSE_GROUP_BRAND,
+        steps,
+        companionTypes: options.companionTypes,
+        pour: { strategy: options.pour?.strategy ?? HoldToPourStrategy },
+        onPourComplete: options.onPourComplete
+      }).build();
+    } catch (error) {
+      throw new Error(
+        `The CUI Kit models are not registered: call KosModelRegistry.cuiKit.models() in the app's registration chain (${error.message})`
+      );
+    }
+  }, [nozzle]);
+  const [ready, setReady] = React.useState(false);
+  const [, setVersion] = React.useState(0);
+  React.useEffect(() => {
+    if (!kit) return void 0;
+    let dispose;
+    let cancelled = false;
+    let attached = false;
+    kosUiSdk.whenReady(kit).then(() => {
+      if (cancelled) return;
+      attached = true;
+      if (kit.attach()) {
+        kit.reset();
+      }
+      setReady(true);
+      dispose = kosUiSdk.kosAutoEffect(() => {
+        readKitState(kit);
+        setVersion((version) => version + 1);
+      });
+    });
+    return () => {
+      cancelled = true;
+      dispose?.();
+      if (attached) kit.detach();
+    };
+  }, [kit]);
+  const updateOnBeforePour = React.useCallback(
+    (callback) => {
+      kit?.setBeforePour(callback);
     },
-    [nozzle == null ? void 0 : nozzle.path]
+    [kit]
   );
-  const handleBeforePourRejected = React.useCallback(async () => {
-    const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/pre/pour/rejected/`;
-    kosUiSdk.EventBus.publish(topic, {});
-  }, [nozzle == null ? void 0 : nozzle.path]);
-  const onPourCancel = React.useCallback(() => {
-    const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/pour/cancel/`;
-    kosUiSdk.EventBus.publish(topic, {});
-  }, [nozzle == null ? void 0 : nozzle.path]);
-  const { brands, selectBrand, selectedBrand, clearBrand, brandCompanions } = useBrands({
-    companionType: (_a = options.companionTypes) == null ? void 0 : _a.brand,
-    onBrandSelected,
-    onBrandCleared
-  });
-  const {
-    beverages,
-    selectBeverage,
-    selectedBeverage,
-    clearBeverage,
-    beverageCompanions
-  } = useBeverages({
-    companionType: (_b = options.companionTypes) == null ? void 0 : _b.beverage,
-    onBeverageSelected,
-    onClearBeverage: onBeverageCleared,
-    onBeverageListUpdated
+  const gesture = kosUiSdk.usePressGesture({
+    onPressed: () => void kit?.pressPour(),
+    onRelease: () => kit?.releasePour()
   });
-  const {
-    clearFlavors,
-    flavors,
-    selectFlavor,
-    selectedFlavors,
-    flavorCompanions
-  } = useFlavors({
-    companionType: (_c = options.companionTypes) == null ? void 0 : _c.flavor,
-    onFlavorSelected,
-    onFlavorCleared
-  });
-  const [onBeforePour, setOnBeforePour] = React.useState();
-  const updateOnBeforePour = React.useCallback((callback) => {
-    setOnBeforePour(() => callback);
-  }, []);
-  const pour = useNozzlePour({
-    onPour,
-    onPourCancel,
-    onBeforePour: handleBeforePour,
-    onBeforePourRejected: handleBeforePourRejected
-  });
-  updatePourContext.current = pour.updatePourContext;
-  removeFromPourContext.current = pour.removeFromPourContext;
-  const back = React.useCallback(() => {
-    log$2.debug(`Navigating back from group: ${currentGroup}`);
-    switch (currentGroup) {
-      case DISPENSE_GROUP_BRAND:
-        clearBeverage();
-        clearBrand();
-        break;
-      case DISPENSE_GROUP_BEVERAGE:
-      case DISPENSE_GROUP_FLAVOR:
-        setCurrentGroup(initialGroup);
-        clearBeverage();
-        clearBrand();
-        break;
-    }
-  }, [clearBeverage, clearBrand, currentGroup, initialGroup]);
-  const home = React.useCallback(() => {
-    const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/home/`;
-    kosUiSdk.EventBus.publish(topic, {});
-    setCurrentGroup(initialGroup);
-    if (initialGroup === DISPENSE_GROUP_BRAND) {
-      clearBeverage();
-      clearBrand();
-    }
-    if (initialGroup === DISPENSE_GROUP_BEVERAGE) {
-      clearBeverage();
-    }
-  }, [clearBeverage, clearBrand, initialGroup]);
+  const pour = {
+    handlers: gesture.dom,
+    cancel: () => void kit?.cancelPour(),
+    start: async (pourOptions) => await kit?.startPour(pourOptions) ?? false,
+    press: async (pourOptions) => await kit?.pressPour(pourOptions) ?? false,
+    release: (pourOptions) => kit?.releasePour(pourOptions),
+    updatePourContext: (key, value) => kit?.pourContext.set(key, value),
+    removeFromPourContext: (key) => kit?.pourContext.remove(key),
+    status: nozzle
+  };
   const pauseTimers = React.useCallback(() => {
     if (timersRef.current.length === 0) {
-      log$2.debug("No timers to pause.");
+      log$3.debug("No timers to pause.");
       return;
     }
-    log$2.debug(`Pausing ${timersRef.current.length} timers.`);
+    log$3.debug(`Pausing ${timersRef.current.length} timers.`);
     timersRef.current.forEach((timer) => {
-      log$2.debug(`Pausing timer with id ${timer.id}.`);
+      log$3.debug(`Pausing timer with id ${timer.id}.`);
       timer.pause();
     });
   }, []);
   const restartTimers = React.useCallback(() => {
     if (timersRef.current.length === 0) {
-      log$2.debug("No timers to restart.");
+      log$3.debug("No timers to restart.");
       return;
     }
-    log$2.debug(`Restarting ${timersRef.current.length} timers.`);
+    log$3.debug(`Restarting ${timersRef.current.length} timers.`);
     timersRef.current.forEach((timer) => {
-      log$2.debug(`Restarting timer with id ${timer.id}.`);
+      log$3.debug(`Restarting timer with id ${timer.id}.`);
       timer.restart();
     });
   }, []);
@@ -541,11 +426,12 @@ const useCuiKit = ({
       return;
     }
     if (timersRef.current.some((t) => t.id === timer.id)) {
-      log$2.debug(`Timer with id ${timer.id} already exists.`);
+      log$3.debug(`Timer with id ${timer.id} already exists.`);
       return;
     }
     timersRef.current.push(timer);
   }, []);
+  const active = ready ? kit : void 0;
   return {
     timers: {
       add: addTimer,
@@ -553,43 +439,70 @@ const useCuiKit = ({
       restart: restartTimers
     },
     nav: {
-      currentGroup,
-      back,
-      home
+      currentGroup: active?.currentGroup ?? (steps ? steps.brands ? DISPENSE_GROUP_BRAND : DISPENSE_GROUP_BEVERAGE : initialGroup ?? DISPENSE_GROUP_BRAND),
+      back: () => active?.back(),
+      home: () => active?.home(),
+      steps: active?.enabledSteps,
+      canBack: active?.canBack ?? false,
+      toPour: (pourOptions) => active?.toPour(pourOptions)
     },
     pour,
     updateOnBeforePour,
     selections: {
-      [DISPENSE_GROUP_BRAND]: selectedBrand,
-      [DISPENSE_GROUP_BEVERAGE]: selectedBeverage,
-      [DISPENSE_GROUP_FLAVOR]: selectedFlavors
+      [DISPENSE_GROUP_BRAND]: active?.selectedBrand ?? null,
+      [DISPENSE_GROUP_BEVERAGE]: active?.selectedBeverage ?? null,
+      [DISPENSE_GROUP_FLAVOR]: active?.selectedFlavors ?? []
     },
     [DISPENSE_GROUP_BRAND]: {
-      models: brands,
-      companions: brandCompanions,
-      clear: clearBrand,
+      models: active?.brands ?? [],
+      companions: active?.brandCompanions ?? [],
+      clear: () => active?.clearBrand(),
       handlers: {
-        onSelected: selectBrand
+        onSelected: async (model, context, forceUpdate) => {
+          if (forceUpdate) {
+            log$3.warn(
+              `forceUpdate is not currently supported when setting brand`
+            );
+          }
+          active?.selectBrand(model, context);
+        }
       }
     },
     [DISPENSE_GROUP_BEVERAGE]: {
-      models: beverages,
-      companions: beverageCompanions,
-      clear: clearBeverage,
+      models: active?.beverages ?? [],
+      companions: active?.beverageCompanions ?? [],
+      clear: () => void active?.clearBeverage(),
       handlers: {
-        onSelected: selectBeverage
+        onSelected: async (model, context, forceUpdate) => active?.selectBeverage(model, context, forceUpdate)
       }
     },
     [DISPENSE_GROUP_FLAVOR]: {
-      models: flavors,
-      companions: flavorCompanions,
-      clear: clearFlavors,
+      models: active?.flavors ?? [],
+      companions: active?.flavorCompanions ?? [],
+      clear: () => void active?.clearFlavors(),
       handlers: {
-        onSelected: selectFlavor
+        onSelected: async (model, context, forceUpdate) => active?.selectFlavor(model, context, forceUpdate)
       }
     }
   };
 };
+const readKitState = (kit) => [
+  kit.currentGroup,
+  kit.canBack,
+  kit.selectedBrand,
+  kit.selectedBeverage,
+  ...kit.selectedFlavors,
+  ...kit.brands,
+  ...kit.beverages,
+  ...kit.flavors,
+  ...kit.brandCompanions,
+  ...kit.beverageCompanions,
+  ...kit.flavorCompanions
+];
+const log$2 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "use-ambient-attract-timers"
+});
 const useAmbientAttractTimers = (props) => {
   const { model: nozzle } = useNozzleContext();
   const [attractTimer, setAttractTimer] = React.useState(null);
@@ -603,66 +516,66 @@ const useAmbientAttractTimers = (props) => {
   } = props;
   const handleAmbientTimer = React.useCallback(() => {
     if (onAmbientTimer) {
-      kosUiSdk.KosLog.info("Ambient timer expired.  Calling callback");
-      onAmbientTimer == null ? void 0 : onAmbientTimer();
+      log$2.info("Ambient timer expired.  Calling callback");
+      onAmbientTimer?.();
     }
   }, [onAmbientTimer]);
   const handleAttractTimer = React.useCallback(() => {
     if (onAttractTimer) {
-      kosUiSdk.KosLog.info("Attract timer expired.  Calling callback");
-      onAttractTimer == null ? void 0 : onAttractTimer();
+      log$2.info("Attract timer expired.  Calling callback");
+      onAttractTimer?.();
     }
   }, [onAttractTimer]);
   const handleResetAttractTimer = React.useCallback(() => {
     if (attractTimer) {
       attractTimer.restart();
-      onResetAttractTimer == null ? void 0 : onResetAttractTimer();
+      onResetAttractTimer?.();
     }
   }, [attractTimer, onResetAttractTimer]);
   const handlePauseAttractTimer = React.useCallback(() => {
     if (attractTimer) {
       attractTimer.reset();
-      onResetAttractTimer == null ? void 0 : onResetAttractTimer();
+      onResetAttractTimer?.();
     }
   }, [attractTimer, onResetAttractTimer]);
   const handleResume = React.useCallback(() => {
     if (attractTimer) {
       attractTimer.pause();
-      onResumeAttractTimer == null ? void 0 : onResumeAttractTimer();
+      onResumeAttractTimer?.();
     }
   }, [attractTimer, onResumeAttractTimer]);
   React.useEffect(() => {
     if (nozzle && defaultAttractTime) {
-      kosUiSdk.KosLog.info("Nozzle is available.  Creating timers");
+      log$2.info("Nozzle is available.  Creating timers");
       const timer = kosUiSdk.TimerManager.createTimer(
         "attract-timer-" + nozzle.path,
         defaultAttractTime
       );
       if (defaultAttractTime) {
-        timer == null ? void 0 : timer.addTimeoutAction({
+        timer?.addTimeoutAction({
           name: "attract-timer",
           remainingTime: 0,
           action: handleAttractTimer
         });
       }
       if (defaultAmbientTime) {
-        timer == null ? void 0 : timer.addTimeoutAction({
+        timer?.addTimeoutAction({
           name: "ambient-timer",
           remainingTime: defaultAmbientTime,
           action: handleAmbientTimer
         });
       }
       if (defaultAttractTime) {
-        timer == null ? void 0 : timer.start();
+        timer?.start();
       }
       setAttractTimer(timer ?? null);
       return () => {
-        timer == null ? void 0 : timer.reset();
+        timer?.reset();
         setAttractTimer(null);
       };
     }
     return () => {
-      kosUiSdk.KosLog.info("Nozzle is not available.  No timers to clear");
+      log$2.info("Nozzle is not available.  No timers to clear");
     };
   }, [
     defaultAmbientTime,
@@ -743,7 +656,7 @@ const useDispenseLifecycle = ({
 }) => {
   const { model: nozzle } = useNozzleContext();
   React.useEffect(() => {
-    const topics = buildDispenseTopics(nozzle == null ? void 0 : nozzle.path, {
+    const topics = buildDispenseTopics(nozzle?.path, {
       onBrandSelected,
       onBrandCleared,
       onBeverageListUpdated,
@@ -766,10 +679,10 @@ const useDispenseLifecycle = ({
       ({ topic, callback }) => subscribe(topic, callback)
     );
     return () => {
-      disposers.forEach((disposer) => disposer == null ? void 0 : disposer());
+      disposers.forEach((disposer) => disposer?.());
     };
   }, [
-    nozzle == null ? void 0 : nozzle.path,
+    nozzle?.path,
     onAmbientTimer,
     onAttractTimer,
     onBeverageCleared,
@@ -789,7 +702,10 @@ const useDispenseLifecycle = ({
     onReturnToHome
   ]);
 };
-const log$1 = kosUiSdk.KosLog.createLogger({ name: "useCuiKitTimers" });
+const log$1 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "useCuiKitTimers"
+});
 const useCuiKitTimers = (props) => {
   const { model: nozzle } = useNozzleContext();
   const [idleTimer, setIdleTimer] = React.useState(null);
@@ -803,9 +719,9 @@ const useCuiKitTimers = (props) => {
   const hasAreYouThereFiredRef = React.useRef(false);
   const handleAreYouThereTimer = React.useCallback(() => {
     if (!hasAreYouThereFiredRef.current && onAreYouThereTimer) {
-      kosUiSdk.KosLog.info("Are you there timer expired.  Calling callback");
+      log$1.info("Are you there timer expired.  Calling callback");
       hasAreYouThereFiredRef.current = true;
-      onAreYouThereTimer == null ? void 0 : onAreYouThereTimer();
+      onAreYouThereTimer?.();
     }
   }, [onAreYouThereTimer]);
   const handleIdleTimer = React.useCallback(() => {
@@ -815,7 +731,7 @@ const useCuiKitTimers = (props) => {
     );
     if (onIdleTimer) {
       log$1.debug("Idle timer expired.  Calling callback");
-      onIdleTimer == null ? void 0 : onIdleTimer();
+      onIdleTimer?.();
     } else {
       log$1.debug("No onIdleTimer callback provided!");
     }
@@ -825,7 +741,7 @@ const useCuiKitTimers = (props) => {
     if (idleTimer) {
       idleTimer.restart();
       hasAreYouThereFiredRef.current = false;
-      onResetIdleTimer == null ? void 0 : onResetIdleTimer();
+      onResetIdleTimer?.();
     }
   }, [idleTimer, onResetIdleTimer, props.prefix]);
   const handlePauseIdleTimer = React.useCallback(() => {
@@ -833,12 +749,12 @@ const useCuiKitTimers = (props) => {
     if (idleTimer) {
       idleTimer.reset();
       hasAreYouThereFiredRef.current = false;
-      onResetIdleTimer == null ? void 0 : onResetIdleTimer();
+      onResetIdleTimer?.();
     }
   }, [idleTimer, onResetIdleTimer, props.prefix]);
   React.useEffect(() => {
     log$1.debug(
-      `useCuiKitTimers effect triggered - nozzle: ${!!nozzle}, path: ${nozzle == null ? void 0 : nozzle.path}, callbacks: handleIdle=${!!handleIdleTimer}, handleAreYouThere=${!!handleAreYouThereTimer}`
+      `useCuiKitTimers effect triggered - nozzle: ${!!nozzle}, path: ${nozzle?.path}, callbacks: handleIdle=${!!handleIdleTimer}, handleAreYouThere=${!!handleAreYouThereTimer}`
     );
     if (nozzle) {
       log$1.info("Nozzle is available.  Creating timers");
@@ -850,19 +766,19 @@ const useCuiKitTimers = (props) => {
         `Adding idle timer action for ${props.prefix ?? ""}idle-timer-${nozzle.path} with callback:`,
         !!handleIdleTimer
       );
-      timer == null ? void 0 : timer.addTimeoutAction({
+      timer?.addTimeoutAction({
         name: "idle-timer",
         remainingTime: 0,
         action: handleIdleTimer
       });
-      timer == null ? void 0 : timer.addTimeoutAction({
+      timer?.addTimeoutAction({
         name: "are-you-there-timer",
         remainingTime: defaultAreYouThereTime,
         action: handleAreYouThereTimer
       });
       setIdleTimer(timer ?? null);
       return () => {
-        timer == null ? void 0 : timer.reset();
+        timer?.reset();
         setIdleTimer(null);
       };
     }
@@ -883,7 +799,10 @@ const useCuiKitTimers = (props) => {
     pause: handlePauseIdleTimer
   };
 };
-const log = kosUiSdk.KosLog.createLogger({ name: "useDefaultCuiKitLifecycle" });
+const log = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "useDefaultCuiKitLifecycle"
+});
 const useDefaultCuiKitLifecycle = ({
   kit,
   inactivity,
@@ -892,26 +811,25 @@ const useDefaultCuiKitLifecycle = ({
   onBeforeAreYouThereTimer,
   areYouThereRejectionPolicy = "pause"
 }) => {
-  var _a, _b, _c, _d;
   const [showAmbientScreen, setShowAmbientScreen] = React.useState(false);
   const [showAttractScreen, setShowAttractScreen] = React.useState(false);
   const { model: nozzle } = useNozzleContext();
   const [hasPoured, setHasPoured] = React.useState(false);
-  const idleTimeout = (inactivity == null ? void 0 : inactivity.idleTimeout) ?? 15;
-  const areYouThereTimeout = (inactivity == null ? void 0 : inactivity.areYouThereTimeoutOffset) ?? 10;
-  const idlePourTimeout = (pour == null ? void 0 : pour.idleTimeout) ?? (inactivity == null ? void 0 : inactivity.idleTimeout) ?? 10;
-  const areYouTherePourTimeout = (pour == null ? void 0 : pour.areYouThereTimeoutOffset) ?? (inactivity == null ? void 0 : inactivity.areYouThereTimeoutOffset) ?? 5;
-  const ambientTimeout = screens == null ? void 0 : screens.ambientTimeoutOffset;
-  const attractTimeout = screens == null ? void 0 : screens.attractTimeout;
+  const idleTimeout = inactivity?.idleTimeout ?? 15;
+  const areYouThereTimeout = inactivity?.areYouThereTimeoutOffset ?? 10;
+  const idlePourTimeout = pour?.idleTimeout ?? inactivity?.idleTimeout ?? 10;
+  const areYouTherePourTimeout = pour?.areYouThereTimeoutOffset ?? inactivity?.areYouThereTimeoutOffset ?? 5;
+  const ambientTimeout = screens?.ambientTimeoutOffset;
+  const attractTimeout = screens?.attractTimeout;
   const handleIdleTimeout = React.useCallback(() => {
     log.info("handleIdleTimeout called - navigating home and publishing event");
     setShowAreYouThere(false);
-    kit == null ? void 0 : kit.nav.home();
+    kit?.nav.home();
     if (nozzle) {
       const topic = `/kos/dispense/${nozzle.path}/idle/timeout/`;
       kosUiSdk.EventBus.publish(topic, {});
     }
-  }, [(_a = kit == null ? void 0 : kit.nav) == null ? void 0 : _a.home, nozzle]);
+  }, [kit?.nav?.home, nozzle]);
   const handleResetIdleTimer = React.useCallback(() => {
     log.info("handleResetIdleTimer called - resetting idle timer");
     setShowAreYouThere(false);
@@ -940,13 +858,13 @@ const useDefaultCuiKitLifecycle = ({
     if (attractTimeout) {
       setShowAttractScreen(false);
       setShowAmbientScreen(false);
-      kit == null ? void 0 : kit.nav.home();
+      kit?.nav.home();
       if (nozzle) {
         const topic = `/kos/dispense/${nozzle.path}/attract/resume/`;
         kosUiSdk.EventBus.publish(topic, {});
       }
     }
-  }, [kit == null ? void 0 : kit.nav, attractTimeout, nozzle]);
+  }, [kit?.nav, attractTimeout, nozzle]);
   const {
     pause: ambientPause,
     restart: ambientRestart,
@@ -958,7 +876,7 @@ const useDefaultCuiKitLifecycle = ({
     onAttractTimer: handleAttractTimer,
     onResumeAttractTimer: handleAttractResume
   });
-  (_b = kit == null ? void 0 : kit.timers) == null ? void 0 : _b.add(attractTimer);
+  kit?.timers?.add(attractTimer);
   const [showAreYouThere, setShowAreYouThere] = React.useState(false);
   log.info(
     "Creating idle timer with timeout:",
@@ -1054,8 +972,8 @@ const useDefaultCuiKitLifecycle = ({
       });
     }
   }, [pourIdleTimer, areYouTherePourTimeout, handleAreYouThereTimer]);
-  (_c = kit == null ? void 0 : kit.timers) == null ? void 0 : _c.add(idleTimer);
-  (_d = kit == null ? void 0 : kit.timers) == null ? void 0 : _d.add(pourIdleTimer);
+  kit?.timers?.add(idleTimer);
+  kit?.timers?.add(pourIdleTimer);
   const handlePour = React.useCallback(() => {
     setHasPoured(false);
     pausePourTimer();
@@ -1118,15 +1036,13 @@ const useDefaultCuiKitLifecycle = ({
     onPourCancel: handlePourCancel,
     onBeforePourRejected: handleBeforePourRejected,
     onInit: handleInit
-    // Note: Timer-related handlers (onIdleTimeout, onAmbientTimer, onAttractTimer,
-    // onResumeAttractTimer, onAreYouThereTimeout) are NOT included here since this
-    // component's own timer hooks call those handlers directly. Including them would
-    // create circular event loops.
+    // The timer handlers are left out because this hook's own timers call them directly;
+    // subscribing to their events as well would create an event loop.
   });
   const areYouThereCountdown = hasPoured ? areYouTherePourTimeout : areYouThereTimeout;
   React.useEffect(() => {
     if (nozzle && attractTimer) {
-      const topic = `/kos/dispense/${nozzle == null ? void 0 : nozzle.path}/init/`;
+      const topic = `/kos/dispense/${nozzle?.path}/init/`;
       kosUiSdk.EventBus.publish(topic, {});
     }
   }, [nozzle, attractTimer]);
@@ -1142,6 +1058,59 @@ const useDefaultCuiKitLifecycle = ({
     restartScreenTimer: ambientRestart
   };
 };
+const useFlavors = ({
+  onFlavorSelected,
+  onFlavorCleared,
+  companionType
+}) => {
+  const { model: nozzle } = useNozzleContext();
+  const flavors = React.useMemo(
+    () => nozzle?.getGroupAvailabilityItems("flavors").filter((f) => f.visible) ?? [],
+    [nozzle]
+  );
+  const companions = React.useMemo(() => {
+    if (!companionType) return [];
+    return flavors.map(
+      (flavor) => kosUiSdk.getKosCompanionModel(flavor, companionType)
+    );
+  }, [flavors, companionType]);
+  const [selectedFlavors, setSelectedFlavors] = React.useState([]);
+  const selectFlavor = React.useCallback(
+    async (flavor, context, forceUpdate) => {
+      setSelectedFlavors(
+        (previous) => previous?.includes(flavor) ? [...previous.filter((p) => p !== flavor)] : [...previous ?? [], flavor]
+      );
+      if (nozzle?.selectedPourable) {
+        const { beverage } = nozzle.selectedPourable;
+        await nozzle.setSelectedPourable(
+          {
+            beverage,
+            additional: selectedFlavors ?? [],
+            context
+          },
+          forceUpdate
+        );
+      }
+      onFlavorSelected?.(flavor, selectedFlavors ?? []);
+    },
+    [nozzle, onFlavorSelected, selectedFlavors]
+  );
+  const clear = React.useCallback(async () => {
+    setSelectedFlavors([]);
+    if (nozzle?.selectedPourable) {
+      const { beverage } = nozzle.selectedPourable;
+      nozzle.setSelectedPourable({ beverage });
+      onFlavorCleared?.();
+    }
+  }, [nozzle, onFlavorCleared]);
+  return {
+    flavors,
+    flavorCompanions: companions,
+    selectFlavor,
+    selectedFlavors,
+    clearFlavors: clear
+  };
+};
 const useDeviceAssembly = () => {
   const modelId = dispenseRegistrationManager.DeviceAssembly.type;
   const result = kosUiSdk.useKosModel({
@@ -1196,31 +1165,9 @@ const useIngredient = () => {
   });
   return result;
 };
-const logger$5 = kosUiSdk.KosLog.createLogger({
-  name: "HoldToPourIntentStrategy",
-  group: "kos-hooks"
-});
-const HoldToPourIntentStrategy = {
-  name: "HoldToPourIntentStrategy",
-  async initiate(model, intent) {
-    if (!(model == null ? void 0 : model.canPour)) {
-      logger$5.debug(`${model == null ? void 0 : model.id} cannot pour.  Returning early.`);
-      return;
-    }
-    if (intent) {
-      logger$5.debug(`performing intent: ${intent}`);
-      await (model == null ? void 0 : model.performIntent(intent));
-    } else {
-      logger$5.debug("no intent provided.  Returning early.");
-    }
-  },
-  async initiateEnded(nozzle) {
-    await (nozzle == null ? void 0 : nozzle.cancelPour());
-  }
-};
-const logger$4 = kosUiSdk.KosLog.createLogger({
-  name: "useNozzlePour",
-  group: "kos-hooks"
+const logger$2 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "useNozzlePour"
 });
 const useIngredientPour = ({
   onPour,
@@ -1229,24 +1176,23 @@ const useIngredientPour = ({
   strategy = HoldToPourIntentStrategy
 }) => {
   const handlePour = React.useCallback(() => {
-    logger$4.debug(
-      `[${strategy == null ? void 0 : strategy.name}] - Pour initiated for model ${intentContainer == null ? void 0 : intentContainer.id}.`
+    logger$2.debug(
+      `[${strategy?.name}] - Pour initiated for model ${intentContainer?.id}.`
     );
-    strategy == null ? void 0 : strategy.initiate(intentContainer);
-    onPour == null ? void 0 : onPour();
+    strategy?.initiate(intentContainer);
+    onPour?.();
   }, [onPour, intentContainer, strategy]);
   const handleCancelPour = React.useCallback(() => {
-    var _a;
-    logger$4.debug(
-      `[${strategy == null ? void 0 : strategy.name}] - Pour initiate ended called for nozzle ${intentContainer == null ? void 0 : intentContainer.id}.`
+    logger$2.debug(
+      `[${strategy?.name}] - Pour initiate ended called for nozzle ${intentContainer?.id}.`
     );
-    (_a = strategy == null ? void 0 : strategy.initiateEnded) == null ? void 0 : _a.call(strategy, intentContainer);
-    onPourCancel == null ? void 0 : onPourCancel();
+    strategy?.initiateEnded?.(intentContainer);
+    onPourCancel?.();
   }, [onPourCancel, intentContainer, strategy]);
   const forceCancelPour = React.useCallback(() => {
-    logger$4.debug(`Force cancelling pour for nozzle ${intentContainer == null ? void 0 : intentContainer.id}.`);
-    intentContainer == null ? void 0 : intentContainer.cancelPour();
-    onPourCancel == null ? void 0 : onPourCancel();
+    logger$2.debug(`Force cancelling pour for nozzle ${intentContainer?.id}.`);
+    intentContainer?.cancelPour();
+    onPourCancel?.();
   }, [onPourCancel, intentContainer]);
   const handlers = kosUiSdk.usePressGesture({
     onPressed: handlePour,
@@ -1285,10 +1231,82 @@ function withNozzle(path, WrappedComponent) {
     return /* @__PURE__ */ jsxRuntime.jsx(KosModelLoader, { ...status, children: /* @__PURE__ */ jsxRuntime.jsx(WrappedComponent, { ...props, nozzle: model }) });
   };
 }
-const logger$3 = kosUiSdk.KosLog.createLogger({
-  name: "usePour",
-  group: "kos-hooks"
+const logger$1 = kosUiSdk.KosLog.createLogger({
+  group: kosUiSdk.LogGroup.ui,
+  name: "useNozzlePour"
 });
+const useNozzlePour = ({
+  onPour,
+  onPourCancel,
+  onBeforePour,
+  onBeforePourRejected,
+  pourContext,
+  strategy = HoldToPourStrategy
+}) => {
+  const { model: nozzle } = useNozzleContext();
+  const [context, _setContext] = React.useState(
+    pourContext || new dispenseRegistrationManager.PourContext()
+  );
+  const handlePour = React.useCallback(async () => {
+    const canPour = onBeforePour ? await onBeforePour?.(context) : true;
+    if (canPour) {
+      logger$1.debug(
+        `[${strategy?.name}] - Pour initiated for nozzle ${nozzle?.id}.`
+      );
+      strategy?.initiate(nozzle);
+      onPour?.();
+    } else {
+      logger$1.debug(
+        `[${strategy?.name}] - Did not pass onBeforePour gate for nozzle ${nozzle?.id}.  Cancelling pour.`
+      );
+      onBeforePourRejected?.();
+    }
+  }, [
+    onPour,
+    nozzle,
+    strategy,
+    onBeforePour,
+    onPourCancel,
+    context,
+    onBeforePourRejected
+  ]);
+  const handleCancelPour = React.useCallback(() => {
+    logger$1.debug(
+      `[${strategy?.name}] - Pour initiate ended called for nozzle ${nozzle?.id}.`
+    );
+    strategy?.initiateEnded?.(nozzle);
+    onPourCancel?.();
+  }, [onPourCancel, nozzle, strategy]);
+  const forceCancelPour = React.useCallback(() => {
+    logger$1.debug(`Force cancelling pour for nozzle ${nozzle?.id}.`);
+    nozzle?.cancelPour();
+    onPourCancel?.();
+  }, [onPourCancel, nozzle]);
+  const handleUpdateContext = React.useCallback(
+    (key, value) => {
+      context.set(key, value);
+    },
+    [context]
+  );
+  const handleRemoveFromContext = React.useCallback(
+    (key) => {
+      context.remove(key);
+    },
+    [context]
+  );
+  const handlers = kosUiSdk.usePressGesture({
+    onPressed: handlePour,
+    onRelease: handleCancelPour
+  });
+  return {
+    handlers: handlers.dom,
+    cancel: forceCancelPour,
+    updatePourContext: handleUpdateContext,
+    removeFromPourContext: handleRemoveFromContext,
+    status: nozzle
+  };
+};
+const logger = kosUiSdk.KosLog.createLogger({ group: kosUiSdk.LogGroup.ui, name: "usePour" });
 const usePourTarget = ({
   onBeforePour,
   onPour,
@@ -1299,43 +1317,42 @@ const usePourTarget = ({
   strategy = HoldToPourStrategy
 }) => {
   const [context, _setContext] = React.useState(
-    pourContext || new PourContext()
+    pourContext || new dispenseRegistrationManager.PourContext()
   );
   const handlePour = React.useCallback(async () => {
-    logger$3.debug(
-      `[${strategy == null ? void 0 : strategy.name}] - calling before pour for pour target ${pourTarget == null ? void 0 : pourTarget.id}.`
+    logger.debug(
+      `[${strategy?.name}] - calling before pour for pour target ${pourTarget?.id}.`
     );
-    const canPour = onBeforePour ? await (onBeforePour == null ? void 0 : onBeforePour(context)) : true;
+    const canPour = onBeforePour ? await onBeforePour?.(context) : true;
     if (canPour) {
-      logger$3.debug(
-        `[${strategy == null ? void 0 : strategy.name}] - Pour initiated for pour target ${pourTarget == null ? void 0 : pourTarget.id}.`
+      logger.debug(
+        `[${strategy?.name}] - Pour initiated for pour target ${pourTarget?.id}.`
       );
-      await (strategy == null ? void 0 : strategy.initiate(pourTarget));
-      onPour == null ? void 0 : onPour();
-      if (!(pourTarget == null ? void 0 : pourTarget.isPouring)) {
-        onPourAbort == null ? void 0 : onPourAbort();
+      await strategy?.initiate(pourTarget);
+      onPour?.();
+      if (!pourTarget?.isPouring) {
+        onPourAbort?.();
       }
     } else {
-      logger$3.debug(
-        `[${strategy == null ? void 0 : strategy.name}] - Pour cancelled for pour target ${pourTarget == null ? void 0 : pourTarget.id}.`
+      logger.debug(
+        `[${strategy?.name}] - Pour cancelled for pour target ${pourTarget?.id}.`
       );
-      onPourCancel == null ? void 0 : onPourCancel();
+      onPourCancel?.();
     }
   }, [onPour, onBeforePour, onPourAbort, pourTarget, strategy, context]);
   const handleCancelPour = React.useCallback(async () => {
-    var _a;
-    logger$3.debug(
-      `[${strategy == null ? void 0 : strategy.name}] - Pour initiate ended called for pour target ${pourTarget == null ? void 0 : pourTarget.id}.`
+    logger.debug(
+      `[${strategy?.name}] - Pour initiate ended called for pour target ${pourTarget?.id}.`
     );
-    const ignore = await ((_a = strategy == null ? void 0 : strategy.initiateEnded) == null ? void 0 : _a.call(strategy, pourTarget));
+    const ignore = await strategy?.initiateEnded?.(pourTarget);
     if (!ignore) {
-      onPourCancel == null ? void 0 : onPourCancel();
+      onPourCancel?.();
     }
   }, [onPourCancel, pourTarget, strategy]);
   const forceCancelPour = React.useCallback(async () => {
-    logger$3.debug(`Force cancelling pour for pour target ${pourTarget == null ? void 0 : pourTarget.id}.`);
-    await (pourTarget == null ? void 0 : pourTarget.cancelPour());
-    onPourCancel == null ? void 0 : onPourCancel();
+    logger.debug(`Force cancelling pour for pour target ${pourTarget?.id}.`);
+    await pourTarget?.cancelPour();
+    onPourCancel?.();
   }, [onPourCancel, pourTarget]);
   const handleUpdateContext = React.useCallback(
     (key, value) => {
@@ -1361,99 +1378,6 @@ const usePourTarget = ({
     status: pourTarget
   };
 };
-const logger$2 = kosUiSdk.KosLog.createLogger({
-  name: "TapOrHoldIntentStrategy",
-  group: "kos-hooks"
-});
-class TapOrHoldIntentStrategy {
-  constructor(intent) {
-    __publicField(this, "intent");
-    __publicField(this, "name", "TapOrHoldIntentStrategy");
-    __publicField(this, "isHold", false);
-    __publicField(this, "disposer", null);
-    this.intent = intent;
-  }
-  async initiate(model, intent) {
-    this.disposer = setTimeout(() => {
-      this.isHold = true;
-    }, 250);
-    if ((model == null ? void 0 : model.isPouring) && !this.isHold) {
-      logger$2.debug(`additional tap detected.  cancelling pour`);
-      await model.cancelPour();
-      return;
-    }
-    if (!(model == null ? void 0 : model.canPour)) {
-      logger$2.debug(`${model == null ? void 0 : model.id} cannot pour.  Returning early.`);
-      return;
-    }
-    if (intent) {
-      logger$2.debug(`performing intent: ${intent}`);
-      await (model == null ? void 0 : model.performIntent(intent));
-    } else {
-      logger$2.debug("no intent provided.  Returning early.");
-    }
-  }
-  async initiateEnded(nozzle) {
-    if (this.disposer)
-      clearTimeout(this.disposer);
-    this.disposer = null;
-    if (!this.isHold) {
-      logger$2.debug("Tap detected.  don't cancel and return.");
-      return true;
-    }
-    await (nozzle == null ? void 0 : nozzle.cancelPour());
-    return false;
-  }
-}
-const logger$1 = kosUiSdk.KosLog.createLogger({
-  name: "TapToPourIntentStrategy",
-  group: "kos-hooks"
-});
-const TapToPourIntentStrategy = {
-  name: "TapToPourIntentStrategy",
-  async initiate(model, intent) {
-    if (model == null ? void 0 : model.isPouring) {
-      logger$1.debug(`Nozzle ${model == null ? void 0 : model.id} is already pouring.  cancelling pour`);
-      await model.cancelPour();
-      return;
-    }
-    if (!(model == null ? void 0 : model.canPour)) {
-      logger$1.debug(`Nozzle ${model == null ? void 0 : model.id} cannot pour.  Returning early.`);
-      return;
-    }
-    if (intent) {
-      logger$1.debug(`performing intent: ${intent}`);
-      await (model == null ? void 0 : model.performIntent(intent));
-    } else {
-      logger$1.debug("no intent provided.  Returning early.");
-    }
-  },
-  async initiateEnded(_nozzle) {
-    return true;
-  }
-};
-const logger = kosUiSdk.KosLog.createLogger({
-  name: "HoldToPourStrategy",
-  group: "kos-hooks"
-});
-const TapToPourStrategy = {
-  name: "TapToPourStrategy",
-  async initiate(nozzle) {
-    if (nozzle == null ? void 0 : nozzle.isPouring) {
-      logger.debug(`Nozzle ${nozzle == null ? void 0 : nozzle.id} is already pouring.  cancelling pour`);
-      await nozzle.cancelPour();
-      return;
-    }
-    if (!(nozzle == null ? void 0 : nozzle.canPour)) {
-      logger.debug(`Nozzle ${nozzle == null ? void 0 : nozzle.id} cannot pour.  Returning early.`);
-      return;
-    }
-    await (nozzle == null ? void 0 : nozzle.pour());
-  },
-  async initiateEnded(_nozzle) {
-    return true;
-  }
-};
 const useGenericPour = (id, servicePathFactory, itemId, data) => {
   const modelId = id;
   const result = kosUiSdk.useKosModel({
@@ -1591,7 +1515,19 @@ function createDispenseKitContext() {
     }
     return ctx;
   };
-  return [useCuiKitContext, CuiKitContext.Provider];
+  const useCuiPour = (options = {}) => {
+    const kit = React.useContext(CuiKitContext);
+    const gesture = kosUiSdk.usePressGesture({
+      onPressed: () => void kit?.pour.press(options),
+      onRelease: () => kit?.pour.release(options)
+    });
+    return {
+      handlers: gesture.dom,
+      start: async () => await kit?.pour.start(options) ?? false,
+      cancel: () => kit?.pour.cancel()
+    };
+  };
+  return [useCuiKitContext, CuiKitContext.Provider, useCuiPour];
 }
 function CuiKitWrapper({
   children,
@@ -1608,8 +1544,8 @@ function DispenseView({
   props
 }) {
   const { nozzlePaths } = useDeviceAssemblyContext();
-  const totalNozzles = (nozzlePaths == null ? void 0 : nozzlePaths.length) || 0;
-  const nozzles = (nozzlePaths == null ? void 0 : nozzlePaths.map((path, index) => /* @__PURE__ */ jsxRuntime.jsx(NozzleProvider, { path, children: /* @__PURE__ */ jsxRuntime.jsx(
+  const totalNozzles = nozzlePaths?.length || 0;
+  const nozzles = nozzlePaths?.map((path, index) => /* @__PURE__ */ jsxRuntime.jsx(NozzleProvider, { path, children: /* @__PURE__ */ jsxRuntime.jsx(
     CuiKitWrapper,
     {
       provider,
@@ -1623,7 +1559,7 @@ function DispenseView({
       },
       children
     }
-  ) }, path))) || [];
+  ) }, path)) || [];
   return nozzles;
 }
 function CuiKit({
@@ -1640,10 +1576,11 @@ function CuiKit({
   ) }) : null;
 }
 function initializeCuiKit(props) {
-  const [useCuiKitContext, DispenseKitProvider] = createDispenseKitContext();
+  const [useCuiKitContext, DispenseKitProvider, useCuiPour] = createDispenseKitContext();
   return [
     useCuiKitContext,
-    CuiKit({ provider: DispenseKitProvider, props })
+    CuiKit({ provider: DispenseKitProvider, props }),
+    useCuiPour
   ];
 }
 const Holder = React.createContext(void 0);
@@ -1772,7 +1709,6 @@ exports.HolderProvider = HolderProvider;
 exports.IngredientContainerProvider = IngredientContainerProvider;
 exports.IngredientProvider = IngredientProvider;
 exports.NozzleProvider = NozzleProvider;
-exports.PourContext = PourContext;
 exports.PumpProvider = PumpProvider;
 exports.TapOrHoldIntentStrategy = TapOrHoldIntentStrategy;
 exports.TapToPourIntentStrategy = TapToPourIntentStrategy;
@@ -1821,4 +1757,4 @@ exports.withHolderContainer = withHolderContainer;
 exports.withIngredient = withIngredient;
 exports.withIngredientContainer = withIngredientContainer;
 exports.withNozzle = withNozzle;
-//# sourceMappingURL=pump-provider-BAQXIUuP.cjs.map
+//# sourceMappingURL=pump-provider-B4WR3LiY.cjs.map