Skip to content

Commit 761f6bc

Browse files
committed
fix(index): 启动期审计保留清理改读装配后的 cfg(#254 复审)
CodeRabbit 在 #305 上指出的口径错位:启动期 llm_audit_logs 清理读的是 rawCfg, 而写入侧(dream / summarize / 写入准入)读的都是装配后的 cfg(raw + 轻量预设 + 面板 kv 旗标)。面板把 llmAudit.enabled 打开、bundle 里是关的时,清理会跳过, 写入照写,审计表就无保留期地增长。 - 把启动期清理挪到 cfg 装配之后(nestedFlags 合并完),改读 cfg.llmAudit。 - 保留期默认 90 天与「失败只 warn」不变。 - 新增回归:面板说开 + bundle 说关 + 保留期 1 天,过期行必须被清掉。 该用例在旧代码下红(已用 stash 验证),修后绿。
1 parent 91574d1 commit 761f6bc

5 files changed

Lines changed: 72 additions & 24 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-3E63DD?style=flat-square" alt="license"></a>
1111
<a href="https://github.com/slow-stack/mneme/actions"><img src="https://img.shields.io/github/actions/workflow/status/slow-stack/mneme/ci.yml?style=flat-square&label=CI" alt="CI"></a>
1212
<a href="https://nodejs.org"><img src="https://img.shields.io/badge/node-22%2B-3E63DD?style=flat-square&logo=nodedotjs&logoColor=white" alt="node"></a>
13-
<a href="https://github.com/slow-stack/mneme"><img src="https://img.shields.io/badge/tests-1329%20passed-3E63DD?style=flat-square" alt="tests"></a>
13+
<a href="https://github.com/slow-stack/mneme"><img src="https://img.shields.io/badge/tests-1330%20passed-3E63DD?style=flat-square" alt="tests"></a>
1414
<a href="https://codecov.io/gh/slow-stack/mneme"><img src="https://img.shields.io/codecov/c/github/slow-stack/mneme/main?style=flat-square" alt="coverage"></a>
1515
<a href="https://github.com/awesome-dsh-plugin/awesome-dsh-plugin"><img src="https://awesome-dsh-plugin.com/badge.svg" alt="Awesome"></a>
1616
</p>
@@ -182,7 +182,7 @@ dsh web
182182

183183
```bash
184184
cd dsh-mneme && npm install
185-
npm test # 1329 个测试
185+
npm test # 1330 个测试
186186
npm run stress # 三轴线压测
187187
npm run sync # src → lib 同步
188188
```
@@ -364,7 +364,7 @@ The plugin ships a zero-dependency stdio MCP server (standalone npm package **`m
364364

365365
```bash
366366
cd dsh-mneme && npm install
367-
npm test # 1329 tests
367+
npm test # 1330 tests
368368
npm run stress # three-axis stress test
369369
npm run sync # src → lib sync
370370
```

‎dsh-mneme/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[![npm version](https://img.shields.io/npm/v/@modusensus/dsh-mneme?color=blue&label=npm)](https://www.npmjs.com/package/@modusensus/dsh-mneme)
66
[![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
77
[![Awesome](https://awesome-dsh-plugin.com/badge.svg)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)
8-
[![tests](https://img.shields.io/badge/tests-1329%20passed-success)](https://github.com/slow-stack/mneme)
8+
[![tests](https://img.shields.io/badge/tests-1330%20passed-success)](https://github.com/slow-stack/mneme)
99
[![CI](https://img.shields.io/github/actions/workflow/status/slow-stack/mneme/ci.yml)](https://github.com/slow-stack/mneme/actions)
1010
[![node](https://img.shields.io/badge/node-22%2B-blue)](https://nodejs.org)
1111
[![npm downloads](https://img.shields.io/npm/d18m/@modusensus/dsh-mneme.svg?color=blue&label=downloads)](https://www.npmjs.com/package/@modusensus/dsh-mneme)
@@ -581,7 +581,7 @@ src/
581581
├── api.js # HTTP 路由(Web 面板数据通道,含 /conflicts 冲突队列)
582582
└── index.js # 插件接线
583583
lib/ # src 的同步分发产物(npm run sync;发布前由 root prepack 的 check-sync.js 校验一致性;唯一手写例外 lib/client.js——Web 面板 bundle,sync 不覆盖)
584-
test/ # 1329 个 node:test 测试(审计与三轴线压测不变量;src↔lib 一致性由 scripts/check-sync.js 发布闸门校验)
584+
test/ # 1330 个 node:test 测试(审计与三轴线压测不变量;src↔lib 一致性由 scripts/check-sync.js 发布闸门校验)
585585
scripts/ # e2e-dsh.js 端到端演示 · stress-dsh.js 三轴线压测 · sync-lib.js 同步 · check-sync.js 发布闸门 · benchmark-recall.js / benchmark-embed.js / benchmark-rerank.js 基准 · sync-test-badge.mjs 测试徽章 · build-runtime-manifest.mjs 运行时清单
586586
```
587587
@@ -590,7 +590,7 @@ scripts/ # e2e-dsh.js 端到端演示 · stress-dsh.js 三轴线压
590590
```bash
591591
cd dsh-mneme
592592
npm install # 安装 peer 依赖(以 devDependencies 形式,用于本地测试)
593-
npm test # 运行 1329 个测试
593+
npm test # 运行 1330 个测试
594594
npm run stress # 三轴线压测:长会话检索 / 冲突仲裁 / 多 Agent 并发(离线 mock LLM)
595595
npm run sync # 把 src/ 同步到 lib/(发布时由 prepack 钩子自动执行)
596596
```

‎dsh-mneme/lib/index.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,6 @@ export const apply = (ctx, config) => {
197197
try {
198198
store.deleteOldFailures(new Date(Date.now() - 90 * 86400000).toISOString());
199199
} catch { /* non-fatal */ }
200-
// Bug8: enforce llm_audit_logs retention on boot (config.llmAudit.retentionDays,
201-
// default 90). Best-effort like the failure prune — the audit trail is
202-
// bookkeeping and a failed purge must never block plugin boot.
203-
try {
204-
if (rawCfg.llmAudit?.enabled !== false) {
205-
const retentionMs = Number.isInteger(rawCfg.llmAudit?.retentionDays) ? rawCfg.llmAudit.retentionDays : 90;
206-
store.deleteOldLlmAudits(new Date(Date.now() - retentionMs * 86400000).toISOString());
207-
}
208-
} catch { /* non-fatal */ }
209200

210201
// User-configurable settings (profile, rules, panel mode, standalone API
211202
// token) share the same SQLite file in dedicated tables, isolated from
@@ -244,6 +235,18 @@ export const apply = (ctx, config) => {
244235
cfg[objKey] = { ...(cfg[objKey] ?? {}), ...sub };
245236
}
246237

238+
// Bug8 的启动期清理放在装配之后:面板把 llmAudit.* 写进 kv、经 nestedFlags 合进
239+
// cfg,而写入侧(dream / summarize / 写入准入)读的都是装配后的 cfg——清理若读
240+
// rawCfg,面板改了保留期它不认,更糟的是「开不开审计」与写入侧可能取到不同的值
241+
// (raw 说关 → 不清理,cfg 说开 → 照写,审计表就无保留期地长)。保留期默认 90 天、
242+
// 失败只 warn,与失败表清理同款:账本清理绝不许挡住插件启动。
243+
try {
244+
if (cfg.llmAudit?.enabled !== false) {
245+
const retentionMs = Number.isInteger(cfg.llmAudit?.retentionDays) ? cfg.llmAudit.retentionDays : 90;
246+
store.deleteOldLlmAudits(new Date(Date.now() - retentionMs * 86400000).toISOString());
247+
}
248+
} catch { /* non-fatal */ }
249+
247250
// 记忆语言(memory.language):本实例逐层传入 inject / summarize / dream /
248251
// sleep / mirror,多实例(如 agent preset 内挂载)互不影响。
249252
const mirror = createMirror(memoryDir, langOf(cfg));

‎dsh-mneme/src/index.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,6 @@ export const apply = (ctx, config) => {
197197
try {
198198
store.deleteOldFailures(new Date(Date.now() - 90 * 86400000).toISOString());
199199
} catch { /* non-fatal */ }
200-
// Bug8: enforce llm_audit_logs retention on boot (config.llmAudit.retentionDays,
201-
// default 90). Best-effort like the failure prune — the audit trail is
202-
// bookkeeping and a failed purge must never block plugin boot.
203-
try {
204-
if (rawCfg.llmAudit?.enabled !== false) {
205-
const retentionMs = Number.isInteger(rawCfg.llmAudit?.retentionDays) ? rawCfg.llmAudit.retentionDays : 90;
206-
store.deleteOldLlmAudits(new Date(Date.now() - retentionMs * 86400000).toISOString());
207-
}
208-
} catch { /* non-fatal */ }
209200

210201
// User-configurable settings (profile, rules, panel mode, standalone API
211202
// token) share the same SQLite file in dedicated tables, isolated from
@@ -244,6 +235,18 @@ export const apply = (ctx, config) => {
244235
cfg[objKey] = { ...(cfg[objKey] ?? {}), ...sub };
245236
}
246237

238+
// Bug8 的启动期清理放在装配之后:面板把 llmAudit.* 写进 kv、经 nestedFlags 合进
239+
// cfg,而写入侧(dream / summarize / 写入准入)读的都是装配后的 cfg——清理若读
240+
// rawCfg,面板改了保留期它不认,更糟的是「开不开审计」与写入侧可能取到不同的值
241+
// (raw 说关 → 不清理,cfg 说开 → 照写,审计表就无保留期地长)。保留期默认 90 天、
242+
// 失败只 warn,与失败表清理同款:账本清理绝不许挡住插件启动。
243+
try {
244+
if (cfg.llmAudit?.enabled !== false) {
245+
const retentionMs = Number.isInteger(cfg.llmAudit?.retentionDays) ? cfg.llmAudit.retentionDays : 90;
246+
store.deleteOldLlmAudits(new Date(Date.now() - retentionMs * 86400000).toISOString());
247+
}
248+
} catch { /* non-fatal */ }
249+
247250
// 记忆语言(memory.language):本实例逐层传入 inject / summarize / dream /
248251
// sleep / mirror,多实例(如 agent preset 内挂载)互不影响。
249252
const mirror = createMirror(memoryDir, langOf(cfg));

‎dsh-mneme/test/llm-audit.test.js‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import test from "node:test";
22
import assert from "node:assert/strict";
33
import { EventEmitter } from "node:events";
4+
import { DatabaseSync } from "node:sqlite";
5+
import { mkdtempSync } from "node:fs";
6+
import { tmpdir } from "node:os";
7+
import { join } from "node:path";
8+
import { Context } from "@deepseek-ai/cordis";
49
import { createStore } from "../src/store.js";
10+
import * as mneme from "../src/index.js";
511
import { createService } from "../src/service.js";
612
import { createDreamScheduler } from "../src/dream.js";
713
import { createSummarizer } from "../src/summarize.js";
@@ -554,3 +560,39 @@ test("entity extraction writes no audit row when llmAudit.enabled === false", as
554560
assert.equal(service.listLlmAudits().length, 0, "no audit rows when disabled");
555561
store.close();
556562
});
563+
564+
// 启动期保留清理(Bug8)必须与写入侧读**同一份**配置。面板把 llmAudit.enabled 写进
565+
// kv、经 nestedFlags 合进 cfg,bundle 里可能是关的:清理若读 rawCfg,就会出现「面板
566+
// 说开 → 各写入点照写,raw 说关 → 不清理」这种无保留期的增长(写入准入 #254 也是读
567+
// cfg 的写入点之一)。所以这条锁的是「清理跟着装配后的 cfg 走」。
568+
test("boot retention purge reads the assembled config, not rawCfg", async () => {
569+
const dir = mkdtempSync(join(tmpdir(), "mneme-audit-retention-"));
570+
const dbPath = join(dir, "memory.db");
571+
572+
const seed = createStore(dbPath);
573+
createSettings(seed.db).setFeatureFlags({ "llmAudit.enabled": true });
574+
seed.saveLlmAudit({
575+
timestamp: new Date(Date.now() - 2 * 86400000).toISOString(),
576+
trigger_source: "autoDream",
577+
operation_type: "dream_consolidate",
578+
model_id: "m",
579+
status: "success"
580+
});
581+
assert.equal(seed.listLlmAudits().length, 1, "先放一行过期审计");
582+
seed.close();
583+
584+
const ctx = new Context();
585+
ctx.provide("tools", { register() { return () => {}; } });
586+
ctx.provide("commands", { register() { return () => {}; } });
587+
ctx.provide("systemPrompt", { context() { return () => {}; } });
588+
ctx.provide("agentDefaultModel", { currentSelection() { return { provider: "mock", model: "mock" }; } });
589+
ctx.provide("llm", { async *stream() { yield { type: "finish", reason: { kind: "stop" } }; } });
590+
ctx.provide("webServer", { register() { return () => {}; } });
591+
// bundle 说关、面板说开,保留期 1 天而那行已过期 2 天:只有读装配后的 cfg 才会清掉它
592+
await ctx.plugin(mneme, { memoryDir: dir, llmAudit: { enabled: false, retentionDays: 1 } });
593+
594+
const after = new DatabaseSync(dbPath);
595+
const left = after.prepare("SELECT count(*) AS c FROM llm_audit_logs").get().c;
596+
after.close();
597+
assert.equal(left, 0, "面板开着的审计必须按 cfg 清理,否则审计行只增不减");
598+
});

0 commit comments

Comments
 (0)