@claude-flow/memory 3.0.0-alpha.17 → 3.0.0-alpha.18

package/dist/consolidator.js

@@ -0,0 +1,209 @@
+/**
+ * MemoryConsolidator — ADR-125 Phase 4
+ *
+ * Periodic maintenance for the in-memory state owned by {@link UnifiedMemoryService}.
+ *
+ * Operations:
+ * - `sweepExpired()` — drop entries past `expiresAt` from all indexes (including HNSW).
+ * - `dedup(strategy)` — collapse content-hash duplicates per strategy.
+ * - `compactHnsw()` — rebuild the HNSW index from current `entries`.
+ * - `runAll()` — sweep → dedup → compact in order.
+ *
+ * Invoked from two paths:
+ * 1. {@link UnifiedMemoryService}'s lifecycle (background timer when
+ *    `consolidator.autoRun === true`, plus `close()`).
+ * 2. The AgentDB `nightlyLearner` controller (`src/controller-registry.ts`)
+ *    delegates to `runAll()` instead of hitting AgentDB directly.
+ *
+ * Phase 3 placeholder lives in this file too — it provides the typed
+ * surface that {@link UnifiedMemoryService.getConsolidator} resolves to.
+ * The real implementation lands with Phase 4.
+ *
+ * @module v3/memory/consolidator
+ */
+import { createHash } from 'node:crypto';
+import { HNSWIndex } from './hnsw-index.js';
+export class MemoryConsolidator {
+    service;
+    opts;
+    constructor(service, opts = {}) {
+        this.service = service;
+        this.opts = opts;
+    }
+    /**
+     * Drop all entries whose `expiresAt` is in the past.
+     */
+    async sweepExpired() {
+        const adapter = this.service.getAdapter();
+        const entries = adapter.entries;
+        const namespaceIndex = adapter.namespaceIndex;
+        const keyIndex = adapter.keyIndex;
+        const tagIndex = adapter.tagIndex;
+        const index = adapter.index;
+        const now = Date.now();
+        const toRemove = [];
+        for (const entry of entries.values()) {
+            if (entry.expiresAt != null && entry.expiresAt < now) {
+                toRemove.push(entry);
+            }
+        }
+        let hnswRemoved = 0;
+        for (const entry of toRemove) {
+            entries.delete(entry.id);
+            namespaceIndex.get(entry.namespace)?.delete(entry.id);
+            keyIndex.delete(`${entry.namespace}:${entry.key}`);
+            for (const tag of entry.tags)
+                tagIndex.get(tag)?.delete(entry.id);
+            if (entry.embedding) {
+                const removed = await index.removePoint(entry.id);
+                if (removed)
+                    hnswRemoved += 1;
+            }
+        }
+        // Clean up empty namespace/tag sets to keep memory bounded
+        for (const [ns, ids] of namespaceIndex) {
+            if (ids.size === 0)
+                namespaceIndex.delete(ns);
+        }
+        for (const [tag, ids] of tagIndex) {
+            if (ids.size === 0)
+                tagIndex.delete(tag);
+        }
+        return {
+            removed: toRemove.length,
+            remaining: entries.size,
+            hnswRemoved,
+        };
+    }
+    /**
+     * Collapse content-hash duplicates across all namespaces per `strategy`.
+     *
+     * - `keep-newest`: keep the entry with the highest `updatedAt`, drop the rest.
+     * - `keep-oldest`: keep the entry with the lowest `createdAt`, drop the rest.
+     * - `merge-tags`: keep newest, but union the tag sets of the duplicates first.
+     */
+    async dedup(strategy) {
+        const adapter = this.service.getAdapter();
+        const entries = adapter.entries;
+        const namespaceIndex = adapter.namespaceIndex;
+        const keyIndex = adapter.keyIndex;
+        const tagIndex = adapter.tagIndex;
+        const index = adapter.index;
+        const effective = strategy ?? this.opts.dedupStrategy ?? 'keep-newest';
+        // Bucket by content hash
+        const buckets = new Map();
+        for (const entry of entries.values()) {
+            const hash = createHash('sha256').update(entry.content).digest('hex');
+            const bucket = buckets.get(hash);
+            if (bucket)
+                bucket.push(entry);
+            else
+                buckets.set(hash, [entry]);
+        }
+        let merged = 0;
+        let dupGroups = 0;
+        for (const bucket of buckets.values()) {
+            if (bucket.length <= 1)
+                continue;
+            dupGroups += 1;
+            // Choose keeper
+            let keeper;
+            if (effective === 'keep-oldest') {
+                keeper = bucket.reduce((acc, e) => e.createdAt < acc.createdAt ? e : acc);
+            }
+            else {
+                // keep-newest + merge-tags share this branch
+                keeper = bucket.reduce((acc, e) => e.updatedAt > acc.updatedAt ? e : acc);
+            }
+            if (effective === 'merge-tags') {
+                const tagSet = new Set(keeper.tags);
+                for (const e of bucket)
+                    for (const t of e.tags)
+                        tagSet.add(t);
+                const oldTags = keeper.tags;
+                keeper.tags = [...tagSet];
+                // Update tagIndex membership for newly-added tags
+                for (const t of keeper.tags) {
+                    if (!oldTags.includes(t)) {
+                        if (!tagIndex.has(t))
+                            tagIndex.set(t, new Set());
+                        tagIndex.get(t).add(keeper.id);
+                    }
+                }
+            }
+            // Drop everyone except the keeper
+            for (const e of bucket) {
+                if (e.id === keeper.id)
+                    continue;
+                entries.delete(e.id);
+                namespaceIndex.get(e.namespace)?.delete(e.id);
+                const compositeKey = `${e.namespace}:${e.key}`;
+                if (keyIndex.get(compositeKey) === e.id) {
+                    keyIndex.delete(compositeKey);
+                }
+                for (const tag of e.tags)
+                    tagIndex.get(tag)?.delete(e.id);
+                if (e.embedding) {
+                    await index.removePoint(e.id);
+                }
+                merged += 1;
+            }
+        }
+        return { merged, groups: dupGroups };
+    }
+    /**
+     * Rebuild the HNSW index from the current set of entries with embeddings.
+     * Returns a count snapshot + duration.
+     */
+    async compactHnsw() {
+        const adapter = this.service.getAdapter();
+        const entries = adapter.entries;
+        const index = adapter.index;
+        const before = index.size;
+        const t0 = Date.now();
+        // Build a fresh HNSW from current entries that have embeddings.
+        const cfg = index.getConfig();
+        const fresh = new HNSWIndex({
+            dimensions: cfg.dimensions,
+            M: cfg.M,
+            efConstruction: cfg.efConstruction,
+            maxElements: cfg.maxElements,
+            metric: cfg.metric,
+        });
+        for (const entry of entries.values()) {
+            if (entry.embedding) {
+                try {
+                    await fresh.addPoint(entry.id, entry.embedding);
+                }
+                catch {
+                    // Tolerate dimension mismatches in malformed datasets.
+                }
+            }
+        }
+        // Swap pointers atomically and re-forward events
+        adapter.index = fresh;
+        if (typeof adapter.emit === 'function') {
+            fresh.on('point:added', (data) => adapter.emit('index:added', data));
+        }
+        const durationMs = Date.now() - t0;
+        return { before, after: fresh.size, durationMs };
+    }
+    /**
+     * Sweep → dedup → compact. Used by the background timer and by the
+     * `nightlyLearner` AgentDB controller.
+     */
+    async runAll() {
+        const start = Date.now();
+        const sweep = await this.sweepExpired();
+        const dedup = await this.dedup();
+        const compact = await this.compactHnsw();
+        return {
+            sweep,
+            dedup,
+            compact,
+            totalDurationMs: Date.now() - start,
+        };
+    }
+}
+export default MemoryConsolidator;
+//# sourceMappingURL=consolidator.js.map

package/dist/consolidator.js.map

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

package/dist/consolidator.test.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Phase 4 — MemoryConsolidator (ADR-125)
+ *
+ * Verifies:
+ * - `sweepExpired()` after 1000 entries with `expiresAt` in the past →
+ *   `entries.size === 0` AND `hnsw.size === 0` (Acceptance Criterion #4).
+ * - `dedup('keep-newest')` collapses content-hash duplicates and keeps the
+ *   newest by `updatedAt`.
+ * - `dedup('keep-oldest')` keeps the oldest by `createdAt`.
+ * - `dedup('merge-tags')` unions tags and keeps the newest.
+ * - `compactHnsw` rebuilds the index so size matches `entries.size`.
+ * - Auto-run timer with a small interval calls `runAll()` at least once.
+ * - `nightlyLearner` controller delegates to `MemoryConsolidator.runAll()`
+ *   when a `MemoryService` is registered.
+ */
+export {};
+//# sourceMappingURL=consolidator.test.d.ts.map

package/dist/consolidator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"consolidator.test.d.ts","sourceRoot":"","sources":["../src/consolidator.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG"}

package/dist/consolidator.test.js

@@ -0,0 +1,239 @@
+/**
+ * Phase 4 — MemoryConsolidator (ADR-125)
+ *
+ * Verifies:
+ * - `sweepExpired()` after 1000 entries with `expiresAt` in the past →
+ *   `entries.size === 0` AND `hnsw.size === 0` (Acceptance Criterion #4).
+ * - `dedup('keep-newest')` collapses content-hash duplicates and keeps the
+ *   newest by `updatedAt`.
+ * - `dedup('keep-oldest')` keeps the oldest by `createdAt`.
+ * - `dedup('merge-tags')` unions tags and keeps the newest.
+ * - `compactHnsw` rebuilds the index so size matches `entries.size`.
+ * - Auto-run timer with a small interval calls `runAll()` at least once.
+ * - `nightlyLearner` controller delegates to `MemoryConsolidator.runAll()`
+ *   when a `MemoryService` is registered.
+ */
+import { describe, it, expect, vi } from 'vitest';
+import { MemoryService } from './index.js';
+import { MemoryConsolidator } from './consolidator.js';
+import { ControllerRegistry } from './controller-registry.js';
+import { createDefaultEntry } from './types.js';
+function randomVec(dim, seed) {
+    const out = new Float32Array(dim);
+    let s = seed | 0 || 1;
+    for (let i = 0; i < dim; i++) {
+        s ^= s << 13;
+        s ^= s >>> 17;
+        s ^= s << 5;
+        out[i] = ((s | 0) / 2 ** 31);
+    }
+    return out;
+}
+async function newService(opts = {}) {
+    const svc = new MemoryService({
+        dimensions: 8,
+        persistenceEnabled: false,
+        snapshotInterval: 0,
+        ...opts,
+    });
+    await svc.initialize();
+    return svc;
+}
+describe('Phase 4 — MemoryConsolidator.sweepExpired', () => {
+    it('Acceptance Criterion #4 — 1000 expired entries → 0 remaining + HNSW emptied', async () => {
+        const svc = await newService();
+        const consolidator = new MemoryConsolidator(svc);
+        const past = Date.now() - 1;
+        for (let i = 0; i < 1000; i++) {
+            const entry = createDefaultEntry({
+                key: `expired-${i}`,
+                content: `content-${i}`,
+                expiresAt: past,
+            });
+            entry.embedding = randomVec(8, i + 1);
+            await svc.store(entry);
+        }
+        const adapter = svc.getAdapter();
+        expect(adapter.entries.size).toBe(1000);
+        expect(adapter.index.size).toBe(1000);
+        const result = await consolidator.sweepExpired();
+        expect(result.removed).toBe(1000);
+        expect(result.remaining).toBe(0);
+        expect(result.hnswRemoved).toBe(1000);
+        expect(adapter.entries.size).toBe(0);
+        expect(adapter.index.size).toBe(0);
+        await svc.close();
+    });
+    it('leaves non-expired entries untouched', async () => {
+        const svc = await newService();
+        const consolidator = new MemoryConsolidator(svc);
+        // 5 expired + 5 fresh
+        for (let i = 0; i < 5; i++) {
+            const entry = createDefaultEntry({
+                key: `e-${i}`,
+                content: `e-${i}`,
+                expiresAt: Date.now() - 1,
+            });
+            entry.embedding = randomVec(8, i + 1);
+            await svc.store(entry);
+        }
+        for (let i = 0; i < 5; i++) {
+            const entry = createDefaultEntry({ key: `f-${i}`, content: `f-${i}` });
+            entry.embedding = randomVec(8, i + 100);
+            await svc.store(entry);
+        }
+        const result = await consolidator.sweepExpired();
+        expect(result.removed).toBe(5);
+        expect(result.remaining).toBe(5);
+        await svc.close();
+    });
+});
+describe('Phase 4 — MemoryConsolidator.dedup', () => {
+    it('keep-newest: drops 10 duplicates and keeps newest by updatedAt', async () => {
+        const svc = await newService();
+        const consolidator = new MemoryConsolidator(svc);
+        // 40 unique + 10 dupes of the same content as entry 0
+        const dupContent = 'duplicate-marker';
+        const newestTimestamps = [];
+        for (let i = 0; i < 40; i++) {
+            const entry = createDefaultEntry({ key: `u-${i}`, content: `unique-${i}` });
+            entry.embedding = randomVec(8, i + 1);
+            await svc.store(entry);
+        }
+        // The first dup has the OLDEST updatedAt; the last dup has the NEWEST.
+        for (let i = 0; i < 10; i++) {
+            const entry = createDefaultEntry({ key: `dup-${i}`, content: dupContent });
+            entry.embedding = randomVec(8, i + 500);
+            entry.updatedAt = 1_000_000_000 + i; // monotonic, last is newest
+            await svc.store(entry);
+            newestTimestamps.push(entry.updatedAt);
+        }
+        const result = await consolidator.dedup('keep-newest');
+        expect(result.merged).toBe(9);
+        expect(result.groups).toBe(1);
+        // Survivor's updatedAt should equal the max of the dup timestamps
+        const adapter = svc.getAdapter();
+        const survivors = [...adapter.entries.values()].filter((e) => e.content === dupContent);
+        expect(survivors.length).toBe(1);
+        expect(survivors[0].updatedAt).toBe(Math.max(...newestTimestamps));
+        await svc.close();
+    });
+    it('keep-oldest: keeps the entry with the lowest createdAt', async () => {
+        const svc = await newService();
+        const consolidator = new MemoryConsolidator(svc);
+        const ids = [];
+        for (let i = 0; i < 3; i++) {
+            const entry = createDefaultEntry({ key: `o-${i}`, content: 'same' });
+            entry.embedding = randomVec(8, i + 1);
+            entry.createdAt = 1000 + i; // i=0 is oldest
+            await svc.store(entry);
+            ids.push(entry.id);
+        }
+        const result = await consolidator.dedup('keep-oldest');
+        expect(result.merged).toBe(2);
+        const adapter = svc.getAdapter();
+        expect(adapter.entries.size).toBe(1);
+        expect(adapter.entries.has(ids[0])).toBe(true);
+        await svc.close();
+    });
+    it('merge-tags: unions tag sets across the duplicates and keeps newest', async () => {
+        const svc = await newService();
+        const consolidator = new MemoryConsolidator(svc);
+        for (let i = 0; i < 3; i++) {
+            const entry = createDefaultEntry({
+                key: `t-${i}`,
+                content: 'same',
+                tags: [`tag-${i}`, 'common'],
+            });
+            entry.embedding = randomVec(8, i + 1);
+            entry.updatedAt = 1000 + i;
+            await svc.store(entry);
+        }
+        const result = await consolidator.dedup('merge-tags');
+        expect(result.merged).toBe(2);
+        const adapter = svc.getAdapter();
+        const survivors = [...adapter.entries.values()];
+        expect(survivors.length).toBe(1);
+        const survivor = survivors[0];
+        expect(new Set(survivor.tags)).toEqual(new Set(['tag-0', 'tag-1', 'tag-2', 'common']));
+        await svc.close();
+    });
+});
+describe('Phase 4 — MemoryConsolidator.compactHnsw', () => {
+    it('rebuilds the HNSW index so size matches entries.size after sweep', async () => {
+        const svc = await newService();
+        const consolidator = new MemoryConsolidator(svc);
+        // Insert + expire half
+        const half = 20;
+        for (let i = 0; i < half * 2; i++) {
+            const entry = createDefaultEntry({
+                key: `c-${i}`,
+                content: `c-${i}`,
+                expiresAt: i < half ? Date.now() - 1 : undefined,
+            });
+            entry.embedding = randomVec(8, i + 1);
+            await svc.store(entry);
+        }
+        await consolidator.sweepExpired();
+        const result = await consolidator.compactHnsw();
+        expect(result.before).toBeGreaterThanOrEqual(half);
+        expect(result.after).toBe(half);
+        const adapter = svc.getAdapter();
+        expect(adapter.index.size).toBe(adapter.entries.size);
+        await svc.close();
+    });
+});
+describe('Phase 4 — MemoryService auto-run timer', () => {
+    it('invokes consolidator.runAll() at the configured interval', async () => {
+        const svc = new MemoryService({
+            dimensions: 8,
+            persistenceEnabled: false,
+            snapshotInterval: 0,
+            consolidator: { autoRun: true, intervalMs: 50 },
+        });
+        await svc.initialize();
+        // Spy on the lazily-loaded consolidator. getConsolidator() returns a
+        // singleton, so swap its runAll for a spy after first construction.
+        const consolidator = await svc.getConsolidator();
+        const spy = vi.spyOn(consolidator, 'runAll');
+        // Wait long enough for at least one tick.
+        await new Promise((r) => setTimeout(r, 180));
+        expect(spy).toHaveBeenCalled();
+        await svc.close();
+    });
+    it('close() clears the consolidator timer', async () => {
+        const svc = new MemoryService({
+            dimensions: 8,
+            persistenceEnabled: false,
+            snapshotInterval: 0,
+            consolidator: { autoRun: true, intervalMs: 50 },
+        });
+        await svc.initialize();
+        const consolidator = await svc.getConsolidator();
+        const spy = vi.spyOn(consolidator, 'runAll');
+        await svc.close();
+        await new Promise((r) => setTimeout(r, 150));
+        // No new calls after close()
+        const callCountAtClose = spy.mock.calls.length;
+        await new Promise((r) => setTimeout(r, 150));
+        expect(spy.mock.calls.length).toBe(callCountAtClose);
+    });
+});
+describe('Phase 4 — nightlyLearner controller delegates to MemoryConsolidator', () => {
+    it('returns a wrapper bound to consolidator.runAll when memoryService is registered', async () => {
+        const svc = await newService();
+        const registry = new ControllerRegistry();
+        await registry.initialize({ memoryService: svc });
+        const inst = registry.get('nightlyLearner');
+        expect(inst).toBeTruthy();
+        expect(inst.source).toBe('memory-consolidator');
+        expect(typeof inst.runAll).toBe('function');
+        const result = await inst.runAll();
+        expect(result).toHaveProperty('sweep');
+        expect(result).toHaveProperty('dedup');
+        expect(result).toHaveProperty('compact');
+        await registry.shutdown();
+        await svc.close();
+    });
+});
+//# sourceMappingURL=consolidator.test.js.map

package/dist/consolidator.test.js.map

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

package/dist/controller-registry.d.ts

@@ -90,6 +90,13 @@ export interface RuntimeConfig {
      * on this injection point.
      */
     agentdb?: unknown;
+    /**
+     * `MemoryService` (or compatible) used to back the `nightlyLearner`
+     * controller. When provided, ADR-125 Phase 4 wraps it with
+     * `MemoryConsolidator.runAll()` instead of delegating directly to AgentDB's
+     * `NightlyLearner`. Accepts `any` to avoid a circular import.
+     */
+    memoryService?: any;
 }
 /**
  * Level-based initialization order per ADR-053.

package/dist/controller-registry.d.ts.map

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

package/dist/controller-registry.js

@@ -387,7 +387,6 @@ export class ControllerRegistry extends EventEmitter {
             case 'causalRecall':
             case 'learningSystem':
             case 'explainableRecall':
-            case 'nightlyLearner':
             case 'graphTransformer':
             case 'graphAdapter':
             case 'gnnService':
@@ -397,11 +396,20 @@ export class ControllerRegistry extends EventEmitter {
             case 'rvfOptimizer':
             case 'mmrDiversityRanker':
                 return this.agentdb !== null;
+            // ADR-125 Phase 4 — nightlyLearner is enabled when EITHER an AgentDB
+            // is present (legacy path) OR a MemoryService is registered (new path
+            // backed by MemoryConsolidator.runAll).
+            case 'nightlyLearner':
+                return this.agentdb !== null || !!this.config.memoryService;
             // SemanticRouter — auto-enable if agentdb available (exported since alpha.10)
             case 'semanticRouter':
                 return this.agentdb !== null;
-            // Optional controllers
+            // ADR-125 Phase 5 — hybridSearch auto-enables when a MemoryService is
+            // registered. Replaces the prior "placeholder, require explicit enable"
+            // posture.
             case 'hybridSearch':
+                return !!this.config.memoryService;
+            // Optional controllers
             case 'agentMemoryScope':
             case 'sonaTrajectory':
             case 'federatedSession':
@@ -494,9 +502,69 @@ export class ControllerRegistry extends EventEmitter {
                 });
                 return cache;
             }
-            case 'hybridSearch':
-                // BM25 hybrid search — placeholder for future implementation
-                return null;
+            case 'hybridSearch': {
+                // ADR-125 Phase 5 — real RRF + MMR hybrid search.
+                // Calls semanticSearch() (which degrades gracefully when embedder is
+                // unavailable) AND searchKeyword() independently, fuses via RRF, then
+                // diversifies via MMR (lambda=0.7).
+                const memSvc = this.config.memoryService;
+                if (!memSvc)
+                    return null;
+                const adapter = typeof memSvc.getAdapter === 'function' ? memSvc.getAdapter() : null;
+                if (!adapter)
+                    return null;
+                const { applyRRF, applyMMR } = await import('./smart-retrieval.js');
+                return {
+                    /**
+                     * Run a fused hybrid search.
+                     * @param query        Free-form query string.
+                     * @param opts.limit   Final result count (default 10).
+                     * @param opts.fanOutK Per-arm fanout before fusion (default = limit * 3).
+                     * @param opts.mmrLambda MMR relevance/diversity balance (default 0.7).
+                     */
+                    search: async (query, opts = {}) => {
+                        const limit = opts.limit ?? 10;
+                        const fanOutK = opts.fanOutK ?? Math.max(limit * 3, 20);
+                        const mmrLambda = opts.mmrLambda ?? 0.7;
+                        // Dense arm — may internally fall back to keyword if embedder is
+                        // missing, but that's still a valid signal to fuse.
+                        let dense = [];
+                        try {
+                            dense = await adapter.semanticSearch(query, fanOutK);
+                        }
+                        catch {
+                            dense = [];
+                        }
+                        // Sparse arm — FTS5 / keyword search.
+                        let sparse = [];
+                        try {
+                            sparse = await adapter.searchKeyword(query, { k: fanOutK });
+                        }
+                        catch {
+                            sparse = [];
+                        }
+                        // Adapt SearchResult[] → SearchCandidate[] expected by RRF
+                        const toCands = (results) => results.map((r) => ({
+                            id: r.entry.id,
+                            key: r.entry.key,
+                            content: r.entry.content,
+                            namespace: r.entry.namespace,
+                            metadata: r.entry.metadata,
+                            createdAt: r.entry.createdAt,
+                            updatedAt: r.entry.updatedAt,
+                            score: r.score,
+                            _entry: r.entry,
+                        }));
+                        const fused = applyRRF([toCands(dense), toCands(sparse)], 60);
+                        const diverse = applyMMR(fused, mmrLambda, limit);
+                        return diverse.map((s) => ({
+                            entry: s.candidate._entry,
+                            score: s.score,
+                        }));
+                    },
+                    source: 'hybrid-rrf-mmr',
+                };
+            }
             case 'agentMemoryScope':
                 // Agent memory scope — placeholder, activated when explicitly enabled
                 return null;
@@ -646,6 +714,25 @@ export class ControllerRegistry extends EventEmitter {
                 }
             }
             case 'nightlyLearner': {
+                // ADR-125 Phase 4 — prefer the MemoryConsolidator when a
+                // MemoryService is registered. The consolidator's `runAll()` is the
+                // documented entry point for sweep + dedup + compact and replaces the
+                // thin delegate to AgentDB's NightlyLearner.
+                const memSvc = this.config.memoryService;
+                if (memSvc && typeof memSvc.getConsolidator === 'function') {
+                    try {
+                        const consolidator = await memSvc.getConsolidator();
+                        return {
+                            run: () => consolidator.runAll(),
+                            runAll: () => consolidator.runAll(),
+                            sweepExpired: () => consolidator.sweepExpired(),
+                            dedup: (s) => consolidator.dedup(s),
+                            compactHnsw: () => consolidator.compactHnsw(),
+                            source: 'memory-consolidator',
+                        };
+                    }
+                    catch { /* fall through to AgentDB */ }
+                }
                 if (!this.agentdb)
                     return null;
                 try {