@swift-food-services/catering-widget 0.2.0-beta.8 → 0.2.0-beta.9

package/dist/index.cjs

@@ -7536,12 +7536,15 @@ function createChatEndpoints(client) {
       const res = await client.request(`/catering-chat/${sid}`);
       return handleChatResponse(res);
     },
-    sendMessage: (sid, message, address, selectedMealSessionIndex) => {
+    sendMessage: (sid, message, address, selectedMealSessionIndex, selectedIntentId) => {
       const body = { message };
       if (address) body.address = address;
       if (typeof selectedMealSessionIndex === "number") {
         body.selectedMealSessionIndex = selectedMealSessionIndex;
       }
+      if (typeof selectedIntentId === "string" && selectedIntentId.length > 0) {
+        body.selectedIntentId = selectedIntentId;
+      }
       return post(`/catering-chat/${sid}/message`, body);
     },
     editField: (sid, field, value, mealSessionIndex) => {
@@ -12555,21 +12558,10 @@ function ActiveSessionPanel({
 }
 
 // src/components/ai/edit/translateEditField.ts
-function translateEditField(field, value, meals, aiMealSessions, mealSessionIndex) {
-  if (field === "guestCount") {
-    return { field: "headcount", value };
-  }
-  const idx = mealSessionIndex ?? 0;
-  const meal = meals.find((m) => m.mealSessionIndex === idx) ?? meals[0] ?? null;
-  const meta = meal ? aiMealSessions[meal.mealSessionIndex] : void 0;
-  if (field === "sessionDate") {
-    const time = meta?.eventTime || "12:00";
-    return { field: "event_datetime", value: `${value}T${time}` };
-  }
-  if (field === "eventTime") {
-    const date = meta?.sessionDate || (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
-    return { field: "event_datetime", value: `${date}T${value}` };
-  }
+function translateEditField(field, value) {
+  if (field === "guestCount") return { field: "headcount", value };
+  if (field === "sessionDate") return { field: "event_date", value };
+  if (field === "eventTime") return { field: "event_time", value };
   return { field, value };
 }
 
@@ -12577,6 +12569,16 @@ function translateEditField(field, value, meals, aiMealSessions, mealSessionInde
 var STORAGE_KEY2 = "swift-food-chat-session";
 var messagesKey = (sid) => `swift-food-chat-messages-${sid}`;
 var errorKey = (sid) => `swift-food-chat-error-${sid}`;
+function clearChatSessionStorage() {
+  if (typeof window === "undefined") return null;
+  const sid = window.localStorage.getItem(STORAGE_KEY2);
+  window.localStorage.removeItem(STORAGE_KEY2);
+  if (sid) {
+    window.localStorage.removeItem(messagesKey(sid));
+    window.localStorage.removeItem(errorKey(sid));
+  }
+  return sid;
+}
 function readCachedError(sid) {
   if (typeof window === "undefined") return null;
   const raw = window.localStorage.getItem(errorKey(sid));
@@ -12653,10 +12655,14 @@ function useChatSession(options = {}) {
   const sessionIdRef = react.useRef(null);
   const lastTaxonomyRef = react.useRef({});
   const selectedMealSessionIndexRef = react.useRef(null);
+  const selectedIntentIdRef = react.useRef(null);
   const applySideState = react.useCallback((data) => {
     setStatus(data.status ?? null);
-    setLatestMealSessions(data.mealSessions ?? []);
-    setLatestActiveMealSessionIndex(data.activeMealSessionIndex ?? 0);
+    const meals = data.mealSessions ?? [];
+    setLatestMealSessions(meals);
+    setLatestActiveMealSessionIndex(
+      (prev) => meals.length === 0 ? 0 : Math.max(0, Math.min(prev, meals.length - 1))
+    );
     if (data.summary) {
       setLatestSummary(data.summary);
       lastTaxonomyRef.current = data.summary.taxonomy;
@@ -12928,11 +12934,13 @@ function useChatSession(options = {}) {
       setRetryParams(null);
       try {
         const selectedIdx = selectedMealSessionIndexRef.current;
+        const selectedIntentId = selectedIntentIdRef.current;
         const data = await api.chat.sendMessage(
           sid,
           text,
           address,
-          selectedIdx
+          selectedIdx,
+          selectedIntentId
         );
         applyResponse(data);
       } catch (e) {
@@ -12965,19 +12973,11 @@ function useChatSession(options = {}) {
     if (!params || !sid) return;
     await dispatchSend(sid, params.text, params.address);
   }, [retryParams, dispatchSend]);
-  const latestMealSessionPartsRef = react.useRef([]);
-  const latestMealSessionsRef = react.useRef([]);
   const applyEditField = react.useCallback(
     async (field, value, mealSessionIndex) => {
       const sid = sessionIdRef.current;
       if (!sid) return;
-      const translated = translateEditField(
-        field,
-        value,
-        latestMealSessionPartsRef.current,
-        latestMealSessionsRef.current,
-        mealSessionIndex
-      );
+      const translated = translateEditField(field, value);
       await callApiAndApply(
         () => api.chat.editField(
           sid,
@@ -13034,17 +13034,22 @@ function useChatSession(options = {}) {
     [api, callApiAndApply]
   );
   const pickMealSession = react.useCallback(
+    // Local-only navigation — no network round-trip. The old
+    // pick_meal_session call blocked the UI on a server response just to
+    // move the active tab, which made switching meals feel like it hung.
+    // We update the viewed index immediately and stash it as the
+    // "currently viewing" signal so the next /message carries it
+    // (selectedMealSessionIndex) for BE disambiguation. The viewed intent
+    // is cleared here and repopulated by IntentStepper's focus effect once
+    // the new meal renders. Kept async (returns a resolved promise) so the
+    // hook's contract and existing `void pickMealSession(idx)` callers are
+    // unchanged.
     async (mealSessionIndex) => {
-      const sid = sessionIdRef.current;
-      if (!sid) return;
-      await callApiAndApply(
-        () => api.chat.menuAction(sid, {
-          action: "pick_meal_session",
-          mealSessionIndex
-        })
-      );
+      setLatestActiveMealSessionIndex(mealSessionIndex);
+      selectedMealSessionIndexRef.current = mealSessionIndex;
+      selectedIntentIdRef.current = null;
     },
-    [api, callApiAndApply]
+    []
   );
   const confirmInheritance = react.useCallback(
     async (mealSessionIndex, accept) => {
@@ -13146,8 +13151,6 @@ function useChatSession(options = {}) {
     if (latestMealSessions.length === 0) return parts;
     return parts.filter((p) => p.mealSessionIndex < latestMealSessions.length);
   }, [messages, latestMealSessions]);
-  latestMealSessionPartsRef.current = latestMealSessionParts;
-  latestMealSessionsRef.current = latestMealSessions;
   return {
     messages,
     sending,
@@ -13181,6 +13184,10 @@ function useChatSession(options = {}) {
     getTaxonomyValueFor,
     setSelectedMealSessionIndex: (idx) => {
       selectedMealSessionIndexRef.current = idx;
+      selectedIntentIdRef.current = null;
+    },
+    setSelectedIntentId: (id) => {
+      selectedIntentIdRef.current = id;
     },
     submitFeedback
   };
@@ -13200,7 +13207,6 @@ function mergeAdaptedMealParts(data) {
       mealSessionIndex: i,
       intentBlocks: blocks.map((b) => ({
         type: "intent_block",
-        intentId: b.intentId,
         mealSessionIndex: i,
         intent: b.intent,
         restaurantPicks: b.restaurantPicks
@@ -13268,7 +13274,11 @@ function findLatestMealSessionParts(messages) {
     (a, b) => a.mealSessionIndex - b.mealSessionIndex
   );
 }
-var STORAGE_KEY_PREFIX = "swift-food-cart-v3-";
+var STORAGE_KEY_PREFIX = "swift-food-cart-v4-";
+function clearCartStorage(sessionId) {
+  if (!sessionId || typeof window === "undefined") return;
+  window.localStorage.removeItem(STORAGE_KEY_PREFIX + sessionId);
+}
 var emptyIntent = () => ({
   selectedRestaurantId: null,
   qtyOverrides: {},
@@ -13487,12 +13497,13 @@ function ChatSessionProvider({
   const [suggestionsOverlayDismissed, setSuggestionsOverlayDismissed] = react.useState(false);
   const [feedbackTarget, setFeedbackTarget] = react.useState(null);
   const [feedbackRating, setFeedbackRating] = react.useState(0);
+  const [feedbackState, setFeedbackState] = react.useState("idle");
   react.useEffect(() => {
     if (!chat.sessionId) setActiveViewedPreview(null);
   }, [chat.sessionId]);
   const hasResults = react.useMemo(
-    () => chat.latestMealSessionParts.some((p) => p.intentBlocks.length > 0),
-    [chat.latestMealSessionParts]
+    () => chat.latestMealSessions.length > 0,
+    [chat.latestMealSessions]
   );
   const prevPartsRef = react.useRef(chat.latestMealSessionParts);
   const onViewResultsRef = react.useRef(onViewResults);
@@ -13528,17 +13539,22 @@ function ChatSessionProvider({
     feedbackTarget,
     feedbackRating,
     setFeedbackRating,
+    feedbackState,
+    setFeedbackState,
     startFeedback: (messageId, up, eventId) => {
       setFeedbackTarget({ messageId, up, eventId });
       setFeedbackRating(0);
+      setFeedbackState("idle");
     },
     startGeneralFeedback: () => {
       setFeedbackTarget({ messageId: "__general__", up: false });
       setFeedbackRating(0);
+      setFeedbackState("idle");
     },
     cancelFeedback: () => {
       setFeedbackTarget(null);
       setFeedbackRating(0);
+      setFeedbackState("idle");
     },
     hasResults,
     suggestionsOverlayDismissed,
@@ -15066,7 +15082,7 @@ function IntentBlockCard({
             items: selected.items,
             onAddItem
           },
-          `${part.intentId}-${selected.restaurant.id}-${section.title ?? "_null"}`
+          `${part.intent.id}-${selected.restaurant.id}-${section.title ?? "_null"}`
         )) }),
         alts.length >= 3 && /* @__PURE__ */ jsxRuntime.jsx(
           AltRestaurantChips,
@@ -15251,10 +15267,10 @@ function resolveSelections(blocks, explicit) {
   const resolved = /* @__PURE__ */ new Map();
   const priorIds = /* @__PURE__ */ new Set();
   for (const block of blocks) {
-    const explicitId = explicit.get(block.intentId);
+    const explicitId = explicit.get(block.intent.id);
     const chosenId = explicitId ?? block.restaurantPicks[pickDefaultIndex(block.restaurantPicks, priorIds)]?.restaurant.id;
     if (chosenId !== void 0) {
-      resolved.set(block.intentId, chosenId);
+      resolved.set(block.intent.id, chosenId);
       priorIds.add(chosenId);
     }
   }
@@ -15340,11 +15356,11 @@ function MealSessionStepper({
           IntentBlockCard,
           {
             part: block,
-            selectedRestaurantId: resolved.get(block.intentId) ?? block.restaurantPicks[0]?.restaurant.id ?? "",
-            onSelectRestaurant: handleSelect(block.intentId),
+            selectedRestaurantId: resolved.get(block.intent.id) ?? block.restaurantPicks[0]?.restaurant.id ?? "",
+            onSelectRestaurant: handleSelect(block.intent.id),
             onAddItem
           },
-          block.intentId
+          block.intent.id
         ))
       },
       stepMode ? `step-${safeStepIdx}` : "all"
@@ -17113,14 +17129,14 @@ function AIChatBody() {
     const el = textareaRef.current;
     if (!el) return;
     el.style.height = "auto";
-    const gateMinHeight = gateActive ? 72 : 0;
+    const gateMinHeight = gateActive && feedbackTarget === null ? 72 : 0;
     const fullHeight = Math.max(el.scrollHeight, gateMinHeight);
     el.style.height = `${Math.min(fullHeight, MAX_INPUT_HEIGHT)}px`;
     el.style.overflowY = fullHeight > MAX_INPUT_HEIGHT ? "auto" : "hidden";
   };
   react.useEffect(() => {
     handleInput();
-  }, [input, feedbackNote, gateActive]);
+  }, [input, feedbackNote, gateActive, feedbackTarget]);
   react.useEffect(() => {
     if (!pendingInputFocus) return;
     if (gateActive || pillEditing) return;
@@ -17255,8 +17271,8 @@ function AIChatBody() {
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-shrink-0 px-3 py-2.5 flex items-center gap-3 border-b border-base-200", children: [
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-9 h-9 rounded-full bg-primary flex items-center justify-center flex-shrink-0", children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Sparkles, { className: "w-4 h-4 text-white" }) }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1 min-w-0", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-semibold text-gray-800", children: "AI Assistant" }),
-        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-gray-500", children: "Get menu suggestions" })
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-sm font-semibold text-gray-800", children: "Nibbles" }),
+        /* @__PURE__ */ jsxRuntime.jsx("p", { className: "text-xs text-gray-500", children: "Our AI Assistant" })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsxs(
         "button",
@@ -17486,7 +17502,7 @@ function AIChatBody() {
           animate: { opacity: 1, y: 0 },
           exit: { opacity: 0, y: -8 },
           transition: { duration: 0.18, ease: "easeOut" },
-          children: gateActive ? /* @__PURE__ */ jsxRuntime.jsxs(
+          children: gateActive && !inFeedbackMode ? /* @__PURE__ */ jsxRuntime.jsxs(
             react$1.motion.form,
             {
               onSubmit: handleSubmit,
@@ -18049,13 +18065,13 @@ function buildCategoryView(category, mealSession, cart, resolveSelectedRestauran
   const view = [];
   for (const block of mealSession.intentBlocks) {
     if (block.intent.category !== category) continue;
-    const selectedRestaurantId = resolveSelectedRestaurantId(block.intentId) ?? block.restaurantPicks[0]?.restaurant.id ?? null;
+    const selectedRestaurantId = resolveSelectedRestaurantId(block.intent.id) ?? block.restaurantPicks[0]?.restaurant.id ?? null;
     if (!selectedRestaurantId) continue;
     const pick = block.restaurantPicks.find(
       (rp) => rp.restaurant.id === selectedRestaurantId
     );
     if (!pick) continue;
-    const cartIntent = cart[block.intentId];
+    const cartIntent = cart[block.intent.id];
     const removedSet = new Set(cartIntent?.removedItemIds ?? []);
     const pickedSet = new Set(cartIntent?.pickedItemIds ?? []);
     const swappedInItems = cartIntent ? Object.values(cartIntent.swappedIn) : [];
@@ -18070,7 +18086,7 @@ function buildCategoryView(category, mealSession, cart, resolveSelectedRestauran
     for (const item of liveItems) {
       view.push({
         item,
-        intent: { intentId: block.intentId, quantity: block.intent.quantity },
+        intent: { intentId: block.intent.id, quantity: block.intent.quantity },
         itemsInPick,
         overrideQty: cartIntent?.qtyOverrides[item.id],
         intentQuantityPacks: packsByItemId?.get(item.id) ?? null
@@ -18226,7 +18242,7 @@ function checkMinOrders(mealSessionParts, aiMealSessions, cart) {
   return out;
 }
 function findRestaurantForEntry(intentId, ms, cart) {
-  const block = ms.intentBlocks.find((b) => b.intentId === intentId);
+  const block = ms.intentBlocks.find((b) => b.intent.id === intentId);
   if (!block) return null;
   const selectedId = cart.getSelectedRestaurantId(intentId) ?? block.restaurantPicks[0]?.restaurant.id ?? null;
   if (!selectedId) return null;
@@ -18305,13 +18321,13 @@ function aiPlanToPricingInput(mealSessionParts, aiMealSessions, cart) {
       }
     }
     for (const block of ms.intentBlocks) {
-      const selectedRestaurantId = cart.getSelectedRestaurantId(block.intentId) ?? block.restaurantPicks[0]?.restaurant.id ?? null;
+      const selectedRestaurantId = cart.getSelectedRestaurantId(block.intent.id) ?? block.restaurantPicks[0]?.restaurant.id ?? null;
       if (!selectedRestaurantId) continue;
       const pick = block.restaurantPicks.find(
         (rp) => rp.restaurant.id === selectedRestaurantId
       );
       if (!pick) continue;
-      const cartIntent = cart.cart[block.intentId];
+      const cartIntent = cart.cart[block.intent.id];
       const removedSet = new Set(cartIntent?.removedItemIds ?? []);
       const pickedSet = new Set(cartIntent?.pickedItemIds ?? []);
       const liveItems = [
@@ -18323,7 +18339,7 @@ function aiPlanToPricingInput(mealSessionParts, aiMealSessions, cart) {
         )
       ];
       for (const it of liveItems) {
-        const qty = qtyByItemKey.get(`${block.intentId}::${it.id}`) ?? 0;
+        const qty = qtyByItemKey.get(`${block.intent.id}::${it.id}`) ?? 0;
         if (qty <= 0) continue;
         orderItems.push({
           item: toPricingItem(it, selectedRestaurantId),
@@ -18733,7 +18749,13 @@ function IntentStepper({
   const safeIntentIdx = Math.min(intentIndex, blocks.length);
   const isReview = blocks.length > 0 && safeIntentIdx === blocks.length;
   const block = isReview || blocks.length === 0 ? null : blocks[safeIntentIdx] ?? null;
-  const selectedRestaurantId = block ? cart.getSelectedRestaurantId(block.intentId) ?? block.restaurantPicks[0]?.restaurant.id ?? null : null;
+  const focusedIntentId = block?.intent.id ?? null;
+  const { chat: chatForFocus } = useChatSessionContext();
+  react.useEffect(() => {
+    chatForFocus.setSelectedMealSessionIndex(activeMealSessionIndex);
+    chatForFocus.setSelectedIntentId(focusedIntentId);
+  }, [activeMealSessionIndex, focusedIntentId]);
+  const selectedRestaurantId = block ? cart.getSelectedRestaurantId(block.intent.id) ?? block.restaurantPicks[0]?.restaurant.id ?? null : null;
   const pickIdx = block ? Math.max(
     0,
     block.restaurantPicks.findIndex(
@@ -18741,7 +18763,7 @@ function IntentStepper({
     )
   ) : 0;
   const selected = block ? block.restaurantPicks[pickIdx] : void 0;
-  const cartIntent = block ? cart.cart[block.intentId] : void 0;
+  const cartIntent = block ? cart.cart[block.intent.id] : void 0;
   const removedSet = new Set(cartIntent?.removedItemIds ?? []);
   const intentLiveSlots = react.useMemo(() => {
     if (!block || !selected) return [];
@@ -18757,13 +18779,13 @@ function IntentStepper({
     const headcount = activeMealMeta?.guestCount ?? 1;
     const result = [];
     for (const b of blocks) {
-      const selRestId = cart.getSelectedRestaurantId(b.intentId) ?? b.restaurantPicks[0]?.restaurant.id ?? null;
+      const selRestId = cart.getSelectedRestaurantId(b.intent.id) ?? b.restaurantPicks[0]?.restaurant.id ?? null;
       if (!selRestId) continue;
       const pick = b.restaurantPicks.find(
         (rp) => rp.restaurant.id === selRestId
       );
       if (!pick) continue;
-      const ci = cart.cart[b.intentId];
+      const ci = cart.cart[b.intent.id];
       const rem = new Set(ci?.removedItemIds ?? []);
       const picked = new Set(ci?.pickedItemIds ?? []);
       const swappedIn = ci?.swappedIn ?? {};
@@ -18785,7 +18807,7 @@ function IntentStepper({
       const items = liveSlots.map(({ item: it, slotId }) => {
         const qty = effectiveQty({
           targetItem: it,
-          targetIntent: { intentId: b.intentId, quantity: b.intent.quantity },
+          targetIntent: { intentId: b.intent.id, quantity: b.intent.quantity },
           itemsInTargetPick: liveItems.length,
           categoryView,
           headcount
@@ -18900,7 +18922,7 @@ function IntentStepper({
   const nextLabel = isReview ? !isLastMeal ? aiMealSessions[orderedMeals[myPos + 1].mealSessionIndex]?.sessionName ?? null : null : !isLastIntent ? capitalize(blocks[safeIntentIdx + 1].intent.phrase) : "Review";
   const handlePickAlt = (restaurantId) => {
     if (!block) return;
-    cart.setRestaurant(block.intentId, restaurantId);
+    cart.setRestaurant(block.intent.id, restaurantId);
   };
   function computeAddonChip(intentId, item, restaurantId, restaurantName) {
     const groups = item.addons ?? [];
@@ -19094,27 +19116,27 @@ function IntentStepper({
                       intentPhrase: b.intent.phrase,
                       restaurantName,
                       items,
-                      intentId: b.intentId,
+                      intentId: b.intent.id,
                       restaurantId,
                       intentExcludes: b.intent.excludes,
                       onSwap,
-                      onRemove: (itemId) => cart.removeItem(b.intentId, itemId),
-                      onTogglePicked: (itemId) => cart.togglePicked(b.intentId, itemId),
-                      onQtyChange: (itemId, q) => cart.setQty(b.intentId, itemId, q),
+                      onRemove: (itemId) => cart.removeItem(b.intent.id, itemId),
+                      onTogglePicked: (itemId) => cart.togglePicked(b.intent.id, itemId),
+                      onQtyChange: (itemId, q) => cart.setQty(b.intent.id, itemId, q),
                       onViewItem: (item) => setViewItem({
                         item,
-                        intentId: b.intentId,
+                        intentId: b.intent.id,
                         restaurantId,
                         restaurantName
                       }),
                       getAddonChip: (item) => computeAddonChip(
-                        b.intentId,
+                        b.intent.id,
                         item,
                         restaurantId,
                         restaurantName
                       )
                     },
-                    b.intentId
+                    b.intent.id
                   )) }) : /* @__PURE__ */ jsxRuntime.jsx(EmptyIntentState, { message: "No items picked yet \u2014 head back and check the items you want." })
                 },
                 `${activeMealSessionIndex}-review`
@@ -19140,9 +19162,9 @@ function IntentStepper({
                       }
                     ),
                     intentLiveSlots.length > 0 ? /* @__PURE__ */ jsxRuntime.jsx("ul", { style: { margin: "0", padding: 0, listStyle: "none" }, children: intentLiveSlots.map(({ item, slotId }) => {
-                      const checked = cart.isPicked(block.intentId, item.id);
+                      const checked = cart.isPicked(block.intent.id, item.id);
                       const chip = computeAddonChip(
-                        block.intentId,
+                        block.intent.id,
                         item,
                         selected.restaurant.id,
                         selected.restaurant.name
@@ -19166,7 +19188,7 @@ function IntentStepper({
                           addonState: chip.state,
                           addonSummary: chip.summary,
                           onSwap: () => onSwap({
-                            intentId: block.intentId,
+                            intentId: block.intent.id,
                             slotId,
                             itemId: item.id,
                             itemName: item.name,
@@ -19176,10 +19198,10 @@ function IntentStepper({
                             intentExcludes: block.intent.excludes,
                             visibleItemIds: intentLiveSlots.map((s) => s.item.id)
                           }),
-                          onRemove: () => cart.removeItem(block.intentId, item.id),
+                          onRemove: () => cart.removeItem(block.intent.id, item.id),
                           onView: () => setViewItem({
                             item,
-                            intentId: block.intentId,
+                            intentId: block.intent.id,
                             restaurantId: selected.restaurant.id,
                             restaurantName: selected.restaurant.name
                           })
@@ -19189,7 +19211,7 @@ function IntentStepper({
                     }) }) : /* @__PURE__ */ jsxRuntime.jsx(EmptyIntentState, { message: "No items in this intent yet \u2014 keep chatting on the right." })
                   ]
                 },
-                `${activeMealSessionIndex}-${block.intentId}-${pickedId}`
+                `${activeMealSessionIndex}-${block.intent.id}-${pickedId}`
               ) }),
               atFinal && minOrderShortfalls.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(
                 "div",
@@ -19742,7 +19764,7 @@ function TimelineList({
         children: [
           ...meal.intentBlocks.map((b, i) => ({
             kind: "intent",
-            key: b.intentId,
+            key: b.intent.id,
             phrase: b.intent.phrase,
             idx: i
           })),
@@ -20812,13 +20834,13 @@ function resolveDraftItems(mealSessionParts, aiMealSessions, activeMealSessionIn
   }
   const out = [];
   for (const block of ms.intentBlocks) {
-    const selectedRestaurantId = cart.getSelectedRestaurantId(block.intentId) ?? block.restaurantPicks[0]?.restaurant.id;
+    const selectedRestaurantId = cart.getSelectedRestaurantId(block.intent.id) ?? block.restaurantPicks[0]?.restaurant.id;
     if (!selectedRestaurantId) continue;
     const pick = block.restaurantPicks.find(
       (rp) => rp.restaurant.id === selectedRestaurantId
     );
     if (!pick) continue;
-    const cartIntent = cart.cart[block.intentId];
+    const cartIntent = cart.cart[block.intent.id];
     const removedSet = new Set(cartIntent?.removedItemIds ?? []);
     const pickedSet = new Set(cartIntent?.pickedItemIds ?? []);
     const liveItems = [
@@ -20830,7 +20852,7 @@ function resolveDraftItems(mealSessionParts, aiMealSessions, activeMealSessionIn
       )
     ];
     for (const it of liveItems) {
-      const qty = qtyByItemKey.get(`${block.intentId}::${it.id}`) ?? 0;
+      const qty = qtyByItemKey.get(`${block.intent.id}::${it.id}`) ?? 0;
       if (qty <= 0) continue;
       out.push({
         id: it.id,
@@ -20850,7 +20872,7 @@ function resolveDraftItems(mealSessionParts, aiMealSessions, activeMealSessionIn
         reason: it.reason ?? "",
         restaurantId: selectedRestaurantId,
         intentPhrase: block.intent.phrase,
-        addonSelections: cart.getAddonSelections(block.intentId, it.id)
+        addonSelections: cart.getAddonSelections(block.intent.id, it.id)
       });
     }
   }
@@ -25703,6 +25725,8 @@ function CheckoutScreen() {
       markOrderAsSubmitted();
       setShowPaymentModal(false);
       setSubmittedOrder(createCateringOrderResponse);
+      const clearedSid = clearChatSessionStorage();
+      clearCartStorage(clearedSid);
       const orderId = createCateringOrderResponse?.id ?? "";
       const accessToken = createCateringOrderResponse?.sharedAccessUsers?.[0]?.accessToken ?? "";
       setPendingOrderResult({
@@ -26373,7 +26397,7 @@ function CheckoutScreen() {
                 deliveryFeeAmt.toFixed(2)
               ] })
             ] }),
-            promoDiscountAmt > 2 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-between text-sm text-success font-medium", children: [
+            promoDiscountAmt > 0 && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-between text-sm text-success font-medium", children: [
               /* @__PURE__ */ jsxRuntime.jsx("span", { children: "Promo Discount" }),
               /* @__PURE__ */ jsxRuntime.jsxs("span", { children: [
                 "-\xA3",
@@ -29061,7 +29085,17 @@ function CateringOrderBuilder() {
                           )
                         }
                       ),
-                      mobileChatView === "chat" && /* @__PURE__ */ jsxRuntime.jsx(MobileChatFloatingChips, { bottomOffset: 64 + 8, inputRef: mobileAIInputRef })
+                      mobileChatView === "chat" && /* @__PURE__ */ jsxRuntime.jsx(
+                        MobileChatFloatingChips,
+                        {
+                          bottomOffset: mobileAIInputHeight + 28,
+                          inputRef: mobileAIInputRef,
+                          onCancelFeedback: () => {
+                            setMobileAIInput("");
+                            resetMobileAIInputHeight();
+                          }
+                        }
+                      )
                     ]
                   },
                   "chat-surface"
@@ -29630,15 +29664,24 @@ function MobileChatThread({
   const paddingTop = hasAddressTopPill ? 68 : 56;
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "px-4", style: { paddingTop, paddingBottom }, children: /* @__PURE__ */ jsxRuntime.jsx(ChatMessagesView, {}) });
 }
-function MobileChatFloatingChips({ bottomOffset, inputRef }) {
+function MobileChatFloatingChips({
+  bottomOffset,
+  inputRef,
+  onCancelFeedback
+}) {
   const {
     hasResults,
     onViewResults,
     feedbackTarget,
     feedbackRating,
     setFeedbackRating,
+    feedbackState,
     cancelFeedback
   } = useChatSessionContext();
+  const handleCancel = () => {
+    cancelFeedback();
+    onCancelFeedback?.();
+  };
   const [feedbackHover, setFeedbackHover] = react.useState(0);
   const inFeedbackMode = feedbackTarget !== null;
   react.useEffect(() => {
@@ -29665,7 +29708,7 @@ function MobileChatFloatingChips({ bottomOffset, inputRef }) {
               "button",
               {
                 type: "button",
-                onClick: cancelFeedback,
+                onClick: handleCancel,
                 className: "p-0.5 rounded text-white/60 hover:text-white transition-colors",
                 "aria-label": "Cancel feedback",
                 children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.X, { className: "w-3.5 h-3.5" })
@@ -29693,7 +29736,9 @@ function MobileChatFloatingChips({ bottomOffset, inputRef }) {
               },
               n
             )) }),
-            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-white/80 min-w-[3.5rem]", children: activeStar > 0 ? RATING_LABELS[activeStar - 1] : "" })
+            /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs font-medium text-white/80 min-w-[3.5rem]", children: feedbackState === "done" ? "" : activeStar > 0 ? RATING_LABELS[activeStar - 1] : "" }),
+            feedbackState === "error" && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs text-red-300", children: "Failed" }),
+            feedbackState === "done" && /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-xs text-green-300 font-medium", children: "Thanks!" })
           ]
         },
         "feedback-pill"
@@ -29731,13 +29776,11 @@ function MobileAIInput({
     chat: { sending, bootstrapping, sessionId, sendText, submitFeedback },
     feedbackTarget,
     feedbackRating,
+    feedbackState,
+    setFeedbackState,
     cancelFeedback
   } = useChatSessionContext();
   const inFeedbackMode = feedbackTarget !== null;
-  const [feedbackState, setFeedbackState] = react.useState("idle");
-  react.useEffect(() => {
-    if (!feedbackTarget) setFeedbackState("idle");
-  }, [feedbackTarget]);
   const chatDisabled = sending || bootstrapping || !sessionId;
   const inputDisabled = inFeedbackMode ? feedbackState === "sending" : bootstrapping || !sessionId;
   const sendDisabled = inFeedbackMode ? feedbackState === "sending" : submitBlocked || (chatDisabled || !value.trim());