@mohasinac/appkit 4.26.0 → 4.28.0

package/dist/features/shipments/components/AdminShipmentLotItemsView.js

@@ -4,6 +4,8 @@ import React from "react";
 import { useApiMutation } from "@mohasinac/appkit/client";
 import { Alert, Badge, Button, Div, FieldCheckbox, FieldInput, Grid, Heading, Modal, Pagination, Skeleton, Stack, Table, Thead, Tbody, Tr, Th, Td, Text, Textarea, } from "../../../ui";
 import { apiClient } from "../../../http";
+import { createShipmentItemSchema } from "../schemas/validation";
+import { ValidationError } from "../../../errors/validation-error";
 import { ADMIN_ENDPOINTS } from "../../../constants/api-endpoints";
 import { ACTIONS } from "../../../_internal/shared/actions/action-registry";
 import { useShipmentItems } from "../hooks/useShipments";
@@ -42,12 +44,27 @@ export function AdminShipmentLotItemsView({ shipmentId, lotId }) {
     const [linkTarget, setLinkTarget] = React.useState(null);
     const addItemMutation = useApiMutation({
         successMessage: "Item added",
-        mutationFn: () => apiClient.post(ADMIN_ENDPOINTS.SHIPMENT_LOT_ITEMS(shipmentId, lotId), {
-            title,
-            quantity: Number(quantity),
-            isForSelfUse,
-            price: isForSelfUse ? undefined : Math.round(Number(priceRupees) * 100) / 100,
-        }),
+        mutationFn: () => {
+            /*
+             * `createShipmentItemSchema` already validated this route and had no
+             * client consumer, so its rule — a projected sale price is required
+             * unless the item is for self use — only ever surfaced as a 400 that
+             * named no field. `Number(priceRupees)` also yields NaN on a typo,
+             * which the schema rejects and the old payload sent.
+             */
+            const parsed = createShipmentItemSchema.safeParse({
+                title,
+                quantity: Number(quantity),
+                isForSelfUse,
+                price: isForSelfUse ? undefined : Math.round(Number(priceRupees) * 100) / 100,
+            });
+            if (!parsed.success) {
+                // ValidationError carries the issue list; a bare Error flattens it to
+                // one string and loses which field failed.
+                throw new ValidationError(parsed.error.issues[0]?.message ?? "Check the item details.", parsed.error.issues);
+            }
+            return apiClient.post(ADMIN_ENDPOINTS.SHIPMENT_LOT_ITEMS(shipmentId, lotId), parsed.data);
+        },
         onSuccess: () => {
             setTitle("");
             setQuantity("1");

package/dist/features/site-settings/components/ActionPermissionsManager.js

@@ -57,7 +57,7 @@ const CATEGORY_COLORS = {
     "Messaging": "bg-cyan-100 text-cyan-800 dark:bg-cyan-900/30 dark:text-cyan-300",
     "Seller": "bg-warning-surface text-warning dark:bg-warning-surface dark:text-warning",
     "Orders": "bg-lime-100 text-lime-800 dark:bg-lime-900/30 dark:text-lime-300",
-    "Account": "bg-[var(--appkit-color-surface)] text-zinc-700 bg-[var(--appkit-color-surface-elevated)] text-[var(--appkit-color-text-muted)]",
+    "Account": "bg-[var(--appkit-color-surface)] bg-[var(--appkit-color-surface-elevated)] text-[var(--appkit-color-text-muted)]",
 };
 const ALL_ACTION_IDS = Object.values(ACTION_ID);
 export function ActionPermissionsManager({ initialConfig, onUpdate }) {

package/dist/features/store-extensions/repository/store-extensions.repositories.d.ts

@@ -1,15 +1,32 @@
 /**
  * S-STORE Extension Repositories
  *
- * 11 lightweight BaseRepository subclasses. None of these collections store
- * PII directly so no `createWithId` override is required (Pattern #9). Uses
- * the BaseRepository public API only: `findById`, `findBy`, `findAll`,
- * `create`, `update`, `delete`.
+ * 11 lightweight BaseRepository subclasses.
+ *
+ * This header used to claim "none of these collections store PII directly" —
+ * that was wrong: `PayoutMethodsRepository` holds `upiVpa`, `accountNumber` and
+ * `ifscCode`, which sat in cleartext because of it. It now declares `piiFields`
+ * and BaseRepository's write hooks encrypt them on every write path, so no
+ * per-method override is needed (which is the point of the hooks — Pattern #9
+ * described overrides that never existed).
+ *
+ * The other ten hold no PII and use the BaseRepository public API only.
  */
 import { BaseRepository } from "../../../providers/db-firebase";
+import type { DocumentSnapshot } from "firebase-admin/firestore";
 import { type AnalyticsAlertDocument, type AnalyticsCardDocument, type ItemRequestDocument, type ListingTemplateDocument, type ModerationQueueDocument, type PayoutMethodDocument, type ReportDocument, type ShippingConfigDocument, type StoreCategoryDocument, type StoreGoogleConfigDocument, type StoreWhatsAppConfigDocument } from "../schemas/firestore";
 export declare class PayoutMethodsRepository extends BaseRepository<PayoutMethodDocument> {
+    /**
+     * Bank/UPI details, encrypted at rest by BaseRepository's write hooks.
+     *
+     * This repository had no encryption at all. Nothing queries these by equality
+     * (`listByStore` filters on `storeId`), so no read path depended on their
+     * plaintext.
+     */
+    protected piiFields: readonly ["upiVpa", "accountNumber", "ifscCode"];
     constructor();
+    /** Decrypt on read so callers see the shape they wrote. */
+    protected mapDoc<D = PayoutMethodDocument>(snap: DocumentSnapshot): D;
     listByStore(storeId: string): Promise<{
         items: PayoutMethodDocument[];
     }>;

package/dist/features/store-extensions/repository/store-extensions.repositories.js

@@ -1,16 +1,36 @@
 /**
  * S-STORE Extension Repositories
  *
- * 11 lightweight BaseRepository subclasses. None of these collections store
- * PII directly so no `createWithId` override is required (Pattern #9). Uses
- * the BaseRepository public API only: `findById`, `findBy`, `findAll`,
- * `create`, `update`, `delete`.
+ * 11 lightweight BaseRepository subclasses.
+ *
+ * This header used to claim "none of these collections store PII directly" —
+ * that was wrong: `PayoutMethodsRepository` holds `upiVpa`, `accountNumber` and
+ * `ifscCode`, which sat in cleartext because of it. It now declares `piiFields`
+ * and BaseRepository's write hooks encrypt them on every write path, so no
+ * per-method override is needed (which is the point of the hooks — Pattern #9
+ * described overrides that never existed).
+ *
+ * The other ten hold no PII and use the BaseRepository public API only.
  */
 import { BaseRepository } from "../../../providers/db-firebase";
+import { decryptPiiFields } from "../../../security/pii-encrypt";
 import { ANALYTICS_ALERTS_COLLECTION, ANALYTICS_CARDS_COLLECTION, ITEM_REQUESTS_COLLECTION, LISTING_TEMPLATES_COLLECTION, MODERATION_QUEUE_COLLECTION, PAYOUT_METHODS_COLLECTION, REPORTS_COLLECTION, SHIPPING_CONFIGS_COLLECTION, STORE_CATEGORIES_COLLECTION, STORE_GOOGLE_CONFIG_COLLECTION, STORE_WHATSAPP_CONFIG_COLLECTION, } from "../schemas/firestore";
 export class PayoutMethodsRepository extends BaseRepository {
     constructor() {
         super(PAYOUT_METHODS_COLLECTION);
+        /**
+         * Bank/UPI details, encrypted at rest by BaseRepository's write hooks.
+         *
+         * This repository had no encryption at all. Nothing queries these by equality
+         * (`listByStore` filters on `storeId`), so no read path depended on their
+         * plaintext.
+         */
+        this.piiFields = ["upiVpa", "accountNumber", "ifscCode"];
+    }
+    /** Decrypt on read so callers see the shape they wrote. */
+    mapDoc(snap) {
+        const raw = super.mapDoc(snap);
+        return decryptPiiFields(raw, [...this.piiFields]);
     }
     async listByStore(storeId) {
         const items = await this.findBy("storeId", storeId);

package/dist/features/store-extensions/schemas/shipping-config-form.js

@@ -66,17 +66,30 @@ export const shippingConfigFormSchema = z
     method: annotate(shippingMethodSchema, {
         section: "basics", quick: true, order: 2, row: "pair",
     }),
+    /*
+     * Each rate field shows only for the method it belongs to. A flat-rate
+     * rule has no price-per-kg, and showing one invites a seller to fill in a
+     * number the checkout will never read.
+     *
+     * These pair with the `superRefine` below, which requires the field under
+     * the SAME condition — hiding a required field would otherwise fail
+     * validation invisibly.
+     */
     flatRate: annotate(amount("Flat rate").optional(), {
         section: "rates", sectionLabel: "Rates", order: 1, row: "pair",
+        when: (v) => v.method === "flat",
     }),
     pricePerKg: annotate(amount("Price per kg").optional(), {
         section: "rates", order: 2, row: "pair",
+        when: (v) => v.method === "weight",
     }),
     freeAbove: annotate(amount("Free above").optional(), {
         section: "rates", order: 3, row: "pair",
+        when: (v) => v.method === "free",
     }),
     expressSurcharge: annotate(amount("Express surcharge").optional(), {
         section: "rates", order: 4, row: "pair",
+        when: (v) => v.method === "express",
     }),
     estimatedDays: annotate(z.coerce.number().int("Estimated days must be a whole number.").min(0).max(365).optional(), { section: "rates", order: 5, row: "pair" }),
     isDefault: annotate(z.boolean(), {

package/dist/features/store-extensions/schemas/store-category-form.js

@@ -17,7 +17,7 @@
  * parses this: `storeId` is set from the session, never from the body, so a
  * caller cannot write a category into someone else's store by adding a field.
  *
- * `productIds` and `isActive` are deliberately absent: they are managed after
+ * `productIds` is deliberately absent: it is managed after
  * creation (assigning products, toggling visibility), not typed into the
  * create form, and the repository supplies their defaults.
  *

package/dist/features/stores/actions/store-query-actions.js

@@ -4,6 +4,7 @@
  * Public and seller-facing read functions for store listings, products,
  * auctions and reviews.  No auth — callers decide whether auth is needed.
  */
+import { cache } from "react";
 import { sieveFilter, SIEVE_OP } from "@mohasinac/appkit";
 import { NotFoundError } from "../../../errors";
 import { filterTestDataForViewer, filterSingleTestData } from "../../../_internal/server/features/tester/visibility";
@@ -26,8 +27,31 @@ export async function listStores(params = {}, viewer) {
     const result = await storeRepository.listStores(model);
     return { ...result, items: filterTestDataForViewer(result.items, viewer) };
 }
+/**
+ * Request-scoped memo of the raw store fetch.
+ *
+ * CLAUDE.md § SSR Architecture requires `React.cache` on any data-fetch shared
+ * by a page and its `generateMetadata`. `stores/[storeSlug]/layout.tsx` awaits
+ * `getStoreBySlug` in BOTH — so every store page view was doing two identical
+ * Firestore reads.
+ *
+ * 🛑 The cache wraps the REPOSITORY call, not `getStoreBySlug`, and that is
+ * deliberate. `React.cache` memoises per argument list, and the two call sites
+ * pass different arguments — `getStoreBySlug(slug)` in `generateMetadata`,
+ * `getStoreBySlug(slug, viewer)` in the layout body. Wrapping the exported
+ * function would produce two cache entries and dedupe nothing.
+ *
+ * Making them match by reading the session in `generateMetadata` would be worse
+ * still: `getServerSessionUser()` is a dynamic API, and a dynamic API reached
+ * from metadata opts the route out of static rendering — the exact defect that
+ * made the whole site uncacheable (see `src/app/[locale]/layout.tsx`).
+ *
+ * So the read is cached on `storeSlug` alone and the viewer-specific
+ * `filterSingleTestData` is applied outside it, per caller.
+ */
+const fetchStoreBySlug = cache((storeSlug) => storeRepository.findBySlug(storeSlug));
 export async function getStoreBySlug(storeSlug, viewer) {
-    const store = await storeRepository.findBySlug(storeSlug);
+    const store = await fetchStoreBySlug(storeSlug);
     return filterSingleTestData(store, viewer);
 }
 export async function getStoreProducts(storeSlug, params = {}, viewer) {

package/dist/features/stores/components/InteractiveStoreCard.js

@@ -25,5 +25,5 @@ export function InteractiveStoreCard({ store, href, selectable, isSelected = fal
         ].join(" "), onMouseDown: !isSelected ? longPress.onMouseDown : undefined, onMouseUp: !isSelected ? longPress.onMouseUp : undefined, onMouseLeave: !isSelected ? longPress.onMouseLeave : undefined, onTouchStart: !isSelected ? longPress.onTouchStart : undefined, onTouchEnd: !isSelected ? longPress.onTouchEnd : undefined, onTouchCancel: !isSelected ? longPress.onTouchCancel : undefined, children: [onSelect && (_jsx(BaseListingCard.Checkbox, { selected: isSelected, onSelect: (e) => {
                     e.preventDefault();
                     onSelect(store.id, !isSelected);
-                }, label: isSelected ? "Deselect store" : "Select store", position: "top-2 left-2", className: selectable || isSelected ? "opacity-100" : "opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto transition-opacity" })), _jsxs(Link, { href: href, className: "flex flex-col flex-1 min-h-0", children: [_jsxs(Div, { surface: "muted", className: `relative aspect-video w-full ${__O.hidden} flex-shrink-0`, children: [hasBanner ? (_jsx(MediaImage, { src: store.storeBannerURL, alt: `${store.storeName} banner`, size: "banner", className: "h-full w-full object-cover transition-transform duration-500 group-hover:scale-105" })) : (_jsx(Row, { className: "absolute inset-0", align: "center", justify: "center", children: _jsx(Span, { className: "opacity-20 select-none", size: "5xl", "aria-hidden": "true", children: "\uD83C\uDFEA" }) })), _jsx(Scrim, { direction: "bottom-up", intensity: "subtle", className: "absolute inset-x-0 bottom-0 h-12" }), store.averageRating != null && store.averageRating > 0 && (_jsxs(Div, { className: CLS_RATING_BADGE, children: ["\u2605 ", store.averageRating.toFixed(1)] }))] }), _jsxs(Stack, { paddingY: "b-md", className: "flex-1", padding: "x-md", children: [_jsx(Row, { className: "-mt-5 mb-2", align: "end", justify: "between", children: _jsx(Div, { className: "flex-shrink-0", children: hasLogo ? (_jsx(Div, { className: "relative h-10 w-10 border-2 border-white border-[var(--appkit-color-border-subtle)] bg-[var(--appkit-color-surface)]", rounded: "lg", shadow: "md", overflow: "hidden", children: _jsx(MediaImage, { src: store.storeLogoURL, alt: store.storeName, size: "thumbnail", onError: () => setLogoBroken(true) }) })) : (_jsx(Row, { textWeight: "bold", textSize: "base", className: "h-10 w-10 border-2 border-white bg-primary/10 dark:bg-primary/20 text-primary", align: "center", justify: "center", rounded: "lg", shadow: "md", children: initial })) }) }), _jsx(Heading, { level: 3, className: `group-hover:text-primary transition-colors`, truncate: true, size: "sm", weight: "bold", color: "primary", children: store.storeName }), store.storeDescription ? (_jsx(RichText, { html: normalizeRichTextHtml(store.storeDescription), proseClass: "prose prose-sm max-w-none dark:prose-invert prose-p:my-0", className: "mt-1 line-clamp-2 text-[length:var(--appkit-text-xs)] text-[var(--appkit-color-text-muted)] flex-1" })) : (_jsx(Div, { className: "flex-1" })), _jsxs(Row, { color: "muted", textSize: "xs", gap: "sm", className: "mt-2.5", wrap: true, children: [store.totalProducts != null && store.totalProducts > 0 && (_jsxs(Span, { layout: "flex", gap: "2xs", children: [_jsx(Span, { "aria-hidden": "true", children: "\uD83D\uDCE6" }), " ", store.totalProducts, " ", labels.products ?? "products"] })), store.itemsSold != null && store.itemsSold > 0 && (_jsxs(Span, { layout: "flex", gap: "2xs", children: [_jsx(Span, { "aria-hidden": "true", children: "\uD83D\uDECD\uFE0F" }), " ", store.itemsSold, " ", labels.sold ?? "sold"] }))] }), _jsxs(Row, { border: "top-subtle", paddingY: "y-xs-tall", className: "mt-3", align: "center", justify: "between", children: [_jsxs(Span, { size: "xs", weight: "semibold", className: "text-primary group-hover:underline transition-colors", children: [labels.visitStore ?? "Visit store", " \u2192"] }), store.totalReviews != null && store.totalReviews > 0 && (_jsxs(Span, { size: "xs", color: "muted", children: [store.totalReviews, " ", labels.reviews ?? "reviews"] }))] })] })] })] }));
+                }, label: isSelected ? "Deselect store" : "Select store", position: "top-2 left-2", className: selectable || isSelected ? "opacity-100" : "opacity-0 pointer-events-none group-hover:opacity-100 group-hover:pointer-events-auto transition-opacity" })), _jsxs(Link, { href: href, className: "flex flex-col flex-1 min-h-0", children: [_jsxs(Div, { surface: "muted", className: `relative aspect-video w-full ${__O.hidden} flex-shrink-0`, children: [hasBanner ? (_jsx(MediaImage, { src: store.storeBannerURL, alt: `${store.storeName} banner`, size: "banner", className: "h-full w-full object-cover transition-transform duration-500 group-hover:scale-105" })) : (_jsx(Row, { className: "absolute inset-0", align: "center", justify: "center", children: _jsx(Span, { className: "opacity-20 select-none", size: "5xl", "aria-hidden": "true", children: "\uD83C\uDFEA" }) })), _jsx(Scrim, { direction: "bottom-up", intensity: "subtle", className: "absolute inset-x-0 bottom-0 h-12" }), store.averageRating != null && store.averageRating > 0 && (_jsxs(Div, { className: CLS_RATING_BADGE, children: ["\u2605 ", store.averageRating.toFixed(1)] }))] }), _jsxs(Stack, { paddingY: "b-md", className: "flex-1", padding: "x-md", children: [_jsx(Row, { className: "-mt-5 mb-2", align: "end", justify: "between", children: _jsx(Div, { className: "flex-shrink-0", children: hasLogo ? (_jsx(Div, { className: "relative h-10 w-10 border-2 border-[var(--appkit-color-border-subtle)] bg-[var(--appkit-color-surface)]", rounded: "lg", shadow: "md", overflow: "hidden", children: _jsx(MediaImage, { src: store.storeLogoURL, alt: store.storeName, size: "thumbnail", onError: () => setLogoBroken(true) }) })) : (_jsx(Row, { textWeight: "bold", textSize: "base", className: "h-10 w-10 border-2 border-white bg-primary/10 dark:bg-primary/20 text-primary", align: "center", justify: "center", rounded: "lg", shadow: "md", children: initial })) }) }), _jsx(Heading, { level: 3, className: `group-hover:text-primary transition-colors`, truncate: true, size: "sm", weight: "bold", color: "primary", children: store.storeName }), store.storeDescription ? (_jsx(RichText, { html: normalizeRichTextHtml(store.storeDescription), proseClass: "prose prose-sm max-w-none dark:prose-invert prose-p:my-0", className: "mt-1 line-clamp-2 text-[length:var(--appkit-text-xs)] text-[var(--appkit-color-text-muted)] flex-1" })) : (_jsx(Div, { className: "flex-1" })), _jsxs(Row, { color: "muted", textSize: "xs", gap: "sm", className: "mt-2.5", wrap: true, children: [store.totalProducts != null && store.totalProducts > 0 && (_jsxs(Span, { layout: "flex", gap: "2xs", children: [_jsx(Span, { "aria-hidden": "true", children: "\uD83D\uDCE6" }), " ", store.totalProducts, " ", labels.products ?? "products"] })), store.itemsSold != null && store.itemsSold > 0 && (_jsxs(Span, { layout: "flex", gap: "2xs", children: [_jsx(Span, { "aria-hidden": "true", children: "\uD83D\uDECD\uFE0F" }), " ", store.itemsSold, " ", labels.sold ?? "sold"] }))] }), _jsxs(Row, { border: "top-subtle", paddingY: "y-xs-tall", className: "mt-3", align: "center", justify: "between", children: [_jsxs(Span, { size: "xs", weight: "semibold", className: "text-primary group-hover:underline transition-colors", children: [labels.visitStore ?? "Visit store", " \u2192"] }), store.totalReviews != null && store.totalReviews > 0 && (_jsxs(Span, { size: "xs", color: "muted", children: [store.totalReviews, " ", labels.reviews ?? "reviews"] }))] })] })] })] }));
 }

package/dist/features/stores/components/StoreHeader.js

@@ -8,7 +8,7 @@ import { SellerTrustBadge } from "../../scams/components/SellerTrustBadge";
 const __O = {
     hidden: "overflow-hidden",
 };
-const CLS_AVATAR = "-mt-8 h-16 w-16 rounded-xl border-2 border-white border-[var(--appkit-color-border-subtle)] bg-warning-surface dark:bg-warning-surface flex items-center justify-center text-warning dark:text-warning font-bold text-[length:var(--appkit-text-2xl)] shadow-sm";
+const CLS_AVATAR = "-mt-8 h-16 w-16 rounded-xl border-2 border-[var(--appkit-color-border-subtle)] bg-warning-surface dark:bg-warning-surface flex items-center justify-center text-warning dark:text-warning font-bold text-[length:var(--appkit-text-2xl)] shadow-sm";
 const CLS_STARS = "inline-flex items-center gap-[var(--appkit-space-1)] text-warning";
 const CLS_FOLLOW_BTN = "rounded-lg border border-warning px-[var(--appkit-space-4)] py-[var(--appkit-space-2)] text-[length:var(--appkit-text-sm)] font-medium text-warning hover:bg-warning-surface transition-colors";
 const CLS_WARN_BANNER = "mt-3 rounded-lg bg-warning-surface dark:bg-warning-surface border border-warning dark:border-warning px-[var(--appkit-space-3)] py-[var(--appkit-space-2)] text-[length:var(--appkit-text-sm)] text-warning dark:text-warning";

package/dist/features/stores/components/StoreNavTabs.js

@@ -1,8 +1,7 @@
 "use client";
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { useRouter } from "next/navigation";
-import { Button, Div, Select, TextLink } from "../../../ui";
-const CLS_ACTIVE_TAB = "border-primary text-primary";
+import { TabBarButton, TabBarShell, TabsNavSelect, TextLink } from "../../../ui";
 export function StoreNavTabs({ tabs, dropdownTabs = [], dropdownPlaceholder = "Browse listings", activeValue, onTabChange, renderTabBar, className = "", }) {
     const router = useRouter();
     const handleChange = (v) => onTabChange?.(v);
@@ -18,9 +17,22 @@ export function StoreNavTabs({ tabs, dropdownTabs = [], dropdownPlaceholder = "B
             router.push(tab.href);
         handleChange(tab.value);
     };
-    return (_jsxs(Div, { layout: "flex", gap: "2", align: "center", role: "tablist", border: "bottom", className: `overflow-x-auto ${className}`, children: [dropdownTabs.length > 0 && (_jsx(Select, { bare: true, "aria-label": dropdownPlaceholder, options: dropdownTabs.map((tab) => ({ value: tab.value, label: tab.label })), value: activeDropdownTab?.value ?? "", placeholder: activeDropdownTab ? undefined : dropdownPlaceholder, onValueChange: handleDropdownChange, className: `max-w-[12rem] flex-shrink-0 whitespace-nowrap ${activeDropdownTab ? CLS_ACTIVE_TAB : ""}` })), tabs.map((tab) => tab.href ? (_jsx(TextLink, { variant: "bare", href: tab.href, role: "tab", "aria-selected": activeValue === tab.value, paddingX: "md", paddingY: "xs", size: "sm", weight: "medium", className: `whitespace-nowrap border-b-2 -mb-px transition-colors ${activeValue === tab.value
-                    ? CLS_ACTIVE_TAB
-                    : "border-transparent text-[var(--appkit-color-text-muted)] text-[var(--appkit-color-text-muted)] hover:text-neutral-800 hover:text-[var(--appkit-color-text-muted)]"}`, children: tab.label }, tab.value)) : (_jsx(Button, { variant: "ghost", type: "button", role: "tab", "aria-selected": activeValue === tab.value, onClick: () => handleChange(tab.value), paddingX: "md", paddingY: "sm", textSize: "sm", weight: "medium", rounded: "none", className: `whitespace-nowrap border-b-2 -mb-px transition-colors ${activeValue === tab.value
-                    ? CLS_ACTIVE_TAB
-                    : "border-transparent text-[var(--appkit-color-text-muted)] text-[var(--appkit-color-text-muted)] hover:text-neutral-800 hover:text-[var(--appkit-color-text-muted)]"}`, children: tab.label }, tab.value)))] }));
+    /*
+     * The listing-type picker goes in `leading` — i.e. INSIDE the shell but
+     * OUTSIDE the role="tablist" element. It used to be a direct child of the
+     * tablist, which is invalid ARIA: a <select> is not a role="tab". Its old
+     * `max-w-[12rem] flex-shrink-0` sizing also went onto the inner <select>,
+     * the wrong element for sizing utilities (Root Cause #29); those now live
+     * on `.appkit-tabs-dropdown` in Tabs.style.css.
+     */
+    const leading = dropdownTabs.length > 0 ? (_jsx(TabsNavSelect, { ariaLabel: dropdownPlaceholder, options: dropdownTabs.map((tab) => ({ value: tab.value, label: tab.label })), value: activeDropdownTab?.value ?? "", placeholder: activeDropdownTab ? undefined : dropdownPlaceholder, selected: Boolean(activeDropdownTab), onValueChange: handleDropdownChange })) : undefined;
+    /*
+     * Triggers carry `.appkit-tabs-trigger` and NOTHING else — no padding /
+     * size / weight props, no conditional colour classes. `important: true` is
+     * set in both tailwind configs, so any surviving utility would beat the
+     * component CSS unconditionally. The old inactive string also contained
+     * contradictory duplicates (`hover:text-neutral-800` immediately overridden
+     * by `hover:text-…text-muted`), so hover had been a no-op.
+     */
+    return (_jsx(TabBarShell, { className: className, ariaLabel: "Store sections", leading: leading, activeKey: activeValue, children: tabs.map((tab) => tab.href ? (_jsx(TextLink, { variant: "bare", href: tab.href, role: "tab", "aria-selected": activeValue === tab.value, className: "appkit-tabs-trigger", children: tab.label }, tab.value)) : (_jsx(TabBarButton, { selected: activeValue === tab.value, onClick: () => handleChange(tab.value), children: tab.label }, tab.value))) }));
 }

package/dist/features/support/repository/support.repository.d.ts

@@ -1,5 +1,6 @@
 import { BaseRepository } from "../../../providers/db-firebase";
 import type { FirebaseSieveFields, FirebaseSieveResult, SieveModel } from "../../../providers/db-firebase";
+import type { DocumentSnapshot } from "firebase-admin/firestore";
 import { type SupportTicketDocument, type SupportTicketCreateInput, type SupportTicketUpdateInput, type TicketMessage, type TicketStatus } from "../schemas/firestore";
 import { type HistoryActor } from "../../../_internal/shared/history/index";
 /** Who/why for a write that lands in `statusHistory`. */
@@ -11,7 +12,18 @@ export interface TicketWriteContext {
 }
 export declare class SupportRepository extends BaseRepository<SupportTicketDocument> {
     static readonly SIEVE_FIELDS: FirebaseSieveFields;
+    /**
+     * Ticket PII, encrypted by BaseRepository's write hooks.
+     *
+     * `SUPPORT_TICKET_PII_FIELDS` existed but was only ever used to scrub status
+     * history — the documents themselves were never encrypted. Safe to enable:
+     * nothing queries these by equality (the admin list searches `subject`), so
+     * no read path depends on their plaintext.
+     */
+    protected piiFields: readonly ["userEmail", "userDisplayName", "assignedToName"];
     constructor();
+    /** Decrypt on read so callers see the shape they wrote. */
+    protected mapDoc<D = SupportTicketDocument>(snap: DocumentSnapshot): D;
     createTicket(input: SupportTicketCreateInput): Promise<SupportTicketDocument>;
     getUserTickets(userId: string, page?: number, pageSize?: number): Promise<FirebaseSieveResult<SupportTicketDocument>>;
     getTicketById(ticketId: string): Promise<SupportTicketDocument | null>;

package/dist/features/support/repository/support.repository.js

@@ -3,11 +3,26 @@ import { BaseRepository, prepareForFirestore, parseSieveDateValue, } from "../..
 import { normalizeError } from "../../../errors/normalize";
 import { DatabaseError } from "../../../errors";
 import { SUPPORT_TICKET_FIELDS } from "../../../constants/field-names";
+import { decryptPiiFields } from "../../../security/pii-encrypt";
 import { SUPPORT_TICKET_COLLECTION, SUPPORT_TICKET_PII_FIELDS, SUPPORT_TICKET_TRACKED_FIELDS, TicketStatusValues, ACTIVE_TICKET_STATUSES, } from "../schemas/firestore";
 import { withHistory } from "../../../_internal/shared/history/index";
 export class SupportRepository extends BaseRepository {
     constructor() {
         super(SUPPORT_TICKET_COLLECTION);
+        /**
+         * Ticket PII, encrypted by BaseRepository's write hooks.
+         *
+         * `SUPPORT_TICKET_PII_FIELDS` existed but was only ever used to scrub status
+         * history — the documents themselves were never encrypted. Safe to enable:
+         * nothing queries these by equality (the admin list searches `subject`), so
+         * no read path depends on their plaintext.
+         */
+        this.piiFields = SUPPORT_TICKET_PII_FIELDS;
+    }
+    /** Decrypt on read so callers see the shape they wrote. */
+    mapDoc(snap) {
+        const raw = super.mapDoc(snap);
+        return decryptPiiFields(raw, [...SUPPORT_TICKET_PII_FIELDS]);
     }
     async createTicket(input) {
         try {

package/dist/features/support/schemas/ticket-create-form.d.ts

@@ -0,0 +1,33 @@
+import { z } from "zod";
+import { type TicketCategory } from "./firestore";
+/**
+ * 🛑 `annotate()` must be the OUTERMOST call on each field — it keys a WeakMap
+ * by schema instance and every zod wrapper returns a new one.
+ */
+export declare const supportTicketCreateSchema: z.ZodEffects<z.ZodObject<{
+    category: z.ZodEnum<[TicketCategory, ...TicketCategory[]]>;
+    subject: z.ZodString;
+    description: z.ZodString;
+    orderId: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    category: TicketCategory;
+    description: string;
+    subject: string;
+    orderId?: string | undefined;
+}, {
+    category: TicketCategory;
+    description: string;
+    subject: string;
+    orderId?: string | undefined;
+}>, {
+    category: TicketCategory;
+    description: string;
+    subject: string;
+    orderId?: string | undefined;
+}, {
+    category: TicketCategory;
+    description: string;
+    subject: string;
+    orderId?: string | undefined;
+}>;
+export type SupportTicketCreateValues = z.infer<typeof supportTicketCreateSchema>;

package/dist/features/support/schemas/ticket-create-form.js

@@ -0,0 +1,82 @@
+/*
+ * WHY: Support tickets had THREE validation rules in three places that did not
+ *      agree. `/user/support/new` hand-rolled a `canSubmit` boolean;
+ *      `UserSupportView`'s drawer checked nothing at all; and
+ *      `POST /api/support/tickets` declared its own inline schema.
+ * WHAT: One schema for both surfaces AND the route.
+ *
+ * ## The page was STRICTER than the route, which is the interesting part
+ *
+ * `/user/support/new` required an `orderId` when the category is
+ * `order_issue` — a real rule, since an order complaint with no order is
+ * unactionable and support has to go back and ask. The route never enforced
+ * it, and the drawer never enforced anything, so the same ticket was
+ * acceptable or not depending on which surface the user happened to open.
+ *
+ * That rule is a `.superRefine` here, so it now holds on all three. Deleting
+ * it to "match the route" would have been the easy read of consolidation and
+ * the wrong one: the stricter rule was the correct one.
+ *
+ * EXPORTS: supportTicketCreateSchema, type SupportTicketCreateValues
+ *
+ * @tag domain:support
+ * @tag layer:schema
+ * @tag pattern:none
+ * @tag access:isomorphic
+ * @tag consumers:/user/support/new,UserSupportView,/api/support/tickets
+ * @tag sideEffects:none
+ */
+import { z } from "zod";
+import { annotate } from "../../shell/field-ui-meta";
+import { TicketCategoryValues } from "./firestore";
+/*
+ * `Object.values(...)` rather than `z.enum(TicketCategoryValues)`. The object
+ * form of `z.enum` is Zod 4 syntax, and appkit compiles against zod 3 while
+ * the app is on 4 — the two-zod split this repo carries. The tuple form works
+ * in both, and still DERIVES from the one map, so a twelfth category cannot be
+ * omitted here (Root Cause #61).
+ */
+const CATEGORY_TUPLE = Object.values(TicketCategoryValues);
+/**
+ * 🛑 `annotate()` must be the OUTERMOST call on each field — it keys a WeakMap
+ * by schema instance and every zod wrapper returns a new one.
+ */
+export const supportTicketCreateSchema = z
+    .object({
+    category: annotate(z.enum(CATEGORY_TUPLE), {
+        section: "ticket",
+        sectionLabel: "What do you need help with?",
+        sectionRequired: true,
+        quick: true,
+        order: 1,
+        row: "pair",
+    }),
+    subject: annotate(z
+        .string()
+        .min(3, "Give the ticket a subject of at least 3 characters.")
+        .max(200, "Keep the subject under 200 characters."), { section: "ticket", quick: true, order: 2, row: "full" }),
+    description: annotate(z
+        .string()
+        .min(10, "Describe the problem in at least 10 characters.")
+        .max(5000, "Keep the description under 5000 characters."), { section: "ticket", quick: true, order: 3, row: "full", kind: "textarea" }),
+    orderId: annotate(z.string().max(120).optional(), {
+        section: "ticket",
+        order: 4,
+        row: "pair",
+        help: "Required when the category is an order issue.",
+    }),
+})
+    .superRefine((v, ctx) => {
+    /*
+     * The rule only `/user/support/new` enforced. An order complaint with no
+     * order id cannot be actioned — support has to reply asking for it, which
+     * is a round trip the form can prevent.
+     */
+    if (v.category === TicketCategoryValues.ORDER_ISSUE && !v.orderId?.trim()) {
+        ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["orderId"],
+            message: "Which order is this about? An order id is required.",
+        });
+    }
+});

package/dist/features/tester/seed-data/products-tester-seed-data.js

@@ -23,7 +23,7 @@
  * @tag sideEffects:none
  */
 import { PRODUCT_FIELDS } from "../../../constants/field-names";
-import { buildSearchTokens } from "../../../utils/search-tokens";
+import { buildSearchTxt } from "../../../utils/search-txt";
 import { seedExtMedia } from "../../../seed/_helpers/media";
 import { testDataExpiresAt } from "./tester-ttl";
 const TESTER_STORE_ID = "store-tester-sandbox";
@@ -42,7 +42,7 @@ function withTokens(p) {
         storeId: TESTER_STORE_ID,
         storeName: TESTER_STORE_NAME,
         ...p,
-        searchTokens: buildSearchTokens(p.title, p.description, p.brand, p.brandSlug, p.categoryNames, p.tags),
+        searchTxt: buildSearchTxt([p.title, p.description, p.brand, p.brandSlug, p.categoryNames, p.tags]),
     };
 }
 // Staggered, incrementing-id auction fixtures so testers can watch a live
@@ -308,6 +308,111 @@ export const productsTesterSeedData = [
         createdAt: new Date(),
         updatedAt: new Date(),
     }),
+    // ── Grouped-cart-line fixtures ───────────────────────────────────────────
+    // Each of the three below exists to make ONE picker branch testable by hand.
+    // Without them the branch can only be reached by editing data live, which a
+    // reseed silently wipes out.
+    withTokens({
+        id: "product-tester-group-soldout",
+        slug: "product-tester-group-soldout",
+        title: "Test Part — Sold Out (Group Member)",
+        description: "A member of the tester product group that is deliberately out of stock. Exists so the group picker's blocked-member branch has real data: it must render a reason chip instead of a +/- stepper, and must not be selectable. Auto-expires in 7 days.",
+        categorySlugs: COLLECTIBLES_CATEGORY_SLUGS,
+        categoryNames: COLLECTIBLES_CATEGORY_NAMES,
+        brandSlug: "brand-tester-sandbox",
+        brand: "TestBrand",
+        price: 129,
+        currency: "INR",
+        stockQuantity: 0,
+        availableQuantity: 0,
+        isSold: true,
+        mainImage: seedExtMedia("https://picsum.photos/seed/product-image-tester-group-soldout-20260101/900/900"),
+        images: [seedExtMedia("https://picsum.photos/seed/product-image-tester-group-soldout-20260101/900/900")],
+        status: PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED,
+        condition: PRODUCT_FIELDS.CONDITION_VALUES.NEW,
+        listingType: "standard",
+        customFields: [],
+        customSections: [],
+        isPromoted: false,
+        isOnSale: false,
+        gstRate: 18,
+        hsnCode: "95030090",
+        groupId: "group-tester-sandbox-bundle",
+        groupParentSlug: "group-tester-sandbox-bundle",
+        groupTitle: TESTER_GROUP_TITLE,
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    }),
+    // A group whose members span TWO stores. `storeId` is the order-splitting key
+    // and the key per-store add-ons/coupons/shipping/payout hang off, so such a
+    // group can never become one cart line — the picker must stand down to a
+    // read-only table rather than offer a button that always fails.
+    // `withTokens` spreads `...p` last, so the storeId below overrides the
+    // sandbox default on purpose.
+    withTokens({
+        id: "product-tester-crossstore-a",
+        slug: "product-tester-crossstore-a",
+        title: "Test Cross-Store Set — Seller A",
+        description: "Parent of a deliberately CROSS-STORE tester group. Its sibling belongs to a different seller, so the group picker must render read-only with no quantity column and no \"Add selected\" button. Auto-expires in 7 days.",
+        categorySlugs: COLLECTIBLES_CATEGORY_SLUGS,
+        categoryNames: COLLECTIBLES_CATEGORY_NAMES,
+        brandSlug: "brand-tester-sandbox",
+        brand: "TestBrand",
+        price: 259,
+        currency: "INR",
+        stockQuantity: 6,
+        availableQuantity: 6,
+        isSold: false,
+        mainImage: seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-a-20260101/900/900"),
+        images: [seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-a-20260101/900/900")],
+        status: PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED,
+        condition: PRODUCT_FIELDS.CONDITION_VALUES.NEW,
+        listingType: "standard",
+        customFields: [],
+        customSections: [],
+        isPromoted: false,
+        isOnSale: false,
+        gstRate: 18,
+        isGroupParent: true,
+        groupId: "group-tester-cross-store",
+        groupTitle: "Tester Cross-Store Set",
+        groupChildSlugs: ["product-tester-crossstore-b"],
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    }),
+    withTokens({
+        id: "product-tester-crossstore-b",
+        slug: "product-tester-crossstore-b",
+        title: "Test Cross-Store Set — Seller B",
+        description: "Sibling of product-tester-crossstore-a, deliberately owned by a DIFFERENT store so the group spans two sellers. Still isTestData, so filterTestDataForViewer keeps it off that store's public listings for non-testers. Auto-expires in 7 days.",
+        categorySlugs: COLLECTIBLES_CATEGORY_SLUGS,
+        categoryNames: COLLECTIBLES_CATEGORY_NAMES,
+        brandSlug: "brand-tester-sandbox",
+        brand: "TestBrand",
+        price: 189,
+        currency: "INR",
+        stockQuantity: 6,
+        availableQuantity: 6,
+        isSold: false,
+        mainImage: seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-b-20260101/900/900"),
+        images: [seedExtMedia("https://picsum.photos/seed/product-image-tester-crossstore-b-20260101/900/900")],
+        status: PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED,
+        condition: PRODUCT_FIELDS.CONDITION_VALUES.NEW,
+        listingType: "standard",
+        customFields: [],
+        customSections: [],
+        isPromoted: false,
+        isOnSale: false,
+        gstRate: 12,
+        // The whole point of this fixture — a different seller from its sibling.
+        storeId: "store-beyblade-arena",
+        storeName: "Beyblade Arena",
+        groupId: "group-tester-cross-store",
+        groupParentSlug: "product-tester-crossstore-a",
+        groupTitle: "Tester Cross-Store Set",
+        createdAt: new Date(),
+        updatedAt: new Date(),
+    }),
     withTokens({
         id: "product-tester-standard-sold",
         slug: "product-tester-standard-sold",
@@ -687,6 +792,7 @@ export const productsTesterSeedData = [
             "product-tester-standard-1",
             "product-tester-standard-2",
             "product-tester-standard-3",
+            "product-tester-group-soldout",
         ],
         createdAt: new Date(),
         updatedAt: new Date(),