@open-mercato/core 0.6.7-develop.6706.1.b3a4c759bb → 0.6.7-develop.6725.1.07a748cfc2

package/src/modules/query_index/lib/engine.ts

@@ -22,6 +22,7 @@ import {
 import { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'
 import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { runBeforeQueryPipeline, runAfterQueryPipeline, type QueryExtensionContext } from '@open-mercato/shared/lib/query/query-extension-runner'
+import { warnOnCiphertextLikeFallback } from '@open-mercato/shared/lib/query/ciphertext-search-warning'
 import { resolveEncryptedSortFields, resolveEncryptedSortMaxRows, sortRowsInMemory } from '@open-mercato/shared/lib/query/encrypted-sort'
 import { mapWithConcurrency } from '@open-mercato/shared/lib/query/bounded-decrypt'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -415,12 +416,16 @@ export class HybridQueryEngine implements QueryEngine {
       const searchSources: SearchTokenSource[] = indexSources
         .map((src) => ({ entity: String(src.entityId), recordIdColumn: src.recordIdColumn }))
         .filter((src) => src.recordIdColumn && src.entity)
-      const hasSearchTokens = searchEnabled && searchSources.length
+      const searchFilters = normalizedFilters.filter((filter) => filter.op === 'like' || filter.op === 'ilike')
+      // Probe `search_tokens` only when this query actually searches. Every consumer of
+      // `searchRuntime.enabled` already sits behind a like/ilike guard, so on a plain list load the
+      // answer is unused — and the probe is a `LIMIT 1` the planner can resolve as a seq scan over a
+      // large `search_tokens`. The join path below already probes lazily for the same reason.
+      const hasSearchTokens = searchEnabled && searchSources.length && searchFilters.length
         ? await this.searchSourcesHaveTokens(searchSources, opts.tenantId ?? null, orgScope)
         : false
       const searchRuntime: SearchRuntime = { ...searchRuntimeBase, searchSources, enabled: searchEnabled && hasSearchTokens }
       const joinSearchAvailability = new Map<string, boolean>()
-      const searchFilters = normalizeFilters(opts.filters).filter((filter) => filter.op === 'like' || filter.op === 'ilike')
       if (searchFilters.length) {
         this.logSearchDebug('search:init', {
           entity,
@@ -446,6 +451,47 @@ export class HybridQueryEngine implements QueryEngine {
           organizationScope: orgScope,
           searchSources,
         })
+        const baseSearchFilters = [...baseFilters, ...cfFilters]
+          .filter((filter) => filter.op === 'like' || filter.op === 'ilike')
+        const fallbackFields = baseSearchFilters
+          .filter((filter) => !searchRuntime.enabled || typeof filter.value !== 'string' || tokenizeText(filter.value, searchConfig).hashes.length === 0)
+          .map((filter) => String(filter.field))
+        if (fallbackFields.length) {
+          await warnOnCiphertextLikeFallback({
+            entity: String(entity),
+            fields: fallbackFields,
+            tenantId: opts.tenantId ?? null,
+            // `searchEnabled` also folds in the missing-table case, which is
+            // "no usable tokens" rather than "the operator switched search off".
+            reason: searchRuntime.enabled
+              ? 'no-indexable-tokens'
+              : searchConfig.enabled ? 'no-search-tokens' : 'search-disabled',
+            service: this.getEncryptionService(),
+          })
+        }
+      }
+      for (const [alias, joinedFilters] of joinFilters) {
+        const filters = joinedFilters.filter((entry) => entry.op === 'like' || entry.op === 'ilike')
+        if (!filters.length) continue
+        const join = joinMap.get(alias)
+        if (!join?.entityId) continue
+        const hasJoinedTokens = searchEnabled
+          ? await this.hasSearchTokens(String(join.entityId), opts.tenantId ?? null, orgScope)
+          : false
+        joinSearchAvailability.set(String(join.entityId), hasJoinedTokens)
+        const fallbackFields = filters
+          .filter((filter) => !hasJoinedTokens || typeof filter.value !== 'string' || tokenizeText(filter.value, searchConfig).hashes.length === 0)
+          .map((filter) => filter.column)
+        if (!fallbackFields.length) continue
+        await warnOnCiphertextLikeFallback({
+          entity: String(join.entityId),
+          fields: fallbackFields,
+          tenantId: opts.tenantId ?? null,
+          reason: hasJoinedTokens
+            ? 'no-indexable-tokens'
+            : searchConfig.enabled ? 'no-search-tokens' : 'search-disabled',
+          service: this.getEncryptionService(),
+        })
       }
       const hasNonBaseSearchSource = searchSources.some(
         (src) => src.entity !== String(entity) || src.recordIdColumn !== 'b.id'
@@ -1636,9 +1682,13 @@ export class HybridQueryEngine implements QueryEngine {
     const orgScope = this.resolveOrganizationScope(opts)
     if (!opts.tenantId) throw new Error('QueryEngine: tenantId is required')
 
+    const normalizedFilters = normalizeFilters(opts.filters)
+    const hasSearchFilter = normalizedFilters.some((filter) => filter.op === 'like' || filter.op === 'ilike')
+
     const searchConfig = resolveSearchConfig()
     const searchEnabled = searchConfig.enabled && await this.tableExists('search_tokens')
-    const hasSearchTokens = searchEnabled
+    // Same gate as `query()`: without a like/ilike filter the probe's answer is never read.
+    const hasSearchTokens = searchEnabled && hasSearchFilter
       ? await this.hasSearchTokens(entity, opts.tenantId ?? null, orgScope)
       : false
     const searchRuntime: SearchRuntime = {
@@ -1649,8 +1699,6 @@ export class HybridQueryEngine implements QueryEngine {
       mintAlias: createSearchAliasMinter(),
     }
 
-    const normalizedFilters = normalizeFilters(opts.filters)
-
     const applyScope = (q: AnyBuilder): AnyBuilder => {
       let next = q
         .where(`${alias}.entity_type`, '=', entity)

package/src/modules/query_index/lib/indexer.ts

@@ -127,7 +127,7 @@ export async function buildIndexDoc(em: EntityManager, params: BuildDocParams):
   // Kept outside the guard below: a failure while building the aggregate search field is a
   // bug in the aggregation or its configuration, and must surface instead of being mistaken
   // for an encryption failure and silently skipping encryption.
-  doc = attachAggregateSearchField(doc)
+  doc = attachAggregateSearchField(doc, { entityType: params.entityType })
 
   try {
     const encryption = resolveTenantEncryptionService(em as any)

package/src/modules/query_index/lib/search-tokens.ts

@@ -1,5 +1,9 @@
 import { type Kysely, sql } from 'kysely'
-import { resolveSearchConfig, type SearchConfig } from '@open-mercato/shared/lib/search/config'
+import {
+  isSearchFieldBlocklisted,
+  resolveSearchConfig,
+  type SearchConfig,
+} from '@open-mercato/shared/lib/search/config'
 import { tokenizeText } from '@open-mercato/shared/lib/search/tokenize'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -62,13 +66,18 @@ function collectTextValues(value: unknown): string[] {
   return []
 }
 
-function shouldIndexField(field: string, value: unknown, config: SearchConfig): boolean {
+function shouldIndexField(
+  field: string,
+  value: unknown,
+  config: SearchConfig,
+  entityType: string | null,
+): boolean {
   if (typeof value !== 'string' && !Array.isArray(value)) return false
   const lower = field.toLowerCase()
   if (lower === 'id' || lower.endsWith('_id') || lower.endsWith('.id')) return false
   if (lower.endsWith('_at')) return false
   if (['created_at', 'updated_at', 'deleted_at', 'tenant_id', 'organization_id'].includes(lower)) return false
-  if (config.blocklistedFields.some((blocked) => lower.includes(blocked))) return false
+  if (isSearchFieldBlocklisted(field, entityType, config)) return false
   const values = collectTextValues(value)
   if (!values.length) return false
   return values.some((text) => tokenizeText(text, config).tokens.length > 0)
@@ -87,7 +96,7 @@ export function buildSearchTokenRows(params: BuildTokenOptions): SearchTokenRow[
   }
 
   for (const [field, rawValue] of Object.entries(params.doc)) {
-    if (!shouldIndexField(field, rawValue, config)) continue
+    if (!shouldIndexField(field, rawValue, config, params.entityType)) continue
     const values = collectTextValues(rawValue)
     const seen = new Set<string>()
     for (const text of values) {

package/src/modules/sales/api/documents/factory.ts

@@ -7,8 +7,11 @@ import { E } from '#generated/entities.ids.generated'
 import type { SalesOrder, SalesQuote } from '../../data/entities'
 import { SalesDocumentTagAssignment } from '../../data/entities'
 import {
+  ORDER_PAYMENT_LEDGER_FIELDS,
+  ORDER_PAYMENT_LEDGER_WARNING_CODE,
   orderCreateSchema,
   quoteCreateSchema,
+  type OrderPaymentLedgerWarning,
 } from '../../data/validators'
 import {
   createPagedListResponseSchema,
@@ -37,6 +40,13 @@ type DocumentBinding = {
   viewFeature: string
 }
 
+type DocumentCreateResult = {
+  orderId?: string
+  quoteId?: string
+  id?: string
+  warnings?: OrderPaymentLedgerWarning[]
+}
+
 const rawBodySchema = z.object({}).passthrough()
 
 const normalizeJsonRecord = (value: unknown): Record<string, unknown> | null => {
@@ -472,7 +482,12 @@ export function buildDocumentCrudOptions(binding: DocumentBinding) {
           )
           return parsed
         },
-        response: ({ result }: { result: any }) => ({ id: result?.orderId ?? result?.quoteId ?? result?.id ?? null }),
+        response: ({ result }: { result?: DocumentCreateResult | null }) => ({
+          id: result?.orderId ?? result?.quoteId ?? result?.id ?? null,
+          ...(binding.kind === 'order' && Array.isArray(result?.warnings)
+            ? { warnings: result.warnings }
+            : {}),
+        }),
         status: 201,
       },
       update: {
@@ -616,8 +631,18 @@ export function buildDocumentOpenApi(binding: DocumentBinding) {
     listResponseSchema,
     create: {
       schema: createSchema,
-      responseSchema: z.object({ id: z.string().uuid().nullable() }),
-      description: `Creates a new sales ${binding.kind}.`,
+      responseSchema: binding.kind === 'order'
+        ? z.object({
+            id: z.string().uuid().nullable(),
+            warnings: z.array(z.object({
+              code: z.literal(ORDER_PAYMENT_LEDGER_WARNING_CODE),
+              fields: z.array(z.enum(ORDER_PAYMENT_LEDGER_FIELDS)),
+            })).optional(),
+          })
+        : z.object({ id: z.string().uuid().nullable() }),
+      description: binding.kind === 'order'
+        ? 'Creates a new sales order. paidTotalAmount, refundedTotalAmount, and outstandingAmount are deprecated compatibility inputs: supplied values are ignored and reported in warnings. Record payments through sales.payments.create or POST /api/sales/payments.'
+        : 'Creates a new sales quote.',
     },
     del: {
       schema: defaultDeleteRequestSchema,

package/src/modules/sales/commands/documents.ts

@@ -76,6 +76,8 @@ import {
   quoteLineCreateSchema,
   quoteAdjustmentCreateSchema,
   orderCreateSchema,
+  ORDER_PAYMENT_LEDGER_WARNING_CODE,
+  resolveSuppliedOrderPaymentLedgerFields,
   orderLineCreateSchema,
   orderAdjustmentCreateSchema,
   invoiceCreateSchema,
@@ -87,6 +89,7 @@ import {
   type QuoteLineCreateInput,
   type QuoteAdjustmentCreateInput,
   type OrderCreateInput,
+  type OrderPaymentLedgerWarning,
   type OrderLineCreateInput,
   type OrderAdjustmentCreateInput,
   type InvoiceCreateInput,
@@ -143,6 +146,7 @@ import type { TranslateWithFallbackFn } from "@open-mercato/shared/lib/i18n/tran
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
+let warnedDeprecatedOrderPaymentLedgerInput = false
 
 // CRUD events configuration for workflow triggers
 const orderCrudEvents: CrudEventsConfig<SalesOrder> = {
@@ -5505,14 +5509,22 @@ const updateOrderCommand: CommandHandler<
 
 const createOrderCommand: CommandHandler<
   OrderCreateInput,
-  { orderId: string }
+  { orderId: string; warnings?: OrderPaymentLedgerWarning[] }
 > = {
   id: "sales.orders.create",
   async execute(rawInput, ctx) {
     const generator = ctx.container.resolve(
       "salesDocumentNumberGenerator",
     ) as SalesDocumentNumberGenerator;
+    const deprecatedPaymentLedgerFields = resolveSuppliedOrderPaymentLedgerFields(rawInput)
     const initial = orderCreateSchema.parse(rawInput ?? {});
+    if (deprecatedPaymentLedgerFields.length && !warnedDeprecatedOrderPaymentLedgerInput) {
+      warnedDeprecatedOrderPaymentLedgerInput = true
+      logger.warn("sales.orders.create ignored deprecated payment ledger input", {
+        code: ORDER_PAYMENT_LEDGER_WARNING_CODE,
+        fields: deprecatedPaymentLedgerFields,
+      })
+    }
     const orderNumber =
       typeof initial.orderNumber === "string" &&
       initial.orderNumber.trim().length
@@ -5871,7 +5883,19 @@ const createOrderCommand: CommandHandler<
       previousStatus: null,
     });
 
-    return { orderId: order.id };
+    return {
+      orderId: order.id,
+      ...(deprecatedPaymentLedgerFields.length
+        ? {
+            warnings: [
+              {
+                code: ORDER_PAYMENT_LEDGER_WARNING_CODE,
+                fields: deprecatedPaymentLedgerFields,
+              },
+            ],
+          }
+        : {}),
+    };
   },
   captureAfter: async (_input, result, ctx) => {
     const em = (ctx.container.resolve("em") as EntityManager).fork();

package/src/modules/sales/components/useSalesChannelsEnabled.ts

@@ -1,59 +1,13 @@
 "use client"
 
-import * as React from 'react'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { useFeatureFlagBoolean } from '@open-mercato/core/modules/feature_toggles/components/hooks/useFeatureFlagBoolean'
 import { SALES_CHANNELS_TOGGLE_ID } from '../lib/salesChannelsToggleId'
 
 export { SALES_CHANNELS_TOGGLE_ID }
 
-const CACHE_TTL_MS = 60_000
-
-type FeatureToggleCheckResponse = {
-  ok?: boolean
-  value?: unknown
-}
-
 // Fails open: channels stay visible unless the toggle explicitly resolves to
 // false. A missing toggle definition (404) or an absent feature_toggles module
 // must not hide sales channel UI.
-async function fetchSalesChannelsEnabled(): Promise<boolean> {
-  try {
-    const call = await apiCall<FeatureToggleCheckResponse>(
-      `/api/feature_toggles/check/boolean?identifier=${SALES_CHANNELS_TOGGLE_ID}`,
-    )
-    if (!call.ok) return true
-    return !(call.result?.ok === true && call.result.value === false)
-  } catch {
-    return true
-  }
-}
-
-let cache: { value: Promise<boolean>; at: number } | null = null
-
-function getSalesChannelsEnabled(): Promise<boolean> {
-  const now = Date.now()
-  if (!cache || now - cache.at > CACHE_TTL_MS) {
-    cache = { value: fetchSalesChannelsEnabled(), at: now }
-  }
-  return cache.value
-}
-
 export function useSalesChannelsEnabled(): { enabled: boolean; isLoading: boolean } {
-  const [resolved, setResolved] = React.useState<boolean | null>(null)
-
-  React.useEffect(() => {
-    let active = true
-    getSalesChannelsEnabled()
-      .then((value) => {
-        if (active) setResolved(value)
-      })
-      .catch(() => {
-        if (active) setResolved(true)
-      })
-    return () => {
-      active = false
-    }
-  }, [])
-
-  return { enabled: resolved !== false, isLoading: resolved === null }
+  return useFeatureFlagBoolean({ id: SALES_CHANNELS_TOGGLE_ID, defaultValue: true })
 }

package/src/modules/sales/data/validators.ts

@@ -624,6 +624,38 @@ export const quoteAdjustmentUpdateSchema = z
   })
   .merge(quoteAdjustmentCreateSchema.partial())
 
+export const ORDER_PAYMENT_LEDGER_FIELDS = [
+  'paidTotalAmount',
+  'refundedTotalAmount',
+  'outstandingAmount',
+] as const
+
+export type OrderPaymentLedgerField = (typeof ORDER_PAYMENT_LEDGER_FIELDS)[number]
+
+export const ORDER_PAYMENT_LEDGER_WARNING_CODE =
+  'sales.order.payment_ledger_input_deprecated' as const
+
+export type OrderPaymentLedgerWarning = {
+  code: typeof ORDER_PAYMENT_LEDGER_WARNING_CODE
+  fields: OrderPaymentLedgerField[]
+}
+
+export function resolveSuppliedOrderPaymentLedgerFields(value: unknown): OrderPaymentLedgerField[] {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return []
+  return ORDER_PAYMENT_LEDGER_FIELDS.filter((field) =>
+    Object.prototype.hasOwnProperty.call(value, field),
+  )
+}
+
+const orderPaymentLedgerShape = {
+  /** @deprecated Derived from recorded payments. Use sales.payments.create or POST /api/sales/payments. */
+  paidTotalAmount: decimal({ min: 0 }).optional(),
+  /** @deprecated Derived from recorded payments. Use sales.payments.create or POST /api/sales/payments. */
+  refundedTotalAmount: decimal({ min: 0 }).optional(),
+  /** @deprecated Derived from recorded payments. Use sales.payments.create or POST /api/sales/payments. */
+  outstandingAmount: decimal().optional(),
+}
+
 const orderTotalsSchema = z.object({
   subtotalNetAmount: decimal({ min: 0 }).optional(),
   subtotalGrossAmount: decimal({ min: 0 }).optional(),
@@ -634,9 +666,6 @@ const orderTotalsSchema = z.object({
   surchargeTotalAmount: decimal({ min: 0 }).optional(),
   grandTotalNetAmount: decimal({ min: 0 }).optional(),
   grandTotalGrossAmount: decimal({ min: 0 }).optional(),
-  paidTotalAmount: decimal({ min: 0 }).optional(),
-  refundedTotalAmount: decimal({ min: 0 }).optional(),
-  outstandingAmount: decimal().optional(),
   lineItemCount: z.coerce.number().int().min(0).optional(),
 })
 
@@ -690,6 +719,7 @@ export const orderCreateSchema = scoped.extend({
   adjustments: z.array(orderAdjustmentCreateSchema.omit({ organizationId: true, tenantId: true, orderId: true })).optional(),
   tags: z.array(uuid()).optional(),
   ...orderTotalsSchema.shape,
+  ...orderPaymentLedgerShape,
 })
 
 export const orderUpdateSchema = z
@@ -1046,8 +1076,23 @@ export type PaymentMethodCreateInput = z.infer<typeof paymentMethodCreateSchema>
 export type PaymentMethodUpdateInput = z.infer<typeof paymentMethodUpdateSchema>
 export type TaxRateCreateInput = z.infer<typeof taxRateCreateSchema>
 export type TaxRateUpdateInput = z.infer<typeof taxRateUpdateSchema>
-export type OrderCreateInput = z.infer<typeof orderCreateSchema>
-export type OrderUpdateInput = z.infer<typeof orderUpdateSchema>
+export type DeprecatedOrderPaymentLedgerInput = {
+  /** @deprecated Derived from recorded payments. Use sales.payments.create or POST /api/sales/payments. */
+  paidTotalAmount?: number
+  /** @deprecated Derived from recorded payments. Use sales.payments.create or POST /api/sales/payments. */
+  refundedTotalAmount?: number
+  /** @deprecated Derived from recorded payments. Use sales.payments.create or POST /api/sales/payments. */
+  outstandingAmount?: number
+}
+
+export type OrderCreateInput = Omit<
+  z.infer<typeof orderCreateSchema>,
+  OrderPaymentLedgerField
+> & DeprecatedOrderPaymentLedgerInput
+export type OrderUpdateInput = Omit<
+  z.infer<typeof orderUpdateSchema>,
+  OrderPaymentLedgerField
+> & DeprecatedOrderPaymentLedgerInput
 export type OrderLineCreateInput = z.infer<typeof orderLineCreateSchema>
 export type OrderLineUpdateInput = z.infer<typeof orderLineUpdateSchema>
 export type OrderAdjustmentCreateInput = z.infer<typeof orderAdjustmentCreateSchema>