Skip to content

Commit 557adbe

Browse files
committed
fix(sleep): 分诊记账分块 + 让出事件循环 + 取消即停(#643 review)
CodeRabbit Major:候选池大时 shadow 同步写完全部 selected 对,连续占用事件 循环、延迟用户活动与取消信号的处理。修法: - recordLedgerTriage 改 async:50 对一块,块间 setImmediate 让出一次;块开始 前检查 signal.aborted,取消即停。 - 不用固定上限裁剪观察样本——shadow 的分母必须完整,截断只来自取消,且在 tally.truncatedAt 可见(静默截断比没有数据更糟)。 - 调用侧传入 phaseConflicts 的 signal。 新增 3 条用例:大池跨块全落账、首块前取消零写入、中途取消停在块边界且 truncatedAt 对可见。受影响 65 测试全绿;check-sync 120 文件一致。
1 parent 7420637 commit 557adbe

5 files changed

Lines changed: 126 additions & 49 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,11 @@ async function phaseConflicts(ctx, service, config, logger, runId, semantic = nu
400400
// 记账时点在 used 去重之后:被去重压掉的那半边对(同一条记忆配给了更高相似的
401401
// 对手)本来就不是这一轮的候选,观察它们只会让分母虚高。
402402
const ledgerTriage = (config.conflictLedgerMode ?? "off") === "shadow"
403-
? recordLedgerTriage(service, runId, selected, {
403+
? await recordLedgerTriage(service, runId, selected, {
404404
dupMinSimilarity: config.conflictLedgerDupMinSimilarity,
405-
logger
405+
logger,
406+
// 分块记账的取消检查:用户活动打断时停止记账,余下的对下一轮重见
407+
signal
406408
})
407409
: null;
408410

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

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -97,27 +97,42 @@ export function triagePair(a, b, similarity, opts = {}) {
9797
* best-effort discipline as saveConflictReviewed / saveDifferentiatedPair —
9898
* 记账本身绝不能反过来把巩固打断)。
9999
*
100-
* @returns tally object {dup, cross-scope-dup, evolution, conflict, recorded, failed}
101-
* or null when the caller shouldn't record (caller decides mode).
100+
* 分块 + 让出(#643 review):候选池大时同步写完全部对会连续占用事件循环、
101+
* 延迟用户活动与取消信号的处理——每块之间 setImmediate 让出一次,并在每块
102+
* 开始前检查 signal.aborted。取消后停止记账,余下的对下一轮自然重见;**不用
103+
* 固定上限裁剪观察样本**(shadow 的分母必须完整,截断只来自取消,且在
104+
* tally.truncatedAt 可见——静默截断会让分布失真,比没有数据更糟)。
105+
*
106+
* @returns Promise<tally> {dup, cross-scope-dup, evolution, conflict, recorded,
107+
* failed, truncatedAt} — truncatedAt 非 null 表示取消点(已处理的对数)
102108
*/
103-
export function recordLedgerTriage(service, runId, pairs, opts = {}) {
104-
const tally = { dup: 0, "cross-scope-dup": 0, evolution: 0, conflict: 0, recorded: 0, failed: 0 };
105-
for (const p of pairs) {
106-
try {
107-
const verdict = triagePair(p.a, p.b, p.similarity, opts);
108-
service.saveConflictLedgerEntry({
109-
run_id: runId,
110-
memory_a: p.a.id,
111-
memory_b: p.b.id,
112-
tier: verdict.tier,
113-
similarity: p.similarity,
114-
signals: verdict.signals
115-
});
116-
tally[verdict.tier] += 1;
117-
tally.recorded += 1;
118-
} catch (error) {
119-
tally.failed += 1;
120-
opts.logger?.warn?.(`dsh-mneme sleep: failed to record ledger triage for ${p.a?.id}/${p.b?.id}: ${String(error)}`);
109+
export async function recordLedgerTriage(service, runId, pairs, opts = {}) {
110+
const tally = { dup: 0, "cross-scope-dup": 0, evolution: 0, conflict: 0, recorded: 0, failed: 0, truncatedAt: null };
111+
const CHUNK = 50;
112+
for (let start = 0; start < pairs.length; start += CHUNK) {
113+
// 块间让出事件循环(首块前不用——pairs 为空或单块时零额外宏任务)
114+
if (start > 0) await new Promise((resolve) => setImmediate(resolve));
115+
if (opts.signal?.aborted) {
116+
tally.truncatedAt = start;
117+
break;
118+
}
119+
for (const p of pairs.slice(start, start + CHUNK)) {
120+
try {
121+
const verdict = triagePair(p.a, p.b, p.similarity, opts);
122+
service.saveConflictLedgerEntry({
123+
run_id: runId,
124+
memory_a: p.a.id,
125+
memory_b: p.b.id,
126+
tier: verdict.tier,
127+
similarity: p.similarity,
128+
signals: verdict.signals
129+
});
130+
tally[verdict.tier] += 1;
131+
tally.recorded += 1;
132+
} catch (error) {
133+
tally.failed += 1;
134+
opts.logger?.warn?.(`dsh-mneme sleep: failed to record ledger triage for ${p.a?.id}/${p.b?.id}: ${String(error)}`);
135+
}
121136
}
122137
}
123138
return tally;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,9 +400,11 @@ async function phaseConflicts(ctx, service, config, logger, runId, semantic = nu
400400
// 记账时点在 used 去重之后:被去重压掉的那半边对(同一条记忆配给了更高相似的
401401
// 对手)本来就不是这一轮的候选,观察它们只会让分母虚高。
402402
const ledgerTriage = (config.conflictLedgerMode ?? "off") === "shadow"
403-
? recordLedgerTriage(service, runId, selected, {
403+
? await recordLedgerTriage(service, runId, selected, {
404404
dupMinSimilarity: config.conflictLedgerDupMinSimilarity,
405-
logger
405+
logger,
406+
// 分块记账的取消检查:用户活动打断时停止记账,余下的对下一轮重见
407+
signal
406408
})
407409
: null;
408410

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

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -97,27 +97,42 @@ export function triagePair(a, b, similarity, opts = {}) {
9797
* best-effort discipline as saveConflictReviewed / saveDifferentiatedPair —
9898
* 记账本身绝不能反过来把巩固打断)。
9999
*
100-
* @returns tally object {dup, cross-scope-dup, evolution, conflict, recorded, failed}
101-
* or null when the caller shouldn't record (caller decides mode).
100+
* 分块 + 让出(#643 review):候选池大时同步写完全部对会连续占用事件循环、
101+
* 延迟用户活动与取消信号的处理——每块之间 setImmediate 让出一次,并在每块
102+
* 开始前检查 signal.aborted。取消后停止记账,余下的对下一轮自然重见;**不用
103+
* 固定上限裁剪观察样本**(shadow 的分母必须完整,截断只来自取消,且在
104+
* tally.truncatedAt 可见——静默截断会让分布失真,比没有数据更糟)。
105+
*
106+
* @returns Promise<tally> {dup, cross-scope-dup, evolution, conflict, recorded,
107+
* failed, truncatedAt} — truncatedAt 非 null 表示取消点(已处理的对数)
102108
*/
103-
export function recordLedgerTriage(service, runId, pairs, opts = {}) {
104-
const tally = { dup: 0, "cross-scope-dup": 0, evolution: 0, conflict: 0, recorded: 0, failed: 0 };
105-
for (const p of pairs) {
106-
try {
107-
const verdict = triagePair(p.a, p.b, p.similarity, opts);
108-
service.saveConflictLedgerEntry({
109-
run_id: runId,
110-
memory_a: p.a.id,
111-
memory_b: p.b.id,
112-
tier: verdict.tier,
113-
similarity: p.similarity,
114-
signals: verdict.signals
115-
});
116-
tally[verdict.tier] += 1;
117-
tally.recorded += 1;
118-
} catch (error) {
119-
tally.failed += 1;
120-
opts.logger?.warn?.(`dsh-mneme sleep: failed to record ledger triage for ${p.a?.id}/${p.b?.id}: ${String(error)}`);
109+
export async function recordLedgerTriage(service, runId, pairs, opts = {}) {
110+
const tally = { dup: 0, "cross-scope-dup": 0, evolution: 0, conflict: 0, recorded: 0, failed: 0, truncatedAt: null };
111+
const CHUNK = 50;
112+
for (let start = 0; start < pairs.length; start += CHUNK) {
113+
// 块间让出事件循环(首块前不用——pairs 为空或单块时零额外宏任务)
114+
if (start > 0) await new Promise((resolve) => setImmediate(resolve));
115+
if (opts.signal?.aborted) {
116+
tally.truncatedAt = start;
117+
break;
118+
}
119+
for (const p of pairs.slice(start, start + CHUNK)) {
120+
try {
121+
const verdict = triagePair(p.a, p.b, p.similarity, opts);
122+
service.saveConflictLedgerEntry({
123+
run_id: runId,
124+
memory_a: p.a.id,
125+
memory_b: p.b.id,
126+
tier: verdict.tier,
127+
similarity: p.similarity,
128+
signals: verdict.signals
129+
});
130+
tally[verdict.tier] += 1;
131+
tally.recorded += 1;
132+
} catch (error) {
133+
tally.failed += 1;
134+
opts.logger?.warn?.(`dsh-mneme sleep: failed to record ledger triage for ${p.a?.id}/${p.b?.id}: ${String(error)}`);
135+
}
121136
}
122137
}
123138
return tally;

‎dsh-mneme/test/conflict-ledger.test.js‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ test("issue#641 dupMin 可经 opts 覆盖(配置键 conflictLedgerDupMinSimila
8787

8888
// ---- recordLedgerTriage:best-effort 记账 ----
8989

90-
test("issue#641 分诊记账:逐对落账、tally 与档位计数一致", () => {
90+
test("issue#641 分诊记账:逐对落账、tally 与档位计数一致", async () => {
9191
const saved = [];
9292
const service = { saveConflictLedgerEntry: (r) => saved.push(r) };
9393
const pairs = [
@@ -96,14 +96,14 @@ test("issue#641 分诊记账:逐对落账、tally 与档位计数一致", () =
9696
{ a: mem("e", { created_at: "2026-10-01T00:00:00.000Z" }), b: mem("f", { created_at: "2026-11-01T00:00:00.000Z" }), similarity: 0.8 },
9797
{ a: mem("g", { created_at: "2026-11-02T00:00:00.000Z" }), b: mem("h", { created_at: "2026-11-01T00:00:00.000Z" }), similarity: 0.86 }
9898
];
99-
const tally = recordLedgerTriage(service, "run-1", pairs, { now: Date.UTC(2026, 10, 1) });
100-
assert.deepEqual(tally, { dup: 1, "cross-scope-dup": 1, evolution: 1, conflict: 1, recorded: 4, failed: 0 });
99+
const tally = await recordLedgerTriage(service, "run-1", pairs, { now: Date.UTC(2026, 10, 1) });
100+
assert.deepEqual(tally, { dup: 1, "cross-scope-dup": 1, evolution: 1, conflict: 1, recorded: 4, failed: 0, truncatedAt: null });
101101
assert.equal(saved.length, 4);
102102
assert.equal(saved[0].tier, "dup");
103103
assert.equal(saved[0].run_id, "run-1");
104104
});
105105

106-
test("issue#641 记账失败只计 failed 不打断:纯测量绝不反噬巩固相位", () => {
106+
test("issue#641 记账失败只计 failed 不打断:纯测量绝不反噬巩固相位", async () => {
107107
let calls = 0;
108108
const service = {
109109
saveConflictLedgerEntry: () => {
@@ -113,7 +113,7 @@ test("issue#641 记账失败只计 failed 不打断:纯测量绝不反噬巩
113113
};
114114
const pairs = [1, 2, 3].map((i) => ({ a: mem(`a${i}`), b: mem(`b${i}`), similarity: 0.91 }));
115115
const warns = [];
116-
const tally = recordLedgerTriage(service, "run-1", pairs, {
116+
const tally = await recordLedgerTriage(service, "run-1", pairs, {
117117
now: Date.UTC(2026, 10, 1),
118118
logger: { warn: (m) => warns.push(m) }
119119
});
@@ -122,6 +122,49 @@ test("issue#641 记账失败只计 failed 不打断:纯测量绝不反噬巩
122122
assert.equal(warns.length, 1, "失败要留下 warn,不是静默吞");
123123
});
124124

125+
test("issue#641 记账分块:大池逐块落账不丢样本(shadow 分母必须完整)", async () => {
126+
const saved = [];
127+
const service = { saveConflictLedgerEntry: (r) => saved.push(r) };
128+
const pairs = Array.from({ length: 120 }, (_, i) => ({
129+
a: mem(`a${i}`, { created_at: "2026-11-01T00:00:00.000Z" }),
130+
b: mem(`b${i}`, { created_at: "2026-11-01T01:00:00.000Z" }),
131+
similarity: 0.91
132+
}));
133+
const tally = await recordLedgerTriage(service, "run-1", pairs, { now: Date.UTC(2026, 10, 1) });
134+
assert.equal(tally.recorded, 120, "跨三块全部落账,无截断");
135+
assert.equal(tally.dup, 120);
136+
assert.equal(tally.truncatedAt, null);
137+
assert.equal(saved.length, 120);
138+
});
139+
140+
test("issue#641 记账分块:取消即停、truncatedAt 可见,绝不静默截断观察样本", async () => {
141+
const service = { saveConflictLedgerEntry: () => {} };
142+
const pairs = Array.from({ length: 120 }, (_, i) => ({
143+
a: mem(`a${i}`, { created_at: "2026-11-01T00:00:00.000Z" }),
144+
b: mem(`b${i}`, { created_at: "2026-11-01T01:00:00.000Z" }),
145+
similarity: 0.91
146+
}));
147+
// 首块前取消:零写入,truncatedAt=0
148+
const stopAtStart = await recordLedgerTriage(service, "run-1", pairs, { now: Date.UTC(2026, 10, 1), signal: { aborted: true } });
149+
assert.equal(stopAtStart.recorded, 0, "取消在首块前生效");
150+
assert.equal(stopAtStart.truncatedAt, 0);
151+
// 中途取消:getter 在首块(50 条)落完后翻转 → 第二块前停,块内不弃样本
152+
const saved = [];
153+
let flipped = false;
154+
const midService = {
155+
saveConflictLedgerEntry: (r) => {
156+
saved.push(r);
157+
if (saved.length >= 10) flipped = true;
158+
}
159+
};
160+
const mid = await recordLedgerTriage(midService, "run-2", pairs, {
161+
now: Date.UTC(2026, 10, 1),
162+
signal: { get aborted() { return flipped; } }
163+
});
164+
assert.equal(mid.recorded, 50, "第一块完整落账(块内不检查取消)");
165+
assert.equal(mid.truncatedAt, 50, "取消点对可见,余下的对下一轮重见");
166+
});
167+
125168
// ---- conflict_ledger 存储契约 ----
126169

127170
test("issue#641 conflict_ledger:键归一化 + 读回 + 人工队列零污染", () => {

0 commit comments

Comments
 (0)