@open-mercato/core 0.8.1-develop.7215.1.60786cf836 → 0.8.1-develop.7219.1.f96cb57e70

package/src/modules/customers/components/calendar/editor/ScheduleSection.tsx

@@ -19,7 +19,6 @@ function DateTimeRow({
   date,
   time,
   showTime,
-  locale,
   onDateChange,
   onTimeChange,
 }: {
@@ -27,7 +26,6 @@ function DateTimeRow({
   date: string
   time: string
   showTime: boolean
-  locale: string
   onDateChange(next: string): void
   onTimeChange(next: string): void
 }) {
@@ -35,7 +33,7 @@ function DateTimeRow({
     <div className="flex w-full items-end gap-2.5">
       <div className="flex min-w-0 flex-1 flex-col gap-1.5">
         <span className={LABEL_CLASS}>{label}</span>
-        <DateControl value={date} onChange={onDateChange} ariaLabel={label} locale={locale} />
+        <DateControl value={date} onChange={onDateChange} ariaLabel={label} />
       </div>
       {showTime ? <TimeControl value={time} onChange={onTimeChange} ariaLabel={label} /> : null}
     </div>
@@ -51,7 +49,6 @@ export function ScheduleSection({
   startTime,
   endDate,
   endTime,
-  locale,
   endsError,
   onAllDayChange,
   onDateChange,
@@ -67,7 +64,6 @@ export function ScheduleSection({
   startTime: string
   endDate: string
   endTime: string
-  locale: string
   endsError?: string | null
   onAllDayChange(next: boolean): void
   onDateChange(next: string): void
@@ -91,7 +87,6 @@ export function ScheduleSection({
         date={date}
         time={startTime}
         showTime={showTime}
-        locale={locale}
         onDateChange={onDateChange}
         onTimeChange={onStartTimeChange}
       />
@@ -101,7 +96,6 @@ export function ScheduleSection({
           date={endDate}
           time={endTime}
           showTime={showTime}
-          locale={locale}
           onDateChange={onEndDateChange}
           onTimeChange={onEndTimeChange}
         />

package/src/modules/customers/components/calendar/editor/inputs.tsx

@@ -116,7 +116,6 @@ export function DateControl({
   value: string
   onChange(next: string): void
   ariaLabel: string
-  locale: string
   className?: string
 }) {
   const [open, setOpen] = React.useState(false)

package/src/modules/entities/lib/helpers.ts

@@ -135,7 +135,7 @@ export async function setRecordCustomFields(
         const cf = em.create(CustomFieldValue, { entityId, recordId, organizationId, tenantId, fieldKey, createdAt: new Date() })
         clearValueColumns(cf)
         const stored = encrypted
-          ? await encryptCustomFieldValue(val, tenantId, getEncryptionService(), encryptionCache)
+          ? await encryptCustomFieldValue(val, tenantId, getEncryptionService(), encryptionCache, { entityId, fieldKey })
           : val
         switch (col) {
           case 'valueText': cf.valueText = stored == null ? null : String(stored); break
@@ -152,7 +152,7 @@ export async function setRecordCustomFields(
 
     const column: keyof CustomFieldValue = encrypted ? 'valueText' : def ? columnFromKind(def.kind) : columnFromJsValue(raw as Primitive)
     const storedValue = encrypted
-      ? await encryptCustomFieldValue(raw as Primitive, tenantId, getEncryptionService(), encryptionCache)
+      ? await encryptCustomFieldValue(raw as Primitive, tenantId, getEncryptionService(), encryptionCache, { entityId, fieldKey })
       : raw
 
     let cf = await em.findOne(CustomFieldValue, { entityId, recordId, organizationId, tenantId, fieldKey })

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

@@ -1,7 +1,7 @@
 import { type Kysely, sql } from 'kysely'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { isUniqueViolation } from '@open-mercato/shared/lib/db/pg-errors'
-import { buildIndexDocument, type IndexCustomFieldValue } from './document'
+import { buildIndexDocument, rebuildAggregateSearchField, type IndexCustomFieldValue } from './document'
 import { replaceSearchTokensForBatch, isSearchDebugEnabled } from './search-tokens'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
@@ -304,7 +304,13 @@ export async function upsertIndexBatch(
           tenantId: scopeTenant ?? null,
         })
         if (decrypted && typeof decrypted === 'object') {
-          tokenDoc = decrypted
+          // Rebuilt on the decrypted copy: `search_text` is on no encryption map, so the
+          // aggregate composed at document-build time still concatenates the ciphertext
+          // values the row carries at rest and tokenizes into rows nothing matches (#5625).
+          // The copy keeps `doc` — the encrypted row written to `entity_indexes` — untouched.
+          // A caller that passes no `decryptDoc` keeps the build-time aggregate by design:
+          // without a decryption step there is no plaintext to recompose it from.
+          tokenDoc = rebuildAggregateSearchField(decrypted, { entityType, config: searchConfig })
         }
       } catch (decryptError) {
         // Only affects the search tokens built below; the indexed document itself is

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

@@ -109,6 +109,34 @@ export function attachAggregateSearchField(
   return doc
 }
 
+/**
+ * Recomputes the aggregate on a shallow copy of `doc`.
+ *
+ * Search tokens are built from the *decrypted* index document, while the document
+ * persisted in `entity_indexes` stays encrypted at rest. The aggregate composed during
+ * document build therefore concatenates ciphertext for every field an encryption map
+ * covers, and `decryptIndexDocForSearch` cannot repair it because `search_text` is on no
+ * map (#5625). Token writers call this on the decrypted document so the aggregate is
+ * tokenized from the same plaintext a user actually searches for; the copy keeps the
+ * caller's stored document untouched.
+ *
+ * A pre-existing aggregate is blanked before recomposition rather than deleted: an empty
+ * string yields no tokens, but it keeps the key on the document, and
+ * `replaceSearchTokensForRecord` scopes its DELETE to the document's own field names. A
+ * deleted key would drop `search_text` out of that scope and strand the ciphertext-derived
+ * rows with no writer left to remove them.
+ */
+export function rebuildAggregateSearchField(
+  doc: Record<string, unknown>,
+  options: AggregateSearchOptions = {},
+): Record<string, unknown> {
+  const copy = { ...doc }
+  // `collectAggregateSearchValues` skips the aggregate's own key, so this blank is
+  // overwritten whenever anything survives the blocklist and stays blank otherwise.
+  if (AGGREGATE_SEARCH_FIELD in copy) copy[AGGREGATE_SEARCH_FIELD] = ''
+  return attachAggregateSearchField(copy, options)
+}
+
 export function buildIndexDocument(
   baseRow: Record<string, unknown>,
   customFieldValues: Iterable<IndexCustomFieldValue> = [],

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

@@ -10,8 +10,9 @@ import {
 } from '@open-mercato/shared/lib/crud/custom-field-definition-index'
 import { type Kysely, type Transaction, sql } from 'kysely'
 import { createLogger } from '@open-mercato/shared/lib/logger'
+import { resolveSearchConfig } from '@open-mercato/shared/lib/search/config'
 import { replaceSearchTokensForRecord, deleteSearchTokensForRecord } from './search-tokens'
-import { attachAggregateSearchField } from './document'
+import { attachAggregateSearchField, rebuildAggregateSearchField } from './document'
 
 const logger = createLogger('query_index').child({ component: 'indexer' })
 
@@ -400,12 +401,24 @@ export async function reindexSearchTokensForRecord(
       dekKeyCache,
     )
   })()
+  // Rebuilt on the decrypted document: the aggregate stored in `entity_indexes` was
+  // composed from the row as it sits at rest, so for every encryption-mapped field it
+  // holds ciphertext no user query can ever match (#5625). `resolveSearchConfig` re-parses
+  // the environment on every call, so it is resolved once and threaded into both the
+  // rebuild and the token writer — that also makes the aggregate's blocklist filter and
+  // the per-field one provably read the same snapshot, as the batch path already does.
+  const searchConfig = resolveSearchConfig()
+  const searchDoc = rebuildAggregateSearchField(await tokenDoc, {
+    entityType: args.entityType,
+    config: searchConfig,
+  })
   await replaceSearchTokensForRecord(db, {
     entityType: args.entityType,
     recordId: args.recordId,
     organizationId: args.organizationId ?? null,
     tenantId: args.tenantId ?? null,
-    doc: await tokenDoc,
+    doc: searchDoc,
+    config: searchConfig,
   }, { trx: args.trx })
 }