@vellumai/assistant 0.3.16 → 0.3.19

package/src/daemon/tls-certs.ts

@@ -152,20 +152,25 @@ export async function ensureTlsCert(): Promise<{ cert: string; key: string; fing
   }
 
   if (status === 'approaching_expiry') {
-    // Buffer existing cert/key/fingerprint before attempting renewal.
-    // generateNewCert() overwrites key.pem in-place, so if it fails mid-flight
-    // (e.g., key written but cert generation fails), reading from disk in the
-    // catch block would return a mismatched key/cert pair.
-    const [existingCert, existingKey, existingFp] = await Promise.all([
-      readFile(certPath, 'utf-8'),
-      readFile(keyPath, 'utf-8'),
-      readFile(fpPath, 'utf-8'),
-    ]);
     try {
-      return await generateNewCert(tlsDir, certPath, keyPath, fpPath);
+      // Buffer existing cert/key/fingerprint before attempting renewal.
+      // generateNewCert() overwrites key.pem in-place, so if it fails mid-flight
+      // (e.g., key written but cert generation fails), reading from disk in the
+      // catch block would return a mismatched key/cert pair.
+      const [existingCert, existingKey, existingFp] = await Promise.all([
+        readFile(certPath, 'utf-8'),
+        readFile(keyPath, 'utf-8'),
+        readFile(fpPath, 'utf-8'),
+      ]);
+      try {
+        return await generateNewCert(tlsDir, certPath, keyPath, fpPath);
+      } catch (err) {
+        log.warn({ err }, 'Proactive TLS renewal failed, continuing with existing certificate');
+        return { cert: existingCert, key: existingKey, fingerprint: existingFp.trim() };
+      }
     } catch (err) {
-      log.warn({ err }, 'Proactive TLS renewal failed, continuing with existing certificate');
-      return { cert: existingCert, key: existingKey, fingerprint: existingFp.trim() };
+      log.warn({ err }, 'Failed to read existing TLS cert for buffering, attempting regeneration');
+      return await generateNewCert(tlsDir, certPath, keyPath, fpPath);
     }
   }
 

package/src/daemon/tool-side-effects.ts

@@ -7,11 +7,11 @@
  * registry entry instead of another if/else branch.
  */
 
-import { normalizeActivationKey } from './handlers/config-voice.js';
 import { updatePublishedAppDeployment } from '../services/published-app-updater.js';
 import { openAppViaSurface } from '../tools/apps/open-proxy.js';
 import type { ToolExecutionResult } from '../tools/types.js';
 import { isDoordashCommand, updateDoordashProgress } from './doordash-steps.js';
+import { normalizeActivationKey } from './handlers/config-voice.js';
 import type { ServerMessage } from './ipc-protocol.js';
 import {
   refreshSurfacesForApp,

package/src/memory/channel-delivery-store.ts

@@ -8,33 +8,31 @@
  *   - delivery-channels.ts — verification replies, segment progress, delivery guards
  */
 
+export type { PendingVerificationReply } from './delivery-channels.js';
+export {
+  claimRunDelivery,
+  clearPendingVerificationReply,
+  getDeliveredSegmentCount,
+  getPendingVerificationReply,
+  resetAllRunDeliveryClaims,
+  resetRunDeliveryClaim,
+  storePendingVerificationReply,
+  updateDeliveredSegmentCount,
+} from './delivery-channels.js';
+export type { InboundResult, RecordInboundOptions } from './delivery-crud.js';
 export {
-  recordInbound,
-  linkMessage,
-  findMessageBySourceId,
-  storePayload,
   clearPayload,
+  findMessageBySourceId,
   getLatestStoredPayload,
+  linkMessage,
+  recordInbound,
+  storePayload,
 } from './delivery-crud.js';
-export type { InboundResult, RecordInboundOptions } from './delivery-crud.js';
-
 export {
   acknowledgeDelivery,
+  getDeadLetterEvents,
+  getRetryableEvents,
   markProcessed,
   recordProcessingFailure,
-  getRetryableEvents,
-  getDeadLetterEvents,
   replayDeadLetters,
 } from './delivery-status.js';
-
-export {
-  storePendingVerificationReply,
-  getPendingVerificationReply,
-  clearPendingVerificationReply,
-  getDeliveredSegmentCount,
-  updateDeliveredSegmentCount,
-  claimRunDelivery,
-  resetRunDeliveryClaim,
-  resetAllRunDeliveryClaims,
-} from './delivery-channels.js';
-export type { PendingVerificationReply } from './delivery-channels.js';

package/src/memory/channel-guardian-store.ts

@@ -10,60 +10,57 @@
  * This file re-exports everything for backward compatibility.
  */
 
+export {
+  type ApprovalRequestStatus,
+  countPendingByConversation,
+  createApprovalRequest,
+  findPendingAccessRequestForRequester,
+  getAllPendingApprovalsByGuardianChat,
+  getApprovalRequestById,
+  getApprovalRequestByRunId,
+  getExpiredPendingApprovals,
+  getPendingApprovalByGuardianChat,
+  getPendingApprovalByRequestAndGuardianChat,
+  getPendingApprovalByRunAndGuardianChat,
+  getPendingApprovalForRequest,
+  getPendingApprovalForRun,
+  getUnresolvedApprovalForRequest,
+  getUnresolvedApprovalForRun,
+  type GuardianApprovalRequest,
+  listPendingApprovalRequests,
+  resolveApprovalRequest,
+  updateApprovalDecision,
+} from './guardian-approvals.js';
 export {
   type BindingStatus,
-  type GuardianBinding,
   createBinding,
   getActiveBinding,
+  type GuardianBinding,
   revokeBinding,
 } from './guardian-bindings.js';
-
 export {
+  getRateLimit,
+  recordInvalidAttempt,
+  resetRateLimit,
+  type VerificationRateLimit,
+} from './guardian-rate-limits.js';
+export {
+  bindSessionIdentity,
   type ChallengeStatus,
-  type SessionStatus,
-  type IdentityBindingStatus,
-  type VerificationPurpose,
-  type VerificationChallenge,
-  createChallenge,
-  revokePendingChallenges,
-  findPendingChallengeByHash,
-  findPendingChallengeForChannel,
   consumeChallenge,
+  countRecentSendsToDestination,
+  createChallenge,
   createVerificationSession,
   findActiveSession,
+  findPendingChallengeByHash,
+  findPendingChallengeForChannel,
   findSessionByBootstrapTokenHash,
   findSessionByIdentity,
-  updateSessionStatus,
+  type IdentityBindingStatus,
+  revokePendingChallenges,
+  type SessionStatus,
   updateSessionDelivery,
-  countRecentSendsToDestination,
-  bindSessionIdentity,
+  updateSessionStatus,
+  type VerificationChallenge,
+  type VerificationPurpose,
 } from './guardian-verification.js';
-
-export {
-  type ApprovalRequestStatus,
-  type GuardianApprovalRequest,
-  createApprovalRequest,
-  getPendingApprovalForRun,
-  getPendingApprovalForRequest,
-  getUnresolvedApprovalForRun,
-  getUnresolvedApprovalForRequest,
-  getPendingApprovalByGuardianChat,
-  getPendingApprovalByRunAndGuardianChat,
-  getPendingApprovalByRequestAndGuardianChat,
-  getAllPendingApprovalsByGuardianChat,
-  getExpiredPendingApprovals,
-  updateApprovalDecision,
-  listPendingApprovalRequests,
-  getApprovalRequestById,
-  getApprovalRequestByRunId,
-  resolveApprovalRequest,
-  countPendingByConversation,
-  findPendingAccessRequestForRequester,
-} from './guardian-approvals.js';
-
-export {
-  type VerificationRateLimit,
-  getRateLimit,
-  recordInvalidAttempt,
-  resetRateLimit,
-} from './guardian-rate-limits.js';

package/src/memory/conversation-crud.ts

@@ -1,4 +1,4 @@
-import { and, count, eq, inArray, isNull, sql, asc } from 'drizzle-orm';
+import { and, asc,count, eq, inArray, isNull, sql } from 'drizzle-orm';
 import { v4 as uuid } from 'uuid';
 import { z } from 'zod';
 
@@ -11,7 +11,7 @@ import { getLogger } from '../util/logger.js';
 import { createRowMapper } from '../util/row-mapper.js';
 import { deleteOrphanAttachments } from './attachments-store.js';
 import { projectAssistantMessage } from './conversation-attention-store.js';
-import { getDb, rawAll, rawExec, rawGet } from './db.js';
+import { getDb, rawExec, rawGet } from './db.js';
 import { indexMessageNow } from './indexer.js';
 import { channelInboundEvents, conversations, llmRequestLogs, memoryEmbeddings, memoryItemEntities, memoryItems, memoryItemSources, memorySegments, messageAttachments, messages, toolInvocations } from './schema.js';
 

package/src/memory/conversation-queries.ts

@@ -1,9 +1,9 @@
 import { and, asc, count, desc, eq, gte, lt, ne, or, sql } from 'drizzle-orm';
 
 import { getLogger } from '../util/logger.js';
-import { getDb, rawAll } from './db.js';
-import { parseConversation, parseMessage } from './conversation-crud.js';
 import type { ConversationRow, MessageRow } from './conversation-crud.js';
+import { parseConversation, parseMessage } from './conversation-crud.js';
+import { getDb, rawAll } from './db.js';
 import { conversations, messages } from './schema.js';
 import { buildFtsMatchQuery } from './search/lexical.js';
 

package/src/memory/conversation-store.ts

@@ -2,44 +2,43 @@
 // Existing imports from this file continue to work without changes.
 
 export {
-  messageMetadataSchema,
-  type MessageMetadata,
-  provenanceFromGuardianContext,
+  addMessage,
+  clearAll,
   type ConversationRow,
-  parseConversation,
-  type MessageRow,
-  parseMessage,
   createConversation,
+  deleteConversation,
+  type DeletedMemoryIds,
+  deleteLastExchange,
+  deleteMessageById,
   getConversation,
-  getConversationThreadType,
   getConversationMemoryScopeId,
-  deleteConversation,
-  addMessage,
-  getMessages,
+  getConversationOriginChannel,
+  getConversationOriginInterface,
+  getConversationThreadType,
   getMessageById,
-  updateConversationTitle,
-  updateConversationUsage,
-  updateConversationContextWindow,
-  clearAll,
-  deleteLastExchange,
-  type DeletedMemoryIds,
-  updateMessageContent,
+  getMessages,
+  type MessageMetadata,
+  messageMetadataSchema,
+  type MessageRow,
+  parseConversation,
+  parseMessage,
+  provenanceFromGuardianContext,
   relinkAttachments,
-  deleteMessageById,
   setConversationOriginChannelIfUnset,
-  getConversationOriginChannel,
   setConversationOriginInterfaceIfUnset,
-  getConversationOriginInterface,
+  updateConversationContextWindow,
+  updateConversationTitle,
+  updateConversationUsage,
+  updateMessageContent,
 } from './conversation-crud.js';
-
 export {
-  listConversations,
+  type ConversationSearchResult,
   countConversations,
   getLatestConversation,
-  getNextMessage,
-  type PaginatedMessagesResult,
   getMessagesPaginated,
+  getNextMessage,
   isLastUserMessageToolResult,
-  type ConversationSearchResult,
+  listConversations,
+  type PaginatedMessagesResult,
   searchConversations,
 } from './conversation-queries.js';

package/src/memory/db-init.ts

@@ -8,6 +8,7 @@ import {
   createConversationAttentionTables,
   createCoreIndexes,
   createCoreTables,
+  createScopedApprovalGrantsTable,
   createExternalConversationBindingsTables,
   createFollowupsTables,
   createMediaAssetsTables,
@@ -17,14 +18,17 @@ import {
   createTasksAndWorkItemsTables,
   createWatchersAndLogsTables,
   migrateCallSessionMode,
-  migrateFkCascadeRebuilds,
   migrateChannelInboundDeliveredSegments,
   migrateConversationsThreadTypeIndex,
+  migrateFkCascadeRebuilds,
   migrateGuardianActionFollowup,
+  migrateGuardianActionToolMetadata,
   migrateGuardianBootstrapToken,
+  migrateGuardianDeliveryConversationIndex,
   migrateGuardianVerificationPurpose,
   migrateGuardianVerificationSessions,
   migrateMessagesFtsBackfill,
+  migrateNotificationDeliveryThreadDecision,
   migrateReminderRoutingIntent,
   migrateSchemaIndexesAndColumns,
   recoverCrashedMigrations,
@@ -100,9 +104,15 @@ export function initializeDb(): void {
   // 14c. Guardian action follow-up lifecycle columns (timeout reason, late answers)
   migrateGuardianActionFollowup(database);
 
+  // 14c2. Guardian action tool-approval metadata columns (tool_name, input_digest)
+  migrateGuardianActionToolMetadata(database);
+
   // 14d. Index on conversations.thread_type for frequent WHERE filters
   migrateConversationsThreadTypeIndex(database);
 
+  // 14e. Index on guardian_action_deliveries.destination_conversation_id for conversation-based lookups
+  migrateGuardianDeliveryConversationIndex(database);
+
   // 15. Notification system
   createNotificationTables(database);
 
@@ -125,5 +135,11 @@ export function initializeDb(): void {
   // 21. Rebuild tables to add ON DELETE CASCADE to FK constraints
   migrateFkCascadeRebuilds(database);
 
+  // 22. Scoped approval grants (channel-agnostic one-time-use grants)
+  createScopedApprovalGrantsTable(database);
+
+  // 23. Thread decision audit columns on notification_deliveries
+  migrateNotificationDeliveryThreadDecision(database);
+
   validateMigrationState(database);
 }

package/src/memory/embedding-local.ts

@@ -1,3 +1,5 @@
+import { dirname, join } from 'node:path';
+
 import { getLogger } from '../util/logger.js';
 import { PromiseGuard } from '../util/promise-guard.js';
 import type { EmbeddingBackend, EmbeddingRequestOptions } from './embedding-backend.js';
@@ -59,13 +61,20 @@ export class LocalEmbeddingBackend implements EmbeddingBackend {
     let transformers: typeof import('@huggingface/transformers');
     try {
       transformers = await import('@huggingface/transformers');
-    } catch (err) {
-      // onnxruntime-node is not bundled in compiled binaries, so the import
-      // fails at runtime. Surface a clear error so callers can fall back to
-      // another embedding backend.
-      throw new Error(
-        `Local embedding backend unavailable: failed to load @huggingface/transformers (${err instanceof Error ? err.message : String(err)})`,
-      );
+    } catch {
+      // In compiled Bun binaries, bare specifier resolution starts from the
+      // virtual /$bunfs/root/ filesystem and can't find externalized packages.
+      // Fall back to resolving from the executable's real disk location where
+      // node_modules/ is co-located.
+      try {
+        const execDir = dirname(process.execPath);
+        const modulePath = join(execDir, 'node_modules', '@huggingface', 'transformers');
+        transformers = await import(modulePath);
+      } catch (err) {
+        throw new Error(
+          `Local embedding backend unavailable: failed to load @huggingface/transformers (${err instanceof Error ? err.message : String(err)})`,
+        );
+      }
     }
     this.extractor = await transformers.pipeline('feature-extraction', this.model, {
       dtype: 'fp32',

package/src/memory/fts-reconciler.ts

@@ -84,37 +84,52 @@ function reconcileTable(opts: {
  */
 export function reconcileFtsIndexes(): FtsReconciliationResult[] {
   const results: FtsReconciliationResult[] = [];
+  const errors: unknown[] = [];
 
   // memory_segment_fts tracks memory_segments
-  const memResult = reconcileTable({
-    ftsTable: 'memory_segment_fts',
-    ftsIdColumn: 'segment_id',
-    ftsContentColumn: 'text',
-    baseTable: 'memory_segments',
-    baseIdColumn: 'id',
-    baseContentColumn: 'text',
-  });
-  results.push(memResult);
-  if (memResult.missingInserted > 0 || memResult.orphansRemoved > 0 || memResult.staleRefreshed > 0) {
-    log.info(memResult, 'Reconciled memory_segment_fts');
-  } else {
-    log.debug(memResult, 'memory_segment_fts is in sync');
+  try {
+    const memResult = reconcileTable({
+      ftsTable: 'memory_segment_fts',
+      ftsIdColumn: 'segment_id',
+      ftsContentColumn: 'text',
+      baseTable: 'memory_segments',
+      baseIdColumn: 'id',
+      baseContentColumn: 'text',
+    });
+    results.push(memResult);
+    if (memResult.missingInserted > 0 || memResult.orphansRemoved > 0 || memResult.staleRefreshed > 0) {
+      log.info(memResult, 'Reconciled memory_segment_fts');
+    } else {
+      log.debug(memResult, 'memory_segment_fts is in sync');
+    }
+  } catch (err) {
+    log.error({ err }, 'Failed to reconcile memory_segment_fts');
+    errors.push(err);
   }
 
   // messages_fts tracks messages
-  const msgResult = reconcileTable({
-    ftsTable: 'messages_fts',
-    ftsIdColumn: 'message_id',
-    ftsContentColumn: 'content',
-    baseTable: 'messages',
-    baseIdColumn: 'id',
-    baseContentColumn: 'content',
-  });
-  results.push(msgResult);
-  if (msgResult.missingInserted > 0 || msgResult.orphansRemoved > 0 || msgResult.staleRefreshed > 0) {
-    log.info(msgResult, 'Reconciled messages_fts');
-  } else {
-    log.debug(msgResult, 'messages_fts is in sync');
+  try {
+    const msgResult = reconcileTable({
+      ftsTable: 'messages_fts',
+      ftsIdColumn: 'message_id',
+      ftsContentColumn: 'content',
+      baseTable: 'messages',
+      baseIdColumn: 'id',
+      baseContentColumn: 'content',
+    });
+    results.push(msgResult);
+    if (msgResult.missingInserted > 0 || msgResult.orphansRemoved > 0 || msgResult.staleRefreshed > 0) {
+      log.info(msgResult, 'Reconciled messages_fts');
+    } else {
+      log.debug(msgResult, 'messages_fts is in sync');
+    }
+  } catch (err) {
+    log.error({ err }, 'Failed to reconcile messages_fts');
+    errors.push(err);
+  }
+
+  if (errors.length > 0) {
+    throw new AggregateError(errors, `FTS reconciliation failed for ${errors.length} table(s)`);
   }
 
   return results;

package/src/memory/guardian-action-store.ts

@@ -7,7 +7,7 @@
  * answer resolves the request and all other deliveries are marked answered.
  */
 
-import { and, desc, eq, inArray, lt } from 'drizzle-orm';
+import { and, count, desc, eq, inArray, lt } from 'drizzle-orm';
 import { v4 as uuid } from 'uuid';
 
 import { getLogger } from '../util/logger.js';
@@ -51,6 +51,8 @@ export interface GuardianActionRequest {
   lateAnsweredAt: number | null;
   followupAction: FollowupAction | null;
   followupCompletedAt: number | null;
+  toolName: string | null;
+  inputDigest: string | null;
   createdAt: number;
   updatedAt: number;
 }
@@ -97,6 +99,8 @@ function rowToRequest(row: typeof guardianActionRequests.$inferSelect): Guardian
     lateAnsweredAt: row.lateAnsweredAt ?? null,
     followupAction: (row.followupAction as FollowupAction) ?? null,
     followupCompletedAt: row.followupCompletedAt ?? null,
+    toolName: row.toolName ?? null,
+    inputDigest: row.inputDigest ?? null,
     createdAt: row.createdAt,
     updatedAt: row.updatedAt,
   };
@@ -137,6 +141,8 @@ export function createGuardianActionRequest(params: {
   pendingQuestionId: string;
   questionText: string;
   expiresAt: number;
+  toolName?: string;
+  inputDigest?: string;
 }): GuardianActionRequest {
   const db = getDb();
   const now = Date.now();
@@ -164,6 +170,8 @@ export function createGuardianActionRequest(params: {
     lateAnsweredAt: null,
     followupAction: null,
     followupCompletedAt: null,
+    toolName: params.toolName ?? null,
+    inputDigest: params.inputDigest ?? null,
     createdAt: now,
     updatedAt: now,
   };
@@ -212,6 +220,26 @@ export function getPendingRequestByCallSessionId(callSessionId: string): Guardia
   return row ? rowToRequest(row) : null;
 }
 
+/**
+ * Count pending guardian action requests for a given call session.
+ * Used as a candidate-affinity hint so the decision engine knows how many
+ * active guardian requests already exist for the current call.
+ */
+export function countPendingRequestsByCallSessionId(callSessionId: string): number {
+  const db = getDb();
+  const row = db
+    .select({ count: count() })
+    .from(guardianActionRequests)
+    .where(
+      and(
+        eq(guardianActionRequests.callSessionId, callSessionId),
+        eq(guardianActionRequests.status, 'pending'),
+      ),
+    )
+    .get();
+  return row?.count ?? 0;
+}
+
 /**
  * First-response-wins resolution. Checks that the request is still
  * 'pending' before updating; returns the updated request on success
@@ -595,6 +623,16 @@ export function getPendingDeliveriesByDestination(
  * Look up a pending delivery by destination conversation ID (for mac channel routing).
  */
 export function getPendingDeliveryByConversation(conversationId: string): GuardianActionDelivery | null {
+  const all = getPendingDeliveriesByConversation(conversationId);
+  return all.length > 0 ? all[0] : null;
+}
+
+/**
+ * Look up all pending deliveries by destination conversation ID.
+ * Used for disambiguation when a reused vellum thread has multiple active
+ * guardian requests.
+ */
+export function getPendingDeliveriesByConversation(conversationId: string): GuardianActionDelivery[] {
   try {
     const db = getDb();
     const rows = db
@@ -612,11 +650,11 @@ export function getPendingDeliveryByConversation(conversationId: string): Guardi
         ),
       )
       .all();
-    return rows.length > 0 ? rowToDelivery(rows[0].delivery) : null;
+    return rows.map((r) => rowToDelivery(r.delivery));
   } catch (err) {
     if (err instanceof Error && err.message.includes('no such table')) {
       log.warn({ err }, 'guardian tables not yet created');
-      return null;
+      return [];
     }
     throw err;
   }
@@ -669,6 +707,16 @@ export function getExpiredDeliveriesByDestination(
  * Look up an expired delivery by destination conversation ID (for mac channel routing).
  */
 export function getExpiredDeliveryByConversation(conversationId: string): GuardianActionDelivery | null {
+  const all = getExpiredDeliveriesByConversation(conversationId);
+  return all.length > 0 ? all[0] : null;
+}
+
+/**
+ * Look up all expired deliveries by destination conversation ID.
+ * Used for disambiguation when a reused vellum thread has multiple expired
+ * guardian requests eligible for follow-up.
+ */
+export function getExpiredDeliveriesByConversation(conversationId: string): GuardianActionDelivery[] {
   try {
     const db = getDb();
     const rows = db
@@ -687,11 +735,11 @@ export function getExpiredDeliveryByConversation(conversationId: string): Guardi
         ),
       )
       .all();
-    return rows.length > 0 ? rowToDelivery(rows[0].delivery) : null;
+    return rows.map((r) => rowToDelivery(r.delivery));
   } catch (err) {
     if (err instanceof Error && err.message.includes('no such table')) {
       log.warn({ err }, 'guardian tables not yet created');
-      return null;
+      return [];
     }
     throw err;
   }
@@ -746,6 +794,16 @@ export function getFollowupDeliveriesByDestination(
  * state by destination conversation ID (for mac channel routing).
  */
 export function getFollowupDeliveryByConversation(conversationId: string): GuardianActionDelivery | null {
+  const all = getFollowupDeliveriesByConversation(conversationId);
+  return all.length > 0 ? all[0] : null;
+}
+
+/**
+ * Look up all deliveries for requests in `awaiting_guardian_choice` follow-up
+ * state by destination conversation ID. Used for disambiguation when a reused
+ * vellum thread has multiple follow-up guardian requests.
+ */
+export function getFollowupDeliveriesByConversation(conversationId: string): GuardianActionDelivery[] {
   try {
     const db = getDb();
     const rows = db
@@ -764,11 +822,11 @@ export function getFollowupDeliveryByConversation(conversationId: string): Guard
         ),
       )
       .all();
-    return rows.length > 0 ? rowToDelivery(rows[0].delivery) : null;
+    return rows.map((r) => rowToDelivery(r.delivery));
   } catch (err) {
     if (err instanceof Error && err.message.includes('no such table')) {
       log.warn({ err }, 'guardian tables not yet created');
-      return null;
+      return [];
     }
     throw err;
   }

package/src/memory/guardian-verification.ts

@@ -131,6 +131,7 @@ export function createChallenge(params: {
     nextResendAt: null,
     codeDigits: 6,
     maxAttempts: 3,
+    verificationPurpose: 'guardian' as const,
     bootstrapTokenHash: null,
     createdAt: now,
     updatedAt: now,

package/src/memory/jobs-worker.ts

@@ -2,6 +2,7 @@ import { getConfig } from '../config/loader.js';
 import type { AssistantConfig } from '../config/types.js';
 import { getLogger } from '../util/logger.js';
 import { rawRun } from './db.js';
+import { reconcileFtsIndexes } from './fts-reconciler.js';
 import { backfillEntityRelationsJob,backfillJob } from './job-handlers/backfill.js';
 import { checkContradictionsJob, cleanupStaleSupersededItemsJob, pruneOldConversationsJob } from './job-handlers/cleanup.js';
 import { cleanupResolvedConflictsJob,resolvePendingConflictsForMessageJob } from './job-handlers/conflict.js';
@@ -9,7 +10,6 @@ import { cleanupResolvedConflictsJob,resolvePendingConflictsForMessageJob } from
 import { embedItemJob, embedSegmentJob, embedSummaryJob } from './job-handlers/embedding.js';
 import { extractEntitiesJob,extractItemsJob } from './job-handlers/extraction.js';
 import { deleteQdrantVectorsJob,rebuildIndexJob } from './job-handlers/index-maintenance.js';
-import { reconcileFtsIndexes } from './fts-reconciler.js';
 import { mediaProcessingJob } from './job-handlers/media-processing.js';
 import { buildConversationSummaryJob, buildGlobalSummaryJob } from './job-handlers/summarization.js';
 import {
@@ -18,7 +18,6 @@ import {
   RETRY_MAX_ATTEMPTS,
   retryDelayForAttempt,
 } from './job-utils.js';
-import { QdrantCircuitOpenError } from './qdrant-circuit-breaker.js';
 import {
   claimMemoryJobs,
   completeMemoryJob,
@@ -32,6 +31,7 @@ import {
   type MemoryJob,
   resetRunningJobsToPending,
 } from './jobs-store.js';
+import { QdrantCircuitOpenError } from './qdrant-circuit-breaker.js';
 import { bumpMemoryVersion } from './recall-cache.js';
 
 // Re-export public utilities consumed by tests and other modules