@open-mercato/core 0.6.7-develop.6653.1.b5bc7194a0 → 0.6.7-develop.6661.1.0043ed1d03

package/src/modules/feature_toggles/commands/global.ts

@@ -52,14 +52,11 @@ const featureToggleCrudIndexer = { entityType: E.feature_toggles.feature_toggle
 
 const FEATURE_TOGGLE_LOCK_RESOURCE_KIND = 'feature_toggles.feature_toggle'
 
-function featureToggleIdentifiers(
-  toggle: FeatureToggle | ToggleSnapshot,
-  ctx: { auth?: { tenantId?: string | null } | null },
-) {
+function featureToggleIdentifiers(toggle: FeatureToggle | ToggleSnapshot) {
   return {
     id: toggle.id,
     organizationId: null,
-    tenantId: ctx.auth?.tenantId ?? null,
+    tenantId: null,
   }
 }
 
@@ -113,7 +110,7 @@ const createToggleCommand: CommandHandler<ToggleCreateInput, { toggleId: string
       dataEngine,
       action: 'created',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -157,7 +154,7 @@ const createToggleCommand: CommandHandler<ToggleCreateInput, { toggleId: string
         dataEngine,
         action: 'deleted',
         entity: toggle,
-        identifiers: featureToggleIdentifiers(toggle, ctx),
+        identifiers: featureToggleIdentifiers(toggle),
         syncOrigin: ctx.syncOrigin,
         indexer: featureToggleCrudIndexer,
       })
@@ -196,7 +193,7 @@ const createToggleCommand: CommandHandler<ToggleCreateInput, { toggleId: string
       dataEngine,
       action: 'created',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -245,7 +242,7 @@ const updateToggleCommand: CommandHandler<ToggleUpdateInput, { toggleId: string
       dataEngine,
       action: 'updated',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -328,7 +325,7 @@ const updateToggleCommand: CommandHandler<ToggleUpdateInput, { toggleId: string
       dataEngine,
       action: 'updated',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -369,7 +366,7 @@ const deleteToggleCommand: CommandHandler<{ body?: Record<string, unknown>; quer
       dataEngine,
       action: 'deleted',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })
@@ -443,7 +440,7 @@ const deleteToggleCommand: CommandHandler<{ body?: Record<string, unknown>; quer
       dataEngine,
       action: 'updated',
       entity: toggle,
-      identifiers: featureToggleIdentifiers(toggle, ctx),
+      identifiers: featureToggleIdentifiers(toggle),
       syncOrigin: ctx.syncOrigin,
       indexer: featureToggleCrudIndexer,
     })

package/src/modules/query_index/api/openapi.ts

@@ -10,7 +10,7 @@ export const queryIndexErrorSchema = z.object({
 export const queryIndexPartitionSchema = z.object({
   partitionIndex: z.number().int().nonnegative().nullable().optional(),
   partitionCount: z.number().int().positive().nullable().optional(),
-  status: z.enum(['reindexing', 'purging', 'stalled', 'completed']),
+  status: z.enum(['reindexing', 'purging', 'stalled', 'completed', 'failed']),
   startedAt: z.string().nullable().optional(),
   finishedAt: z.string().nullable().optional(),
   heartbeatAt: z.string().nullable().optional(),
@@ -19,7 +19,7 @@ export const queryIndexPartitionSchema = z.object({
 })
 
 export const queryIndexJobSchema = z.object({
-  status: z.enum(['idle', 'reindexing', 'purging', 'stalled']),
+  status: z.enum(['idle', 'reindexing', 'purging', 'stalled', 'failed']),
   startedAt: z.string().nullable().optional(),
   finishedAt: z.string().nullable().optional(),
   heartbeatAt: z.string().nullable().optional(),

package/src/modules/query_index/api/status.ts

@@ -240,7 +240,7 @@ export async function GET(req: Request) {
           const stalled =
             !finishedDate && (!heartbeatDate || Date.now() - heartbeatDate.getTime() > HEARTBEAT_STALE_MS)
           const state = finishedDate
-            ? 'completed'
+            ? (row.status === 'failed' ? 'failed' : 'completed')
             : stalled
               ? 'stalled'
               : (row.status as string) || 'reindexing'
@@ -261,22 +261,31 @@ export async function GET(req: Request) {
         (p) => p.status === 'reindexing' || p.status === 'purging',
       )
       const stalledPartitions = activePartitions.filter((p) => p.status === 'stalled')
-      let status: 'idle' | 'reindexing' | 'purging' | 'stalled' = 'idle'
+      const scopeCandidate = !preferOrg || !scopeRow || scopeRow.orgMatch ? scopeRow : null
+      let status: 'idle' | 'reindexing' | 'purging' | 'stalled' | 'failed' = 'idle'
       if (activePartitions.length) {
         if (runningPartitions.length) {
           status = runningPartitions.some((p) => p.status === 'purging') ? 'purging' : 'reindexing'
         } else if (stalledPartitions.length) {
           status = 'stalled'
         }
+      } else if (
+        partitions.some((p) => p.status === 'failed')
+        || (scopeCandidate?.row.finished_at && scopeCandidate.row.status === 'failed')
+      ) {
+        // The run finished but lost records; without this it reports "idle" and the only
+        // hint that anything went wrong is the coverage percentage.
+        status = 'failed'
       }
 
       const startedAt = activePartitions[0]?.startedAt ?? partitions[0]?.startedAt ?? null
-      const finishedAt = status === 'idle' ? (partitions.find((p) => p.finishedAt)?.finishedAt ?? null) : null
+      const finishedAt = status === 'idle' || status === 'failed'
+        ? (partitions.find((p) => p.finishedAt)?.finishedAt ?? null)
+        : null
       const heartbeatAt = activePartitions[0]?.heartbeatAt ?? partitions[0]?.heartbeatAt ?? null
       const jobTotalCount = partitions.reduce((sum, p) => sum + (p.totalCount ?? 0), 0)
       const processedSum = partitions.reduce((sum, p) => sum + (p.processedCount ?? 0), 0)
       const processedCount = jobTotalCount ? Math.min(jobTotalCount, processedSum) : processedSum || null
-      const scopeCandidate = !preferOrg || !scopeRow || scopeRow.orgMatch ? scopeRow : null
 
       return {
         status,
@@ -291,7 +300,7 @@ export async function GET(req: Request) {
               status: (() => {
                 const heartbeatDate = scopeCandidate!.row.heartbeat_at ? new Date(scopeCandidate!.row.heartbeat_at) : null
                 const finishedDate = scopeCandidate!.row.finished_at ? new Date(scopeCandidate!.row.finished_at) : null
-                if (finishedDate) return 'completed'
+                if (finishedDate) return scopeCandidate!.row.status === 'failed' ? 'failed' : 'completed'
                 if (
                   !heartbeatDate ||
                   Date.now() - heartbeatDate.getTime() > HEARTBEAT_STALE_MS

package/src/modules/query_index/cli.ts

@@ -14,7 +14,13 @@ type ProgressBarHandle = {
 import { resolveEntityTableName } from '@open-mercato/shared/lib/query/engine'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'
-import { upsertIndexBatch, type AnyRow } from './lib/batch'
+import {
+  upsertIndexBatch,
+  assertIndexBatchWritesLanded,
+  createEmptyUpsertIndexBatchResult,
+  mergeUpsertIndexBatchResults,
+  type AnyRow,
+} from './lib/batch'
 import { reindexEntity, DEFAULT_REINDEX_PARTITIONS } from './lib/reindexer'
 import { purgeIndexScope } from './lib/purge'
 import { flattenSystemEntityIds } from '@open-mercato/shared/lib/entities/system-entities'
@@ -185,21 +191,20 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
   const encryption = resolveTenantEncryptionService(em as any)
   const dekKeyCache = new Map<string | null, string | null>()
 
+  // Neither helper swallows failures: upsertIndexBatch treats a failed encrypt as a
+  // failed row (writing the plaintext document instead would break encryption at rest)
+  // and records a failed decrypt against fulltext.
   const encryptDoc = async (
     targetEntity: string,
     doc: Record<string, unknown>,
     scope: { organizationId: string | null; tenantId: string | null },
   ) => {
-    try {
-      return await encryptIndexDocForStorage(
-        targetEntity,
-        doc,
-        { tenantId: scope.tenantId ?? null, organizationId: scope.organizationId ?? null },
-        encryption,
-      )
-    } catch {
-      return doc
-    }
+    return await encryptIndexDocForStorage(
+      targetEntity,
+      doc,
+      { tenantId: scope.tenantId ?? null, organizationId: scope.organizationId ?? null },
+      encryption,
+    )
   }
 
   const decryptDoc = async (
@@ -207,17 +212,13 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
     doc: Record<string, unknown>,
     scope: { organizationId: string | null; tenantId: string | null },
   ) => {
-    try {
-      return await decryptIndexDocForSearch(
-        targetEntity,
-        doc,
-        { tenantId: scope.tenantId ?? null, organizationId: scope.organizationId ?? null },
-        encryption,
-        dekKeyCache,
-      )
-    } catch {
-      return doc
-    }
+    return await decryptIndexDocForSearch(
+      targetEntity,
+      doc,
+      { tenantId: scope.tenantId ?? null, organizationId: scope.organizationId ?? null },
+      encryption,
+      dekKeyCache,
+    )
   }
 
   const applyFilters = <QB extends { where: (...args: any[]) => QB }>(q: QB): QB => {
@@ -244,10 +245,11 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
       .executeTakeFirst() as AnyRow | undefined
     if (!row) return { processed: 0, matched: 0 }
     const bar = createProgressBar(progressLabel ?? `Rebuilding ${entityType}`, 1)
-    await upsertIndexBatch(db, entityType, [row], { orgId: orgOverride, tenantId: tenantOverride }, { encryptDoc, decryptDoc })
-    bar.update(1)
+    const singleResult = await upsertIndexBatch(db, entityType, [row], { orgId: orgOverride, tenantId: tenantOverride }, { encryptDoc, decryptDoc })
+    bar.update(singleResult.written)
     bar.complete()
-    return { processed: 1, matched: 1 }
+    assertIndexBatchWritesLanded(entityType, singleResult)
+    return { processed: singleResult.written, matched: 1 }
   }
 
   const countRow = await applyFilters(
@@ -265,10 +267,12 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
 
   const bar = createProgressBar(progressLabel ?? `Rebuilding ${entityType}`, intended)
   let processed = 0
+  let fetched = 0
   let cursorOffset = effectiveOffset
   let remaining = limitValue
+  const writeTotals = createEmptyUpsertIndexBatchResult()
 
-  while (processed < intended) {
+  while (fetched < intended) {
     const chunkLimit = remaining !== undefined ? Math.min(batchSize, remaining) : batchSize
     const chunk = await applyFilters(
       db
@@ -280,12 +284,14 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
     ).execute() as AnyRow[]
     if (!chunk.length) break
 
-    await upsertIndexBatch(db, entityType, chunk as AnyRow[], {
+    const chunkResult = await upsertIndexBatch(db, entityType, chunk as AnyRow[], {
       orgId: orgOverride,
       tenantId: tenantOverride,
     }, { encryptDoc, decryptDoc })
+    mergeUpsertIndexBatchResults(writeTotals, chunkResult)
 
-    processed += chunk.length
+    processed += chunkResult.written
+    fetched += chunk.length
     cursorOffset += chunk.length
     if (remaining !== undefined) remaining -= chunk.length
     bar.update(processed)
@@ -296,6 +302,8 @@ async function rebuildEntityIndexes(options: RebuildExecutionOptions): Promise<R
     bar.update(processed)
   }
   bar.complete()
+  // After bar.complete() so the terminal is left in a sane state before we throw.
+  assertIndexBatchWritesLanded(entityType, writeTotals)
   return { processed, matched: intended }
 }
 

package/src/modules/query_index/components/QueryIndexesTable.tsx

@@ -23,7 +23,7 @@ type Translator = (key: string, params?: Record<string, string | number>) => str
 type PartitionStatus = {
   partitionIndex: number | null
   partitionCount: number | null
-  status: 'reindexing' | 'purging' | 'stalled' | 'completed'
+  status: 'reindexing' | 'purging' | 'stalled' | 'completed' | 'failed'
   processedCount?: number | null
   totalCount?: number | null
   heartbeatAt?: string | null
@@ -32,7 +32,7 @@ type PartitionStatus = {
 }
 
 type JobStatus = {
-  status: 'idle' | 'reindexing' | 'purging' | 'stalled'
+  status: 'idle' | 'reindexing' | 'purging' | 'stalled' | 'failed'
   startedAt?: string | null
   finishedAt?: string | null
   heartbeatAt?: string | null
@@ -40,7 +40,7 @@ type JobStatus = {
   totalCount?: number | null
   partitions?: PartitionStatus[]
   scope?: {
-    status?: 'reindexing' | 'purging' | 'stalled' | 'completed' | null
+    status?: 'reindexing' | 'purging' | 'stalled' | 'completed' | 'failed' | null
     processedCount?: number | null
     totalCount?: number | null
   } | null
@@ -90,6 +90,7 @@ function translateJobStatus(t: Translator, status: JobStatus['status'] | undefin
   if (status === 'reindexing') return t('query_index.table.status.reindexing')
   if (status === 'purging') return t('query_index.table.status.purging')
   if (status === 'stalled') return t('query_index.table.status.stalled')
+  if (status === 'failed') return t('query_index.table.status.failed')
   return ok ? t('query_index.table.status.in_sync') : t('query_index.table.status.out_of_sync')
 }
 
@@ -100,6 +101,7 @@ function translateScopeStatus(
   if (status === 'reindexing') return t('query_index.table.status.scope.reindexing')
   if (status === 'purging') return t('query_index.table.status.scope.purging')
   if (status === 'stalled') return t('query_index.table.status.scope.stalled')
+  if (status === 'failed') return t('query_index.table.status.scope.failed')
   return t('query_index.table.status.scope.completed')
 }
 
@@ -158,6 +160,7 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
         const job = record.job
         const partitions = job?.partitions ?? []
         const ok = record.ok && (!job || job.status === 'idle')
+        const jobFailed = job?.status === 'failed'
         const statusText = translateJobStatus(t, job?.status, ok)
         const jobProgress = job ? formatProgressLabel(job.processedCount ?? null, job.totalCount ?? null, t) : null
         const label = jobProgress
@@ -165,7 +168,7 @@ function createColumns(t: Translator): ColumnDef<Row>[] {
           : statusText
         let variant: StatusBadgeVariant = 'neutral'
         if (job) {
-          if (job.status === 'stalled') variant = 'error'
+          if (job.status === 'stalled' || jobFailed) variant = 'error'
           else if (job.status === 'reindexing' || job.status === 'purging') variant = 'warning'
           else variant = ok ? 'success' : 'neutral'
         } else {

package/src/modules/query_index/i18n/de.json

@@ -46,6 +46,7 @@
   "query_index.table.logs.viewDetails": "Details anzeigen",
   "query_index.table.refresh": "Aktualisieren",
   "query_index.table.searchPlaceholder": "Nach Entität filtern",
+  "query_index.table.status.failed": "Fehlgeschlagen",
   "query_index.table.status.in_sync": "Synchron",
   "query_index.table.status.out_of_sync": "Nicht synchron",
   "query_index.table.status.partitionLabel": "Partition {{index}}",
@@ -54,6 +55,7 @@
   "query_index.table.status.purging": "Bereinigung",
   "query_index.table.status.reindexing": "Reindizierung",
   "query_index.table.status.scope.completed": "Abgeschlossen",
+  "query_index.table.status.scope.failed": "Fehlgeschlagen",
   "query_index.table.status.scope.purging": "Bereinigung",
   "query_index.table.status.scope.reindexing": "Läuft",
   "query_index.table.status.scope.stalled": "Angehalten",

package/src/modules/query_index/i18n/en.json

@@ -46,6 +46,7 @@
   "query_index.table.logs.viewDetails": "View details",
   "query_index.table.refresh": "Refresh",
   "query_index.table.searchPlaceholder": "Filter by entity",
+  "query_index.table.status.failed": "Failed",
   "query_index.table.status.in_sync": "In sync",
   "query_index.table.status.out_of_sync": "Out of sync",
   "query_index.table.status.partitionLabel": "Partition {{index}}",
@@ -54,6 +55,7 @@
   "query_index.table.status.purging": "Purging",
   "query_index.table.status.reindexing": "Reindexing",
   "query_index.table.status.scope.completed": "Done",
+  "query_index.table.status.scope.failed": "Failed",
   "query_index.table.status.scope.purging": "Purging",
   "query_index.table.status.scope.reindexing": "Running",
   "query_index.table.status.scope.stalled": "Stalled",

package/src/modules/query_index/i18n/es.json

@@ -46,6 +46,7 @@
   "query_index.table.logs.viewDetails": "Ver detalles",
   "query_index.table.refresh": "Actualizar",
   "query_index.table.searchPlaceholder": "Filtrar por entidad",
+  "query_index.table.status.failed": "Con errores",
   "query_index.table.status.in_sync": "Sincronizado",
   "query_index.table.status.out_of_sync": "Fuera de sincronización",
   "query_index.table.status.partitionLabel": "Partición {{index}}",
@@ -54,6 +55,7 @@
   "query_index.table.status.purging": "Depurando",
   "query_index.table.status.reindexing": "Reindexando",
   "query_index.table.status.scope.completed": "Completado",
+  "query_index.table.status.scope.failed": "Con errores",
   "query_index.table.status.scope.purging": "Depurando",
   "query_index.table.status.scope.reindexing": "Ejecutando",
   "query_index.table.status.scope.stalled": "Detenido",

package/src/modules/query_index/i18n/pl.json

@@ -46,6 +46,7 @@
   "query_index.table.logs.viewDetails": "Pokaż szczegóły",
   "query_index.table.refresh": "Odśwież",
   "query_index.table.searchPlaceholder": "Filtruj według encji",
+  "query_index.table.status.failed": "Niepowodzenie",
   "query_index.table.status.in_sync": "Zsynchronizowany",
   "query_index.table.status.out_of_sync": "Poza synchronizacją",
   "query_index.table.status.partitionLabel": "Partycja {{index}}",
@@ -54,6 +55,7 @@
   "query_index.table.status.purging": "Czyszczenie",
   "query_index.table.status.reindexing": "Ponowne indeksowanie",
   "query_index.table.status.scope.completed": "Zakończone",
+  "query_index.table.status.scope.failed": "Niepowodzenie",
   "query_index.table.status.scope.purging": "Czyszczenie",
   "query_index.table.status.scope.reindexing": "Uruchomione",
   "query_index.table.status.scope.stalled": "Zatrzymane",