@open-mercato/core 0.4.2-canary-c71ef83148 → 0.4.2-canary-f821f89ef6

package/src/modules/dashboards/services/widgetDataService.ts

@@ -1,10 +1,6 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { CacheStrategy } from '@open-mercato/cache'
 import { createHash } from 'node:crypto'
-import { decryptWithAesGcm } from '@open-mercato/shared/lib/encryption/aes'
-import { resolveTenantEncryptionService } from '@open-mercato/shared/lib/encryption/customFieldValues'
-import { resolveEntityIdFromMetadata } from '@open-mercato/shared/lib/encryption/entityIds'
-import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import {
   type DateRangePreset,
   resolveDateRange,
@@ -21,8 +17,6 @@ import {
 import type { AnalyticsRegistry } from './analyticsRegistry'
 
 const WIDGET_DATA_CACHE_TTL = 120_000
-const WIDGET_DATA_SEGMENT_TTL = 86_400_000
-const WIDGET_DATA_SEGMENT_KEY = 'widget-data:__segment__'
 
 const SAFE_IDENTIFIER_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/
 
@@ -174,11 +168,6 @@ export class WidgetDataService {
       const tags = this.getCacheTags(request.entityType)
       try {
         await this.cache.set(cacheKey, response, { ttl: WIDGET_DATA_CACHE_TTL, tags })
-        await this.cache.set(
-          WIDGET_DATA_SEGMENT_KEY,
-          { updatedAt: response.metadata.fetchedAt },
-          { ttl: WIDGET_DATA_SEGMENT_TTL, tags: ['widget-data'] },
-        )
       } catch {
       }
     }
@@ -293,75 +282,6 @@ export class WidgetDataService {
     assertSafeIdentifier(config.idColumn, 'id column')
     assertSafeIdentifier(config.labelColumn, 'label column')
 
-    const meta = this.resolveEntityMetadata(config.table)
-    const idProp = meta ? this.resolveEntityPropertyName(meta, config.idColumn) : null
-    const labelProp = meta ? this.resolveEntityPropertyName(meta, config.labelColumn) : null
-    const tenantProp = meta
-      ? (this.resolveEntityPropertyName(meta, 'tenant_id') ?? this.resolveEntityPropertyName(meta, 'tenantId'))
-      : null
-    const organizationProp = meta
-      ? (this.resolveEntityPropertyName(meta, 'organization_id') ?? this.resolveEntityPropertyName(meta, 'organizationId'))
-      : null
-    const entityName = meta ? ((meta as any).class ?? meta.className ?? meta.name) : null
-
-    if (meta && idProp && labelProp && tenantProp && entityName) {
-      const where: Record<string, unknown> = {
-        [idProp]: { $in: uniqueIds },
-        [tenantProp]: this.scope.tenantId,
-      }
-      if (organizationProp && this.scope.organizationIds && this.scope.organizationIds.length > 0) {
-        where[organizationProp] = { $in: this.scope.organizationIds }
-      }
-
-      try {
-        const records = await findWithDecryption(
-          this.em,
-          entityName,
-          where,
-          { fields: [idProp, labelProp, tenantProp, organizationProp].filter(Boolean) },
-          { tenantId: this.scope.tenantId, organizationId: this.resolveOrganizationId() },
-        )
-
-        const encryptionService = resolveTenantEncryptionService(this.em as any)
-        const dek = encryptionService?.isEnabled() ? await encryptionService.getDek(this.scope.tenantId) : null
-        let hasEncryptedLabels = false
-        let hasDecryptedLabels = false
-
-        const labelMap = new Map<string, string>()
-        for (const record of records as Array<Record<string, unknown>>) {
-          const id = record[idProp]
-          let labelValue = record[labelProp]
-          if (typeof labelValue === 'string' && this.isEncryptedPayload(labelValue)) {
-            hasEncryptedLabels = true
-            if (dek?.key) {
-              const decrypted = this.decryptWithDek(labelValue, dek.key)
-              if (decrypted !== null) {
-                labelValue = decrypted
-                hasDecryptedLabels = true
-              }
-            }
-          } else if (labelValue != null && labelValue !== '') {
-            hasDecryptedLabels = true
-          }
-
-          if (typeof id === 'string' && labelValue != null && labelValue !== '') {
-            labelMap.set(id, String(labelValue))
-          }
-        }
-
-        if (labelMap.size > 0 && (!hasEncryptedLabels || hasDecryptedLabels)) {
-          return data.map((item) => ({
-            ...item,
-            groupLabel: typeof item.groupKey === 'string' && labelMap.has(item.groupKey)
-              ? labelMap.get(item.groupKey)!
-              : undefined,
-          }))
-        }
-      } catch {
-        // fall through to SQL resolution
-      }
-    }
-
     const clauses = [`"${config.idColumn}" = ANY(?::uuid[])`, 'tenant_id = ?']
     const params: unknown[] = [`{${uniqueIds.join(',')}}`, this.scope.tenantId]
 
@@ -370,43 +290,17 @@ export class WidgetDataService {
       params.push(`{${this.scope.organizationIds.join(',')}}`)
     }
 
-    const sql = `SELECT "${config.idColumn}" as id, "${config.labelColumn}" as label, tenant_id, organization_id FROM "${config.table}" WHERE ${clauses.join(
+    const sql = `SELECT "${config.idColumn}" as id, "${config.labelColumn}" as label FROM "${config.table}" WHERE ${clauses.join(
       ' AND ',
     )}`
 
     try {
       const labelRows = await this.em.getConnection().execute(sql, params)
-      const entityId = this.resolveEntityId(meta)
-      const encryptionService = resolveTenantEncryptionService(this.em as any)
-      const organizationId = this.resolveOrganizationId()
-      const dek = encryptionService?.isEnabled() ? await encryptionService.getDek(this.scope.tenantId) : null
 
       const labelMap = new Map<string, string>()
-      for (const row of labelRows as Array<{ id: string; label: string | null; tenant_id?: string | null; organization_id?: string | null }>) {
-        let labelValue = row.label
-        if (entityId && encryptionService?.isEnabled() && labelValue != null) {
-          const rowOrgId = row.organization_id ?? organizationId ?? null
-          const decrypted = await encryptionService.decryptEntityPayload(
-            entityId,
-            { [config.labelColumn]: labelValue },
-            this.scope.tenantId,
-            rowOrgId,
-          )
-          const resolved = decrypted[config.labelColumn]
-          if (typeof resolved === 'string' || typeof resolved === 'number') {
-            labelValue = String(resolved)
-          }
-        }
-
-        if (labelValue && dek?.key && this.isEncryptedPayload(labelValue)) {
-          const decrypted = this.decryptWithDek(labelValue, dek.key)
-          if (decrypted !== null) {
-            labelValue = decrypted
-          }
-        }
-
-        if (row.id && labelValue != null && labelValue !== '') {
-          labelMap.set(row.id, labelValue)
+      for (const row of labelRows as Array<{ id: string; label: string | null }>) {
+        if (row.id && row.label != null && row.label !== '') {
+          labelMap.set(row.id, row.label)
         }
       }
 
@@ -423,60 +317,6 @@ export class WidgetDataService {
       }))
     }
   }
-
-  private resolveOrganizationId(): string | null {
-    if (!this.scope.organizationIds || this.scope.organizationIds.length !== 1) return null
-    return this.scope.organizationIds[0] ?? null
-  }
-
-  private resolveEntityMetadata(tableName: string): Record<string, any> | null {
-    const registry = (this.em as any)?.getMetadata?.()
-    if (!registry) return null
-    const entries =
-      (typeof registry.getAll === 'function' && registry.getAll()) ||
-      (Array.isArray(registry.metadata) ? registry.metadata : Object.values(registry.metadata ?? {}))
-    const metas = Array.isArray(entries) ? entries : Object.values(entries ?? {})
-    const match = metas.find((meta: any) => {
-      const table = meta?.tableName ?? meta?.collection
-      if (typeof table !== 'string') return false
-      if (table === tableName) return true
-      return table.split('.').pop() === tableName
-    })
-    return match ?? null
-  }
-
-  private resolveEntityPropertyName(meta: Record<string, any>, columnName: string): string | null {
-    const properties = meta?.properties ? Object.values(meta.properties) : []
-    for (const prop of properties as Array<Record<string, any>>) {
-      const fieldName = prop?.fieldName
-      const fieldNames = prop?.fieldNames
-      if (typeof fieldName === 'string' && fieldName === columnName) return prop?.name ?? null
-      if (Array.isArray(fieldNames) && fieldNames.includes(columnName)) return prop?.name ?? null
-      if (prop?.name === columnName) return prop?.name ?? null
-    }
-    return null
-  }
-
-  private resolveEntityId(meta: Record<string, any> | null): string | null {
-    if (!meta) return null
-    try {
-      return resolveEntityIdFromMetadata(meta as any)
-    } catch {
-      return null
-    }
-  }
-
-  private isEncryptedPayload(value: string): boolean {
-    const parts = value.split(':')
-    return parts.length === 4 && parts[3] === 'v1'
-  }
-
-  private decryptWithDek(value: string, dek: string): string | null {
-    const first = decryptWithAesGcm(value, dek)
-    if (first === null) return null
-    if (!this.isEncryptedPayload(first)) return first
-    return decryptWithAesGcm(first, dek) ?? first
-  }
 }
 
 export function createWidgetDataService(

package/src/modules/dashboards/widgets/dashboard/aov-kpi/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import AovKpiWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type AovKpiSettings } from './config'
-const AovKpiWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<AovKpiSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/new-customers-kpi/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import NewCustomersKpiWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type NewCustomersKpiSettings } from './config'
-const NewCustomersKpiWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<NewCustomersKpiSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/orders-by-status/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import OrdersByStatusWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type OrdersByStatusSettings } from './config'
-const OrdersByStatusWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<OrdersByStatusSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/orders-kpi/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import OrdersKpiWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type OrdersKpiSettings } from './config'
-const OrdersKpiWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<OrdersKpiSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/pipeline-summary/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import PipelineSummaryWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type PipelineSummarySettings } from './config'
-const PipelineSummaryWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<PipelineSummarySettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/revenue-kpi/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import RevenueKpiWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueKpiSettings } from './config'
-const RevenueKpiWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<RevenueKpiSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/revenue-trend/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import RevenueTrendWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type RevenueTrendSettings } from './config'
-const RevenueTrendWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<RevenueTrendSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/sales-by-region/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import SalesByRegionWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type SalesByRegionSettings } from './config'
-const SalesByRegionWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<SalesByRegionSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/top-customers/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import TopCustomersWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type TopCustomersSettings } from './config'
-const TopCustomersWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<TopCustomersSettings> = {
   metadata: {

package/src/modules/dashboards/widgets/dashboard/top-products/widget.ts

@@ -1,6 +1,6 @@
-import { lazyDashboardWidget, type DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import type { DashboardWidgetModule } from '@open-mercato/shared/modules/dashboard/widgets'
+import TopProductsWidget from './widget.client'
 import { DEFAULT_SETTINGS, hydrateSettings, type TopProductsSettings } from './config'
-const TopProductsWidget = lazyDashboardWidget(() => import('./widget.client'))
 
 const widget: DashboardWidgetModule<TopProductsSettings> = {
   metadata: {

package/src/modules/dictionaries/components/DictionaryTable.tsx

@@ -171,14 +171,12 @@ export function DictionaryTable({
               const items: RowActionItem[] = []
               if (onEdit) {
                 items.push({
-                  id: 'edit',
                   label: translations.editLabel,
                   onSelect: () => onEdit(entry),
                 })
               }
               if (onDelete) {
                 items.push({
-                  id: 'delete',
                   label: translations.deleteLabel,
                   onSelect: () => onDelete(entry),
                   destructive: true,

package/src/modules/directory/backend/directory/organizations/page.tsx

@@ -235,8 +235,8 @@ export default function DirectoryOrganizationsPage() {
             canManage ? (
               <RowActions
                 items={[
-                  { id: 'edit', label: t('directory.organizations.list.actions.edit', 'Edit'), href: `/backend/directory/organizations/${row.id}/edit` },
-                  { id: 'delete', label: t('directory.organizations.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
+                  { label: t('directory.organizations.list.actions.edit', 'Edit'), href: `/backend/directory/organizations/${row.id}/edit` },
+                  { label: t('directory.organizations.list.actions.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
                 ]}
               />
             ) : null

package/src/modules/directory/backend/directory/tenants/page.tsx

@@ -160,8 +160,8 @@ export default function DirectoryTenantsPage() {
             canManage ? (
               <RowActions
                 items={[
-                  { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/directory/tenants/${row.id}/edit` },
-                  { id: 'delete', label: t('common.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
+                  { label: t('common.edit', 'Edit'), href: `/backend/directory/tenants/${row.id}/edit` },
+                  { label: t('common.delete', 'Delete'), destructive: true, onSelect: () => handleDelete(row) },
                 ]}
               />
             ) : null

package/src/modules/directory/events.ts

@@ -0,0 +1,31 @@
+import { createModuleEvents } from '@open-mercato/shared/modules/events'
+
+/**
+ * Directory Module Events
+ *
+ * Declares all events that can be emitted by the directory module.
+ */
+const events = [
+  // Tenants
+  { id: 'directory.tenants.created', label: 'Tenant Created', entity: 'tenants', category: 'crud' },
+  { id: 'directory.tenants.updated', label: 'Tenant Updated', entity: 'tenants', category: 'crud' },
+  { id: 'directory.tenants.deleted', label: 'Tenant Deleted', entity: 'tenants', category: 'crud' },
+
+  // Organizations
+  { id: 'directory.organizations.created', label: 'Organization Created', entity: 'organizations', category: 'crud' },
+  { id: 'directory.organizations.updated', label: 'Organization Updated', entity: 'organizations', category: 'crud' },
+  { id: 'directory.organizations.deleted', label: 'Organization Deleted', entity: 'organizations', category: 'crud' },
+] as const
+
+export const eventsConfig = createModuleEvents({
+  moduleId: 'directory',
+  events,
+})
+
+/** Type-safe event emitter for directory module */
+export const emitDirectoryEvent = eventsConfig.emit
+
+/** Event IDs that can be emitted by the directory module */
+export type DirectoryEventId = typeof events[number]['id']
+
+export default eventsConfig

package/src/modules/entities/backend/entities/user/[entityId]/records/page.tsx

@@ -338,8 +338,8 @@ export RECORD_ID="<record uuid>"`}</code></pre>
           rowActions={(row) => (
             <RowActions
               items={[
-                { id: 'edit', label: 'Edit', href: `/backend/entities/user/${encodeURIComponent(entityId)}/records/${encodeURIComponent(String((row as any).id))}` },
-                { id: 'delete', label: 'Delete', destructive: true, onSelect: async () => {
+                { label: 'Edit', href: `/backend/entities/user/${encodeURIComponent(entityId)}/records/${encodeURIComponent(String((row as any).id))}` },
+                { label: 'Delete', destructive: true, onSelect: async () => {
                   try {
                     if (typeof window !== 'undefined') {
                       const ok = window.confirm('Delete this record?')

package/src/modules/entities/components/SystemEntitiesTable.tsx

@@ -88,7 +88,7 @@ export default function SystemEntitiesTable() {
       rowActions={(row) => (
         <RowActions
           items={[
-            { id: 'edit', label: 'Edit', href: `/backend/entities/system/${encodeURIComponent(row.entityId)}` },
+            { label: 'Edit', href: `/backend/entities/system/${encodeURIComponent(row.entityId)}` },
           ]}
         />
       )}

package/src/modules/entities/components/UserEntitiesTable.tsx

@@ -110,8 +110,8 @@ export default function UserEntitiesTable() {
       rowActions={(row) => (
         <RowActions
           items={[
-            { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}` },
-            { id: 'show-records', label: t('entities.user.table.actions.showRecords', 'Show records'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}/records` },
+            { label: t('common.edit', 'Edit'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}` },
+            { label: t('entities.user.table.actions.showRecords', 'Show records'), href: `/backend/entities/user/${encodeURIComponent(row.entityId)}/records` },
           ]}
         />
       )}

package/src/modules/feature_toggles/components/FeatureTogglesTable.tsx

@@ -205,11 +205,12 @@ export function FeatureTogglesTable() {
       }}
       rowActions={(row) => (
         <RowActions items={[
-          { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.id}/edit` },
-          { id: 'view', label: t('common.view', 'Overrides'), href: `/backend/feature-toggles/global/${row.id}` },
-          { id: 'delete', label: t('common.delete', 'Delete'), destructive: true, onSelect: () => { void handleDelete(row) } },
+          { label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.id}/edit` },
+          { label: t('common.view', 'Overrides'), href: `/backend/feature-toggles/global/${row.id}` },
+          { label: t('common.delete', 'Delete'), destructive: true, onSelect: () => { void handleDelete(row) } },
         ]} />
       )}
     />
   )
 }
+

package/src/modules/feature_toggles/components/OverridesTable.tsx

@@ -161,7 +161,7 @@ export default function OverridesTable() {
             }}
             rowActions={(row) => (
                 <RowActions items={[
-                    { id: 'edit', label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.toggleId}` },
+                    { label: t('common.edit', 'Edit'), href: `/backend/feature-toggles/global/${row.toggleId}` },
                 ]} />
             )}
             error={error ? error.message : undefined}

package/src/modules/planner/backend/planner/availability-rulesets/page.tsx

@@ -202,8 +202,8 @@ export default function PlannerAvailabilityRuleSetsPage() {
           rowActions={(row) => (
             <RowActions
               items={[
-                { id: 'edit', label: labels.actions.edit, href: `/backend/planner/availability-rulesets/${row.id}` },
-                { id: 'delete', label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
+                { label: labels.actions.edit, href: `/backend/planner/availability-rulesets/${row.id}` },
+                { label: labels.actions.delete, destructive: true, onSelect: () => { void handleDelete(row) } },
               ]}
             />
           )}

package/src/modules/query_index/cli.ts

@@ -22,50 +22,6 @@ import type { VectorIndexService } from '@open-mercato/search/vector'
 
 type ParsedArgs = Record<string, string | boolean>
 
-type PartitionProgressInfo = { processed: number; total: number }
-
-function isIndexerVerbose(): boolean {
-  const parsed = parseBooleanToken(process.env.OM_INDEXER_VERBOSE ?? '')
-  return parsed === true
-}
-
-function createGroupedProgress(label: string, partitionTargets: number[]) {
-  const totals = new Map<number, number>()
-  const processed = new Map<number, number>()
-  let bar: ProgressBarHandle | null = null
-
-  const getTotals = () => {
-    let total = 0
-    let done = 0
-    for (const value of totals.values()) total += value
-    for (const value of processed.values()) done += value
-    return { total, done }
-  }
-
-  const tryInitBar = () => {
-    if (bar) return
-    if (totals.size < partitionTargets.length) return
-    const { total } = getTotals()
-    if (total <= 0) return
-    bar = createProgressBar(label, total) as ProgressBarHandle
-  }
-
-  return {
-    onProgress(partition: number, info: PartitionProgressInfo) {
-      processed.set(partition, info.processed)
-      if (!totals.has(partition)) totals.set(partition, info.total)
-      tryInitBar()
-      if (!bar) return
-      const { done } = getTotals()
-      bar.update(done)
-    },
-    complete() {
-      if (bar) bar.complete()
-    },
-    getTotals,
-  }
-}
-
 function parseArgs(rest: string[]): ParsedArgs {
   const args: ParsedArgs = {}
   for (let i = 0; i < rest.length; i += 1) {
@@ -594,14 +550,8 @@ const reindex: ModuleCli = {
           await purgeIndexScope(baseEm, { entityType: entity, organizationId: orgId, tenantId })
         }
         console.log(`Reindexing ${entity}${force ? ' (forced)' : ''} in ${partitionTargets.length} partition(s)...`)
-        const verbose = isIndexerVerbose()
-        const progressState = verbose ? new Map<number, { last: number }>() : null
-        const groupedProgress =
-          !verbose && partitionTargets.length > 1
-            ? createGroupedProgress(`Reindexing ${entity}`, partitionTargets)
-            : null
-        const renderProgress = (part: number, entityId: string, info: PartitionProgressInfo) => {
-          if (!progressState) return
+        const progressState = new Map<number, { last: number }>()
+        const renderProgress = (part: number, entityId: string, info: { processed: number; total: number }) => {
           const state = progressState.get(part) ?? { last: 0 }
           const now = Date.now()
           if (now - state.last < 1000 && info.processed < info.total) return
@@ -618,7 +568,7 @@ const reindex: ModuleCli = {
             const label = partitionTargets.length > 1 ? ` [partition ${part + 1}/${partitionCount}]` : ''
             if (partitionTargets.length === 1) {
               console.log(`  -> processing${label}`)
-            } else if (verbose && idx === 0) {
+            } else if (idx === 0) {
               console.log(`  -> processing partitions in parallel (count=${partitionTargets.length})`)
             }
             const partitionContainer = await createRequestContainer()
@@ -646,14 +596,9 @@ const reindex: ModuleCli = {
                 onProgress(info) {
                   if (useBar) {
                     if (info.total > 0 && !progressBar) {
-                      progressBar = createProgressBar(
-                        `Reindexing ${entity}${label}`,
-                        info.total,
-                      ) as ProgressBarHandle
+                    progressBar = createProgressBar(`Reindexing ${entity}${label}`, info.total) as ProgressBarHandle
                     }
                     progressBar?.update(info.processed)
-                  } else if (groupedProgress) {
-                    groupedProgress.onProgress(part, info)
                   } else {
                     renderProgress(part, entity, info)
                   }
@@ -662,9 +607,7 @@ const reindex: ModuleCli = {
               if (progressBar) {
                 (progressBar as ProgressBarHandle).complete()
               }
-              if (!useBar && groupedProgress) {
-                groupedProgress.onProgress(part, { processed: partitionStats.processed, total: partitionStats.total })
-              } else if (!useBar) {
+              if (!useBar) {
                 renderProgress(part, entity, { processed: partitionStats.processed, total: partitionStats.total })
               } else {
                 console.log(
@@ -679,7 +622,6 @@ const reindex: ModuleCli = {
             }
           }),
         )
-        groupedProgress?.complete()
         const totalProcessed = stats.reduce((acc, value) => acc + value, 0)
         console.log(`Finished ${entity}: processed ${totalProcessed} row(s) across ${partitionTargets.length} partition(s)`)
         await recordIndexerLog(
@@ -735,14 +677,8 @@ const reindex: ModuleCli = {
         console.log(
           `[${idx + 1}/${entityIds.length}] Reindexing ${id}${force ? ' (forced)' : ''} in ${partitionTargets.length} partition(s)...`,
         )
-        const verbose = isIndexerVerbose()
-        const progressState = verbose ? new Map<number, { last: number }>() : null
-        const groupedProgress =
-          !verbose && partitionTargets.length > 1
-            ? createGroupedProgress(`Reindexing ${id}`, partitionTargets)
-            : null
-        const renderProgress = (part: number, entityId: string, info: PartitionProgressInfo) => {
-          if (!progressState) return
+        const progressState = new Map<number, { last: number }>()
+        const renderProgress = (part: number, entityId: string, info: { processed: number; total: number }) => {
           const state = progressState.get(part) ?? { last: 0 }
           const now = Date.now()
           if (now - state.last < 1000 && info.processed < info.total) return
@@ -759,7 +695,7 @@ const reindex: ModuleCli = {
             const label = partitionTargets.length > 1 ? ` [partition ${part + 1}/${partitionCount}]` : ''
             if (partitionTargets.length === 1) {
               console.log(`  -> processing${label}`)
-            } else if (verbose && partitionIdx === 0) {
+            } else if (partitionIdx === 0) {
               console.log(`  -> processing partitions in parallel (count=${partitionTargets.length})`)
             }
             const partitionContainer = await createRequestContainer()
@@ -787,22 +723,18 @@ const reindex: ModuleCli = {
                 onProgress(info) {
                   if (useBar) {
                     if (info.total > 0 && !progressBar) {
-                      progressBar = createProgressBar(`Reindexing ${id}${label}`, info.total) as ProgressBarHandle
+                    progressBar = createProgressBar(`Reindexing ${id}${label}`, info.total) as ProgressBarHandle
                     }
                     progressBar?.update(info.processed)
-                  } else if (groupedProgress) {
-                    groupedProgress.onProgress(part, info)
                   } else {
                     renderProgress(part, id, info)
                   }
                 },
               })
-              if (progressBar) {
-                (progressBar as ProgressBarHandle).complete()
-              }
-              if (!useBar && groupedProgress) {
-                groupedProgress.onProgress(part, { processed: result.processed, total: result.total })
-              } else if (!useBar) {
+            if (progressBar) {
+              (progressBar as ProgressBarHandle).complete()
+            }
+              if (!useBar) {
                 renderProgress(part, id, { processed: result.processed, total: result.total })
               } else {
                 console.log(
@@ -817,7 +749,6 @@ const reindex: ModuleCli = {
             }
           }),
         )
-        groupedProgress?.complete()
         const totalProcessed = partitionResults.reduce((acc, value) => acc + value, 0)
         console.log(`  -> ${id} complete: processed ${totalProcessed} row(s) across ${partitionTargets.length} partition(s)`)
         await recordIndexerLog(