@mohasinac/appkit 4.11.1 → 4.11.2

package/dist/features/products/components/ProductsIndexPageView.js

@@ -1,75 +1,22 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { productRepository } from "../../../repositories";
 import { ROUTES } from "../../../constants";
 import { Container, Div, Heading, Main, Section, Text, TextLink } from "../../../ui";
 import { AdSlot } from "../../homepage/components/AdSlot";
-import { parseListingSearchParams } from "../../../utils/listing-params";
 import { ProductsIndexListing } from "./ProductsIndexListing";
 import { PRODUCT_FIELDS } from "../../../constants/field-names";
-import { sieveFilter, sieveMultiEq, sieveAnd, SIEVE_OP } from "../../../utils/sieve-builder";
 import { sortBy } from "../../../constants/sort";
 import { GENERIC_PRODUCT_LISTING_TYPES } from "../constants/listing-tabs";
-const DEFAULT_PAGE = 1;
+import { listPublicProducts, parsePublicProductParams, } from "../../../_internal/server/features/products/list-public";
 const DEFAULT_PAGE_SIZE = 24;
 const DEFAULT_SORT = sortBy(PRODUCT_FIELDS.CREATED_AT);
-function sp(params, key) {
-    const v = params[key];
-    return Array.isArray(v) ? v[0] ?? "" : v ?? "";
-}
-function buildProductFilters(params) {
-    const listingTypeParam = sp(params, "listingType");
-    const listingType = listingTypeParam && GENERIC_PRODUCT_LISTING_TYPES.includes(listingTypeParam)
-        ? listingTypeParam
-        : GENERIC_PRODUCT_LISTING_TYPES.join("|");
-    const parts = [
-        sieveFilter(PRODUCT_FIELDS.STATUS, SIEVE_OP.EQ, PRODUCT_FIELDS.STATUS_VALUES.PUBLISHED),
-        sieveFilter(PRODUCT_FIELDS.LISTING_TYPE, SIEVE_OP.EQ, listingType),
-    ];
-    const condition = sp(params, "condition");
-    if (condition) {
-        const values = condition.split("|").filter(Boolean);
-        if (values.length === 1)
-            parts.push(sieveFilter(PRODUCT_FIELDS.CONDITION, SIEVE_OP.EQ, values[0]));
-        // BUG FIX: pipe is invalid for ==; expand to multiple AND clauses
-        else if (values.length > 1)
-            parts.push(sieveMultiEq(PRODUCT_FIELDS.CONDITION, values));
-    }
-    const minPrice = sp(params, "minPrice");
-    const maxPrice = sp(params, "maxPrice");
-    if (minPrice)
-        parts.push(sieveFilter(PRODUCT_FIELDS.PRICE, SIEVE_OP.GTE, minPrice));
-    if (maxPrice)
-        parts.push(sieveFilter(PRODUCT_FIELDS.PRICE, SIEVE_OP.LTE, maxPrice));
-    const storeId = sp(params, "seller");
-    if (storeId)
-        parts.push(sieveFilter(PRODUCT_FIELDS.STORE_ID, SIEVE_OP.EQ, storeId));
-    const freeShipping = sp(params, "freeShipping");
-    if (freeShipping === "true") {
-        parts.push(sieveFilter(PRODUCT_FIELDS.SHIPPING_PAID_BY, SIEVE_OP.EQ, PRODUCT_FIELDS.SHIPPING_PAID_BY_VALUES.SELLER));
-    }
-    // Mirror ProductsIndexListing's client-side "Show sold" default (same Root Cause
-    // pattern as auctions' dateFrom default — SSR initialData is seeded into React
-    // Query with staleTime:Infinity, so if this filter doesn't already exclude sold /
-    // out-of-stock products, the client never refetches and they leak into the default view).
-    const showSold = sp(params, "showSold") === "true";
-    if (!showSold)
-        parts.push(sieveFilter(PRODUCT_FIELDS.STOCK_QUANTITY, SIEVE_OP.GT, 0));
-    return sieveAnd(...parts);
-}
 export async function ProductsIndexPageView({ searchParams = {} }) {
-    const std = parseListingSearchParams(searchParams);
-    const sort = std.sorts ?? DEFAULT_SORT;
-    const page = std.page ?? DEFAULT_PAGE;
-    const pageSize = std.pageSize ?? DEFAULT_PAGE_SIZE;
-    const filters = buildProductFilters(searchParams);
-    const result = await productRepository
-        .list({
-        filters,
-        sorts: sort,
-        page,
-        pageSize,
-    })
-        .catch(() => null);
-    const products = result ?? null;
+    // See ArtStickersListView — one shared filter implementation with
+    // /api/products, so SSR and the client refetch agree by construction.
+    const products = await listPublicProducts(parsePublicProductParams(searchParams, {
+        listingTypes: GENERIC_PRODUCT_LISTING_TYPES,
+        pageSize: DEFAULT_PAGE_SIZE,
+        sorts: DEFAULT_SORT,
+        hideSoldByDefault: true,
+    }));
     return (_jsxs(Main, { children: [_jsx(Section, { border: "bottom-subtle", paddingY: "b-md", padding: "t-xl", children: _jsxs(Container, { size: "xl", children: [_jsx(Heading, { level: 1, size: "3xl", weight: "bold", color: "primary", children: "Products" }), _jsx(Text, { className: "mt-1", color: "muted", size: "sm", children: "Discover amazing products and deals" }), _jsx(Div, { className: "mt-3", children: _jsx(TextLink, { variant: "bare", href: String(ROUTES.PUBLIC.AUCTIONS), rounded: "full", paddingX: "sm", paddingY: "2xs", size: "xs", weight: "medium", layout: "inline-flex", align: "center", gap: "sm", className: "border border-primary/30 bg-primary/10 text-primary-700 dark:text-primary-400 hover:bg-primary/15 transition-colors", children: "\uD83C\uDFF7\uFE0F Looking for unique deals? Browse Auctions \u2192" }) })] }) }), _jsxs(Container, { size: "xl", padding: "x-md", children: [_jsx(AdSlot, { id: "listing-sidebar-top", className: "mb-4 mt-4" }), _jsx(ProductsIndexListing, { initialData: products }), _jsx(AdSlot, { id: "listing-sidebar-bottom", className: "mt-8" })] })] }));
 }

package/dist/features/products/repository/products.repository.js

@@ -3,6 +3,7 @@ import { increment, serverTimestamp } from "../../../contracts/field-ops";
 import { DatabaseError } from "../../../errors";
 import { BaseRepository, prepareForFirestore, parseSieveDateValue, } from "../../../providers/db-firebase";
 import { cacheManager } from "../../../core";
+import { serverLogger } from "../../../monitoring";
 import { generateUniqueId, slugify, buildSearchTokens, tokenizeQuery, generateBarcodeId } from "../../../utils";
 import { PRODUCT_COLLECTION, ProductStatusValues } from "../schemas";
 import { PRODUCT_FIELDS } from "../../../constants/field-names";
@@ -31,6 +32,8 @@ const LISTING_KIND_ALIAS_MAP = {
     classified: LISTING_TYPE_VALUES.CLASSIFIED,
     "digital-code": LISTING_TYPE_VALUES.DIGITAL_CODE,
     live: LISTING_TYPE_VALUES.LIVE,
+    art: LISTING_TYPE_VALUES.ART,
+    stickers: LISTING_TYPE_VALUES.STICKERS,
     // Legacy → canonical.
     product: LISTING_TYPE_VALUES.STANDARD,
     preorder: LISTING_TYPE_VALUES.PRE_ORDER,
@@ -559,12 +562,45 @@ ProductRepository.FILTER_ALIASES = {
         if (operator !== "==" && operator !== "!=")
             return "";
         // Accept both canonical tokens (`standard`, `auction`, `pre-order`,
-        // `prize-draw`) and legacy aliases (`product`, `preorder`, `prizedraw`).
-        // `LISTING_KIND_ACCEPTED` is the single source of truth — keep it in
-        // sync with `LISTING_KIND_ALIAS_MAP`.
-        if (!LISTING_KIND_ACCEPTED.has(value))
+        // `prize-draw`, `art`, `stickers`, …) and legacy aliases (`product`,
+        // `preorder`, `prizedraw`). `LISTING_KIND_ACCEPTED` is the single source
+        // of truth — keep it in sync with `LISTING_KIND_ALIAS_MAP`.
+        //
+        // A pipe-joined value (`art|stickers`, `standard|classified|live`) is a
+        // sievejs OR-group that the Firebase adapter upgrades to a `.where(…,
+        // "in", …)` query — the combined browse pages (/products, /art) send
+        // exactly this. Before 2026-08-21 the whole string was tested against
+        // `LISTING_KIND_ACCEPTED` as one token, never matched, and the clause was
+        // dropped silently, so those pages queried with NO listing-type filter at
+        // all. Split first, map each part, then re-emit the OR-group.
+        const parts = value.split("|").filter(Boolean);
+        if (parts.length === 0)
             return "";
-        return buildListingKindClause(value, operator === "!=");
+        const unknown = parts.filter((p) => !LISTING_KIND_ACCEPTED.has(p));
+        if (unknown.length > 0) {
+            // Loud, not silent — a dropped filter reads as "no results" downstream
+            // with nothing to trace it back to (Root Cause: the art/stickers bug).
+            serverLogger.warn("Unknown listingType filter value(s) — clause dropped", {
+                value,
+                unknown,
+                accepted: [...LISTING_KIND_ACCEPTED],
+            });
+            return "";
+        }
+        if (operator === "!=") {
+            // Firestore allows at most one `!=` per query, so a multi-value
+            // exclusion can't be expressed here — reject rather than half-apply it.
+            if (parts.length > 1) {
+                serverLogger.warn("Multi-value listingType != is not supported — clause dropped", { value });
+                return "";
+            }
+            return buildListingKindClause(parts[0], true);
+        }
+        const canonical = parts.map((p) => LISTING_KIND_ALIAS_MAP[p]);
+        // De-dupe: legacy aliases can collapse onto the same canonical token
+        // (e.g. `product|standard`), and Firestore rejects a duplicate `in` value.
+        const unique = [...new Set(canonical)];
+        return `${PRODUCT_FIELDS.LISTING_TYPE}==${unique.join("|")}`;
     },
     /**
      * Public catalog scope shorthand. Maps a single token to the canonical

package/dist/features/seller/actions/offer-actions.d.ts

@@ -5,6 +5,12 @@
  * Auth, rate-limiting, and input validation are handled by the calling server action.
  */
 import type { OfferDocument } from "../schemas";
+/**
+ * How long an accepted offer stays claimable at its locked price. Shared by the
+ * seller-accept path, the buyer-accepts-counter path, and the expiry sweep so
+ * all three can't drift.
+ */
+export declare const OFFER_CHECKOUT_WINDOW_MS: number;
 import type { CartDocument } from "../../cart/schemas/firestore";
 export interface MakeOfferInput {
     productId: string;

package/dist/features/seller/actions/offer-actions.js

@@ -15,6 +15,12 @@ import { cartRepository } from "../../cart/repository/cart.repository";
 import { maskOfferForSeller } from "../../../security";
 import { ERROR_MESSAGES, AuthorizationError, ValidationError, NotFoundError, OFFER_ERROR_CODES, } from "../../../errors";
 import { OfferStatusValues } from "../schemas";
+/**
+ * How long an accepted offer stays claimable at its locked price. Shared by the
+ * seller-accept path, the buyer-accepts-counter path, and the expiry sweep so
+ * all three can't drift.
+ */
+export const OFFER_CHECKOUT_WINDOW_MS = 48 * 60 * 60 * 1000;
 const ERR_OFFER_NOT_FOUND = "Offer not found";
 const ERR_NOT_AUTHORISED = "Not authorized";
 // --- Buyer: Make an Offer --------------------------------------------------
@@ -89,12 +95,8 @@ export async function respondToOffer(userId, input) {
     if (new Date() > offer.expiresAt)
         throw new ValidationError(ERROR_MESSAGES.OFFER.EXPIRED);
     let updated;
-    const CHECKOUT_WINDOW_MS = 48 * 60 * 60 * 1000;
     if (action === "accept") {
-        updated = await offerRepository.accept(offerId, offer.offerAmount, sellerNote);
-        await offerRepository.update(offerId, {
-            checkoutDeadline: new Date(Date.now() + CHECKOUT_WINDOW_MS),
-        });
+        updated = await offerRepository.accept(offerId, offer.offerAmount, sellerNote, new Date(Date.now() + OFFER_CHECKOUT_WINDOW_MS));
     }
     else if (action === "decline") {
         updated = await offerRepository.decline(offerId, sellerNote);
@@ -144,10 +146,7 @@ export async function acceptCounterOffer(userId, offerId) {
         throw new ValidationError("No counter to accept.");
     if (new Date() > offer.expiresAt)
         throw new ValidationError(ERROR_MESSAGES.OFFER.EXPIRED);
-    const updated = await offerRepository.acceptCounter(offerId);
-    await offerRepository.update(offerId, {
-        checkoutDeadline: new Date(Date.now() + 48 * 60 * 60 * 1000),
-    });
+    const updated = await offerRepository.acceptCounter(offerId, new Date(Date.now() + OFFER_CHECKOUT_WINDOW_MS));
     const counterStore = offer.storeId ? await storeRepository.findById(offer.storeId) : null;
     if (counterStore?.ownerId)
         await sendNotification({

package/dist/features/seller/components/SellerOffersView.d.ts

@@ -3,6 +3,11 @@ import type { ListingLayoutProps } from "../../../ui";
 export interface SellerOffersViewProps extends ListingLayoutProps {
     onAcceptOffer?: (id: string) => Promise<void>;
     onRejectOffer?: (id: string) => Promise<void>;
-    onCounterOffer?: (id: string) => void;
+    /**
+     * Countering needs an amount, so this view hosts the form (a QuickFormDrawer,
+     * per Rule #9) and hands the consumer the collected values — rather than the
+     * old `(id) => void` shape, which left every consumer to invent its own input.
+     */
+    onCounterOffer?: (id: string, counterAmount: number, sellerNote?: string) => Promise<void>;
 }
 export declare function SellerOffersView({ children, onAcceptOffer, onRejectOffer, onCounterOffer, ...props }: SellerOffersViewProps): React.JSX.Element;

package/dist/features/seller/components/SellerOffersView.js

@@ -1,15 +1,20 @@
 "use client";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { sieveFilter, SIEVE_OP } from "@mohasinac/appkit/client";
 import { sortBy } from "@mohasinac/appkit/client";
 import React from "react";
-import { FilterChipGroup, ListingLayout, RowActionMenu } from "../../../ui";
+import { FilterChipGroup, ListingLayout, RowActionMenu, RecordDetailModal } from "../../../ui";
+import { QuickFormDrawer } from "../../shell/QuickFormDrawer";
+import { counterOfferFormSchema } from "../schemas/offer-forms";
 import { SELLER_ENDPOINTS } from "../../../constants/api-endpoints";
 import { SELLER_OFFER_STATUS_TABS } from "../../admin/constants/filter-tabs";
 import { ACTIONS } from "../../../_internal/shared/actions/action-registry";
 import { toRecordArray, toRelativeDate, toCurrency, toStringValue, } from "../../admin/hooks/useAdminListingData";
 import { DataListingView } from "../../admin/components/DataListingView";
 export function SellerOffersView({ children, onAcceptOffer, onRejectOffer, onCounterOffer, ...props }) {
+    const [detailRow, setDetailRow] = React.useState(null);
+    const [counterRow, setCounterRow] = React.useState(null);
+    const [isCountering, setIsCountering] = React.useState(false);
     if (React.Children.count(children) > 0) {
         return (_jsx(ListingLayout, { portal: "seller", ...props, children: children }));
     }
@@ -26,26 +31,31 @@ export function SellerOffersView({ children, onAcceptOffer, onRejectOffer, onCou
             { value: sortBy("createdAt", "DESC"), label: "Newest" },
             { value: sortBy("createdAt", "ASC"), label: "Oldest" },
         ],
-        mapRows: (response) => toRecordArray(response.offers).map((item, index) => ({
+        mapRows: (response) => toRecordArray(response.items).map((item, index) => ({
             id: toStringValue(item.id, `offer-${index}`),
             primary: toStringValue(item.productTitle ?? item.title, "Untitled product"),
             secondary: [
                 `Offer: ${toCurrency(item.offerAmount ?? item.amount)}`,
+                `Listed: ${toCurrency(item.listedPrice)}`,
                 toStringValue(item.buyerName ?? "Unknown buyer", "Unknown buyer"),
             ].join(" · "),
             status: toStringValue(item.status, "Pending"),
             updatedAt: toRelativeDate(item.updatedAt ?? item.createdAt),
+            detail: item,
         })),
-        getTotal: (response, mappedRows) => typeof response.meta?.total === "number"
-            ? response.meta.total
-            : mappedRows.length,
+        getTotal: (response, mappedRows) => typeof response.total === "number" ? response.total : mappedRows.length,
+        // A menu of pure mutations is not a detail affordance — the seller must be
+        // able to READ the offer (buyer note, listed vs offered price, expiry)
+        // before accepting or declining it (Root Cause #56).
+        onRowClick: (row) => setDetailRow(row),
         buildFilters: (state) => state.status && state.status !== "All" ? sieveFilter("status", SIEVE_OP.EQ, state.status) : undefined,
         renderRowActions: (row) => (_jsx(RowActionMenu, { actions: [
+                { label: "View details", onClick: () => setDetailRow(row) },
                 ...(onAcceptOffer
                     ? [{ label: ACTIONS.STORE["accept-offer"].label, onClick: () => void onAcceptOffer(row.id) }]
                     : []),
                 ...(onCounterOffer
-                    ? [{ label: ACTIONS.STORE["counter-offer"].label, onClick: () => onCounterOffer(row.id) }]
+                    ? [{ label: ACTIONS.STORE["counter-offer"].label, onClick: () => setCounterRow(row) }]
                     : []),
                 ...(onRejectOffer
                     ? [{ label: ACTIONS.STORE["reject-offer"].label, destructive: true, onClick: () => void onRejectOffer(row.id) }]
@@ -53,5 +63,46 @@ export function SellerOffersView({ children, onAcceptOffer, onRejectOffer, onCou
             ] })),
         renderFilterPanel: ({ pendingFilters, setPendingFilters }) => (_jsx(FilterChipGroup, { label: "Status", tabs: SELLER_OFFER_STATUS_TABS, value: pendingFilters.status ?? "", onChange: (id) => setPendingFilters((p) => ({ ...p, status: id })) })),
     };
-    return _jsx(DataListingView, { config: config });
+    const d = detailRow?.detail ?? {};
+    return (_jsxs(_Fragment, { children: [_jsx(DataListingView, { config: config }), _jsx(RecordDetailModal, { isOpen: detailRow !== null, onClose: () => setDetailRow(null), title: detailRow?.primary ?? "Offer", badges: detailRow ? [{ label: detailRow.status }] : undefined, description: toStringValue(d.buyerNote, ""), fields: [
+                    { label: "Buyer", value: toStringValue(d.buyerName, "Unknown buyer") },
+                    { label: "Listed price", value: toCurrency(d.listedPrice) },
+                    { label: "Offered", value: toCurrency(d.offerAmount) },
+                    ...(d.counterAmount
+                        ? [{ label: "Your counter", value: toCurrency(d.counterAmount) }]
+                        : []),
+                    ...(d.lockedPrice
+                        ? [{ label: "Agreed price", value: toCurrency(d.lockedPrice) }]
+                        : []),
+                    { label: "Offer expires", value: toRelativeDate(d.expiresAt) },
+                    ...(d.checkoutDeadline
+                        ? [{ label: "Buyer must pay by", value: toRelativeDate(d.checkoutDeadline) }]
+                        : []),
+                    ...(d.sellerNote ? [{ label: "Your note", value: toStringValue(d.sellerNote, "") }] : []),
+                ] }), _jsx(QuickFormDrawer, { isOpen: counterRow !== null, onClose: () => setCounterRow(null), title: `Counter offer — ${counterRow?.primary ?? ""}`, submitLabel: "Send counter", isLoading: isCountering, schema: counterOfferFormSchema, fields: [
+                    {
+                        name: "counterAmount",
+                        label: "Your counter price (₹)",
+                        type: "number",
+                        required: true,
+                        helperText: "Must be below your listed price and different from the buyer's offer.",
+                    },
+                    {
+                        name: "sellerNote",
+                        label: "Note to buyer (optional)",
+                        type: "textarea",
+                        placeholder: "Best I can do is …",
+                    },
+                ], onSubmit: async (values) => {
+                    if (!counterRow || !onCounterOffer)
+                        return;
+                    setIsCountering(true);
+                    try {
+                        await onCounterOffer(counterRow.id, Number(values.counterAmount), values.sellerNote ? String(values.sellerNote) : undefined);
+                        setCounterRow(null);
+                    }
+                    finally {
+                        setIsCountering(false);
+                    }
+                } })] }));
 }

package/dist/features/seller/repository/offer.repository.d.ts

@@ -51,15 +51,31 @@ declare class OfferRepository extends BaseRepository<OfferDocument> {
      */
     countByBuyerAndProduct(buyerUid: string, productId: string, since: Date): Promise<number>;
     updateStatus(offerId: string, patch: OfferUpdateInput): Promise<OfferDocument>;
-    accept(offerId: string, lockedPrice: number, sellerNote?: string): Promise<OfferDocument>;
+    accept(offerId: string, lockedPrice: number, sellerNote?: string, checkoutDeadline?: Date): Promise<OfferDocument>;
     decline(offerId: string, sellerNote?: string): Promise<OfferDocument>;
     counter(offerId: string, counterAmount: number, sellerNote?: string): Promise<OfferDocument>;
-    acceptCounter(offerId: string): Promise<OfferDocument>;
+    acceptCounter(offerId: string, checkoutDeadline?: Date): Promise<OfferDocument>;
     withdraw(offerId: string): Promise<OfferDocument>;
+    /**
+     * Terminal transition, called once the buyer's order for this offer exists.
+     *
+     * `"paid"` has been in `OfferStatusValues` since the feature shipped but had
+     * NO server-side writer — the only thing that ever set it was an optimistic
+     * client-side patch in UserOffersPanel, which meant a reload showed the offer
+     * back at "accepted" and it could be added to the cart and ordered again.
+     */
+    markPaid(offerId: string, orderId: string): Promise<OfferDocument>;
     /**
      * Cloud Functions compatibility: pending/countered offers already expired.
      */
     findExpiredActive(now: Date): Promise<OfferDocument[]>;
+    /**
+     * Accepted offers whose 48h checkout window has lapsed. These were never
+     * swept before — `findExpiredActive` only looks at pending/countered — so an
+     * accepted-but-never-paid offer stayed "accepted" forever and its locked
+     * price remained claimable long after the seller expected it to lapse.
+     */
+    findExpiredAccepted(now: Date): Promise<OfferDocument[]>;
     expireMany(offerIds: string[]): Promise<void>;
 }
 export declare const offerRepository: OfferRepository;

package/dist/features/seller/repository/offer.repository.js

@@ -134,13 +134,18 @@ class OfferRepository extends BaseRepository {
             updatedAt: new Date(),
         });
     }
-    async accept(offerId, lockedPrice, sellerNote) {
+    async accept(offerId, lockedPrice, sellerNote, checkoutDeadline) {
+        // One write, not two. `checkoutDeadline` used to be missing from
+        // OfferUpdateInput, which forced callers to follow every accept() with a
+        // separate generic update() — leaving a window where an offer was
+        // "accepted" with no deadline at all.
         return this.updateStatus(offerId, {
             status: "accepted",
             lockedPrice,
             sellerNote,
             acceptedAt: new Date(),
             respondedAt: new Date(),
+            ...(checkoutDeadline ? { checkoutDeadline } : {}),
         });
     }
     async decline(offerId, sellerNote) {
@@ -158,7 +163,7 @@ class OfferRepository extends BaseRepository {
             respondedAt: new Date(),
         });
     }
-    async acceptCounter(offerId) {
+    async acceptCounter(offerId, checkoutDeadline) {
         const offer = await this.findById(offerId);
         if (!offer || !offer.counterAmount)
             throw new Error("Offer or counter not found");
@@ -167,6 +172,7 @@ class OfferRepository extends BaseRepository {
             lockedPrice: offer.counterAmount,
             acceptedAt: new Date(),
             respondedAt: new Date(),
+            ...(checkoutDeadline ? { checkoutDeadline } : {}),
         });
     }
     async withdraw(offerId) {
@@ -175,6 +181,21 @@ class OfferRepository extends BaseRepository {
             respondedAt: new Date(),
         });
     }
+    /**
+     * Terminal transition, called once the buyer's order for this offer exists.
+     *
+     * `"paid"` has been in `OfferStatusValues` since the feature shipped but had
+     * NO server-side writer — the only thing that ever set it was an optimistic
+     * client-side patch in UserOffersPanel, which meant a reload showed the offer
+     * back at "accepted" and it could be added to the cart and ordered again.
+     */
+    async markPaid(offerId, orderId) {
+        return this.updateStatus(offerId, {
+            status: "paid",
+            paidOrderId: orderId,
+            paidAt: new Date(),
+        });
+    }
     /**
      * Cloud Functions compatibility: pending/countered offers already expired.
      */
@@ -187,6 +208,21 @@ class OfferRepository extends BaseRepository {
             .get();
         return snapshot.docs.map((doc) => this.mapDoc(doc));
     }
+    /**
+     * Accepted offers whose 48h checkout window has lapsed. These were never
+     * swept before — `findExpiredActive` only looks at pending/countered — so an
+     * accepted-but-never-paid offer stayed "accepted" forever and its locked
+     * price remained claimable long after the seller expected it to lapse.
+     */
+    async findExpiredAccepted(now) {
+        const snapshot = await this.db
+            .collection(this.collection)
+            .where(OFFER_FIELDS.STATUS, "==", "accepted")
+            .where(OFFER_FIELDS.CHECKOUT_DEADLINE, "<=", now)
+            .limit(500)
+            .get();
+        return snapshot.docs.map((doc) => this.mapDoc(doc));
+    }
     async expireMany(offerIds) {
         const batch = this.db.batch();
         const now = new Date();

package/dist/features/seller/schemas/firestore.d.ts

@@ -36,9 +36,12 @@ export interface OfferDocument extends BaseDocument {
     acceptedAt?: Date;
     checkoutDeadline?: Date;
     respondedAt?: Date;
+    /** Set by `markPaid` once the buyer's order exists — makes "paid" auditable. */
+    paidOrderId?: string;
+    paidAt?: Date;
 }
 export declare const OFFER_COLLECTION: "offers";
-export declare const OFFER_INDEXED_FIELDS: readonly ["buyerUid", "storeId", "productId", "status", "createdAt", "expiresAt"];
+export declare const OFFER_INDEXED_FIELDS: readonly ["buyerUid", "storeId", "productId", "status", "createdAt", "expiresAt", "checkoutDeadline"];
 export declare const OFFER_FIELDS: {
     readonly ID: "id";
     readonly PRODUCT_ID: "productId";
@@ -60,11 +63,13 @@ export declare const OFFER_FIELDS: {
     readonly ACCEPTED_AT: "acceptedAt";
     readonly CHECKOUT_DEADLINE: "checkoutDeadline";
     readonly RESPONDED_AT: "respondedAt";
+    readonly PAID_ORDER_ID: "paidOrderId";
+    readonly PAID_AT: "paidAt";
     readonly CREATED_AT: "createdAt";
     readonly UPDATED_AT: "updatedAt";
 };
 export type OfferCreateInput = Pick<OfferDocument, "productId" | "productTitle" | "productSlug" | "productImageUrl" | "buyerUid" | "buyerName" | "buyerEmail" | "storeId" | "storeName" | "offerAmount" | "listedPrice" | "currency" | "buyerNote">;
-export type OfferUpdateInput = Partial<Pick<OfferDocument, "status" | "counterAmount" | "lockedPrice" | "sellerNote" | "acceptedAt" | "respondedAt" | "updatedAt">>;
+export type OfferUpdateInput = Partial<Pick<OfferDocument, "status" | "counterAmount" | "lockedPrice" | "sellerNote" | "acceptedAt" | "checkoutDeadline" | "respondedAt" | "paidOrderId" | "paidAt" | "updatedAt">>;
 export declare const offerQueryHelpers: {
     readonly byBuyer: (buyerUid: string) => readonly ["buyerUid", "==", string];
     readonly byStore: (storeId: string) => readonly ["storeId", "==", string];

package/dist/features/seller/schemas/firestore.js

@@ -20,6 +20,7 @@ export const OFFER_INDEXED_FIELDS = [
     "status",
     "createdAt",
     "expiresAt",
+    "checkoutDeadline",
 ];
 export const OFFER_FIELDS = {
     ID: "id",
@@ -42,6 +43,8 @@ export const OFFER_FIELDS = {
     ACCEPTED_AT: "acceptedAt",
     CHECKOUT_DEADLINE: "checkoutDeadline",
     RESPONDED_AT: "respondedAt",
+    PAID_ORDER_ID: "paidOrderId",
+    PAID_AT: "paidAt",
     CREATED_AT: "createdAt",
     UPDATED_AT: "updatedAt",
 };

package/dist/features/seller/schemas/offer-forms.d.ts

@@ -0,0 +1,12 @@
+import { z } from "zod";
+export declare const counterOfferFormSchema: z.ZodObject<{
+    counterAmount: z.ZodNumber;
+    sellerNote: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    counterAmount: number;
+    sellerNote?: string | undefined;
+}, {
+    counterAmount: number;
+    sellerNote?: string | undefined;
+}>;
+export type CounterOfferFormValues = z.infer<typeof counterOfferFormSchema>;

package/dist/features/seller/schemas/offer-forms.js

@@ -0,0 +1,28 @@
+/*
+ * WHY: Rule #9 — every appkit form is schema-driven. The seller's counter-offer
+ *      drawer had no form at all before 2026-08-21 (the view took an
+ *      `(id) => void` callback and left each consumer to invent an input), so
+ *      `respondToOffer`'s counter branch had zero real callers.
+ * WHAT: Zod schema for the counter-offer QuickFormDrawer. Deliberately only the
+ *       field-shape rules that can be checked without loading the offer — the
+ *       relational rules (below listed price, different from the buyer's offer)
+ *       stay server-side in `respondToOffer`, which is the only place that can
+ *       be trusted with them.
+ *
+ * EXPORTS:
+ *   counterOfferFormSchema, type CounterOfferFormValues
+ *
+ * @tag domain:seller,offers
+ * @tag layer:schema
+ * @tag pattern:none
+ * @tag access:isomorphic
+ * @tag consumers:SellerOffersView
+ * @tag sideEffects:none
+ */
+import { z } from "zod";
+export const counterOfferFormSchema = z.object({
+    counterAmount: z.coerce
+        .number({ invalid_type_error: "Enter a counter amount." })
+        .positive("Counter amount must be greater than zero."),
+    sellerNote: z.string().max(500, "Keep your note under 500 characters.").optional(),
+});

package/dist/index.d.ts

@@ -2457,7 +2457,7 @@ export { getProductFilterKeys } from "./features/products/index";
 export { getProductSortOptions } from "./features/products/index";
 export { getProductTableColumns } from "./features/products/index";
 export { normalizeListingType, isAuctionListing, isPreOrderListing, isStandardListing, isPrizeDrawListing, isClassifiedListing, isDigitalCodeListing, isLiveListing, isArtListing, isStickersListing, } from "./features/products/index";
-export { isListingTypeEnabled, isCategoryTypeEnabled, enabledListingTypes, enabledCategoryTypes, } from "./_internal/shared/listing-types/feature-flags";
+export { isListingTypeEnabled, isCategoryTypeEnabled, enabledListingTypes, enabledCategoryTypes, ALL_LISTING_TYPES, } from "./_internal/shared/listing-types/feature-flags";
 export { actionTracker, setActionTrackerSink, resetActionTrackerSink, type ActionEvent, type ActionTrackerSink, } from "./_internal/shared/listing-types/action-tracker";
 export { cartRequiresShipping, cartIsDigitalOnly, cartIsChatOnly, } from "./_internal/shared/listing-types/cart-shipping";
 export { ACTIONS, action, act, canPerformAction, actionsForListingType, actionLabel, type ActionDef, type ActionKind, type ActionResource, type ActionTree, type ActionConfirmation, } from "./_internal/shared/actions/action-registry";
@@ -3264,3 +3264,4 @@ export { safeFireAndForget } from "./utils/safe-fire-forget";
 export { withRetry } from "./http/retry";
 export { normalizeError, getErrorMessage, isApiNormalized, isAppNormalized, isFirebaseAuthNormalized, isFirebaseFirestoreNormalized, isFirebaseStorageNormalized, isNativeNormalized, isNetworkNormalized, isUnknownNormalized, isZodNormalized, } from "./errors/normalize";
 export type { NormalizedError, NormalizedApiError, NormalizedAppError, NormalizedFirebaseAuthError, NormalizedFirebaseFirestoreError, NormalizedFirebaseStorageError, NormalizedNativeError, NormalizedNetworkError, NormalizedUnknownThrownValue, NormalizedZodError, } from "./errors/normalize";
+export { CART_LANE, CART_LANE_PRIORITY, CART_LANE_LABELS, laneOf, activeLane, laneItems, laneCounts, isLaneCheckoutable, laneBlockReason, isLockedLane, canAddNewItems, type CartLane, type LaneAssignable, } from "./_internal/shared/checkout/lanes";

package/dist/index.js

@@ -4463,7 +4463,7 @@ export { getProductTableColumns } from "./features/products/index";
 // SB-UNI-F 2026-05-13 â€" Phase 2 predicates added (classified/digital-code/live).
 export { normalizeListingType, isAuctionListing, isPreOrderListing, isStandardListing, isPrizeDrawListing, isClassifiedListing, isDigitalCodeListing, isLiveListing, isArtListing, isStickersListing, } from "./features/products/index";
 // SB-UNI-X4 2026-05-13 â€" per-type feature-flag helpers.
-export { isListingTypeEnabled, isCategoryTypeEnabled, enabledListingTypes, enabledCategoryTypes, } from "./_internal/shared/listing-types/feature-flags";
+export { isListingTypeEnabled, isCategoryTypeEnabled, enabledListingTypes, enabledCategoryTypes, ALL_LISTING_TYPES, } from "./_internal/shared/listing-types/feature-flags";
 // SB-UNI-X5 2026-05-13 â€" action telemetry sink.
 export { actionTracker, setActionTrackerSink, resetActionTrackerSink, } from "./_internal/shared/listing-types/action-tracker";
 // SB-UNI-S 2026-05-13 â€" cart-level shipping-requirement helpers.
@@ -5666,3 +5666,6 @@ export { withRetry } from "./http/retry";
 // Every catch (e: unknown) funnels through normalizeError(e) which returns
 // a NormalizedError discriminated union. Audit-catch-normalize enforces this.
 export { normalizeError, getErrorMessage, isApiNormalized, isAppNormalized, isFirebaseAuthNormalized, isFirebaseFirestoreNormalized, isFirebaseStorageNormalized, isNativeNormalized, isNetworkNormalized, isUnknownNormalized, isZodNormalized, } from "./errors/normalize";
+// Checkout lanes — the derived auction > offer > standard partition of the
+// cart, and the priority rule that decides which one may be checked out.
+export { CART_LANE, CART_LANE_PRIORITY, CART_LANE_LABELS, laneOf, activeLane, laneItems, laneCounts, isLaneCheckoutable, laneBlockReason, isLockedLane, canAddNewItems, } from "./_internal/shared/checkout/lanes";

package/dist/server-entry.d.ts

@@ -45,6 +45,7 @@ export { StoreClassifiedsPageView } from "./features/stores/components/StoreClas
 export { StoreDigitalCodesPageView } from "./features/stores/components/StoreDigitalCodesPageView";
 export { StoreLiveItemsPageView } from "./features/stores/components/StoreLiveItemsPageView";
 export { getProductForDetail, listSitemapProducts, type SitemapProduct, } from "./_internal/server/features/products/index";
+export { listPublicProducts, parsePublicProductParams, PUBLIC_PRODUCT_MAX_PAGE_SIZE, type PublicProductListInput, type PublicProductListResult, type PublicProductListOptions, type PublicProductExecutor, type PublicProductQuery, } from "./_internal/server/features/products/index";
 export { getAuctionForDetail, getProductFeaturesForAuction, } from "./_internal/server/features/auctions/index";
 export { getPreOrderForDetail, getProductFeaturesForPreOrder, } from "./_internal/server/features/pre-orders/index";
 export { getBrandForDetail, getBrandCategoryForDetail, createBrandAction, updateBrandAction, deleteBrandAction, toggleBrandActiveAction, } from "./_internal/server/features/brands/index";

package/dist/server-entry.js

@@ -51,6 +51,7 @@ export { StoreDigitalCodesPageView } from "./features/stores/components/StoreDig
 export { StoreLiveItemsPageView } from "./features/stores/components/StoreLiveItemsPageView";
 // S2: products data layer — deduped via React.cache()
 export { getProductForDetail, listSitemapProducts, } from "./_internal/server/features/products/index";
+export { listPublicProducts, parsePublicProductParams, PUBLIC_PRODUCT_MAX_PAGE_SIZE, } from "./_internal/server/features/products/index";
 // S3: auctions data layer — deduped via React.cache()
 export { getAuctionForDetail, getProductFeaturesForAuction, } from "./_internal/server/features/auctions/index";
 // S3: pre-orders data layer — deduped via React.cache()

package/dist/server.d.ts

@@ -501,6 +501,7 @@ export type { GoogleReview, GoogleReviewsResult } from "./features/homepage/lib/
 export { GoogleReviewsSection } from "./features/homepage/components/GoogleReviewsSection";
 export type { GoogleReviewsSectionProps } from "./features/homepage/components/GoogleReviewsSection";
 export { getProductForDetail, listSitemapProducts, computeRelatedItems, toProductItem, type SitemapProduct, type RelatedItemsResult, } from "./_internal/server/features/products/index";
+export { listPublicProducts, parsePublicProductParams, PUBLIC_PRODUCT_MAX_PAGE_SIZE, type PublicProductListInput, type PublicProductListResult, type PublicProductListOptions, type PublicProductExecutor, type PublicProductQuery, } from "./_internal/server/features/products/index";
 export { getBundleForDetail, listBundleMembers, listFeaturedBundles, getRelatedBundles, resolveBundleMemberIds, resolveBundleOriginalTotal, buildBundleMetadata, renderBundleOg, renderBundleOgImage, addBundleToCartAction, type BundleDataOptions, type BundleMetadataOptions, type BundleOgData, } from "./_internal/server/features/bundles/index";
 export { getGroupsForProduct, getGroupsWithItemsForProduct, getGroupsForCategory, getGroupsForBrand } from "./_internal/server/features/grouped/index";
 export { getAuctionForDetail, getProductFeaturesForAuction } from "./_internal/server/features/auctions/index";

package/dist/server.js

@@ -1353,6 +1353,9 @@ export { GoogleReviewsSection } from "./features/homepage/components/GoogleRevie
 // ---------------------------------------------------------------------------
 // Data layers — each wrapped in React.cache for request-scoped dedup
 export { getProductForDetail, listSitemapProducts, computeRelatedItems, toProductItem, } from "./_internal/server/features/products/index";
+// The single public-listing query — every SSR listing view and /api/products
+// share it so their filter semantics cannot drift (Root Cause #30).
+export { listPublicProducts, parsePublicProductParams, PUBLIC_PRODUCT_MAX_PAGE_SIZE, } from "./_internal/server/features/products/index";
 // S-SBUNI-3/4 2026-05-13 — bundle data/metadata/og layer.
 export { getBundleForDetail, listBundleMembers, listFeaturedBundles, getRelatedBundles, resolveBundleMemberIds, resolveBundleOriginalTotal, buildBundleMetadata, renderBundleOg, renderBundleOgImage, addBundleToCartAction, } from "./_internal/server/features/bundles/index";
 export { getGroupsForProduct, getGroupsWithItemsForProduct, getGroupsForCategory, getGroupsForBrand } from "./_internal/server/features/grouped/index";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mohasinac/appkit",
-  "version": "4.11.1",
+  "version": "4.11.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public"