@threadbase-sh/scanner 0.9.1 → 0.9.3

package/dist/index.d.cts

@@ -371,15 +371,18 @@ declare class ConversationScanner {
     private readonly dbPath;
     private readonly sidecarEnabled;
     private engineInstance;
+    private inFlightScan;
     private emitter;
     private watcher;
     private queue;
     private periodicTimer;
+    private inFlightReconcile;
     constructor(options?: ConversationScannerOptions);
     private get persistent();
     private engine;
-    close(): void;
+    close(): Promise<void>;
     scan(options?: ScanOptions): Promise<ScanResult>;
+    private runScan;
     private scanPersistent;
     private finalize;
     private scanInMemory;

package/dist/index.d.ts

@@ -371,15 +371,18 @@ declare class ConversationScanner {
     private readonly dbPath;
     private readonly sidecarEnabled;
     private engineInstance;
+    private inFlightScan;
     private emitter;
     private watcher;
     private queue;
     private periodicTimer;
+    private inFlightReconcile;
     constructor(options?: ConversationScannerOptions);
     private get persistent();
     private engine;
-    close(): void;
+    close(): Promise<void>;
     scan(options?: ScanOptions): Promise<ScanResult>;
+    private runScan;
     private scanPersistent;
     private finalize;
     private scanInMemory;

package/dist/index.js

@@ -1781,6 +1781,19 @@ var ConversationFilesRepo = class {
     const rows = this.db.prepare("SELECT absolute_path FROM conversation_files WHERE status != 'deleted'").all();
     return rows.map((r) => r.absolute_path);
   }
+  // Active file paths belonging to any of the given accounts. Backs the
+  // deletion-reconcile so a scan that covered only some accounts can't mark
+  // another account's files deleted (they live in the same shared index.db but
+  // a different profile owns them). Returns [] for an empty account list.
+  activePathsByAccounts(accounts) {
+    if (accounts.length === 0) return [];
+    const placeholders = accounts.map(() => "?").join(", ");
+    const rows = this.db.prepare(
+      `SELECT absolute_path FROM conversation_files
+         WHERE status != 'deleted' AND account IN (${placeholders})`
+    ).all(...accounts);
+    return rows.map((r) => r.absolute_path);
+  }
   // Active files whose immediate parent is exactly parentDir (no nested
   // subdirectories). Backs the dir-mtime gate's reuse path: a project dir with
   // an unchanged mtime and no nested files can skip the glob entirely.
@@ -2153,8 +2166,15 @@ var PersistentEngine = class {
       scanned += batch.length;
       options.onProgress?.(scanned, discovered.length);
     }
+    const coveredAccounts = /* @__PURE__ */ new Set();
+    if (enabled.includes(CLAUDE_CODE_PROVIDER)) {
+      for (const p of activeProfiles) coveredAccounts.add(p.id);
+    }
+    if (enabled.includes(CODEX_CLI_PROVIDER) && (options.codexRoots?.length ?? 0) > 0) {
+      coveredAccounts.add("codex");
+    }
     const seen = new Set(discovered.map((d) => d.filePath));
-    for (const path of this.files.allActivePaths()) {
+    for (const path of this.files.activePathsByAccounts([...coveredAccounts])) {
       if (!seen.has(path)) this.markDeleted(path);
     }
     log.info({ scanned, indexed: this.conversations.count() }, "persistent: indexAll complete");
@@ -2464,10 +2484,21 @@ var ConversationScanner = class {
   dbPath;
   sidecarEnabled;
   engineInstance = null;
+  // The most recent scan()'s promise while it is still running, or null when
+  // idle. close() awaits it before closing the SQLite handle so a fire-and-
+  // forget scan can't have its DB shut mid-indexAll ("database connection is
+  // not open"). Tracks the latest scan only — concurrent scans on one instance
+  // aren't a supported pattern (a single writer DB), and the latest resolving
+  // implies earlier ones already settled in practice.
+  inFlightScan = null;
   emitter = new EventEmitter();
   watcher = null;
   queue = null;
   periodicTimer = null;
+  // The in-flight periodicReconcile() job, if one is mid-run. unwatch() awaits
+  // it before dropping the queue/engine so its post-await engine.files access
+  // can't hit a closed DB (the watch-mode half of Bug #4).
+  inFlightReconcile = null;
   constructor(options) {
     this.conversationLRU = new LRUCache(options?.conversationCacheSize ?? 5);
     if (options?.persistent === false) {
@@ -2490,14 +2521,31 @@ var ConversationScanner = class {
     return this.engineInstance;
   }
   // Release the SQLite connection. No-op in legacy mode. Safe to call
-  // repeatedly. Stops the watcher first if one is running; call unwatch()
-  // explicitly beforehand if you need to await watcher teardown.
-  close() {
-    if (this.watcher || this.queue || this.periodicTimer) void this.unwatch();
+  // repeatedly. Awaits watcher teardown AND any in-flight scan before closing
+  // the DB handle, so a fire-and-forget scan() can never have its connection
+  // shut mid-indexAll() ("database connection is not open"). This is why close()
+  // is async — callers should await it during shutdown. (Scanner review Bug #4.)
+  async close() {
+    if (this.watcher || this.queue || this.periodicTimer) await this.unwatch();
+    if (this.inFlightScan) {
+      try {
+        await this.inFlightScan;
+      } catch {
+      }
+    }
     this.engineInstance?.close();
     this.engineInstance = null;
   }
   async scan(options = {}) {
+    const promise = this.runScan(options);
+    this.inFlightScan = promise;
+    try {
+      return await promise;
+    } finally {
+      if (this.inFlightScan === promise) this.inFlightScan = null;
+    }
+  }
+  async runScan(options) {
     const profiles = await this.resolveProfiles(options.profiles);
     const activeProfiles = profiles.filter((p) => p.enabled && p.scanHistory !== false);
     this.lastTier = resolveTier(options.tier ?? "standard", options.tiers);
@@ -2933,7 +2981,10 @@ var ConversationScanner = class {
     const periodicMs = options.periodicMs ?? 6e4;
     if (periodicMs > 0) {
       this.periodicTimer = setInterval(() => {
-        void this.periodicReconcile(activeProfiles);
+        const job = this.periodicReconcile(activeProfiles).finally(() => {
+          if (this.inFlightReconcile === job) this.inFlightReconcile = null;
+        });
+        this.inFlightReconcile = job;
       }, periodicMs);
       this.periodicTimer.unref?.();
     }
@@ -2977,6 +3028,9 @@ var ConversationScanner = class {
       clearInterval(this.periodicTimer);
       this.periodicTimer = null;
     }
+    if (this.inFlightReconcile) {
+      await this.inFlightReconcile;
+    }
     if (this.watcher) {
       await this.watcher.stop();
       this.watcher = null;