@lemoncat7/dsh-partner 1.11.2 → 1.12.0

package/lib/memory-retrieval.js

@@ -0,0 +1,20 @@
+export function memoryTerms(value) {
+    const words = value.normalize('NFKC').toLocaleLowerCase().slice(0, 4000).match(/[a-z0-9_]+|\p{Script=Han}+/gu) ?? [];
+    return [...new Set(words.flatMap(word => /^\p{Script=Han}+$/u.test(word) && word.length > 2
+            ? Array.from({ length: word.length - 1 }, (_, index) => word.slice(index, index + 2)) : [word]))].slice(0, 80);
+}
+export function memoryRelevance(memory, terms) {
+    const haystack = `${memory.subject} ${memory.content}`.normalize('NFKC').toLocaleLowerCase();
+    const matches = terms.filter(term => haystack.includes(term)).length;
+    return terms.length ? matches / terms.length : 0;
+}
+export function rankMemories(memories, query, now, relevantOnly = true) {
+    const terms = memoryTerms(query);
+    return memories.map(item => {
+        const lexical = memoryRelevance(item, terms);
+        const recency = Math.max(0, 1 - (now - item.updatedAt) / (180 * 86_400_000));
+        return { item, lexical, score: lexical * .5 + item.importance * .22 + item.confidence * .18 + recency * .1 };
+    }).filter(entry => !relevantOnly || entry.lexical > 0)
+        .sort((a, b) => b.score - a.score || b.item.updatedAt - a.item.updatedAt).map(entry => entry.item);
+}
+//# sourceMappingURL=memory-retrieval.js.map

package/lib/memory-retrieval.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memory-retrieval.js","sourceRoot":"","sources":["../src/memory-retrieval.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,8BAA8B,CAAC,IAAI,EAAE,CAAA;IACpH,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC;YACzF,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;AAClH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAkD,EAAE,KAAe;IACjG,MAAM,QAAQ,GAAG,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,iBAAiB,EAAE,CAAA;IAC5F,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAA;IACpE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AAClD,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAAyB,EAAE,KAAa,EAAE,GAAW,EAAE,YAAY,GAAG,IAAI;IACrG,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,CAAA;IAChC,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QACzB,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,UAAU,CAAC,CAAC,CAAA;QAC5E,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,GAAG,IAAI,CAAC,UAAU,GAAG,GAAG,GAAG,OAAO,GAAG,EAAE,EAAE,CAAA;IAC9G,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,YAAY,IAAI,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;SACnD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACtG,CAAC"}

package/lib/memory-store.d.ts

@@ -1,4 +1,7 @@
 import type { ConversationTurn, DailyReflection, DailyReviewResult, DailyReviewTarget, MemoryCandidate, MemoryRecallContext, MemoryRelation, MemoryRelationReviewContext, PartnerMemory, UserProfileSnapshot } from './memory-domain.js';
+import { type MemoryJob } from './memory-journal.js';
+import type { ReflectionResult } from './memory-domain.js';
+import { readScenes, readExperienceDrafts } from './memory-artifacts.js';
 type ReflectionResultLike = {
     daily: Omit<DailyReflection, 'date' | 'companionId' | 'scopeId' | 'updatedAt' | 'turnCount'>;
     memories: MemoryCandidate[];
@@ -15,13 +18,34 @@ export declare class PartnerMemoryStore {
     private readonly writes;
     constructor(root: string, timeZone?: string);
     day(at: number): string;
+    enqueue(turn: ConversationTurn): Promise<void>;
+    hasPendingTurns(companionId: string, scopeId: string): Promise<boolean>;
+    memoryLayers(companionId: string, scopeId: string): Promise<{
+        scenes: ReturnType<typeof readScenes>;
+        experiences: ReturnType<typeof readExperienceDrafts>;
+        jobs: Array<{
+            id: string;
+            attempts: number;
+            nextAt: number;
+            status: string;
+        }>;
+    }>;
+    reviewExperience(companionId: string, scopeId: string, id: string, version: string, action: 'approved' | 'rejected'): Promise<void>;
+    exportExperience(companionId: string, scopeId: string, id: string): Promise<string>;
+    history(companionId: string, scopeId: string, before?: number, limit?: number, beforeId?: string): Promise<ConversationTurn[]>;
+    retryJob(companionId: string, scopeId: string, id: string): Promise<void>;
+    claimJob(companionId: string, now?: number): Promise<MemoryJob | undefined>;
+    candidateMemories(companionId: string, scopeId: string, query: string): Promise<PartnerMemory[]>;
+    checkpointJob(job: MemoryJob, result: ReflectionResult): Promise<void>;
+    settleJob(job: MemoryJob, error?: string): Promise<void>;
+    private journal;
     archive(turn: ConversationTurn): Promise<void>;
-    consolidate(turn: ConversationTurn, result: ReflectionResultLike): Promise<void>;
+    consolidate(turn: ConversationTurn, result: ReflectionResultLike, job?: MemoryJob): Promise<void>;
     recall(companionId: string, scopeId: string, query: string, limit?: number): Promise<PartnerMemory[]>;
     recallContext(companionId: string, scopeId: string, query: string, limit?: number): Promise<MemoryRecallContext>;
     profileSnapshot(companionId: string, scopeId: string): Promise<UserProfileSnapshot>;
     profileSnapshots(companionId: string, knownScopeIds?: string[]): Promise<UserProfileSnapshot[]>;
-    recentMemories(companionId: string, limit?: number): Promise<PartnerMemory[]>;
+    recentMemories(companionId: string, limit?: number, scopeId?: string): Promise<PartnerMemory[]>;
     legacyHeartbeatFocuses(companionId: string): Promise<LegacyHeartbeatFocus[]>;
     dropLegacyHeartbeatFocuses(companionId: string): Promise<void>;
     updateMemory(companionId: string, memoryId: string, subject: string, content: string): Promise<PartnerMemory>;

package/lib/memory-store.d.ts.map

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

package/lib/memory-store.js

@@ -3,6 +3,9 @@ import { appendFile, mkdir, readFile, readdir, rename, rm } from 'node:fs/promis
 import { dirname, join } from 'node:path';
 import { DatabaseSync } from 'node:sqlite';
 import { buildProfileSnapshot, canonicalProfileSubject, isProfileBaselineEntry } from './profile-domain.js';
+import { initializeMemoryJournal, enqueueMemoryJob, claimMemoryJob, checkpointMemoryJob, settleMemoryJob, assertMemoryLease } from './memory-journal.js';
+import { rankMemories, memoryRelevance, memoryTerms } from './memory-retrieval.js';
+import { initializeMemoryArtifacts, applyMemoryArtifacts, readScenes, readExperienceDrafts, readExperienceDraft, reviewExperienceDraft, experienceMarkdown } from './memory-artifacts.js';
 export class PartnerMemoryStore {
     root;
     timeZone;
@@ -12,6 +15,71 @@ export class PartnerMemoryStore {
         this.timeZone = timeZone;
     }
     day(at) { return localDay(at, this.timeZone); }
+    async enqueue(turn) {
+        await this.journal(turn.companionId, db => enqueueMemoryJob(db, turn));
+    }
+    async hasPendingTurns(companionId, scopeId) {
+        return this.journal(companionId, db => Boolean(db.prepare('SELECT 1 FROM memory_jobs WHERE scope_id=? AND done=0 LIMIT 1').get(scopeId)));
+    }
+    async memoryLayers(companionId, scopeId) {
+        return this.journal(companionId, db => ({
+            scenes: readScenes(db, scopeId, this.memoriesForScope(db, companionId, scopeId)),
+            experiences: readExperienceDrafts(db, scopeId),
+            jobs: db.prepare('SELECT id, attempts, next_at, lease_until FROM memory_jobs WHERE scope_id=? AND done=0 ORDER BY at LIMIT 100')
+                .all(scopeId).map(row => ({ id: String(row.id), attempts: Number(row.attempts), nextAt: Number(row.next_at),
+                status: Number(row.lease_until) > Date.now() ? 'processing' : Number(row.attempts) > 0 ? 'retrying' : 'pending' })),
+        }));
+    }
+    async reviewExperience(companionId, scopeId, id, version, action) {
+        await this.journal(companionId, db => reviewExperienceDraft(db, scopeId, id, version, action));
+    }
+    async exportExperience(companionId, scopeId, id) {
+        return this.journal(companionId, db => {
+            const draft = readExperienceDraft(db, scopeId, id);
+            if (!draft || draft.status !== 'approved')
+                throw new Error('只能导出已审核通过的经验草稿');
+            return experienceMarkdown(draft);
+        });
+    }
+    async history(companionId, scopeId, before = Date.now() + 1, limit = 30, beforeId = '\uffff') {
+        return this.journal(companionId, db => db.prepare('SELECT turn_json FROM memory_jobs WHERE scope_id=? AND (at<? OR (at=? AND id<?)) ORDER BY at DESC, id DESC LIMIT ?')
+            .all(scopeId, before, before, beforeId, Math.max(1, Math.min(100, limit))).map(row => JSON.parse(String(row.turn_json))));
+    }
+    async retryJob(companionId, scopeId, id) {
+        await this.journal(companionId, db => {
+            const result = db.prepare('UPDATE memory_jobs SET next_at=0 WHERE id=? AND scope_id=? AND done=0 AND lease_until<=?').run(id, scopeId, Date.now());
+            if (!result.changes)
+                throw new Error('任务不存在、已完成或正在处理');
+        });
+    }
+    async claimJob(companionId, now = Date.now()) {
+        return this.journal(companionId, db => claimMemoryJob(db, now));
+    }
+    async candidateMemories(companionId, scopeId, query) {
+        return this.journal(companionId, db => {
+            const items = this.memoriesForScope(db, companionId, scopeId).filter(item => item.status !== 'superseded');
+            const relevant = rankMemories(items, query, Date.now()).slice(0, 12);
+            const recent = [...items].sort((a, b) => b.updatedAt - a.updatedAt).slice(0, 4);
+            return [...new Map([...relevant, ...recent].map(item => [item.id, item])).values()];
+        });
+    }
+    async checkpointJob(job, result) {
+        await this.journal(job.turn.companionId, db => checkpointMemoryJob(db, job, result));
+    }
+    async settleJob(job, error) {
+        await this.journal(job.turn.companionId, db => settleMemoryJob(db, job, error));
+    }
+    async journal(companionId, action) {
+        return this.serialValue(this.databasePath(companionId), async () => {
+            const db = await this.open(companionId);
+            try {
+                return action(db);
+            }
+            finally {
+                db.close();
+            }
+        });
+    }
     async archive(turn) {
         const directory = this.scopeDirectory(turn.companionId, turn.scopeId);
         const path = join(directory, 'conversations', `${localDay(turn.at, this.timeZone)}.jsonl`);
@@ -20,11 +88,19 @@ export class PartnerMemoryStore {
             await appendFile(path, `${JSON.stringify(turn)}\n`, { encoding: 'utf8', mode: 0o600 });
         });
     }
-    async consolidate(turn, result) {
+    async consolidate(turn, result, job) {
         await this.serial(this.databasePath(turn.companionId), async () => {
             const database = await this.open(turn.companionId);
             try {
                 database.exec('BEGIN IMMEDIATE');
+                if (job) {
+                    assertMemoryLease(database, job);
+                    const row = database.prepare('SELECT committed FROM memory_jobs WHERE id=?').get(turn.id);
+                    if (row?.committed) {
+                        database.exec('COMMIT');
+                        return;
+                    }
+                }
                 const existing = this.memoriesForScope(database, turn.companionId, turn.scopeId);
                 for (const memory of mergeMemories(existing, result.memories, turn))
                     this.upsertMemory(database, memory);
@@ -36,6 +112,8 @@ export class PartnerMemoryStore {
           ON CONFLICT(scope_id, date) DO UPDATE SET summary=excluded.summary, events_json=excluded.events_json,
           open_tasks_json=excluded.open_tasks_json, completed_tasks_json=excluded.completed_tasks_json,
           learnings_json=excluded.learnings_json, updated_at=excluded.updated_at, turn_count=excluded.turn_count`).run(date, turn.companionId, turn.scopeId, compact(result.daily.summary, 1200), json(strings(result.daily.events, 20, 240)), json(strings(result.daily.openTasks, 20, 240)), json(strings(result.daily.completedTasks, 20, 240)), json(strings(result.daily.learnings, 20, 240)), Date.now(), number(previous?.turn_count) + 1);
+                if (job)
+                    database.prepare('UPDATE memory_jobs SET committed=1 WHERE id=?').run(turn.id);
                 database.exec('COMMIT');
             }
             catch (error) {
@@ -54,10 +132,7 @@ export class PartnerMemoryStore {
             const rows = database.prepare(`SELECT * FROM memories
         WHERE scope_id = ? AND status = 'active' AND (expires_at IS NULL OR expires_at > ?)
         ORDER BY updated_at DESC`).all(scopeId, now);
-            const terms = tokenize(query);
-            return rows.map(memoryFromRow).map(item => ({ item, score: recallScore(item, terms, now) }))
-                .sort((a, b) => b.score - a.score || b.item.updatedAt - a.item.updatedAt)
-                .slice(0, limit).map(entry => entry.item);
+            return rankMemories(rows.map(memoryFromRow), query, now).slice(0, Math.max(0, Math.min(100, limit)));
         }
         finally {
             database.close();
@@ -71,14 +146,19 @@ export class PartnerMemoryStore {
         WHERE companion_id = ? AND scope_id = ? AND status = 'active' AND (expires_at IS NULL OR expires_at > ?)
         ORDER BY updated_at DESC`).all(companionId, scopeId, now).map(memoryFromRow);
             const profile = buildProfileSnapshot(companionId, scopeId, memories);
-            const baselineIds = new Set(profile.entries.map(entry => entry.id));
-            const terms = tokenize(query);
-            const scored = memories
-                .filter(item => !baselineIds.has(item.id) && (item.kind !== 'profile' || isProfileBaselineEntry(item)))
-                .map(item => ({ item, score: recallScore(item, terms, now) }))
-                .sort((a, b) => b.score - a.score || b.item.updatedAt - a.item.updatedAt);
-            const recall = expandRecallWithRelations(database, companionId, scopeId, memories, scored.map(entry => entry.item), baselineIds, limit);
-            return { profile, ...recall };
+            const baselineIds = new Set([...profile.entries, ...(profile.preferences ?? [])].map(entry => entry.id));
+            const scored = rankMemories(memories.filter(item => !baselineIds.has(item.id) && (item.kind !== 'profile' || isProfileBaselineEntry(item))), query, now);
+            const recall = expandRecallWithRelations(database, companionId, scopeId, memories, scored, baselineIds, Math.max(0, Math.min(100, limit)));
+            const terms = memoryTerms(query);
+            const scenes = readScenes(database, scopeId, memories).filter(scene => memoryRelevance({ subject: scene.title, content: scene.summary }, terms) > 0).slice(0, 2);
+            const history = (database.prepare(`SELECT id, at, substr(json_extract(turn_json, '$.user'), 1, 4000) AS user,
+        substr(json_extract(turn_json, '$.assistant'), 1, 700) AS assistant
+        FROM memory_jobs WHERE scope_id=? ORDER BY at DESC LIMIT 100`).all(scopeId))
+                .map(row => ({ id: String(row.id), at: Number(row.at), user: String(row.user), assistant: String(row.assistant) }))
+                .map(turn => ({ turn, score: memoryRelevance({ subject: '', content: turn.user }, terms) }))
+                .filter(item => item.score >= .2).sort((a, b) => b.score - a.score || b.turn.at - a.turn.at).slice(0, 2)
+                .map(({ turn }) => ({ id: turn.id, at: turn.at, user: compact(turn.user, 500), assistant: compact(turn.assistant, 700) }));
+            return { profile, ...recall, scenes, history };
         }
         finally {
             database.close();
@@ -88,7 +168,7 @@ export class PartnerMemoryStore {
         const database = await this.open(companionId);
         try {
             const rows = database.prepare(`SELECT * FROM memories WHERE companion_id = ? AND scope_id = ?
-        AND kind = 'profile' AND status = 'active' AND (expires_at IS NULL OR expires_at > ?)
+        AND kind IN ('profile', 'preference') AND status = 'active' AND (expires_at IS NULL OR expires_at > ?)
         ORDER BY updated_at DESC`).all(companionId, scopeId, Date.now());
             return buildProfileSnapshot(companionId, scopeId, rows.map(memoryFromRow));
         }
@@ -99,7 +179,7 @@ export class PartnerMemoryStore {
     async profileSnapshots(companionId, knownScopeIds = []) {
         const database = await this.open(companionId);
         try {
-            const rows = database.prepare(`SELECT * FROM memories WHERE companion_id = ? AND kind = 'profile'
+            const rows = database.prepare(`SELECT * FROM memories WHERE companion_id = ? AND kind IN ('profile', 'preference')
         AND status = 'active' AND (expires_at IS NULL OR expires_at > ?) ORDER BY updated_at DESC`)
                 .all(companionId, Date.now()).map(memoryFromRow);
             const grouped = new Map();
@@ -115,10 +195,12 @@ export class PartnerMemoryStore {
             database.close();
         }
     }
-    async recentMemories(companionId, limit = 100) {
+    async recentMemories(companionId, limit = 100, scopeId) {
         const database = await this.open(companionId);
         try {
-            return database.prepare('SELECT * FROM memories ORDER BY updated_at DESC LIMIT ?').all(limit).map(memoryFromRow);
+            return (scopeId === undefined
+                ? database.prepare('SELECT * FROM memories ORDER BY updated_at DESC LIMIT ?').all(limit)
+                : database.prepare('SELECT * FROM memories WHERE scope_id=? ORDER BY updated_at DESC LIMIT ?').all(scopeId, limit)).map(memoryFromRow).map(item => item.status === 'active' && item.expiresAt !== undefined && item.expiresAt <= Date.now() ? { ...item, status: 'expired' } : item);
         }
         finally {
             database.close();
@@ -217,7 +299,7 @@ export class PartnerMemoryStore {
             if (!row)
                 throw new Error('daily reflection was not found');
             reflection = reflectionFromRow(row);
-            memories = this.memoriesForScope(database, target.companionId, target.scopeId).filter(item => item.status === 'active');
+            memories = this.memoriesForScope(database, target.companionId, target.scopeId).filter(item => item.status === 'active' && (item.expiresAt === undefined || item.expiresAt > Date.now()));
             const byId = new Map(memories.map(memory => [memory.id, memory]));
             existingRelations = database.prepare('SELECT * FROM memory_relations WHERE companion_id = ? AND scope_id = ? ORDER BY updated_at DESC, confidence DESC')
                 .all(target.companionId, target.scopeId).map(relationFromRow).flatMap(relation => {
@@ -238,19 +320,26 @@ export class PartnerMemoryStore {
                 return [];
             }
         });
-        return { reflection, memories, existingRelations, turns };
+        const dateAt = Date.parse(target.date);
+        const durable = await this.journal(target.companionId, db => (db.prepare('SELECT turn_json FROM memory_jobs WHERE scope_id=? AND at>=? AND at<? ORDER BY at, rowid')
+            .all(target.scopeId, dateAt - 86_400_000, dateAt + 2 * 86_400_000)).map(row => JSON.parse(String(row.turn_json))).filter(turn => this.day(turn.at) === target.date));
+        return { reflection, memories, existingRelations, turns: [...new Map([...turns, ...durable].map(turn => [turn.id, turn])).values()].sort((a, b) => a.at - b.at) };
     }
     async completeDailyReview(target, result) {
         await this.serial(this.databasePath(target.companionId), async () => {
             const database = await this.open(target.companionId);
             try {
                 database.exec('BEGIN IMMEDIATE');
+                if (database.prepare('SELECT 1 FROM memory_jobs WHERE scope_id=? AND done=0 LIMIT 1').get(target.scopeId)) {
+                    throw new Error('终审期间有新的待提炼轮次，稍后重试');
+                }
                 const existing = this.memoriesForScope(database, target.companionId, target.scopeId);
                 const at = Date.now();
                 const synthetic = { id: `daily-review-${target.date}`, companionId: target.companionId, scopeId: target.scopeId, sessionId: 'daily-review', at, user: `每日终审 ${target.date}`, assistant: result.daily.summary };
                 const merged = mergeMemories(existing, result.memories, synthetic);
                 for (const memory of merged)
                     this.upsertMemory(database, memory);
+                applyMemoryArtifacts(database, target.scopeId, merged, result.scenes ?? [], result.experiences ?? [], at);
                 database.prepare(`UPDATE daily_reflections SET summary=?, events_json=?, open_tasks_json=?, completed_tasks_json=?,
           learnings_json=?, updated_at=?, reviewed_at=?, review_attempts=0, review_error=NULL, next_review_at=0
           WHERE scope_id=? AND date=?`).run(compact(result.daily.summary, 1200), json(strings(result.daily.events, 20, 240)), json(strings(result.daily.openTasks, 20, 240)), json(strings(result.daily.completedTasks, 20, 240)), json(strings(result.daily.learnings, 20, 240)), at, at, target.scopeId, target.date);
@@ -351,8 +440,12 @@ export class PartnerMemoryStore {
             const database = await this.open(companionId);
             try {
                 database.exec('BEGIN IMMEDIATE');
-                database.prepare('DELETE FROM daily_reflections WHERE companion_id = ? AND updated_at < ?').run(companionId, cutoff);
-                database.prepare('DELETE FROM memories WHERE companion_id = ? AND updated_at < ?').run(companionId, cutoff);
+                database.prepare(`DELETE FROM daily_reflections WHERE companion_id = ? AND updated_at < ? AND reviewed_at IS NOT NULL
+          AND NOT EXISTS (SELECT 1 FROM memory_jobs WHERE done=0 AND scope_id=daily_reflections.scope_id)`).run(companionId, cutoff);
+                // Retention is for history, not a silent TTL for confirmed durable facts.
+                database.prepare(`DELETE FROM memories WHERE companion_id = ? AND updated_at < ? AND locked=0
+          AND (status!='active' OR (expires_at IS NOT NULL AND expires_at<=?))`).run(companionId, cutoff, Date.now());
+                database.prepare('DELETE FROM memory_jobs WHERE done=1 AND at<?').run(cutoff);
                 database.exec('COMMIT');
             }
             catch (error) {
@@ -367,7 +460,8 @@ export class PartnerMemoryStore {
     async open(companionId) {
         await mkdir(this.memoryRoot(companionId), { recursive: true, mode: 0o700 });
         const database = new DatabaseSync(this.databasePath(companionId));
-        database.exec(`PRAGMA journal_mode = WAL; PRAGMA foreign_keys = ON; PRAGMA busy_timeout = 5000;
+        try {
+            database.exec(`PRAGMA journal_mode = WAL; PRAGMA foreign_keys = ON; PRAGMA busy_timeout = 5000;
       CREATE TABLE IF NOT EXISTS memories (
         id TEXT PRIMARY KEY, companion_id TEXT NOT NULL, scope_id TEXT NOT NULL, kind TEXT NOT NULL,
         subject TEXT NOT NULL, content TEXT NOT NULL, status TEXT NOT NULL, confidence REAL NOT NULL,
@@ -391,11 +485,18 @@ export class PartnerMemoryStore {
       );
       CREATE INDEX IF NOT EXISTS relations_companion_scope ON memory_relations(companion_id, scope_id, updated_at DESC);
       PRAGMA user_version = 1;`);
-        ensureColumn(database, 'daily_reflections', 'reviewed_at', 'INTEGER');
-        ensureColumn(database, 'daily_reflections', 'review_attempts', 'INTEGER NOT NULL DEFAULT 0');
-        ensureColumn(database, 'daily_reflections', 'review_error', 'TEXT');
-        ensureColumn(database, 'daily_reflections', 'next_review_at', 'INTEGER NOT NULL DEFAULT 0');
-        return database;
+            ensureColumn(database, 'daily_reflections', 'reviewed_at', 'INTEGER');
+            ensureColumn(database, 'daily_reflections', 'review_attempts', 'INTEGER NOT NULL DEFAULT 0');
+            ensureColumn(database, 'daily_reflections', 'review_error', 'TEXT');
+            ensureColumn(database, 'daily_reflections', 'next_review_at', 'INTEGER NOT NULL DEFAULT 0');
+            initializeMemoryJournal(database);
+            initializeMemoryArtifacts(database);
+            return database;
+        }
+        catch (error) {
+            database.close();
+            throw error;
+        }
     }
     memoriesForScope(database, companionId, scopeId) {
         return database.prepare('SELECT * FROM memories WHERE companion_id = ? AND scope_id = ?').all(companionId, scopeId).map(memoryFromRow);
@@ -514,36 +615,34 @@ function mergeMemories(existing, candidates, turn) {
     const memories = existing.map(item => ({ ...item, evidence: [...item.evidence] }));
     for (const candidate of candidates.slice(0, 12)) {
         const subject = candidate.kind === 'profile' ? canonicalProfileSubject(candidate.subject) ?? candidate.subject : candidate.subject;
-        const match = memories.find(item => item.kind === candidate.kind && sameMemorySubject(item, candidate.kind, subject) && item.status !== 'superseded');
-        if (match?.locked)
+        const match = memories.find(item => item.kind === candidate.kind && item.companionId === turn.companionId && item.scopeId === turn.scopeId
+            && (candidate.targetMemoryId ? item.id === candidate.targetMemoryId : sameMemorySubject(item, candidate.kind, subject)) && item.status !== 'superseded');
+        // A stale or foreign explicit target must never silently create another memory.
+        if (candidate.targetMemoryId && !match)
             continue;
-        if (candidate.operation === 'remove') {
-            if (match) {
-                match.status = 'superseded';
-                match.updatedAt = turn.at;
-            }
-            ;
+        if (match?.locked)
             continue;
-        }
-        if (candidate.operation === 'complete') {
+        const evidence = candidate.sourceEvidence ?? { turnId: turn.id, at: turn.at, excerpt: compact(turn.user, 300) };
+        if (candidate.operation === 'remove' || candidate.operation === 'complete') {
             if (match) {
-                match.status = 'completed';
+                match.status = candidate.operation === 'remove' ? 'superseded' : 'completed';
                 match.updatedAt = turn.at;
+                match.evidence = [...match.evidence.filter(item => item.turnId !== evidence.turnId), evidence].slice(-8);
             }
-            ;
             continue;
         }
-        const evidence = { turnId: turn.id, at: turn.at, excerpt: compact(turn.user, 300) };
         if (match) {
             if (!match.locked)
                 match.content = compact(candidate.content, 800);
-            match.confidence = Math.max(match.confidence, bounded(candidate.confidence));
-            match.importance = Math.max(match.importance, bounded(candidate.importance));
+            match.confidence = bounded(candidate.confidence);
+            match.importance = bounded(candidate.importance);
             match.updatedAt = turn.at;
             match.status = 'active';
-            match.evidence = [...match.evidence.filter(item => item.turnId !== turn.id), evidence].slice(-8);
+            match.evidence = [...match.evidence.filter(item => item.turnId !== evidence.turnId), evidence].slice(-8);
             if (candidate.expiresInDays)
                 match.expiresAt = turn.at + candidate.expiresInDays * 86_400_000;
+            else if (candidate.kind === 'profile' || candidate.kind === 'preference' || candidate.kind === 'relationship')
+                delete match.expiresAt;
         }
         else
             memories.push({
@@ -632,12 +731,6 @@ function relationFromRow(row) {
         kind: string(row.kind), label: string(row.label), confidence: number(row.confidence), updatedAt: number(row.updated_at),
     };
 }
-function recallScore(memory, terms, now) {
-    const haystack = normalize(`${memory.subject} ${memory.content}`);
-    const lexical = terms.length === 0 ? 0 : terms.filter(term => haystack.includes(term)).length / terms.length;
-    const recency = Math.max(0, 1 - (now - memory.updatedAt) / (180 * 86_400_000));
-    return lexical * 0.5 + memory.importance * 0.22 + memory.confidence * 0.18 + recency * 0.1;
-}
 function rollback(database) { try {
     database.exec('ROLLBACK');
 }
@@ -650,7 +743,6 @@ function ensureColumn(database, table, column, definition) {
 function tableExists(database, table) {
     return database.prepare("SELECT 1 FROM sqlite_master WHERE type = 'table' AND name = ?").get(table) !== undefined;
 }
-function tokenize(value) { return [...new Set(normalize(value).match(/[\p{L}\p{N}]{2,}/gu) ?? [])].slice(0, 40); }
 function normalize(value) { return value.toLocaleLowerCase().replace(/\s+/g, ''); }
 function bounded(value) { return Number.isFinite(value) ? Math.min(1, Math.max(0, value)) : 0.5; }
 function strings(value, limit, max) { return [...new Set(value.map(item => compact(item, max)).filter(Boolean))].slice(0, limit); }