@open-mercato/core 0.4.6-develop-6953d75a91 → 0.4.6-develop-90c3eb0e8a

package/src/modules/progress/lib/events.ts

@@ -18,6 +18,15 @@ export type ProgressJobCreatedPayload = {
   jobId: string
   jobType: string
   name: string
+  description?: string | null
+  status?: string
+  progressPercent?: number
+  processedCount?: number
+  totalCount?: number | null
+  etaSeconds?: number | null
+  cancellable?: boolean
+  startedAt?: string | null
+  finishedAt?: string | null
   tenantId: string
   organizationId?: string | null
 }
@@ -25,36 +34,87 @@ export type ProgressJobCreatedPayload = {
 export type ProgressJobStartedPayload = {
   jobId: string
   jobType: string
+  name?: string
+  description?: string | null
+  status?: string
+  progressPercent?: number
+  processedCount?: number
+  totalCount?: number | null
+  etaSeconds?: number | null
+  cancellable?: boolean
+  startedAt?: string | null
+  finishedAt?: string | null
   tenantId: string
+  organizationId?: string | null
 }
 
 export type ProgressJobUpdatedPayload = {
   jobId: string
   jobType?: string
+  name?: string
+  description?: string | null
+  status?: string
   progressPercent: number
   processedCount: number
   totalCount?: number | null
   etaSeconds?: number | null
   tenantId: string
+  organizationId?: string | null
+  cancellable?: boolean
+  startedAt?: string | null
+  finishedAt?: string | null
 }
 
 export type ProgressJobCompletedPayload = {
   jobId: string
   jobType: string
+  name?: string
+  description?: string | null
+  status?: string
+  progressPercent?: number
+  processedCount?: number
+  totalCount?: number | null
+  etaSeconds?: number | null
+  cancellable?: boolean
+  startedAt?: string | null
+  finishedAt?: string | null
   resultSummary?: Record<string, unknown> | null
   tenantId: string
+  organizationId?: string | null
 }
 
 export type ProgressJobFailedPayload = {
   jobId: string
   jobType: string
+  name?: string
+  description?: string | null
+  status?: string
+  progressPercent?: number
+  processedCount?: number
+  totalCount?: number | null
+  etaSeconds?: number | null
+  cancellable?: boolean
+  startedAt?: string | null
+  finishedAt?: string | null
   errorMessage: string
   tenantId: string
+  organizationId?: string | null
   stale?: boolean
 }
 
 export type ProgressJobCancelledPayload = {
   jobId: string
   jobType: string
+  name?: string
+  description?: string | null
+  status?: string
+  progressPercent?: number
+  processedCount?: number
+  totalCount?: number | null
+  etaSeconds?: number | null
+  cancellable?: boolean
+  startedAt?: string | null
+  finishedAt?: string | null
   tenantId: string
+  organizationId?: string | null
 }

package/src/modules/progress/lib/progressServiceImpl.ts

@@ -4,6 +4,23 @@ import type { ProgressService } from './progressService'
 import { calculateEta, calculateProgressPercent, STALE_JOB_TIMEOUT_SECONDS } from './progressService'
 import { PROGRESS_EVENTS } from './events'
 
+function buildJobPayload(job: ProgressJob): Record<string, unknown> {
+  return {
+    jobId: job.id,
+    jobType: job.jobType,
+    name: job.name,
+    description: job.description ?? null,
+    status: job.status,
+    progressPercent: job.progressPercent,
+    processedCount: job.processedCount,
+    totalCount: job.totalCount ?? null,
+    etaSeconds: job.etaSeconds ?? null,
+    cancellable: job.cancellable,
+    startedAt: job.startedAt?.toISOString() ?? null,
+    finishedAt: job.finishedAt?.toISOString() ?? null,
+  }
+}
+
 export function createProgressService(em: EntityManager, eventBus: { emit: (event: string, payload: Record<string, unknown>) => Promise<void> }): ProgressService {
   return {
     async createJob(input, ctx) {
@@ -26,9 +43,7 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       await em.persistAndFlush(job)
 
       await eventBus.emit(PROGRESS_EVENTS.JOB_CREATED, {
-        jobId: job.id,
-        jobType: job.jobType,
-        name: job.name,
+        ...buildJobPayload(job),
         tenantId: ctx.tenantId,
         organizationId: ctx.organizationId,
       })
@@ -46,9 +61,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       await em.flush()
 
       await eventBus.emit(PROGRESS_EVENTS.JOB_STARTED, {
-        jobId: job.id,
-        jobType: job.jobType,
+        ...buildJobPayload(job),
         tenantId: ctx.tenantId,
+        organizationId: job.organizationId ?? null,
       })
 
       return job
@@ -84,13 +99,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       await em.flush()
 
       await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {
-        jobId: job.id,
-        jobType: job.jobType,
-        progressPercent: job.progressPercent,
-        processedCount: job.processedCount,
-        totalCount: job.totalCount,
-        etaSeconds: job.etaSeconds,
+        ...buildJobPayload(job),
         tenantId: ctx.tenantId,
+        organizationId: job.organizationId ?? null,
       })
 
       return job
@@ -112,10 +123,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       await em.flush()
 
       await eventBus.emit(PROGRESS_EVENTS.JOB_UPDATED, {
-        jobId: job.id,
-        progressPercent: job.progressPercent,
-        processedCount: job.processedCount,
+        ...buildJobPayload(job),
         tenantId: ctx.tenantId,
+        organizationId: job.organizationId ?? null,
       })
 
       return job
@@ -136,10 +146,10 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       await em.flush()
 
       await eventBus.emit(PROGRESS_EVENTS.JOB_COMPLETED, {
-        jobId: job.id,
-        jobType: job.jobType,
+        ...buildJobPayload(job),
         resultSummary: job.resultSummary,
         tenantId: ctx.tenantId,
+        organizationId: job.organizationId ?? null,
       })
 
       return job
@@ -157,10 +167,10 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       await em.flush()
 
       await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {
-        jobId: job.id,
-        jobType: job.jobType,
+        ...buildJobPayload(job),
         errorMessage: job.errorMessage,
         tenantId: ctx.tenantId,
+        organizationId: job.organizationId ?? null,
       })
 
       return job
@@ -185,9 +195,9 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
       await em.flush()
 
       await eventBus.emit(PROGRESS_EVENTS.JOB_CANCELLED, {
-        jobId: job.id,
-        jobType: job.jobType,
+        ...buildJobPayload(job),
         tenantId: ctx.tenantId,
+        organizationId: job.organizationId ?? null,
       })
 
       return job
@@ -246,11 +256,11 @@ export function createProgressService(em: EntityManager, eventBus: { emit: (even
         job.errorMessage = `Job stale: no heartbeat for ${timeoutSeconds} seconds`
 
         await eventBus.emit(PROGRESS_EVENTS.JOB_FAILED, {
-          jobId: job.id,
-          jobType: job.jobType,
+          ...buildJobPayload(job),
           errorMessage: job.errorMessage,
           tenantId: job.tenantId,
           stale: true,
+          organizationId: job.organizationId ?? null,
         })
       }
 

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

@@ -71,6 +71,9 @@ export async function POST(req: Request) {
         if (auth.orgId !== undefined) {
           payload.organizationId = auth.orgId ?? null
         }
+        if (typeof auth.sub === 'string' && auth.sub.length > 0) {
+          payload.requestedByUserId = auth.sub
+        }
         return bus.emitEvent(
           'query_index.reindex',
           payload,

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

@@ -288,16 +288,14 @@ export default function QueryIndexesTable() {
         : t('query_index.table.actions.vectorReindex')
       const errorMessage = t('query_index.table.errors.actionFailed', { action: actionLabel })
       try {
-        if (action === 'reindex') {
-          await apiCallOrThrow('/api/vector/reindex', {
-            method: 'POST',
-            headers: { 'content-type': 'application/json' },
-            body: JSON.stringify({ entityId }),
-          }, { errorMessage })
-        } else {
-          const url = `/api/vector/index?entityId=${encodeURIComponent(entityId)}`
-          await apiCallOrThrow(url, { method: 'DELETE' }, { errorMessage })
-        }
+        await apiCallOrThrow('/api/search/embeddings/reindex', {
+          method: 'POST',
+          headers: { 'content-type': 'application/json' },
+          body: JSON.stringify({
+            entityId,
+            purgeFirst: action === 'purge',
+          }),
+        }, { errorMessage })
       } catch (err) {
         console.error('query_index.table.vectorAction', err)
         if (typeof window !== 'undefined') {

package/src/modules/query_index/subscribers/reindex.ts

@@ -3,6 +3,7 @@ import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'
 import { reindexEntity } from '../lib/reindexer'
 import type { VectorIndexService } from '@open-mercato/search/vector'
+import type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'
 
 export const metadata = { event: 'query_index.reindex', persistent: true }
 
@@ -25,6 +26,93 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
   const partitionCount = Number.isFinite(payload?.partitionCount) ? Math.max(1, Math.trunc(payload.partitionCount)) : undefined
   const partitionIndex = Number.isFinite(payload?.partitionIndex) ? Math.max(0, Math.trunc(payload.partitionIndex)) : undefined
   const resetCoverage = typeof payload?.resetCoverage === 'boolean' ? payload.resetCoverage : undefined
+  const requestedByUserId = typeof payload?.requestedByUserId === 'string' ? payload.requestedByUserId : null
+
+  const progressTenantId = typeof tenantId === 'string' && tenantId.length > 0 ? tenantId : null
+  const progressOrganizationId = typeof organizationId === 'string' && organizationId.length > 0 ? organizationId : null
+  const progressPartitionIndex = Number.isFinite(partitionIndex) ? partitionIndex : null
+  const progressPartitionCount = Number.isFinite(partitionCount) ? partitionCount : null
+  let progressService: ProgressService | null = null
+  let progressJobId: string | null = null
+  let progressEnabled = false
+  try {
+    progressService = ctx.resolve<ProgressService>('progressService')
+    progressEnabled = progressService != null && progressTenantId != null
+  } catch {
+    progressService = null
+    progressEnabled = false
+  }
+
+  const updateProgress = async (
+    info: { processed: number; total: number },
+    options?: { complete?: boolean; failed?: boolean; errorMessage?: string },
+  ): Promise<void> => {
+    if (!progressEnabled || !progressService || !progressTenantId) return
+    const progressCtx = {
+      tenantId: progressTenantId,
+      organizationId: progressOrganizationId,
+      userId: requestedByUserId,
+    }
+    const totalCount = Number.isFinite(info.total) ? Math.max(0, info.total) : 0
+    const processedCount = Number.isFinite(info.processed) ? Math.max(0, info.processed) : 0
+    const progressPercent = totalCount > 0 ? Math.min(100, Math.round((processedCount / totalCount) * 100)) : 0
+    try {
+      if (!progressJobId) {
+        const created = await progressService.createJob({
+          jobType: 'query_index.reindex',
+          name: `Query index reindex: ${entityType}`,
+          description: progressPartitionCount && progressPartitionCount > 1
+            ? `Partition ${((progressPartitionIndex ?? 0) + 1).toString()} of ${progressPartitionCount.toString()}`
+            : undefined,
+          totalCount: totalCount > 0 ? totalCount : undefined,
+          cancellable: false,
+          meta: {
+            entityType,
+            partitionIndex: progressPartitionIndex,
+            partitionCount: progressPartitionCount,
+          },
+          partitionIndex: progressPartitionIndex ?? undefined,
+          partitionCount: progressPartitionCount ?? undefined,
+        }, progressCtx)
+        progressJobId = created.id
+        await progressService.startJob(progressJobId, progressCtx)
+      }
+
+      await progressService.updateProgress(
+        progressJobId,
+        {
+          processedCount,
+          totalCount: totalCount > 0 ? totalCount : undefined,
+          progressPercent,
+        },
+        progressCtx,
+      )
+
+      if (options?.complete) {
+        await progressService.completeJob(
+          progressJobId,
+          {
+            resultSummary: {
+              entityType,
+              processed: processedCount,
+              total: totalCount,
+            },
+          },
+          progressCtx,
+        )
+      } else if (options?.failed) {
+        await progressService.failJob(
+          progressJobId,
+          {
+            errorMessage: options.errorMessage ?? `Reindex failed for ${entityType}`,
+          },
+          progressCtx,
+        )
+      }
+    } catch {
+      // Never block query_index subscriber execution because of progress tracking.
+    }
+  }
 
   try {
     await recordIndexerLog(
@@ -57,7 +145,14 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
       partitionIndex,
       resetCoverage,
       vectorService,
+      onProgress: (info) => {
+        void updateProgress(info)
+      },
     })
+    await updateProgress(
+      { processed: result.processed, total: result.total },
+      { complete: true },
+    )
     await recordIndexerLog(
       { em },
       {
@@ -76,6 +171,10 @@ export default async function handle(payload: any, ctx: { resolve: <T=any>(name:
       },
     )
   } catch (error) {
+    await updateProgress(
+      { processed: 0, total: 0 },
+      { failed: true, errorMessage: error instanceof Error ? error.message : String(error) },
+    )
     await recordIndexerLog(
       { em },
       {