Skip to content

Commit 180d261

Browse files
committed
feat(dream): T3 取代链——旧行 superseded_by 指向新行,检索降权不归档(#641 beta 第三阶段)
enforce 档的演进对(created_at 差 ≥7 天)从「只记账」升级为真处置: - store:memories 加 superseded_by/superseded_at 两列(幂等迁移,存量行 NULL 不猜历史)+ 部分索引;supersedeChain 只动这两列,刻意不走 updateMemory 完整写路径——syncMirror/notifyWrite/updated_at 都不该被纯元数据标注触发 (正文零变化镜像无 diff;bump updated_at 会污染「这一对刚判过」的宽松 代理判定)。已归档/已遗忘行不落链(给幽灵记账没有意义)。 - sleep/dream 双链路:enforce 下演进对新者胜落链(服务器时钟,内容声称的 时间不做键),账本状态推进 superseded;快照行缺 created_at 时退回纯记账, 宁可少处置不编造时间方向。相位结果透出 t3Chained。 - 与 supersede 动作的归档语义刻意不同:演进不是输赢,旧值仍是「曾经为真」 的可追溯历史——不归档、向量保留,降权在检索侧做(fuseRecall 感知是下一 个提交)。 全量 3295 tests / 3294 pass / 0 fail(pipefail)。
1 parent a859484 commit 180d261

9 files changed

Lines changed: 198 additions & 18 deletions

File tree

‎dsh-mneme/lib/dream.js‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
15171517
}
15181518
if (ledgerEnforce) {
15191519
let t1Resolved = 0;
1520+
let t3Chained = 0;
15201521
let marked = 0;
15211522
for (const d of decisions.filter((x) => x.action === "conflict")) {
15221523
const a = snapshot.get(d.winner);
@@ -1543,6 +1544,22 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
15431544
// CAS 没过(两侧在快照后被改过):不冒险自动处置,落账本留观察。
15441545
service.saveConflictLedgerEntry({ run_id: runId, memory_a: a.id, memory_b: b.id, tier: verdict.tier, similarity: verdict.signals.similarity, signals: verdict.signals });
15451546
}
1547+
} else if (verdict.tier === "evolution") {
1548+
// T3 取代链(与 sleep enforce 同款):旧行 superseded_by → 新行,
1549+
// 不归档、不进 applyList。快照行可能缺 created_at(老决策),缺了
1550+
// 就退回纯记账——宁可少处置,不编造时间方向。
1551+
const newer = (a.created_at ?? "") >= (b.created_at ?? "") ? a : b;
1552+
const older = newer === a ? b : a;
1553+
try {
1554+
if (service.supersedeChain(older.id, newer.id)) {
1555+
t3Chained += 1;
1556+
service.setConflictLedgerStatus(a.id, b.id, "superseded");
1557+
} else {
1558+
service.saveConflictLedgerEntry({ run_id: runId, memory_a: a.id, memory_b: b.id, tier: verdict.tier, similarity: verdict.signals.similarity, signals: verdict.signals });
1559+
}
1560+
} catch (error) {
1561+
logger?.warn?.(`dsh-mneme dream: ledger T3 chain failed for ${a.id}/${b.id}: ${String(error)}`);
1562+
}
15461563
} else {
15471564
service.saveConflictLedgerEntry({ run_id: runId, memory_a: a.id, memory_b: b.id, tier: verdict.tier, similarity: verdict.signals.similarity, signals: verdict.signals });
15481565
}
@@ -1552,7 +1569,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
15521569
}
15531570
}
15541571
if (marked > 0) {
1555-
logger?.info?.(`[dsh-mneme] dream: ledger enforce marked ${marked} conflict decision(s), ${t1Resolved} deterministically superseded`);
1572+
logger?.info?.(`[dsh-mneme] dream: ledger enforce marked ${marked} conflict decision(s), ${t1Resolved} superseded, ${t3Chained} chained`);
15561573
}
15571574
}
15581575
const applyList = ledgerEnforce

‎dsh-mneme/lib/dream/sleep.js‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,19 +422,38 @@ async function phaseConflicts(ctx, service, config, logger, runId, semantic = nu
422422

423423
// Issue #641(beta 第二阶段,enforce 档):确定性处置接线。T1(dup)走
424424
// supersedeInfoFirstPair(与冻结分支自动档同一条契约,decisions.js 共享实现);
425-
// T2/T3/T4 记账即处置——不停车、不送 LLM、不归档任何一行。人审队列与 LLM
426-
// 裁决在本档下都不再消费冲突候选,conflict_pending 恒空。每轮上限沿用
427-
// sleepConflictMaxPairsPerRun:处置虽不走 LLM,归档仍是写动作,写预算与
428-
// freeze/auto 两档同口径。T3 的真实处置(superseded_by 取代链 + 检索降权)
429-
// 与 T4 的惰性消解(检索时排序 + 注入标注)是后续 PR,本档先把人审摘出去。
425+
// T1 走信息量优先 supersede、T3 走取代链(superseded_by 指向,不归档)、
426+
// T2/T4 记账即处置——不停车、不送 LLM。人审队列与 LLM 裁决在本档下都不再
427+
// 消费冲突候选,conflict_pending 恒空。每轮上限沿用
428+
// sleepConflictMaxPairsPerRun:处置虽不走 LLM,归档/落链仍是写动作,写预算
429+
// 与 freeze/auto 两档同口径。T4 的检索时消解(fuseRecall 矛盾感知 + 注入
430+
// 标注)是后续 PR,本档先把人审摘出去。
430431
if (ledgerMode === "enforce") {
431432
const perRunCap = config.sleepConflictMaxPairsPerRun ?? 60;
432433
const pool = perRunCap > 0 ? selected.slice(0, perRunCap) : selected;
433434
let t1Resolved = 0;
434435
let t1Failed = 0;
436+
let t3Chained = 0;
435437
const t1VectorFixups = [];
436438
for (const p of pool) {
437439
const verdict = triagePair(p.a, p.b, p.similarity, { dupMinSimilarity: config.conflictLedgerDupMinSimilarity });
440+
if (verdict.tier === "evolution") {
441+
// T3 取代链(beta 第三阶段):旧行 superseded_by → 新行,检索降权,
442+
// **不归档**——演进不是输赢,旧值仍是「曾经为真」的可追溯历史(与
443+
// supersede 动作的归档语义不同)。新者胜对演进成立:间隔 ≥7 天的
444+
// 同主题对,新记载才反映现状(服务器时钟,内容声称的时间不做键)。
445+
const newer = (p.a.created_at ?? "") >= (p.b.created_at ?? "") ? p.a : p.b;
446+
const older = newer === p.a ? p.b : p.a;
447+
try {
448+
if (service.supersedeChain(older.id, newer.id)) {
449+
t3Chained += 1;
450+
service.setConflictLedgerStatus(p.a.id, p.b.id, "superseded");
451+
}
452+
} catch (error) {
453+
logger?.warn?.(`dsh-mneme sleep: ledger T3 chain failed for ${p.a.id}/${p.b.id}: ${String(error)}`);
454+
}
455+
continue;
456+
}
438457
if (verdict.tier !== "dup") continue;
439458
let res = null;
440459
try {
@@ -472,14 +491,14 @@ async function phaseConflicts(ctx, service, config, logger, runId, semantic = nu
472491
logger?.warn?.(`dsh-mneme sleep: conflict ledger enforce capped at ${pool.length}/${selected.length} pairs this run`);
473492
}
474493
return {
475-
status: t1Failed > 0 ? "degraded" : t1Resolved > 0 ? "ok" : "noop",
494+
status: t1Failed > 0 ? "degraded" : t1Resolved > 0 || t3Chained > 0 ? "ok" : "noop",
476495
clean: t1Failed === 0,
477496
frozen: 0,
478497
scopeCandidates: 0,
479498
pairs: selected.length,
480499
batches: 0,
481500
ledgerSkipped,
482-
enforced: { t1Resolved, t1Failed },
501+
enforced: { t1Resolved, t1Failed, t3Chained },
483502
...(ledgerTriage ? { ledgerTriage } : {})
484503
};
485504
}

‎dsh-mneme/lib/service.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3145,6 +3145,10 @@ export function createService({ store, mirror, config, onWrite, logger, document
31453145
setConflictLedgerStatus: (a, b, s) => store.setConflictLedgerStatus(a, b, s),
31463146
listConflictLedger: (opts) => store.listConflictLedger(opts),
31473147
countConflictLedger: (opts) => store.countConflictLedger(opts),
3148+
// #641 T3 取代链:与上面 ledger 同一条 bookkeeping 纪律——纯元数据标注绝不
3149+
// 触发 write hooks(正文零变化,镜像无 diff;bump updated_at 会污染
3150+
// 「这一对刚判过」的宽松代理判定)。
3151+
supersedeChain: (loserId, winnerId) => store.supersedeChain(loserId, winnerId),
31483152
// Recall evaluation trail (方案 B): audit-bookkeeping semantics like the
31493153
// dream/recall passthroughs above — a recall_evals write is a snapshot, not
31503154
// a memory mutation, so it never triggers write hooks.

‎dsh-mneme/lib/store.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -950,6 +950,10 @@ function toRow(row) {
950950
// isImportedRow)——这两格只回答「来自哪个包 / 幂等键是什么」,不回答身份。
951951
share_pack_id: row.share_pack_id ?? undefined,
952952
share_external_id: row.share_external_id ?? undefined,
953+
// Issue #641 取代链:NULL 读作 undefined(未被取代),与 archived_at 同款
954+
// 「时刻不可知就不编值」。
955+
superseded_by: row.superseded_by ?? undefined,
956+
superseded_at: row.superseded_at ?? undefined,
953957
content_history: parseJsonArray(row.content_history),
954958
evidence: parseJsonArray(row.evidence),
955959
doc_path: row.doc_path ?? undefined,
@@ -1364,6 +1368,15 @@ export function createStore(path) {
13641368
// 唯一性(第二条本地行就撞响),而存量行零重写、读侧 undefined = 「不是外来行」。
13651369
addColumn("memories", "share_pack_id", "ALTER TABLE memories ADD COLUMN share_pack_id TEXT");
13661370
addColumn("memories", "share_external_id", "ALTER TABLE memories ADD COLUMN share_external_id TEXT");
1371+
// Issue #641(beta 第三阶段,取代链):T3(时序演进)的处置不归档——旧行写
1372+
// superseded_by 指向取代它的新行,检索侧降权、注入不再选中,但行本身保持
1373+
// 活跃、随时可人工恢复。存量行两列皆 NULL:历史裁决走的是「归档」路径,
1374+
// 反推不出该指给谁(receipt_chain 有 winner/loser,但那是另一套语义),宁可
1375+
// 不填也不猜。superseded_at 是裁决时刻(服务器单调时钟),与内容时间无关。
1376+
addColumn("memories", "superseded_by", "ALTER TABLE memories ADD COLUMN superseded_by TEXT");
1377+
addColumn("memories", "superseded_at", "ALTER TABLE memories ADD COLUMN superseded_at TEXT");
1378+
// 部分索引:降权查询只关心「已被取代」的行;未取代行(绝大多数)不进索引。
1379+
db.exec("CREATE INDEX IF NOT EXISTS idx_memories_superseded ON memories(superseded_by) WHERE superseded_by IS NOT NULL;");
13671380
// 索引建在加列之后而非写进 SCHEMA(本文件 content_hash 那段:存量库打开时 CREATE TABLE
13681381
// 是 no-op,列还不存在就建索引会直接 no such column)。
13691382
// 部分索引(WHERE ... IS NOT NULL)是刻意的,但它承重的地方要说准:SQLite 的 UNIQUE
@@ -4106,6 +4119,21 @@ export function createStore(path) {
41064119
return res.changes > 0;
41074120
}
41084121

4122+
/**
4123+
* 取代链落笔(issue #641,T3 时序演进的处置):旧行 superseded_by → 新行。
4124+
* 只动这两列,刻意不走 updateMemory 的完整写路径——syncMirror/notifyWrite/
4125+
* updated_at 都不该被一个纯元数据标注触发(正文一个字节没变,镜像无 diff
4126+
* 可同步;bump updated_at 反而会误导「已审过」的宽松代理判定)。已归档/
4127+
* 已遗忘的行不落链(它们已经退场,再标注是给幽灵记账);重复写同一指向
4128+
* 是无害的幂等 no-op,换指向以最后一次为准。
4129+
*/
4130+
function supersedeChain(loserId, winnerId) {
4131+
const res = db.prepare(
4132+
"UPDATE memories SET superseded_by = ?, superseded_at = ? WHERE id = ? AND archived = 0 AND forgotten = 0"
4133+
).run(winnerId, nowIso(), loserId);
4134+
return res.changes > 0;
4135+
}
4136+
41094137
/** Triage rows for the panel/analysis views, newest detection first. */
41104138
function listConflictLedger({ limit = 200, offset = 0, tier, status } = {}) {
41114139
const lim = Math.max(1, Math.min(5000, limit | 0));
@@ -5699,6 +5727,7 @@ export function createStore(path) {
56995727
listConflictReviewed,
57005728
saveConflictLedgerEntry,
57015729
setConflictLedgerStatus,
5730+
supersedeChain,
57025731
listConflictLedger,
57035732
countConflictLedger,
57045733
saveScopeChange,

‎dsh-mneme/src/dream.js‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1517,6 +1517,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
15171517
}
15181518
if (ledgerEnforce) {
15191519
let t1Resolved = 0;
1520+
let t3Chained = 0;
15201521
let marked = 0;
15211522
for (const d of decisions.filter((x) => x.action === "conflict")) {
15221523
const a = snapshot.get(d.winner);
@@ -1543,6 +1544,22 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
15431544
// CAS 没过(两侧在快照后被改过):不冒险自动处置,落账本留观察。
15441545
service.saveConflictLedgerEntry({ run_id: runId, memory_a: a.id, memory_b: b.id, tier: verdict.tier, similarity: verdict.signals.similarity, signals: verdict.signals });
15451546
}
1547+
} else if (verdict.tier === "evolution") {
1548+
// T3 取代链(与 sleep enforce 同款):旧行 superseded_by → 新行,
1549+
// 不归档、不进 applyList。快照行可能缺 created_at(老决策),缺了
1550+
// 就退回纯记账——宁可少处置,不编造时间方向。
1551+
const newer = (a.created_at ?? "") >= (b.created_at ?? "") ? a : b;
1552+
const older = newer === a ? b : a;
1553+
try {
1554+
if (service.supersedeChain(older.id, newer.id)) {
1555+
t3Chained += 1;
1556+
service.setConflictLedgerStatus(a.id, b.id, "superseded");
1557+
} else {
1558+
service.saveConflictLedgerEntry({ run_id: runId, memory_a: a.id, memory_b: b.id, tier: verdict.tier, similarity: verdict.signals.similarity, signals: verdict.signals });
1559+
}
1560+
} catch (error) {
1561+
logger?.warn?.(`dsh-mneme dream: ledger T3 chain failed for ${a.id}/${b.id}: ${String(error)}`);
1562+
}
15461563
} else {
15471564
service.saveConflictLedgerEntry({ run_id: runId, memory_a: a.id, memory_b: b.id, tier: verdict.tier, similarity: verdict.signals.similarity, signals: verdict.signals });
15481565
}
@@ -1552,7 +1569,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
15521569
}
15531570
}
15541571
if (marked > 0) {
1555-
logger?.info?.(`[dsh-mneme] dream: ledger enforce marked ${marked} conflict decision(s), ${t1Resolved} deterministically superseded`);
1572+
logger?.info?.(`[dsh-mneme] dream: ledger enforce marked ${marked} conflict decision(s), ${t1Resolved} superseded, ${t3Chained} chained`);
15561573
}
15571574
}
15581575
const applyList = ledgerEnforce

‎dsh-mneme/src/dream/sleep.js‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,19 +422,38 @@ async function phaseConflicts(ctx, service, config, logger, runId, semantic = nu
422422

423423
// Issue #641(beta 第二阶段,enforce 档):确定性处置接线。T1(dup)走
424424
// supersedeInfoFirstPair(与冻结分支自动档同一条契约,decisions.js 共享实现);
425-
// T2/T3/T4 记账即处置——不停车、不送 LLM、不归档任何一行。人审队列与 LLM
426-
// 裁决在本档下都不再消费冲突候选,conflict_pending 恒空。每轮上限沿用
427-
// sleepConflictMaxPairsPerRun:处置虽不走 LLM,归档仍是写动作,写预算与
428-
// freeze/auto 两档同口径。T3 的真实处置(superseded_by 取代链 + 检索降权)
429-
// 与 T4 的惰性消解(检索时排序 + 注入标注)是后续 PR,本档先把人审摘出去。
425+
// T1 走信息量优先 supersede、T3 走取代链(superseded_by 指向,不归档)、
426+
// T2/T4 记账即处置——不停车、不送 LLM。人审队列与 LLM 裁决在本档下都不再
427+
// 消费冲突候选,conflict_pending 恒空。每轮上限沿用
428+
// sleepConflictMaxPairsPerRun:处置虽不走 LLM,归档/落链仍是写动作,写预算
429+
// 与 freeze/auto 两档同口径。T4 的检索时消解(fuseRecall 矛盾感知 + 注入
430+
// 标注)是后续 PR,本档先把人审摘出去。
430431
if (ledgerMode === "enforce") {
431432
const perRunCap = config.sleepConflictMaxPairsPerRun ?? 60;
432433
const pool = perRunCap > 0 ? selected.slice(0, perRunCap) : selected;
433434
let t1Resolved = 0;
434435
let t1Failed = 0;
436+
let t3Chained = 0;
435437
const t1VectorFixups = [];
436438
for (const p of pool) {
437439
const verdict = triagePair(p.a, p.b, p.similarity, { dupMinSimilarity: config.conflictLedgerDupMinSimilarity });
440+
if (verdict.tier === "evolution") {
441+
// T3 取代链(beta 第三阶段):旧行 superseded_by → 新行,检索降权,
442+
// **不归档**——演进不是输赢,旧值仍是「曾经为真」的可追溯历史(与
443+
// supersede 动作的归档语义不同)。新者胜对演进成立:间隔 ≥7 天的
444+
// 同主题对,新记载才反映现状(服务器时钟,内容声称的时间不做键)。
445+
const newer = (p.a.created_at ?? "") >= (p.b.created_at ?? "") ? p.a : p.b;
446+
const older = newer === p.a ? p.b : p.a;
447+
try {
448+
if (service.supersedeChain(older.id, newer.id)) {
449+
t3Chained += 1;
450+
service.setConflictLedgerStatus(p.a.id, p.b.id, "superseded");
451+
}
452+
} catch (error) {
453+
logger?.warn?.(`dsh-mneme sleep: ledger T3 chain failed for ${p.a.id}/${p.b.id}: ${String(error)}`);
454+
}
455+
continue;
456+
}
438457
if (verdict.tier !== "dup") continue;
439458
let res = null;
440459
try {
@@ -472,14 +491,14 @@ async function phaseConflicts(ctx, service, config, logger, runId, semantic = nu
472491
logger?.warn?.(`dsh-mneme sleep: conflict ledger enforce capped at ${pool.length}/${selected.length} pairs this run`);
473492
}
474493
return {
475-
status: t1Failed > 0 ? "degraded" : t1Resolved > 0 ? "ok" : "noop",
494+
status: t1Failed > 0 ? "degraded" : t1Resolved > 0 || t3Chained > 0 ? "ok" : "noop",
476495
clean: t1Failed === 0,
477496
frozen: 0,
478497
scopeCandidates: 0,
479498
pairs: selected.length,
480499
batches: 0,
481500
ledgerSkipped,
482-
enforced: { t1Resolved, t1Failed },
501+
enforced: { t1Resolved, t1Failed, t3Chained },
483502
...(ledgerTriage ? { ledgerTriage } : {})
484503
};
485504
}

‎dsh-mneme/src/service.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3145,6 +3145,10 @@ export function createService({ store, mirror, config, onWrite, logger, document
31453145
setConflictLedgerStatus: (a, b, s) => store.setConflictLedgerStatus(a, b, s),
31463146
listConflictLedger: (opts) => store.listConflictLedger(opts),
31473147
countConflictLedger: (opts) => store.countConflictLedger(opts),
3148+
// #641 T3 取代链:与上面 ledger 同一条 bookkeeping 纪律——纯元数据标注绝不
3149+
// 触发 write hooks(正文零变化,镜像无 diff;bump updated_at 会污染
3150+
// 「这一对刚判过」的宽松代理判定)。
3151+
supersedeChain: (loserId, winnerId) => store.supersedeChain(loserId, winnerId),
31483152
// Recall evaluation trail (方案 B): audit-bookkeeping semantics like the
31493153
// dream/recall passthroughs above — a recall_evals write is a snapshot, not
31503154
// a memory mutation, so it never triggers write hooks.

0 commit comments

Comments
 (0)