Skip to content

Commit fd58b02

Browse files
committed
fix(sleep): make a refreshed pattern countable, auditable and unborn
A refresh rewrites an existing pattern row instead of minting a new one. That single fact was applied in one place and forgotten in two, so three records disagreed about the same run. - The receipt counted applied + edgeWrites + merged, and refreshedTraits was missing from that sum. A phase reporting refreshed could therefore leave the run receipt at 0: the phase said the store changed, the run said it did not. Count it. The per-kind split stays in dream_runs.phases; the receipt keeps its single write count and its eight-field format. - buildOutcome had no branch for create_merged, so outcome.byId was empty for a run that only refreshed. A refresh was invisible to the audit row even though something was rewritten. Give both create actions a disposition: created, and created-refreshed for the in-place rewrite. That is the audit reading, not a receipt_chain row: a new row has no before/after to record, which is why memory_mints exists. - applyCreate recorded a memory mint on the refresh path too, so the same pattern acquired a second birth record with a different run_id and the panel showed it as born twice. Merge and update already skip the mint table for this reason; create_merged now follows the same rule. Tests drive the production functions: the refresh-only sleep run parses its own receipt and asserts the write count, buildOutcome is called directly for the new dispositions, and two applyDecisions rounds check that the mint table keeps one row. Reverting each fix turns its test red. Refs #619
1 parent a66860d commit fd58b02

12 files changed

Lines changed: 124 additions & 14 deletions

File tree

‎dsh-mneme/CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@
7070
- **验证(第五轮后)**:`test/sleep.test.js` 55/55(新增 2 条:两个对象各铸一条 pattern、`occasion` 边升格后被标记),全量 `node --test test/*.test.js` 3173 用例 / 3172 通过 / 0 失败 / 1 跳过,`check-sync` 118 一致。变异自证两条:标题改回不含 target → sleep 2 红(新那条 + 原有的单 trait 用例断言标题含对象);跳过 `promotedToTrait` 标记 → sleep 1 红。
7171
- **审计第六轮:pattern 正文被一轮轮追加(`applied` 虚报只是表象)**(Ephor 在 `746383d` 上重放同一 payload 三轮实测:正文 161 → 355 → 549 字,`content_history` 0 → 1 → 2)。没铸新行,是把同一段结论一遍遍 `appendContent` 粘到旧 pattern 后面,还带一串重复的 `[证据: …]` 尾巴——而 pattern 正是注入面消费的东西。根因:`saveWithDedupe` 命中同题活跃行时返回 `{ action: "merged", memory: existing }`,`applyCreate` 只看 `created?.memory` 有没有、不看它是新铸还是并入,于是 `applied` 记 1、`applyDecisions` 的 `skipped` 分支永不触发。这条**不是 #619 引入**(`applyCreate` 对 merged 的处理是既有代码,live 库 121 条活跃 pattern 里 0 条被追加过),但 #619 的模板化标题让「同一 (人, 对象, 情绪)」天然同题,把它变成可稳定复现。两处都补:① **pattern 走 `_overwrite` 原地刷新**(`applyCreate` 里 `const overwrite = type === "pattern"`,把 `_overwrite: true` 传给 `saveWithDedupe`;`_overwrite` 是既有逃生口,`src/bootstrap.js`、`src/dream.js` 的 narrative 与 dream summary 都在用)。只对 pattern 放开——其他类型被 create 撞上同题行时仍按合并语义走,整段覆盖既有行比追加更危险。② **`applied` 不再把并入算成新铸**:`applyCreate` 判 `created?.action !== "created"` 即 `applied: 0, merged: 1`,committed 的 action 记 `create_merged`;`applyDecisions` 汇总 `merged`;`phasePatterns` 与 `phaseAffective` 在 `applied === 0 && merged > 0` 时报 `refreshed` 而不是 `ok`/`noop`,`deriveStatus` 把 `refreshed` 算作「有产出」。三个状态各有含义:`ok` 真铸了、`refreshed` 改动了库但没铸新条目、`noop` 什么都没发生。
7272
- **验证(第六轮后)**:`test/sleep.test.js` 57/57(新增 2 条:重放三轮正文长度与证据尾巴不变、只刷新的一轮报 `refreshed`),全量 `node --test test/*.test.js` 3175 用例 / 3174 通过 / 0 失败 / 1 跳过,`check-sync` 118 一致。变异自证新增三条:`overwrite` 硬写 `false` → sleep 1 红;`refreshed` 硬写 `false` → sleep 1 红;`refreshed` 从 status 三元里摘掉 → sleep 1 红。累计变异自证约十四条,全部验完还原。
73+
- **审计第七轮:`refreshed` 拆出来之后三处没跟上,三份记录各说一套**(Ephor 在 `2cdcc25` 上实测,根因是同一个:「没有铸新条目」这个判定被用在了两个不同的地方,一个该用、一个不该用)。① **receipt 与 status 打架**:第二轮 `phase.status=refreshed`、`refreshedTraits=1`,整轮 `run.status=ok`,而 receipt 第 7 段还是 **0**——`totalApplied` 只累加 `applied + edgeWrites + merged`,`refreshedTraits` 不在表里;更麻烦的是 affective 相位的 `merged` 指的是**边**合并数(`merges.length`),同名不同义。漏掉它,就是「相位说改了、整轮说没改」,正是上一轮刚修掉的那个形态又回来了。修法:把 `refreshedTraits` 计进 `totalApplied`;`merged` 一词三义(pattern 刷新数 / 边合并数 / `applyDecisions` 的 create_merged 数)的区分留在 `phases` JSON,receipt 仍是单一的写入计数(八段契约不动)。② **`create_merged` 没进 `buildOutcome`**:`buildOutcome([{action:"create_merged",id:"…"}]).byId` 返回 `{}`,一个只刷新不铸造的轮在审计行里看不出任何目标被处置过——#126 review 在 supersede 上踩过同一个坑,注释就写在那函数里。补上两个 disposition:`create → created`、`create_merged → created-refreshed`(刷新不能冒充新生)。注意这里是**审计面读的结果**,与 `buildRecordReceipts` 产不产行是两件事,新行没有「改动前后的账」可记,故那边仍不产行。③ **`saveMemoryMint` 在刷新路径上仍记账**:同一个 pattern 跑两轮,`memory_mints` 从 1 行变 2 行、`run_id` 各不相同,面板上(`mintsFor` 由 `src/provenance-http.js` 读)显示同一条记忆「出生过两次」。本表语义是「这条记忆出生自哪一轮」,一次刷新不该算再一次出生;既有 `merge`/`update` 路径刻意不记 mint(「再造一份就是第二套账」),只是 `create_merged` 这条新路没被那条规矩覆盖。修法:`applyCreate` 里 `refreshed === true` 时不写 mint。live 库当时 `memory_mints` 48 行、同一 memory 多轮铸造 0 条,尚未显形,属修在显形之前。
74+
- **验证(第七轮后)**:`node --test test/*.test.js` 3177 用例 / 3176 通过 / 0 失败 / 1 跳过,`check-sync` 118 一致。新增 3 条用例全部驱动生产函数:`sleep: a refresh-only trait run reports refreshed…` 里直接 `parseReceipt(second.receipt)` 断言第 7 段为 1、并断言 `mintsFor(pattern.id).length === 1`;`issue#619r: buildOutcome names the create dispositions…` 直接调 `buildOutcome`;`issue#619r: a refreshed pattern does not record a second birth` 两轮 `applyDecisions` 后查 `mintsFor`。变异自证三条,逐条回改均已实测变红:摘掉 `refreshedTraits` 的累加 → sleep 1 红;跳过 create/create_merged 分支 → sleep-action-set 1 红;去掉 `!refreshed` 守卫 → mint-source 1 红 + sleep 1 红。验完三份文件已还原,全量复跑仍 0 失败。
7375

7476

7577
- **会话头顶那个日记入口撤了;「写今天 / 存到这个项目」补进面板**。两处入口同时存在时,用户点哪一个都像「又开了一本」,而右栏那套是旧版遗留下来的:会话头一个按钮 → 右栏页签 → 里面才是写与导出。现在只留一个入口:记忆面板的「日记」标签页。

‎dsh-mneme/lib/dream.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,17 @@ export function buildOutcome(decisions) {
164164
byId[d.loser] = "superseded-archived";
165165
} else if (d.action === "differentiate") {
166166
for (const id of d.ids ?? []) byId[id] = "differentiated";
167+
} else if (d.action === "create") {
168+
// #619:create 铸出新行——记下「这一条是这一轮新生的」。它此前特意不派
169+
// disposition,好让 receipt_chain 不为它产行(新行的改动无处可记,只有
170+
// memory_mints 记出生)。这里补上的是审计面能读懂的那句话,不改 receipt_chain。
171+
if (d.id) byId[d.id] = "created";
172+
} else if (d.action === "create_merged") {
173+
// #619 / Ephor 第七轮 ②:create 撞上同题活跃行时走原地刷新,没有新条目。
174+
// 这条动作原本在 if 链里缺席,`outcome.byId` 就是空对象——一个只刷新不铸造
175+
// 的轮,审计行看不出任何目标被处置过(#126 review 在 supersede 上踩过同一个
176+
// 坑)。刷新有自己的名字,不冒充 created。
177+
if (d.id) byId[d.id] = "created-refreshed";
167178
}
168179
}
169180
return { byId };

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,9 +652,16 @@ function applyCreate(d, service, config = {}, logger = null) {
652652
const refreshed = created?.action !== "created";
653653
// #512:这条记忆出生自哪一轮。只记 create——merge/conflict/update/supersede 对
654654
// 既有行的改动已由 receipt_chain 按 (run_id, record_id) 记账,再造一份就是第二套账。
655+
//
656+
// #619 / Ephor 第七轮 ③:`refreshed` 也在这条规矩里。原地刷新没有铸新条目,
657+
// 它改的是既有行——同一条记忆不该有两份「出生记录」。此前 create_merged 这条
658+
// 新路没被上面那句规矩覆盖,于是一个 pattern 跑两轮,`memory_mints` 就有两行、
659+
// run_id 各不相同,面板上显示成「这条记忆出生过两次」(`mintsFor` 由
660+
// provenance-http.js 读取)。live 库当时还没显形,是因为同题刷新刚上线。
661+
//
655662
// 记账失败不许拖垮这次铸造:归因是审计,记忆已经落盘了。
656663
try {
657-
if (typeof service?.saveMemoryMint === "function" && config?.runId) {
664+
if (!refreshed && typeof service?.saveMemoryMint === "function" && config?.runId) {
658665
service.saveMemoryMint({
659666
memoryId: memory.id,
660667
runId: config.runId,

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,16 +1567,24 @@ export async function runSleep(ctx, service, config, logger, semantic = null, si
15671567
// "ran and did nothing", which is exactly what a probe must never see.
15681568
//
15691569
// The per-kind numbers stay apart in `phases` (`applied` / `edgeWrites` /
1570-
// `merged`); the receipt is a single write count on purpose, because
1571-
// buildReceipt/parseReceipt are an eight-field contract shared with
1572-
// organize.js and four test files. Detail lives in dream_runs.phases JSON,
1573-
// not in the receipt.
1570+
// `merged` / `refreshedTraits`); the receipt is a single write count on
1571+
// purpose, because buildReceipt/parseReceipt are an eight-field contract
1572+
// shared with organize.js and four test files. Detail lives in
1573+
// dream_runs.phases JSON, not in the receipt.
1574+
//
1575+
// #619 / Ephor 第七轮 ①:`refreshedTraits` 必须计入。它是「同一标题的 pattern
1576+
// 被原地重写」的条数——库确实变了,但没有铸新条目,所以它既不在 `applied` 里
1577+
// (那会把刷新谎报成铸造),也不在 `merged` 里(affective 相位的 `merged` 是
1578+
// **边**合并数 `merges.length`,同名不同义)。漏掉它的后果实测过:第二轮
1579+
// `phase.status=refreshed`、`refreshedTraits=1`,整轮 receipt 第 7 段仍是 0,
1580+
// 于是「相位说改了、整轮说没改」,正是上一轮刚修掉的「改了库读成 0」形态。
15741581
const totalApplied = Object.values(phases).reduce(
15751582
(n, p) =>
15761583
n +
15771584
(Number.isInteger(p?.applied) ? p.applied : 0) +
15781585
(Number.isInteger(p?.edgeWrites) ? p.edgeWrites : 0) +
1579-
(Number.isInteger(p?.merged) ? p.merged : 0),
1586+
(Number.isInteger(p?.merged) ? p.merged : 0) +
1587+
(Number.isInteger(p?.refreshedTraits) ? p.refreshedTraits : 0),
15801588
0
15811589
);
15821590
// Issue #126(与 #104 同向):把各 phase 的跳过明细汇总成一行审计数据,带 phase

‎dsh-mneme/lib/store.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,10 @@ CREATE INDEX IF NOT EXISTS idx_distill_runs_created ON distill_runs(created_at);
432432
-- · 本表 = 行级,「这条记忆出生自哪一轮」,覆盖没有窗口的铸造路径。
433433
-- 只填 **create** 一种动作:merge/conflict/update/supersede 对既有行的改动,receipt_chain
434434
-- 已经按 (run_id, record_id) 记过了——再造一份就是第二套账。create 是那边唯一的洞
435-
-- (buildOutcome 刻意不给 create 派 disposition,receipt_chain 也就不产行)。
435+
-- (buildRecordReceipts 不给 create/create_merged 产行:新行没有「改动前后的账」可记,
436+
-- 只有「出生自哪一轮」,那正是本表的事)。#619 起 buildOutcome 会给 create 派
437+
-- disposition(created / created-refreshed),那是审计面读的结果,与 receipt_chain
438+
-- 产不产行是两件事;created-refreshed 是原地刷新,没有出生,本表也不记。
436439
-- run_type / trigger_source 就地冗余:run_id 在 dream_runs 与 distill_runs 两张表里
437440
-- 各有自己的主键域,读侧不该为了显示一个类型去 union 两张审计表。
438441
-- ON DELETE CASCADE:记忆行没了,归因没有指代对象;remove() 仍显式清(与

‎dsh-mneme/src/dream.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,17 @@ export function buildOutcome(decisions) {
164164
byId[d.loser] = "superseded-archived";
165165
} else if (d.action === "differentiate") {
166166
for (const id of d.ids ?? []) byId[id] = "differentiated";
167+
} else if (d.action === "create") {
168+
// #619:create 铸出新行——记下「这一条是这一轮新生的」。它此前特意不派
169+
// disposition,好让 receipt_chain 不为它产行(新行的改动无处可记,只有
170+
// memory_mints 记出生)。这里补上的是审计面能读懂的那句话,不改 receipt_chain。
171+
if (d.id) byId[d.id] = "created";
172+
} else if (d.action === "create_merged") {
173+
// #619 / Ephor 第七轮 ②:create 撞上同题活跃行时走原地刷新,没有新条目。
174+
// 这条动作原本在 if 链里缺席,`outcome.byId` 就是空对象——一个只刷新不铸造
175+
// 的轮,审计行看不出任何目标被处置过(#126 review 在 supersede 上踩过同一个
176+
// 坑)。刷新有自己的名字,不冒充 created。
177+
if (d.id) byId[d.id] = "created-refreshed";
167178
}
168179
}
169180
return { byId };

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,9 +652,16 @@ function applyCreate(d, service, config = {}, logger = null) {
652652
const refreshed = created?.action !== "created";
653653
// #512:这条记忆出生自哪一轮。只记 create——merge/conflict/update/supersede 对
654654
// 既有行的改动已由 receipt_chain 按 (run_id, record_id) 记账,再造一份就是第二套账。
655+
//
656+
// #619 / Ephor 第七轮 ③:`refreshed` 也在这条规矩里。原地刷新没有铸新条目,
657+
// 它改的是既有行——同一条记忆不该有两份「出生记录」。此前 create_merged 这条
658+
// 新路没被上面那句规矩覆盖,于是一个 pattern 跑两轮,`memory_mints` 就有两行、
659+
// run_id 各不相同,面板上显示成「这条记忆出生过两次」(`mintsFor` 由
660+
// provenance-http.js 读取)。live 库当时还没显形,是因为同题刷新刚上线。
661+
//
655662
// 记账失败不许拖垮这次铸造:归因是审计,记忆已经落盘了。
656663
try {
657-
if (typeof service?.saveMemoryMint === "function" && config?.runId) {
664+
if (!refreshed && typeof service?.saveMemoryMint === "function" && config?.runId) {
658665
service.saveMemoryMint({
659666
memoryId: memory.id,
660667
runId: config.runId,

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

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,16 +1567,24 @@ export async function runSleep(ctx, service, config, logger, semantic = null, si
15671567
// "ran and did nothing", which is exactly what a probe must never see.
15681568
//
15691569
// The per-kind numbers stay apart in `phases` (`applied` / `edgeWrites` /
1570-
// `merged`); the receipt is a single write count on purpose, because
1571-
// buildReceipt/parseReceipt are an eight-field contract shared with
1572-
// organize.js and four test files. Detail lives in dream_runs.phases JSON,
1573-
// not in the receipt.
1570+
// `merged` / `refreshedTraits`); the receipt is a single write count on
1571+
// purpose, because buildReceipt/parseReceipt are an eight-field contract
1572+
// shared with organize.js and four test files. Detail lives in
1573+
// dream_runs.phases JSON, not in the receipt.
1574+
//
1575+
// #619 / Ephor 第七轮 ①:`refreshedTraits` 必须计入。它是「同一标题的 pattern
1576+
// 被原地重写」的条数——库确实变了,但没有铸新条目,所以它既不在 `applied` 里
1577+
// (那会把刷新谎报成铸造),也不在 `merged` 里(affective 相位的 `merged` 是
1578+
// **边**合并数 `merges.length`,同名不同义)。漏掉它的后果实测过:第二轮
1579+
// `phase.status=refreshed`、`refreshedTraits=1`,整轮 receipt 第 7 段仍是 0,
1580+
// 于是「相位说改了、整轮说没改」,正是上一轮刚修掉的「改了库读成 0」形态。
15741581
const totalApplied = Object.values(phases).reduce(
15751582
(n, p) =>
15761583
n +
15771584
(Number.isInteger(p?.applied) ? p.applied : 0) +
15781585
(Number.isInteger(p?.edgeWrites) ? p.edgeWrites : 0) +
1579-
(Number.isInteger(p?.merged) ? p.merged : 0),
1586+
(Number.isInteger(p?.merged) ? p.merged : 0) +
1587+
(Number.isInteger(p?.refreshedTraits) ? p.refreshedTraits : 0),
15801588
0
15811589
);
15821590
// Issue #126(与 #104 同向):把各 phase 的跳过明细汇总成一行审计数据,带 phase

‎dsh-mneme/src/store.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,10 @@ CREATE INDEX IF NOT EXISTS idx_distill_runs_created ON distill_runs(created_at);
432432
-- · 本表 = 行级,「这条记忆出生自哪一轮」,覆盖没有窗口的铸造路径。
433433
-- 只填 **create** 一种动作:merge/conflict/update/supersede 对既有行的改动,receipt_chain
434434
-- 已经按 (run_id, record_id) 记过了——再造一份就是第二套账。create 是那边唯一的洞
435-
-- (buildOutcome 刻意不给 create 派 disposition,receipt_chain 也就不产行)。
435+
-- (buildRecordReceipts 不给 create/create_merged 产行:新行没有「改动前后的账」可记,
436+
-- 只有「出生自哪一轮」,那正是本表的事)。#619 起 buildOutcome 会给 create 派
437+
-- disposition(created / created-refreshed),那是审计面读的结果,与 receipt_chain
438+
-- 产不产行是两件事;created-refreshed 是原地刷新,没有出生,本表也不记。
436439
-- run_type / trigger_source 就地冗余:run_id 在 dream_runs 与 distill_runs 两张表里
437440
-- 各有自己的主键域,读侧不该为了显示一个类型去 union 两张审计表。
438441
-- ON DELETE CASCADE:记忆行没了,归因没有指代对象;remove() 仍显式清(与

‎dsh-mneme/test/mint-source.test.js‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,32 @@ test("issue#512: only creation is recorded — edits to existing rows stay in re
260260
store.close();
261261
});
262262

263+
// #619 / Ephor 第七轮 ③:原地刷新不是出生。同一个 pattern 跑两轮,第一轮真铸了、
264+
// 第二轮只是把同一行重写;memory_mints 的语义是「这条记忆出生自哪一轮」,第二行
265+
// 就是「同一条记忆出生过两次」——面板上会显示两条出生记录(mintsFor 由
266+
// provenance-http.js 读)。live 库当时还没显形,因为同题刷新刚上线。
267+
test("issue#619r: a refreshed pattern does not record a second birth", () => {
268+
const { store, service } = setup();
269+
const decision = [{ action: "create", type: "pattern", title: "同题规律", content: "第一轮", importance: 3 }];
270+
const first = applyDecisions(decision, service, null, null, { mintSource: "sleep", runId: "run-a" });
271+
assert.equal(first.applied, 1, "第一轮真铸了");
272+
const row = service.all().find((m) => m.type === "pattern");
273+
assert.equal(store.mintsFor(row.id).length, 1);
274+
275+
const second = applyDecisions(
276+
[{ action: "create", type: "pattern", title: "同题规律", content: "第二轮", importance: 3 }],
277+
service,
278+
null,
279+
null,
280+
{ mintSource: "sleep", runId: "run-b" }
281+
);
282+
assert.equal(second.applied, 0, "第二轮没有新铸");
283+
assert.equal(second.merged, 1, "它刷新了一条");
284+
assert.equal(second.committed[0].action, "create_merged");
285+
assert.equal(store.mintsFor(row.id).length, 1, "刷新不算再一次出生");
286+
store.close();
287+
});
288+
263289
// 端到端:sleep 真的跑一轮,铸造出来的行要指回那一轮的 runId(不是随便一个 id)。
264290
test("issue#512: sleep mints point back at the run that produced them", async () => {
265291
const { store, service } = setup();

0 commit comments

Comments
 (0)