fastrmemory 0.4.0 → 0.6.0

package/dist/src/db/repository.d.ts

@@ -3,6 +3,7 @@ import { RawEvent, Memory, Handoff, Entity, MemoryConflict, Prediction, Action,
 import { SpoolManager } from './spool.js';
 import { PredictionBaserate } from '../learn/planning-fallacy.js';
 import { ConfidenceTier } from './confidence.js';
+import { type ConflictMode, type NerMode, type FtsMode } from '../config.js';
 export interface CreateMemoryParams {
     projectId: string;
     scope?: 'project' | 'global';
@@ -26,11 +27,31 @@ export interface ProjectStatus {
     rawEventCount: number;
     pendingSpoolCount: number;
     embeddingCoveragePercent: number;
+    pendingConflictCount: number;
+    pendingNerCount: number;
+    pendingFtsCount: number;
+}
+export interface RepositoryOptions {
+    /** Overrides write.conflictMode. Used by tests and the sync/deferred equivalence suite. */
+    conflictMode?: ConflictMode;
+    /** Overrides write.nerMode. 'sync' restores entity extraction inside insertMemory(). */
+    nerMode?: NerMode;
+    /** Overrides write.ftsMode. 'sync' restores inline FTS indexing inside insertMemory(). */
+    ftsMode?: FtsMode;
 }
 export declare class FastrRepository {
     private db;
     private spool?;
-    constructor(db: DatabaseSync, spool?: SpoolManager);
+    private conflictMode;
+    private nerMode;
+    private ftsMode;
+    constructor(db: DatabaseSync, spool?: SpoolManager, options?: RepositoryOptions);
+    /** Active conflict-analysis mode for this repository instance. */
+    getConflictMode(): ConflictMode;
+    /** Active entity-extraction mode for this repository instance. */
+    getNerMode(): NerMode;
+    /** Active full-text indexing mode for this repository instance. */
+    getFtsMode(): FtsMode;
     hasGlobalDb(): boolean;
     attachGlobalDatabase(globalDbPath: string): boolean;
     /** Resolves which schema-qualified memories table holds the given id. */
@@ -41,6 +62,47 @@ export declare class FastrRepository {
     getRawEvent(id: string): RawEvent | null;
     getRawEventsForMemory(memoryId: string): RawEvent[];
     insertMemory(params: CreateMemoryParams): Memory;
+    /**
+     * The historical conflict window: the 50 most recent active memories in the project that
+     * were inserted before the target row. Ordering by rowid makes the window reproducible
+     * later: drainConflicts() sees exactly the rows that existed when the memory was written,
+     * even if more memories arrived in the meantime.
+     */
+    private conflictCandidates;
+    /** Runs detectConflict() over the historical window and records new conflict rows. */
+    private recordConflicts;
+    /** Extracts entities and writes entity + graph rows for one memory. */
+    private extractEntitiesForMemory;
+    /** Number of memories waiting for entity extraction. */
+    pendingNerCount(projectId?: string): number;
+    /** Drains the deferred entity-extraction queue in one transaction. */
+    drainNer(batchSize?: number): {
+        drained: number;
+    };
+    /** Number of memories waiting for full-text indexing. */
+    pendingFtsCount(): number;
+    /** Indexes queued memories in one transaction. Idempotent. */
+    drainFts(batchSize?: number): {
+        drained: number;
+    };
+    /** Drains both deferred queues. This is what the maintenance loop calls. */
+    drainAnalysis(batchSize?: number): {
+        conflictsDrained: number;
+        conflictsCreated: number;
+        entitiesDrained: number;
+        ftsDrained: number;
+    };
+    /** Number of memories waiting for conflict analysis. */
+    pendingConflictCount(projectId?: string): number;
+    /**
+     * Drains the deferred conflict queue in one transaction. Each drained memory is compared
+     * against the same 50-row window the synchronous path would have used, so 'sync' and
+     * 'deferred' converge on identical memory_conflicts rows.
+     */
+    drainConflicts(batchSize?: number): {
+        drained: number;
+        created: number;
+    };
     getMemory(id: string): Memory | null;
     listActiveMemories(projectId: string, module?: string): Memory[];
     listTraps(projectId: string): Memory[];

package/dist/src/db/repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/db/repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"repository.d.ts","sourceRoot":"","sources":["../../../src/db/repository.ts"],"names":[],"mappings":"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"}

package/dist/src/db/repository.js

@@ -10,12 +10,32 @@ import { computeProvenanceHash, verifyProvenanceHash } from './provenance.js';
 import { confidenceTier } from './confidence.js';
 import { scrubSecrets } from '../privacy/scrubber.js';
 import { globalBroadcaster } from '../ui/sse.js';
+import { resolveConflictMode, resolveNerMode, resolveFtsMode } from '../config.js';
+import { drainFtsQueue, indexMemoryFtsNow, pendingFtsCount } from './fts-queue.js';
 export class FastrRepository {
     db;
     spool;
-    constructor(db, spool) {
+    conflictMode;
+    nerMode;
+    ftsMode;
+    constructor(db, spool, options = {}) {
         this.db = db;
         this.spool = spool;
+        this.conflictMode = options.conflictMode ?? resolveConflictMode();
+        this.nerMode = options.nerMode ?? resolveNerMode();
+        this.ftsMode = options.ftsMode ?? resolveFtsMode();
+    }
+    /** Active conflict-analysis mode for this repository instance. */
+    getConflictMode() {
+        return this.conflictMode;
+    }
+    /** Active entity-extraction mode for this repository instance. */
+    getNerMode() {
+        return this.nerMode;
+    }
+    /** Active full-text indexing mode for this repository instance. */
+    getFtsMode() {
+        return this.ftsMode;
     }
     hasGlobalDb() {
         try {
@@ -132,64 +152,69 @@ export class FastrRepository {
             content: params.content,
             createdAt: nowIso
         });
-        this.db.prepare(`
-      INSERT INTO ${targetTable} (
-        id, project_id, agent_id, module, kind, title, content, status, pinned, source_event_ids, created_at, provenance_hash
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-    `).run(id, targetProject, agentId, module, kind, params.title, params.content, status, pinned, sourceIds, nowIso, provenanceHash);
+        // Durability: the memory row and its deferred conflict job are committed together.
+        // Nothing else (file links, NER, conflict scan) is allowed to delay this write.
+        this.db.exec('SAVEPOINT fastr_memory_insert');
+        try {
+            this.db.prepare(`
+        INSERT INTO ${targetTable} (
+          id, project_id, agent_id, module, kind, title, content, status, pinned, source_event_ids, created_at, provenance_hash
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+      `).run(id, targetProject, agentId, module, kind, params.title, params.content, status, pinned, sourceIds, nowIso, provenanceHash);
+            if (this.conflictMode === 'deferred' && !isGlobal) {
+                this.db.prepare(`
+          INSERT INTO memory_conflict_queue (project_id, memory_id, created_at)
+          VALUES (?, ?, ?)
+        `).run(targetProject, id, nowIso);
+            }
+            if (this.nerMode === 'deferred') {
+                this.db.prepare(`
+          INSERT INTO memory_ner_queue (project_id, memory_id, created_at)
+          VALUES (?, ?, ?)
+        `).run(params.projectId, id, nowIso);
+            }
+            this.db.exec('RELEASE fastr_memory_insert');
+        }
+        catch (err) {
+            this.db.exec('ROLLBACK TO fastr_memory_insert');
+            this.db.exec('RELEASE fastr_memory_insert');
+            throw err;
+        }
+        // Full-text indexing: the insert trigger queued this row. 'sync' pays the tokenization
+        // cost before returning; 'deferred' (default) leaves it for the next reader or drain.
+        if (this.ftsMode === 'sync') {
+            try {
+                indexMemoryFtsNow(this.db, id, isGlobal && this.hasGlobalDb() ? 'global_db' : 'main');
+            }
+            catch {
+                // Indexing failure must never lose a committed memory.
+            }
+        }
         // Explicit file links
         if (params.files && params.files.length > 0) {
             this.linkFiles(id, params.files, params.symbols, isGlobal && this.hasGlobalDb());
         }
         // 1. Zero-LLM Fast-Path Named Entity Extraction (NER)
-        try {
-            const extracted = extractEntities(`${params.title} ${params.content}`);
-            const autoFiles = [];
-            for (const ent of extracted) {
-                const entId = `ent_${crypto.createHash('sha256').update(`${params.projectId}:${ent.name.toLowerCase()}`).digest('hex').slice(0, 12)}`;
-                // Upsert entity
-                this.db.prepare(`
-          INSERT INTO entities (id, project_id, name, entity_type)
-          VALUES (?, ?, ?, ?)
-          ON CONFLICT(id) DO NOTHING
-        `).run(entId, params.projectId, ent.name, ent.type);
-                // Link memory to entity in knowledge graph
-                const edgeId = `edge_${crypto.randomBytes(6).toString('hex')}`;
-                this.db.prepare(`
-          INSERT INTO graph_edges (id, project_id, source_id, target_id, edge_type, weight)
-          VALUES (?, ?, ?, ?, 'entity_link', 1.0)
-          ON CONFLICT(id) DO NOTHING
-        `).run(edgeId, params.projectId, id, entId);
-                if (ent.type === 'file' && (!params.files || params.files.length === 0)) {
-                    autoFiles.push(ent.name);
-                }
+        // Deferred by default: entity + graph writes are analysis, not durability.
+        if (this.nerMode === 'sync') {
+            try {
+                this.extractEntitiesForMemory(id, params.projectId, params.title, params.content, params.files);
             }
-            if (autoFiles.length > 0 && (!params.files || params.files.length === 0)) {
-                this.linkFiles(id, autoFiles.slice(0, 5));
+            catch {
+                // Non-blocking NER failure protection
             }
         }
-        catch {
-            // Non-blocking NER failure protection
-        }
         // 2. Proactive Contradiction & Conflict Detection
-        try {
-            const candidates = this.db.prepare(`
-        SELECT id, title, content FROM memories
-        WHERE project_id = ? AND valid_to IS NULL AND id != ?
-        ORDER BY created_at DESC LIMIT 50
-      `).all(params.projectId, id);
-            for (const c of candidates) {
-                const check = detectConflict(params.title, params.content, c.title, c.content);
-                if (check.hasConflict) {
-                    this.db.prepare(`
-            INSERT INTO memory_conflicts (project_id, memory_a_id, memory_b_id, reason, score)
-            VALUES (?, ?, ?, ?, ?)
-          `).run(params.projectId, id, c.id, check.reason, check.score);
-                }
+        // 'deferred' (default) queued a job in the insert transaction above; the scan runs in
+        // drainConflicts(). 'sync' reproduces the historical inline behaviour for tests and for
+        // operators who explicitly want conflicts resolved before the call returns.
+        if (this.conflictMode === 'sync') {
+            try {
+                this.recordConflicts(id, targetProject, params.title, params.content);
+            }
+            catch {
+                // Non-blocking conflict check protection
             }
-        }
-        catch {
-            // Non-blocking conflict check protection
         }
         const createdMemory = this.getMemory(id);
         globalBroadcaster.broadcast('memory_created', createdMemory);
@@ -205,6 +230,172 @@ export class FastrRepository {
         }
         return createdMemory;
     }
+    /**
+     * The historical conflict window: the 50 most recent active memories in the project that
+     * were inserted before the target row. Ordering by rowid makes the window reproducible
+     * later: drainConflicts() sees exactly the rows that existed when the memory was written,
+     * even if more memories arrived in the meantime.
+     */
+    conflictCandidates(memoryId, projectId) {
+        const row = this.db.prepare('SELECT rowid AS rid FROM main.memories WHERE id = ?').get(memoryId);
+        if (!row)
+            return [];
+        return this.db.prepare(`
+      SELECT id, title, content FROM main.memories
+      WHERE project_id = ? AND valid_to IS NULL AND rowid < ?
+      ORDER BY created_at DESC, rowid DESC LIMIT 50
+    `).all(projectId, row.rid);
+    }
+    /** Runs detectConflict() over the historical window and records new conflict rows. */
+    recordConflicts(memoryId, projectId, title, content) {
+        let created = 0;
+        for (const candidate of this.conflictCandidates(memoryId, projectId)) {
+            const check = detectConflict(title, content, candidate.title, candidate.content);
+            if (!check.hasConflict)
+                continue;
+            const result = this.db.prepare(`
+        INSERT INTO memory_conflicts (project_id, memory_a_id, memory_b_id, reason, score)
+        SELECT ?, ?, ?, ?, ?
+        WHERE NOT EXISTS (
+          SELECT 1 FROM memory_conflicts WHERE memory_a_id = ? AND memory_b_id = ?
+        )
+      `).run(projectId, memoryId, candidate.id, check.reason, check.score, memoryId, candidate.id);
+            created += Number(result.changes ?? 0);
+        }
+        return created;
+    }
+    /** Extracts entities and writes entity + graph rows for one memory. */
+    extractEntitiesForMemory(memoryId, projectId, title, content, files) {
+        const extracted = extractEntities(`${title} ${content}`);
+        if (extracted.length === 0)
+            return;
+        const existingLinks = this.db
+            .prepare('SELECT COUNT(*) AS c FROM file_links WHERE memory_id = ?')
+            .get(memoryId);
+        const hasExplicitFiles = (files && files.length > 0) || Number(existingLinks?.c ?? 0) > 0;
+        const autoFiles = [];
+        for (const ent of extracted) {
+            const entId = `ent_${crypto.createHash('sha256').update(`${projectId}:${ent.name.toLowerCase()}`).digest('hex').slice(0, 12)}`;
+            this.db.prepare(`
+        INSERT INTO entities (id, project_id, name, entity_type)
+        VALUES (?, ?, ?, ?)
+        ON CONFLICT(id) DO NOTHING
+      `).run(entId, projectId, ent.name, ent.type);
+            const edgeId = `edge_${crypto.randomBytes(6).toString('hex')}`;
+            this.db.prepare(`
+        INSERT INTO graph_edges (id, project_id, source_id, target_id, edge_type, weight)
+        VALUES (?, ?, ?, ?, 'entity_link', 1.0)
+        ON CONFLICT(id) DO NOTHING
+      `).run(edgeId, projectId, memoryId, entId);
+            if (ent.type === 'file' && !hasExplicitFiles) {
+                autoFiles.push(ent.name);
+            }
+        }
+        if (autoFiles.length > 0) {
+            this.linkFiles(memoryId, autoFiles.slice(0, 5));
+        }
+    }
+    /** Number of memories waiting for entity extraction. */
+    pendingNerCount(projectId) {
+        const row = projectId
+            ? this.db.prepare('SELECT COUNT(*) AS c FROM memory_ner_queue WHERE project_id = ?').get(projectId)
+            : this.db.prepare('SELECT COUNT(*) AS c FROM memory_ner_queue').get();
+        return Number(row?.c ?? 0);
+    }
+    /** Drains the deferred entity-extraction queue in one transaction. */
+    drainNer(batchSize = 20) {
+        const limit = Math.max(0, Math.floor(batchSize));
+        if (limit === 0)
+            return { drained: 0 };
+        const rows = this.db.prepare(`
+      SELECT id, project_id, memory_id FROM memory_ner_queue ORDER BY id ASC LIMIT ?
+    `).all(limit);
+        if (rows.length === 0)
+            return { drained: 0 };
+        this.db.exec('SAVEPOINT fastr_drain_ner');
+        try {
+            for (const row of rows) {
+                const memory = this.db.prepare('SELECT title, content FROM main.memories WHERE id = ?').get(row.memory_id);
+                if (memory) {
+                    try {
+                        this.extractEntitiesForMemory(row.memory_id, row.project_id, memory.title, memory.content);
+                    }
+                    catch {
+                        // Non-blocking: a bad row must never stall the queue.
+                    }
+                }
+                this.db.prepare('DELETE FROM memory_ner_queue WHERE id = ?').run(row.id);
+            }
+            this.db.exec('RELEASE fastr_drain_ner');
+        }
+        catch (err) {
+            this.db.exec('ROLLBACK TO fastr_drain_ner');
+            this.db.exec('RELEASE fastr_drain_ner');
+            throw err;
+        }
+        return { drained: rows.length };
+    }
+    /** Number of memories waiting for full-text indexing. */
+    pendingFtsCount() {
+        return pendingFtsCount(this.db, 'main');
+    }
+    /** Indexes queued memories in one transaction. Idempotent. */
+    drainFts(batchSize = 500) {
+        return drainFtsQueue(this.db, { limit: batchSize, schema: 'main' });
+    }
+    /** Drains both deferred queues. This is what the maintenance loop calls. */
+    drainAnalysis(batchSize = 20) {
+        const conflicts = this.drainConflicts(batchSize);
+        const entities = this.drainNer(batchSize);
+        const fts = this.drainFts(Math.max(batchSize, 500));
+        return {
+            conflictsDrained: conflicts.drained,
+            conflictsCreated: conflicts.created,
+            entitiesDrained: entities.drained,
+            ftsDrained: fts.drained
+        };
+    }
+    /** Number of memories waiting for conflict analysis. */
+    pendingConflictCount(projectId) {
+        const row = projectId
+            ? this.db.prepare('SELECT COUNT(*) AS c FROM memory_conflict_queue WHERE project_id = ?').get(projectId)
+            : this.db.prepare('SELECT COUNT(*) AS c FROM memory_conflict_queue').get();
+        return Number(row?.c ?? 0);
+    }
+    /**
+     * Drains the deferred conflict queue in one transaction. Each drained memory is compared
+     * against the same 50-row window the synchronous path would have used, so 'sync' and
+     * 'deferred' converge on identical memory_conflicts rows.
+     */
+    drainConflicts(batchSize = 20) {
+        const limit = Math.max(0, Math.floor(batchSize));
+        if (limit === 0)
+            return { drained: 0, created: 0 };
+        const rows = this.db.prepare(`
+      SELECT id, project_id, memory_id FROM memory_conflict_queue
+      ORDER BY id ASC LIMIT ?
+    `).all(limit);
+        if (rows.length === 0)
+            return { drained: 0, created: 0 };
+        let created = 0;
+        this.db.exec('SAVEPOINT fastr_drain_conflicts');
+        try {
+            for (const row of rows) {
+                const memory = this.db.prepare('SELECT title, content FROM main.memories WHERE id = ?').get(row.memory_id);
+                if (memory) {
+                    created += this.recordConflicts(row.memory_id, row.project_id, memory.title, memory.content);
+                }
+                this.db.prepare('DELETE FROM memory_conflict_queue WHERE id = ?').run(row.id);
+            }
+            this.db.exec('RELEASE fastr_drain_conflicts');
+        }
+        catch (err) {
+            this.db.exec('ROLLBACK TO fastr_drain_conflicts');
+            this.db.exec('RELEASE fastr_drain_conflicts');
+            throw err;
+        }
+        return { drained: rows.length, created };
+    }
     getMemory(id) {
         let row = this.db.prepare('SELECT * FROM memories WHERE id = ?').get(id);
         if (!row && this.hasGlobalDb()) {
@@ -670,7 +861,10 @@ export class FastrRepository {
             dormantCount: counts.dormantCount || 0,
             rawEventCount: rawEvents.count || 0,
             pendingSpoolCount: pendingSpool,
-            embeddingCoveragePercent: coverage
+            embeddingCoveragePercent: coverage,
+            pendingConflictCount: this.pendingConflictCount(projectId),
+            pendingNerCount: this.pendingNerCount(projectId),
+            pendingFtsCount: this.pendingFtsCount()
         };
     }
     // --- SNAPSHOTS & TIME TRAVEL ---