@open-mercato/search 0.5.1-develop.2691.d8a0934b37 → 0.5.1-develop.2694.732417c5ec

package/src/lib/presenter-enricher.ts

@@ -1,4 +1,4 @@
-import type { Knex } from 'knex'
+import type { Kysely } from 'kysely'
 import type {
   SearchBuildContext,
   SearchResult,
@@ -40,7 +40,7 @@ function chunk<T>(array: T[], size: number): T[][] {
  * Uses OR conditions to fetch all needed docs in one round trip.
  */
 async function fetchDocsBatch(
-  knex: Knex,
+  db: Kysely<any>,
   byEntityType: Map<string, SearchResult[]>,
   tenantId: string,
   organizationId?: string | null,
@@ -70,27 +70,28 @@ async function fetchDocsBatch(
     }
 
     // Build query with OR conditions per entity type
-    const query = knex('entity_indexes')
-      .select('entity_type', 'entity_id', 'doc')
-      .where('tenant_id', tenantId)
-      .whereNull('deleted_at')
-      .where((builder) => {
-        for (const [entityType, recordIds] of chunkByType) {
-          builder.orWhere((sub) => {
-            sub.where('entity_type', entityType).whereIn('entity_id', recordIds)
-          })
-        }
-      })
+    let query = db
+      .selectFrom('entity_indexes' as any)
+      .select(['entity_type' as any, 'entity_id' as any, 'doc' as any])
+      .where('tenant_id' as any, '=', tenantId)
+      .where('deleted_at' as any, 'is', null)
+      .where((eb: any) => eb.or(
+        Array.from(chunkByType.entries()).map(([entityType, recordIds]) => eb.and([
+          eb('entity_type' as any, '=', entityType),
+          eb('entity_id' as any, 'in', recordIds),
+        ])),
+      ))
 
     // Add organization filter if provided
     if (organizationId) {
-      query.where((builder) => {
-        builder.where('organization_id', organizationId).orWhereNull('organization_id')
-      })
+      query = query.where((eb: any) => eb.or([
+        eb('organization_id' as any, '=', organizationId),
+        eb('organization_id' as any, 'is', null),
+      ]))
     }
 
-    const rows = await query
-    allDocs.push(...(rows as typeof allDocs))
+    const rows = await query.execute() as Array<{ entity_type: string; entity_id: string; doc: Record<string, unknown> }>
+    allDocs.push(...rows)
   }
 
   return allDocs
@@ -196,7 +197,7 @@ async function computePresenterAndLinks(
  * - Automatic decryption of encrypted fields when encryption service is provided
  */
 export function createPresenterEnricher(
-  knex: Knex,
+  db: Kysely<any>,
   entityConfigMap: Map<EntityId, SearchEntityConfig>,
   queryEngine?: QueryEngine,
   encryptionService?: TenantDataEncryptionService | null,
@@ -215,7 +216,7 @@ export function createPresenterEnricher(
     }
 
     // Single batch query for all docs across all entity types
-    const rawDocs = await fetchDocsBatch(knex, byEntityType, tenantId, organizationId)
+    const rawDocs = await fetchDocsBatch(db, byEntityType, tenantId, organizationId)
 
     // Decrypt docs in parallel using DEK cache for efficiency
     const dekCache = new Map<string | null, string | null>()

package/src/modules/search/api/embeddings/reindex/cancel/route.ts

@@ -2,8 +2,9 @@ import { NextResponse } from 'next/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import type { Queue } from '@open-mercato/queue'
-import type { Knex } from 'knex'
+
 import type { EntityManager } from '@mikro-orm/postgresql'
+import type { Kysely } from 'kysely'
 import type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'
 import { clearReindexLock } from '../../../../lib/reindex-lock'
 import { cancelReindexProgress } from '../../../../lib/reindex-progress'
@@ -25,7 +26,7 @@ export async function POST(req: Request) {
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
   const progressService = container.resolve('progressService') as ProgressService
-  const knex = (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
 
   let queue: Queue | undefined
   try {
@@ -45,7 +46,7 @@ export async function POST(req: Request) {
     }
   }
 
-  await clearReindexLock(knex, auth.tenantId, 'vector', auth.orgId ?? null)
+  await clearReindexLock(db, auth.tenantId, 'vector', auth.orgId ?? null)
   await cancelReindexProgress({
     em,
     progressService,

package/src/modules/search/api/embeddings/reindex/route.ts

@@ -4,8 +4,9 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import type { SearchIndexer } from '../../../../../indexer/search-indexer'
 import type { EmbeddingService } from '../../../../../vector'
 import type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'
-import type { Knex } from 'knex'
+
 import type { EntityManager } from '@mikro-orm/postgresql'
+import type { Kysely } from 'kysely'
 import { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { resolveEmbeddingConfig } from '../../../lib/embedding-config'
@@ -42,10 +43,10 @@ export async function POST(req: Request) {
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
   const progressService = container.resolve('progressService') as ProgressService
-  const knex = (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
 
   // Check if another vector reindex operation is already in progress
-  const existingLock = await getReindexLockStatus(knex, auth.tenantId, { type: 'vector' })
+  const existingLock = await getReindexLockStatus(db, auth.tenantId, { type: 'vector' })
   if (existingLock) {
     const startedAt = new Date(existingLock.startedAt)
     return NextResponse.json(
@@ -65,7 +66,7 @@ export async function POST(req: Request) {
   }
 
   // Acquire lock before starting the operation
-  const { acquired: lockAcquired } = await acquireReindexLock(knex, {
+  const { acquired: lockAcquired } = await acquireReindexLock(db, {
     type: 'vector',
     action: entityId ? `reindex:${entityId}` : 'reindex:all',
     tenantId: auth.tenantId,

package/src/modules/search/api/reindex/cancel/route.ts

@@ -2,8 +2,9 @@ import { NextResponse } from 'next/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import type { Queue } from '@open-mercato/queue'
-import type { Knex } from 'knex'
+
 import type { EntityManager } from '@mikro-orm/postgresql'
+import type { Kysely } from 'kysely'
 import type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'
 import { clearReindexLock } from '../../../lib/reindex-lock'
 import { cancelReindexProgress } from '../../../lib/reindex-progress'
@@ -25,7 +26,7 @@ export async function POST(req: Request) {
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
   const progressService = container.resolve('progressService') as ProgressService
-  const knex = (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
 
   let queue: Queue | undefined
   try {
@@ -45,7 +46,7 @@ export async function POST(req: Request) {
     }
   }
 
-  await clearReindexLock(knex, auth.tenantId, 'fulltext', auth.orgId ?? null)
+  await clearReindexLock(db, auth.tenantId, 'fulltext', auth.orgId ?? null)
   await cancelReindexProgress({
     em,
     progressService,

package/src/modules/search/api/reindex/route.ts

@@ -9,7 +9,7 @@ import { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+import type { Kysely } from 'kysely'
 import { searchDebug, searchError } from '../../../../lib/debug'
 import {
   acquireReindexLock,
@@ -91,10 +91,10 @@ export async function POST(req: Request) {
   const container = await createRequestContainer()
   const em = container.resolve('em') as EntityManager
   const progressService = container.resolve('progressService') as ProgressService
-  const knex = (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+  const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
 
   // Check if another fulltext reindex operation is already in progress
-  const existingLock = await getReindexLockStatus(knex, tenantId, { type: 'fulltext' })
+  const existingLock = await getReindexLockStatus(db, tenantId, { type: 'fulltext' })
   if (existingLock) {
     const startedAt = new Date(existingLock.startedAt)
     return NextResponse.json(
@@ -114,7 +114,7 @@ export async function POST(req: Request) {
   }
 
   // Acquire lock before starting the operation
-  const { acquired: lockAcquired } = await acquireReindexLock(knex, {
+  const { acquired: lockAcquired } = await acquireReindexLock(db, {
     type: 'fulltext',
     action,
     tenantId: tenantId,
@@ -453,7 +453,7 @@ export async function POST(req: Request) {
     // Only clear lock immediately if NOT using queue mode
     // When using queue mode, workers update heartbeat and stale detection handles cleanup
     if (!useQueue) {
-      await clearReindexLock(knex, tenantId, 'fulltext', auth.orgId ?? null)
+      await clearReindexLock(db, tenantId, 'fulltext', auth.orgId ?? null)
     }
 
     const disposable = container as unknown as { dispose?: () => Promise<void> }

package/src/modules/search/api/settings/route.ts

@@ -4,8 +4,9 @@ import { getAuthFromRequest } from '@open-mercato/shared/lib/auth/server'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import type { SearchService } from '@open-mercato/search'
 import type { FullTextSearchStrategy } from '@open-mercato/search/strategies'
-import type { Knex } from 'knex'
+
 import type { EntityManager } from '@mikro-orm/postgresql'
+import type { Kysely } from 'kysely'
 import { getReindexLockStatus } from '../../lib/reindex-lock'
 import { settingsOpenApi } from '../openapi'
 
@@ -132,10 +133,10 @@ export async function GET(req: Request) {
 
     if (auth.tenantId) {
       const em = container.resolve('em') as EntityManager
-      const knex = (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+      const db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
 
       // Check fulltext lock (auto-cleans stale locks based on heartbeat)
-      const fulltextLockStatus = await getReindexLockStatus(knex, auth.tenantId, { type: 'fulltext' })
+      const fulltextLockStatus = await getReindexLockStatus(db, auth.tenantId, { type: 'fulltext' })
       if (fulltextLockStatus) {
         const startedAt = new Date(fulltextLockStatus.startedAt)
         fulltextReindexLock = {
@@ -149,7 +150,7 @@ export async function GET(req: Request) {
       }
 
       // Check vector lock (auto-cleans stale locks based on heartbeat)
-      const vectorLockStatus = await getReindexLockStatus(knex, auth.tenantId, { type: 'vector' })
+      const vectorLockStatus = await getReindexLockStatus(db, auth.tenantId, { type: 'vector' })
       if (vectorLockStatus) {
         const startedAt = new Date(vectorLockStatus.startedAt)
         vectorReindexLock = {

package/src/modules/search/lib/reindex-lock.ts

@@ -1,7 +1,7 @@
-import type { Knex } from 'knex'
+
+import { type Kysely, sql } from 'kysely'
 import {
   prepareJob,
-  updateJobProgress,
   finalizeJob,
   type JobScope,
 } from '@open-mercato/core/modules/query_index/lib/jobs'
@@ -50,7 +50,7 @@ function buildScope(
  * Automatically cleans up stale locks (heartbeat older than 60 seconds).
  */
 export async function getReindexLockStatus(
-  knex: Knex,
+  db: Kysely<any>,
   tenantId: string,
   options?: { type?: ReindexLockType },
 ): Promise<ReindexLockStatus | null> {
@@ -62,29 +62,41 @@ export async function getReindexLockStatus(
     const entityType = LOCK_ENTITY_TYPES[lockType]
 
     try {
-      const job = await knex('entity_index_jobs')
-        .where('entity_type', entityType)
-        .whereRaw('tenant_id is not distinct from ?', [tenantId])
-        .whereNull('finished_at')
-        .first()
+      const job = await db
+        .selectFrom('entity_index_jobs' as any)
+        .selectAll()
+        .where('entity_type' as any, '=', entityType)
+        .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)
+        .where('finished_at' as any, 'is', null)
+        .executeTakeFirst() as {
+          id: string
+          status?: string | null
+          started_at?: Date | string | null
+          heartbeat_at?: Date | string | null
+          organization_id?: string | null
+          processed_count?: number | null
+          total_count?: number | null
+        } | undefined
 
       if (!job) continue
 
       // Check heartbeat staleness
       const heartbeatAt = job.heartbeat_at
-        ? new Date(job.heartbeat_at).getTime()
+        ? new Date(job.heartbeat_at as string | Date).getTime()
         : 0
       const elapsed = Date.now() - heartbeatAt
 
       if (elapsed > HEARTBEAT_STALE_MS) {
         // Auto-cleanup stale lock
-        await knex('entity_index_jobs')
-          .where('id', job.id)
-          .update({ finished_at: knex.fn.now() })
+        await db
+          .updateTable('entity_index_jobs' as any)
+          .set({ finished_at: sql`now()` } as any)
+          .where('id' as any, '=', job.id)
+          .execute()
         continue
       }
 
-      // started_at comes as string from knex, convert if needed
+      // started_at comes as string from Kysely, convert if needed
       const startedAtStr = job.started_at
         ? (typeof job.started_at === 'string' ? job.started_at : new Date(job.started_at).toISOString())
         : new Date().toISOString()
@@ -94,9 +106,9 @@ export async function getReindexLockStatus(
         action: job.status || 'reindexing',
         startedAt: startedAtStr,
         tenantId,
-        organizationId: job.organization_id,
-        processedCount: job.processed_count,
-        totalCount: job.total_count,
+        organizationId: job.organization_id ?? null,
+        processedCount: job.processed_count ?? null,
+        totalCount: job.total_count ?? null,
       }
       return result
     } catch {
@@ -112,7 +124,7 @@ export async function getReindexLockStatus(
  * Fulltext and vector locks are independent - they don't block each other.
  */
 export async function acquireReindexLock(
-  knex: Knex,
+  db: Kysely<any>,
   options: {
     type: ReindexLockType
     action: string
@@ -122,7 +134,7 @@ export async function acquireReindexLock(
   },
 ): Promise<{ acquired: boolean; jobId?: string }> {
   // Check existing active lock
-  const existing = await getReindexLockStatus(knex, options.tenantId, {
+  const existing = await getReindexLockStatus(db, options.tenantId, {
     type: options.type,
   })
   if (existing) {
@@ -135,7 +147,7 @@ export async function acquireReindexLock(
       options.tenantId,
       options.organizationId,
     )
-    const jobId = await prepareJob(knex, scope, 'reindexing', {
+    const jobId = await prepareJob(db, scope, 'reindexing', {
       totalCount: options.totalCount,
     })
 
@@ -149,14 +161,14 @@ export async function acquireReindexLock(
  * Release the reindex lock for a specific type.
  */
 export async function clearReindexLock(
-  knex: Knex,
+  db: Kysely<any>,
   tenantId: string,
   type: ReindexLockType,
   organizationId?: string | null,
 ): Promise<void> {
   try {
     const scope = buildScope(type, tenantId, organizationId)
-    await finalizeJob(knex, scope)
+    await finalizeJob(db, scope)
   } catch {
     // Ignore errors when clearing lock
   }
@@ -170,7 +182,7 @@ export async function clearReindexLock(
  * recreate the lock so the reindex button stays disabled while processing.
  */
 export async function updateReindexProgress(
-  knex: Knex,
+  db: Kysely<any>,
   tenantId: string,
   type: ReindexLockType,
   processedDelta: number,
@@ -179,21 +191,27 @@ export async function updateReindexProgress(
   try {
     const scope = buildScope(type, tenantId, organizationId)
     const entityType = LOCK_ENTITY_TYPES[type]
+    const delta = Math.max(0, processedDelta)
 
     // Try to update existing active job first
-    const updated = await knex('entity_index_jobs')
-      .where('entity_type', entityType)
-      .whereRaw('tenant_id is not distinct from ?', [tenantId])
-      .whereRaw('organization_id is not distinct from ?', [organizationId ?? null])
-      .whereNull('finished_at')
-      .update({
-        processed_count: knex.raw('coalesce(processed_count, 0) + ?', [Math.max(0, processedDelta)]),
-        heartbeat_at: knex.fn.now(),
-      })
+    const result = await db
+      .updateTable('entity_index_jobs' as any)
+      .set({
+        processed_count: sql`coalesce(processed_count, 0) + ${delta}`,
+        heartbeat_at: sql`now()`,
+      } as any)
+      .where('entity_type' as any, '=', entityType)
+      .where(sql<boolean>`tenant_id is not distinct from ${tenantId}`)
+      .where(sql<boolean>`organization_id is not distinct from ${organizationId ?? null}`)
+      .where('finished_at' as any, 'is', null)
+      .executeTakeFirst()
+
+    // Kysely returns numUpdatedRows as bigint; coerce
+    const updated = Number(result?.numUpdatedRows ?? 0n)
 
     // If no active lock exists, recreate it
     if (updated === 0) {
-      await prepareJob(knex, scope, 'reindexing')
+      await prepareJob(db, scope, 'reindexing')
     }
   } catch {
     // Ignore errors when updating progress

package/src/modules/search/subscribers/fulltext_upsert.ts

@@ -37,9 +37,13 @@ export default async function handle(payload: Payload, ctx: HandlerContext) {
   // Resolve missing scope from DB if needed (same pattern as vector_upsert.ts)
   if ((organizationId == null || tenantId == null) && em) {
     try {
-      const knex = em.getConnection().getKnex()
+      const db = em.getKysely()
       const table = resolveEntityTableName(em, entityType)
-      const row = await knex(table).select(['organization_id', 'tenant_id']).where({ id: recordId }).first()
+      const row = await db
+        .selectFrom(table as any)
+        .select(['organization_id' as any, 'tenant_id' as any])
+        .where('id' as any, '=', recordId)
+        .executeTakeFirst() as { organization_id?: string | null; tenant_id?: string | null } | undefined
       if (organizationId == null) organizationId = row?.organization_id ?? organizationId
       if (tenantId == null) tenantId = row?.tenant_id ?? tenantId
     } catch {

package/src/modules/search/subscribers/vector_delete.ts

@@ -33,9 +33,13 @@ export default async function handle(payload: Payload, ctx: HandlerContext) {
 
   if ((organizationId == null || tenantId == null) && em) {
     try {
-      const knex = em.getConnection().getKnex()
+      const db = em.getKysely()
       const table = resolveEntityTableName(em, entityType)
-      const row = await knex(table).select(['organization_id', 'tenant_id']).where({ id: recordId }).first()
+      const row = await db
+        .selectFrom(table as any)
+        .select(['organization_id' as any, 'tenant_id' as any])
+        .where('id' as any, '=', recordId)
+        .executeTakeFirst() as { organization_id?: string | null; tenant_id?: string | null } | undefined
       if (organizationId == null) organizationId = row?.organization_id ?? organizationId
       if (tenantId == null) tenantId = row?.tenant_id ?? tenantId
     } catch {

package/src/modules/search/subscribers/vector_upsert.ts

@@ -33,9 +33,13 @@ export default async function handle(payload: Payload, ctx: HandlerContext) {
 
   if ((organizationId == null || tenantId == null) && em) {
     try {
-      const knex = em.getConnection().getKnex()
+      const db = em.getKysely()
       const table = resolveEntityTableName(em, entityType)
-      const row = await knex(table).select(['organization_id', 'tenant_id']).where({ id: recordId }).first()
+      const row = await db
+        .selectFrom(table as any)
+        .select(['organization_id' as any, 'tenant_id' as any])
+        .where('id' as any, '=', recordId)
+        .executeTakeFirst() as { organization_id?: string | null; tenant_id?: string | null } | undefined
       if (organizationId == null) organizationId = row?.organization_id ?? organizationId
       if (tenantId == null) tenantId = row?.tenant_id ?? tenantId
     } catch {

package/src/modules/search/workers/fulltext-index.worker.ts

@@ -1,9 +1,10 @@
 import type { QueuedJob, JobContext, WorkerMeta } from '@open-mercato/queue'
+import type { Kysely } from 'kysely'
 import { FULLTEXT_INDEXING_QUEUE_NAME, type FulltextIndexJobPayload } from '../../../queue/fulltext-indexing'
 import type { FullTextSearchStrategy } from '../../../strategies/fulltext.strategy'
 import type { SearchIndexer } from '../../../indexer/search-indexer'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+
 import type { EntityId } from '@open-mercato/shared/modules/entities'
 import { recordIndexerLog } from '@open-mercato/shared/lib/indexers/status-log'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
@@ -51,16 +52,16 @@ export async function handleFulltextIndexJob(
     return
   }
 
-  // Resolve EntityManager for logging and knex for database queries
+  // Resolve EntityManager for logging and Kysely for database queries
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let em: any | null = null
-  let knex: Knex | null = null
+  let db: Kysely<any> | null = null
   try {
     em = ctx.resolve('em') as EntityManager
-    knex = (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+    db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
   } catch {
     em = null
-    knex = null
+    db = null
   }
 
   // Resolve searchIndexer for loading fresh data
@@ -193,8 +194,8 @@ export async function handleFulltextIndexJob(
       }
 
       // Update heartbeat to signal worker is still processing
-      if (knex && records.length > 0) {
-        await updateReindexProgress(knex, tenantId, 'fulltext', successCount, organizationId ?? null)
+      if (db && records.length > 0) {
+        await updateReindexProgress(db, tenantId, 'fulltext', successCount, organizationId ?? null)
       }
       if (progressService && em && records.length > 0) {
         const completed = await incrementReindexProgress({
@@ -205,8 +206,8 @@ export async function handleFulltextIndexJob(
           organizationId: organizationId ?? null,
           delta: successCount,
         })
-        if (completed && knex) {
-          await clearReindexLock(knex, tenantId, 'fulltext', organizationId ?? null)
+        if (completed && db) {
+          await clearReindexLock(db, tenantId, 'fulltext', organizationId ?? null)
         }
       }
 

package/src/modules/search/workers/vector-index.worker.ts

@@ -1,9 +1,10 @@
 import type { QueuedJob, JobContext, WorkerMeta } from '@open-mercato/queue'
+import type { Kysely } from 'kysely'
 import { VECTOR_INDEXING_QUEUE_NAME, type VectorIndexJobPayload } from '../../../queue/vector-indexing'
 import type { SearchIndexer } from '../../../indexer/search-indexer'
 import type { EmbeddingService } from '../../../vector'
 import type { EntityManager } from '@mikro-orm/postgresql'
-import type { Knex } from 'knex'
+
 import type { ProgressService } from '@open-mercato/core/modules/progress/lib/progressService'
 import { recordIndexerError } from '@open-mercato/shared/lib/indexers/error-log'
 import { applyCoverageAdjustments, createCoverageAdjustments } from '@open-mercato/core/modules/query_index/lib/coverage'
@@ -61,14 +62,14 @@ export async function handleVectorIndexJob(
       return
     }
 
-    // Get knex for heartbeat updates
-    let knex: Knex | null = null
+    // Get Kysely for heartbeat updates
+    let db: Kysely<any> | null = null
     let em: EntityManager | null = null
     try {
       em = ctx.resolve('em') as EntityManager
-      knex = (em.getConnection() as unknown as { getKnex: () => Knex }).getKnex()
+      db = (em as unknown as { getKysely: () => Kysely<any> }).getKysely()
     } catch {
-      knex = null
+      db = null
       em = null
     }
 
@@ -117,8 +118,8 @@ export async function handleVectorIndexJob(
     }
 
     // Update heartbeat to signal worker is still processing
-    if (knex && records.length > 0) {
-      await updateReindexProgress(knex, tenantId, 'vector', successCount, organizationId ?? null)
+    if (db && records.length > 0) {
+      await updateReindexProgress(db, tenantId, 'vector', successCount, organizationId ?? null)
     }
     if (progressService && em && records.length > 0) {
       const completed = await incrementReindexProgress({
@@ -129,8 +130,8 @@ export async function handleVectorIndexJob(
         organizationId: organizationId ?? null,
         delta: successCount,
       })
-      if (completed && knex) {
-        await clearReindexLock(knex, tenantId, 'vector', organizationId ?? null)
+      if (completed && db) {
+        await clearReindexLock(db, tenantId, 'vector', organizationId ?? null)
       }
     }