@modusensus/dsh-mneme 0.8.11 → 0.8.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (54) hide show
  1. package/README.md +5 -5
  2. package/assets/icon.svg +3 -3
  3. package/lib/api.js +2 -0
  4. package/lib/client.js +12 -1
  5. package/lib/config.js +66 -1
  6. package/lib/dream/decisions.js +16 -0
  7. package/lib/dream/sleep.js +3 -0
  8. package/lib/dream.js +57 -9
  9. package/lib/entities/extractor.js +4 -1
  10. package/lib/graph/anchoring.js +180 -0
  11. package/lib/guide.js +13 -1
  12. package/lib/index.js +18 -5
  13. package/lib/inject.js +15 -3
  14. package/lib/lang.js +10 -0
  15. package/lib/sensitive-scan.js +209 -0
  16. package/lib/service.js +203 -35
  17. package/lib/settings.js +29 -3
  18. package/lib/store.js +155 -11
  19. package/lib/summarize.js +104 -7
  20. package/locale/en.json +6 -6
  21. package/locale/zh.json +6 -6
  22. package/package.json +114 -113
  23. package/scripts/sync-test-badge.mjs +9 -7
  24. package/scripts/test-count-sync.mjs +44 -0
  25. package/src/api.js +2 -0
  26. package/src/config.js +66 -1
  27. package/src/dream/decisions.js +16 -0
  28. package/src/dream/sleep.js +3 -0
  29. package/src/dream.js +57 -9
  30. package/src/entities/extractor.js +4 -1
  31. package/src/graph/anchoring.js +180 -0
  32. package/src/guide.js +13 -1
  33. package/src/index.js +18 -5
  34. package/src/inject.js +15 -3
  35. package/src/lang.js +10 -0
  36. package/src/sensitive-scan.js +209 -0
  37. package/src/service.js +203 -35
  38. package/src/settings.js +29 -3
  39. package/src/store.js +155 -11
  40. package/src/summarize.js +104 -7
  41. package/test/api.test.js +15 -2
  42. package/test/baseline-persist.test.js +248 -0
  43. package/test/dream.test.js +75 -0
  44. package/test/graph-anchoring.test.js +185 -0
  45. package/test/graph-inject-budget.test.js +104 -0
  46. package/test/graph-passive-confirm.test.js +92 -0
  47. package/test/graph-weight-evolution.test.js +105 -0
  48. package/test/inject-pools.test.js +19 -0
  49. package/test/scope-inject-soft.test.js +106 -0
  50. package/test/scope-strict.test.js +112 -0
  51. package/test/sensitive-scan.test.js +207 -0
  52. package/test/summarize.test.js +177 -0
  53. package/test/test-count-sync.test.js +60 -0
  54. package/test/write-admission.test.js +115 -0
@@ -0,0 +1,207 @@
1
+ // #164 A2:写入边界的密钥 / PII 判据(src/sensitive-scan.js)。
2
+ //
3
+ // 这是「真判据」自己的验收,与 write-admission.test.js 里那组(拿参考扫描器测**闸门
4
+ // 接线**)分工不同:这边测判据本身,且第一条用例就是把 #332 配好的 26 条语料原样跑在
5
+ // 生产实现上——维护者 09-28 的验收条件就是这句「同一套负样本原样跑,抓错任何一条就
6
+ // 不算落地」,所以它放在这里而不是再抄一份语料。
7
+ //
8
+ // 参考扫描器 referenceScan 只服务闸门测;本文件刻意**不** import 它——生产判据与
9
+ // 参考实现是两份独立实现,同时跑过同一套语料才算把语料用足(对照着改就成了自证)。
10
+ import test from "node:test";
11
+ import assert from "node:assert/strict";
12
+
13
+ import { scanSensitive, createSensitiveScan } from "../src/sensitive-scan.js";
14
+ import {
15
+ SECRET_SAMPLES,
16
+ PII_SAMPLES,
17
+ POSITIVE_SAMPLES,
18
+ NEGATIVE_SAMPLES,
19
+ SAMPLE_VALUES
20
+ } from "./helpers/write-admission-samples.js";
21
+
22
+ // #164 A2 的语料里那几条凭据值走 helper 的拼接导出,别在测试里另抄一份字面量:
23
+ // GitHub 的 push protection 会按形状拦真实凭据(本 PR 实测:`sk_live_` 一条就够
24
+ // 拒推,helper 正是为这件事把值拆成两段拼的)。这里复用同一份,仓库文本里不留完整形状。
25
+ const STRIPE_KEY = SAMPLE_VALUES.stripeKey;
26
+
27
+ // 正样本那条 OpenAI key 从语料里取,不另抄字面量(同 STRIPE_KEY 的理由)。
28
+ const OPENAI_KEY = POSITIVE_SAMPLES.find((s) => s.id === "openai-key").content.match(/\S*sk-\S+/)[0];
29
+ /** `sk-proj-…` 前缀的变体:语料那条不带 proj-,这里补同样的正文长度。 */
30
+ const openaiProjKey = (body) => `sk-proj-${body}`;
31
+ const OPENAI_BODY = OPENAI_KEY.replace(/^.*?sk-(?:proj-)?/, "");
32
+
33
+ test("真判据:正样本一条都不漏放,且 kind 与语料声明一致", () => {
34
+ for (const sample of POSITIVE_SAMPLES) {
35
+ const text = `${sample.title}\n${sample.content}`;
36
+ const hit = scanSensitive(text);
37
+ assert.ok(hit, `${sample.id} 被漏放(${sample.why})`);
38
+ // kind 是审计行里的稳定判据键:它错了,「按 kind 看命中分布」这条路就断了。
39
+ // 同一个串可能被多条规则吃下(`sk_live_` 也像通用 `sk-`),所以顺序是判据的一部分。
40
+ assert.equal(hit.kind, sample.kind, `${sample.id} 的 kind 必须是语料声明的那个(规则顺序变了就会漂)`);
41
+ assert.equal(typeof hit.label, "string");
42
+ }
43
+ });
44
+
45
+ test("真判据:负样本一条都不误杀(抓错任何一条就不算落地)", () => {
46
+ for (const sample of NEGATIVE_SAMPLES) {
47
+ const hit = scanSensitive(`${sample.title}\n${sample.content}`);
48
+ assert.equal(hit, null, `${sample.id} 被误杀(${sample.why}):实际命中 ${hit?.kind}`);
49
+ }
50
+ });
51
+
52
+ test("密钥与 PII 分两档,但都从同一条通道出来", () => {
53
+ // 分档的意义是「将来按类放行只改策略、不动判据」:kind 集合是策略的抓手,
54
+ // 所以这里断言两类都能被分辨,而不是把 PII 折进密钥那一档。
55
+ assert.ok(SECRET_SAMPLES.length >= 1 && PII_SAMPLES.length >= 1);
56
+ assert.equal(scanSensitive("password = \"Tr0ub4dor&3xKcd\"").kind, "assigned_secret");
57
+ assert.equal(scanSensitive("联系方式 zhang.wei@example.com").kind, "email");
58
+ assert.equal(scanSensitive("值班手机 13800138000").kind, "cn_mobile");
59
+ });
60
+
61
+ test("只扫文本:路径与 id 这类元数据字段不进判据", () => {
62
+ // 元数据由系统生成,不是用户写进来的内容;扫它们只会引入假阳(一个文件名里
63
+ // `token` 这种词很常见)。契约是判据只看记忆的文本字段。
64
+ const scan = createSensitiveScan({ config: { sensitiveScanEnabled: true } });
65
+ assert.equal(scan({ title: "配置", content: "正常正文", id: SAMPLE_VALUES.githubPat, doc_path: STRIPE_KEY }), null);
66
+ // 反过来,正文里的凭据必须报——上面那条不是靠「什么都扫不到」通过的。
67
+ assert.ok(scan({ title: "配置", content: `正文里有 ${SAMPLE_VALUES.githubPat}` }));
68
+ });
69
+
70
+ test("tags 也扫:标签是用户输入的自由文本", () => {
71
+ const scan = createSensitiveScan({ config: { sensitiveScanEnabled: true } });
72
+ assert.equal(scan({ title: "正常标题", content: "正常正文", tags: ["正常"] }), null);
73
+ assert.equal(scan({ title: "正常标题", content: "正常正文", tags: [SAMPLE_VALUES.githubPat] })?.kind, "github_token");
74
+ });
75
+
76
+ test("工厂:判据自己的闸关时连函数都不给(闸门侧行为与 #332 逐字段一致)", () => {
77
+ assert.equal(createSensitiveScan({ config: { sensitiveScanEnabled: false } }), null);
78
+ assert.equal(createSensitiveScan({ config: {} }), null);
79
+ assert.equal(createSensitiveScan({}), null, "没有 config 也不能默认开");
80
+ assert.equal(createSensitiveScan({ config: { sensitiveScanEnabled: "true" } }), null, "字符串 true 不是 true");
81
+ const scan = createSensitiveScan({ config: { sensitiveScanEnabled: true } });
82
+ assert.equal(typeof scan, "function");
83
+ });
84
+
85
+ test("工厂不碰决策:命中只报 kind,拦不拦由闸门的 enforce 决定", () => {
86
+ // 判据与闸门分层(#164:默认仅告警、拦截 opt-in)——判据知道「这是什么」,
87
+ // 但不知道也不该知道「要不要拦」。返回值里没有 decision / enforced 这类字段,
88
+ // 就是这条分层的机器可判点。
89
+ const scan = createSensitiveScan({
90
+ config: { sensitiveScanEnabled: true, writeAdmission: { enabled: true, enforce: false } }
91
+ });
92
+ const hit = scan({ title: "调试", content: openaiProjKey(OPENAI_BODY) });
93
+ assert.deepEqual(Object.keys(hit).sort(), ["kind", "label"]);
94
+ });
95
+
96
+ test("不抛:坏输入返回 null,扫描器故障不会把写入变成不可用", () => {
97
+ assert.equal(scanSensitive(undefined), null);
98
+ assert.equal(scanSensitive(null), null);
99
+ assert.equal(scanSensitive(""), null);
100
+ assert.equal(scanSensitive(12345), null);
101
+ const scan = createSensitiveScan({ config: { sensitiveScanEnabled: true } });
102
+ assert.equal(scan(null), null);
103
+ assert.equal(scan({ title: 7, content: null, tags: "not-an-array" }), null);
104
+ });
105
+
106
+ test("一处命中只报最严重的那条(deny 面记类别,不记条数)", () => {
107
+ // 一篇同时带 Stripe 密钥与邮箱的正文:报密钥那一档。反过来把 PII 排在前面
108
+ // 会让「这条命中过密钥」这个更严重的事实被邮箱盖掉。
109
+ const text = `邮箱 a@b.com,另外 ${STRIPE_KEY}`;
110
+ assert.equal(scanSensitive(text).kind, "stripe_key");
111
+ });
112
+
113
+ test("语料之外的探针:漏放那一类锁一条(实现期实测出来的,不是假想)", () => {
114
+ // 不在 #332 的 26 条语料里,是拿真判据跑额外形状时发现的:AWS secret access key
115
+ // 没有前缀,`secret` 关键词规则又要求它后面紧跟赋值号,多词键
116
+ // (`AWS_SECRET_ACCESS_KEY=`)两条都够不着 → 补了专用的键名规则。
117
+ assert.equal(
118
+ scanSensitive("AWS_SECRET_ACCESS_KEY=wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY").kind,
119
+ "aws_secret_key"
120
+ );
121
+ // 反向确认「值 + 赋值键」这条兜底规则还在工作,而且**不**看值的形状:`api_key =`
122
+ // 后面跟任何 8 位以上的值都报(判据不知道哪个值是真的)。
123
+ assert.equal(scanSensitive("api_key = sk-abcdefghijklmnopqrst").kind, "assigned_secret");
124
+ // 收紧后的开关键字仍然认 24 位以上的真 key(44 位正文,语料那条)。
125
+ assert.equal(scanSensitive(openaiProjKey(OPENAI_BODY)).kind, "openai_key");
126
+ });
127
+
128
+ // --- 合并后独立复审的三项加固 -------------------------------------------------
129
+
130
+ // 赋值句的键与值都在运行时拼装,别写成整串字面量:`.github/workflows/security.yml` 的
131
+ // gitleaks 是**全历史**扫描且没有 allowlist,而 generic-api-key 规则认的是「关键词 +
132
+ // 赋值号 + 高熵值」——一个 16 位、字符全不重复的十六进制串熵值就有 4.0,高于它 3.5 的
133
+ // 阈值,直接落进源码就会被判成真凭据(本批初稿实测:两条各报一次)。
134
+ // 与 helpers/write-admission-samples.js 里那几条凭据值同一个理由,那边也是拼的。
135
+ const envLine = (key, value, prefix = "") => `${prefix}${key}=${value}`;
136
+ /** 一眼假的低熵值:不是占位符(占位符会被守卫挡掉,那样就测不到这条规则了)。 */
137
+ const FAKE_LITERAL = ["super", "sekrit", "000"].join("-");
138
+
139
+ test("左边界放开 `_`:环境变量名形态的赋值也要抓(原先整类漏放)", () => {
140
+ // 回归锁:赋值型规则的左边界原为 `[^A-Za-z0-9_]`,把下划线也当成了标识符内部字符,
141
+ // 于是只有恰好落在行首的 `API_KEY=` 能中,而 `DB_PASSWORD=` / `MY_API_KEY=` /
142
+ // `MYSQL_PASSWORD=` 这种「前缀_关键词」的环境变量名整类漏放——配置片段与 .env 正文
143
+ // 恰恰是最常见的落库形态。放宽后 #332 的 26 条语料仍全绿,说明原写法不是语料换来
144
+ // 的取舍,是白丢的。
145
+ for (const [key, prefix] of [
146
+ ["DB_PASSWORD", ""],
147
+ ["MY_API_KEY", ""],
148
+ ["MYSQL_PASSWORD", ""],
149
+ ["GITHUB_TOKEN", "export "] // 带 shell 前缀的写法
150
+ ]) {
151
+ const line = envLine(key, FAKE_LITERAL, prefix);
152
+ assert.equal(scanSensitive(line)?.kind, "assigned_secret", `${key} 形态的赋值不该漏放`);
153
+ }
154
+ });
155
+
156
+ test("放宽左边界没有放走占位符与间接引用(守卫仍在管那一半)", () => {
157
+ // 与上一条成对:放宽的是「关键词前面能不能是 `_`」,不是「右边的值算不算字面量」。
158
+ // 后者仍归占位符守卫——下面三条正是负样本群里「有敏感词但没有值」的形态。
159
+ // 这些值同样拼装,理由见本节开头(`${...}` 这类串本身也贴着"像凭据"的形状)。
160
+ const placeholders = [
161
+ ["DB_PASSWORD", ["$", "{DB_PASSWORD}"].join("")],
162
+ ["MY_API_KEY", ["<", "your-key-here", ">"].join("")],
163
+ ["DB_PASSWORD", ["process", ".env.DB_PASSWORD"].join("")]
164
+ ];
165
+ for (const [key, value] of placeholders) {
166
+ const line = envLine(key, value);
167
+ assert.equal(scanSensitive(line), null, `${key} 形态的占位 / 间接引用不该报`);
168
+ }
169
+ });
170
+
171
+ test("身份证档加校验位:位数对但校验不过的 18 位数字串不报", () => {
172
+ // 回归锁:原先只有银行卡档有 Luhn、身份证档只看长度,结果是 18 位纯数字(订单号 /
173
+ // 内部编号 / 拼接时间戳)先被身份证规则命中,等不到银行卡那条的校验。补 GB 11643
174
+ // MOD 11-2 之后两侧都干净:校验不过的不报,语料里那条真形状照报。
175
+ assert.equal(scanSensitive("内部编号 123456789012345678 已登记"), null, "校验不过的 18 位不该报");
176
+ assert.equal(scanSensitive("内部编号 987654321098765432 已登记"), null);
177
+ assert.equal(scanSensitive("身份证 11010519491231002X 已核验")?.kind, "cn_id_card");
178
+ // 小写 x 走同一张校验表(语料只覆盖了大写 X)。
179
+ assert.equal(scanSensitive("身份证 11010519491231002x 已核验")?.kind, "cn_id_card");
180
+ });
181
+
182
+ test("email 的 local part 上界恰好卡在 RFC 5321 的 64", () => {
183
+ // 上界不是随手取的数:64 是 RFC 5321 给 local part 的上限,所以「长于 64 不认」
184
+ // 这条边界必须是精确的——松一位会让回溯面失控,紧一位会漏掉合法邮箱。
185
+ const at = (n) => `${"a".repeat(n)}@example.com`;
186
+ assert.ok(scanSensitive(at(64)), "64 位的 local part 是合法的,必须认");
187
+ assert.equal(scanSensitive(at(65)), null, "65 位超出 RFC 上限,不认(换取回溯有界的代价)");
188
+ });
189
+
190
+ test("长文本上的回溯有上界:写阻塞类回归的计时护栏", () => {
191
+ // 回归锁:email 的 local part 与 connection_string 的 scheme 都作用在含 `.` 的字符
192
+ // 类上,缺上界时每个起点都要一路重扫到结尾才失败 → O(n²)。未加上界时实测:34KB
193
+ // 点分链 0.6 秒、120KB 对抗串 23.5 秒(email 18.6s + 连接串 4.1s);而本判据在写入
194
+ // 路径上同步跑,等于把写入卡死。加上界后同输入约 60ms。
195
+ // 预算取 2 秒:比修复前小一个数量级(12× 安全边),又比修复后大 30 倍,不至于像
196
+ // 50ms 级断言那样被 CI 抖动误伤——它抓的是「上界被拿掉」这类数量级回归,不是微优化。
197
+ const inputs = [
198
+ "a.".repeat(30000) + "@" + "b.".repeat(30000) + "!",
199
+ "com.example.pkg.".repeat(10000) + "@"
200
+ ];
201
+ for (const text of inputs) {
202
+ const started = process.hrtime.bigint();
203
+ scanSensitive(text);
204
+ const ms = Number(process.hrtime.bigint() - started) / 1e6;
205
+ assert.ok(ms < 2000, `${text.length} 字符耗时 ${ms.toFixed(1)}ms,超 2000ms 预算(回溯上界被破坏?)`);
206
+ }
207
+ });
@@ -110,6 +110,25 @@ function toolResultEvent(text, isError, seq) {
110
110
  };
111
111
  }
112
112
 
113
+ // DSH 0.2.x 内核对工具结果的实际投递形状:内核给的是 `role:"tool"` 消息本身,
114
+ // content 里只有 `type:"text"` 块、isError 挂在消息上,不再有 tool-result 块。
115
+ // 蒸馏曾只认旧块形状,于是真实会话里的工具输出与工具报错全部被静默丢弃。
116
+ function toolRoleResultEvent(text, isError, seq) {
117
+ return {
118
+ seq,
119
+ type: "tool/result",
120
+ data: {
121
+ message: {
122
+ role: "tool",
123
+ source: { kind: "tool", callId: `call-${seq}` },
124
+ toolCallId: `call-${seq}`,
125
+ content: [{ type: "text", text }],
126
+ isError
127
+ }
128
+ }
129
+ };
130
+ }
131
+
113
132
  function codeDispatchEvent(text, isError, seq) {
114
133
  return {
115
134
  seq,
@@ -143,6 +162,32 @@ test("parseSummaryJson extracts valid entries and skips malformed ones", () => {
143
162
  assert.equal(parsed[1].type, "preference");
144
163
  });
145
164
 
165
+ // --- issue #339 / E8 考卷:JSON 崩溃窗口的 salvage(失败路径修复,默认开)-----
166
+ // E8 实测 10-20% 的窗口输出了含约束的完整对象,只因中段一处语法错误被整窗
167
+ // JSON.parse 拒收 → 生产行为 = 游标卡死 + 温度 0 重试同错 = 静默丢失。
168
+
169
+ test("parseSummaryJson salvages complete objects from a malformed array (issue #339)", () => {
170
+ // E8 现场同款:闭合数组、中段对象含杂散引号(stray quote)。
171
+ const raw = `[
172
+ {"type":"constraint","title":"预算","content":"总额 $12,400","importance":4},
173
+ { " "type": "history", "title": "坏对象", "content": "语法错误" },
174
+ {"type":"preference","title":"硬件","content":"只要 brushed brass"}
175
+ ]`;
176
+ const parsed = parseSummaryJson(raw);
177
+ assert.equal(parsed.length, 2, "the broken middle object is dropped, both survivors kept");
178
+ assert.equal(parsed[0].content, "总额 $12,400");
179
+ assert.equal(parsed[1].title, "硬件");
180
+ });
181
+
182
+ test("parseSummaryJson salvage finding nothing stays a failure (no fake empty success)", () => {
183
+ // 只有一个语法坏掉的对象 → 救回 0 条:不得按「显式空数组」放行消费窗口。
184
+ const raw = `[
185
+ { " "type": "history", "title": "坏", "content": "语法错误" }
186
+ ]`;
187
+ const parsed = parseSummaryJson(raw);
188
+ assert.deepEqual(parsed, []);
189
+ });
190
+
146
191
  test("subscribes to session/event when autoSummarize enabled", () => {
147
192
  const { events } = setup();
148
193
  assert.ok(events.some((e) => e.name === "session/event"));
@@ -673,6 +718,78 @@ test("invalid summary JSON leaves the seq window retryable", async () => {
673
718
  assert.equal(store.count(), 0, "the valid empty retry remains a no-op");
674
719
  });
675
720
 
721
+ test("a JSON-crashed window with salvageable objects is recovered, consumed once, and audited (issue #339)", async (t) => {
722
+ const malformed = `[
723
+ {"type":"constraint","title":"预算","content":"总额 $12,400","importance":4},
724
+ { " "type": "history", "title": "坏对象", "content": "语法错误" },
725
+ {"type":"preference","title":"硬件","content":"只要 brushed brass"}
726
+ ]`;
727
+ const { events, service, store, calls, summarizer } = setup({ distillRateLimitIntervalMs: 0 }, {
728
+ stream() {
729
+ return (async function* () {
730
+ yield { type: "block-start", block: { type: "text" } };
731
+ yield { type: "text-delta", delta: malformed };
732
+ yield { type: "finish", kind: "ok" };
733
+ })();
734
+ }
735
+ });
736
+ t.after(() => { summarizer.dispose(); store.close(); });
737
+ const handler = events.find((e) => e.name === "session/event").fn;
738
+ const session = {
739
+ id: "s-salvage",
740
+ requestHeader: () => ({ config: { provider: "deepseek", model: "deepseek-chat" } }),
741
+ events: [userMessage("带语法错误的蒸馏窗口", 1), { seq: 2, type: "turn/end" }]
742
+ };
743
+
744
+ await handler(session, { seq: 2, type: "turn/end" });
745
+ assert.equal(service.count(), 2, "the two intact objects are written, the broken one dropped");
746
+ const titles = service.list().map((m) => m.title).sort();
747
+ assert.deepEqual(titles, ["硬件", "预算"]);
748
+ assert.equal(calls.length, 1, "salvage consumed the window: no same-window retry");
749
+ const audit = service.listLlmAudits().find((r) => r.status === "success");
750
+ assert.ok(audit, "salvaged run is audited as a success");
751
+ assert.equal(audit.metadata?.json_salvaged, true, "salvage is observable in the audit trail");
752
+
753
+ await handler(session, { seq: 2, type: "turn/end" });
754
+ assert.equal(calls.length, 1, "the consumed window is not re-distilled");
755
+ assert.equal(service.count(), 2, "no duplicate writes on the second turn/end");
756
+ });
757
+
758
+ test("a JSON-crashed window with nothing salvageable stays retryable (issue #339)", async (t) => {
759
+ const hopeless = `[
760
+ { " "type": "history", "title": "坏", "content": "语法错误" }
761
+ ]`;
762
+ let attempt = 0;
763
+ const { events, service, store, calls, summarizer } = setup({ distillRateLimitIntervalMs: 0 }, {
764
+ stream() {
765
+ const output = attempt++ === 0 ? hopeless : `[
766
+ {"type":"history","title":"重试成功","content":"干净窗口","importance":3}
767
+ ]`;
768
+ return (async function* () {
769
+ yield { type: "block-start", block: { type: "text" } };
770
+ yield { type: "text-delta", delta: output };
771
+ yield { type: "finish", kind: "ok" };
772
+ })();
773
+ }
774
+ });
775
+ t.after(() => { summarizer.dispose(); store.close(); });
776
+ const handler = events.find((e) => e.name === "session/event").fn;
777
+ const session = {
778
+ id: "s-salvage-none",
779
+ requestHeader: () => ({ config: { provider: "deepseek", model: "deepseek-chat" } }),
780
+ events: [userMessage("救不回的窗口", 1), { seq: 2, type: "turn/end" }]
781
+ };
782
+
783
+ await handler(session, { seq: 2, type: "turn/end" });
784
+ assert.equal(service.count(), 0, "zero salvage is not a fake success");
785
+ await handler(session, { seq: 2, type: "turn/end" });
786
+ assert.equal(calls.length, 2, "the window stays retryable");
787
+ assert.equal(service.count(), 1);
788
+ assert.ok(service.listLlmAudits().some(
789
+ (r) => r.status === "error" && r.error_message === "invalid summary JSON"
790
+ ), "zero-salvage run keeps the error audit");
791
+ });
792
+
676
793
  test("an all-invalid summary leaves the same window retryable until valid memories are saved", async (t) => {
677
794
  for (const invalid of [
678
795
  [{}],
@@ -960,6 +1077,47 @@ test("collects real tool result and code dispatch payloads with failure status",
960
1077
  assert.match(transcript, /代码执行(成功):代码执行结果/);
961
1078
  });
962
1079
 
1080
+ test("collects tool results delivered as role:tool messages, keeping the legacy block shape", async () => {
1081
+ const { events, calls } = setup({ distillRateLimitIntervalMs: 0 });
1082
+ const handler = events.find((e) => e.name === "session/event").fn;
1083
+ const session = {
1084
+ id: "s-tool-role-shape",
1085
+ requestHeader: () => ({ config: { provider: "deepseek", model: "deepseek-chat" } }),
1086
+ events: [
1087
+ userMessage("检查工具结果两种形状", 1),
1088
+ toolResultEvent("旧形状载荷", false, 2),
1089
+ toolRoleResultEvent("新形状载荷", false, 3),
1090
+ toolRoleResultEvent("TypeError: tool crashed", true, 4),
1091
+ { seq: 5, type: "turn/end" }
1092
+ ]
1093
+ };
1094
+
1095
+ await handler(session, { seq: 5, type: "turn/end" });
1096
+ const transcript = calls[0].messages.find((message) => message.role === "user").content[0].text;
1097
+ assert.match(transcript, /工具结果(成功):旧形状载荷/);
1098
+ assert.match(transcript, /工具结果(成功):新形状载荷/);
1099
+ assert.match(transcript, /工具结果(失败):TypeError: tool crashed/);
1100
+ });
1101
+
1102
+ test("keeps prefix trimming for tool results delivered as role:tool messages", async () => {
1103
+ const { events, calls } = setup({ distillRateLimitIntervalMs: 0 });
1104
+ const handler = events.find((e) => e.name === "session/event").fn;
1105
+ const session = {
1106
+ id: "s-tool-role-trim",
1107
+ requestHeader: () => ({ config: { provider: "deepseek", model: "deepseek-chat" } }),
1108
+ events: [
1109
+ userMessage("检查新形状截断", 1),
1110
+ toolRoleResultEvent(`OUT_START ${"c".repeat(550)} OUT_END`, false, 2),
1111
+ { seq: 3, type: "turn/end" }
1112
+ ]
1113
+ };
1114
+
1115
+ await handler(session, { seq: 3, type: "turn/end" });
1116
+ const transcript = JSON.stringify(calls[0].messages);
1117
+ assert.ok(transcript.includes("OUT_START"));
1118
+ assert.ok(!transcript.includes("OUT_END"), "role:tool 结果同样走 500 字符前缀截断");
1119
+ });
1120
+
963
1121
  test("collects subagent delivery once across inbox and user-message views", async () => {
964
1122
  const { events, calls } = setup({ distillRateLimitIntervalMs: 0 });
965
1123
  const handler = events.find((e) => e.name === "session/event").fn;
@@ -1286,3 +1444,22 @@ test("issue#127: a dedupe lookup that yields nothing still lands the entry (neve
1286
1444
  assert.equal(store.count(), 1, "the entry is stored through the normal write path");
1287
1445
  assert.equal(store.all()[0].title, "必须落库");
1288
1446
  });
1447
+
1448
+ test("parseSummaryJson salvage only takes direct children of the outer array (issue #339 review)", () => {
1449
+ // 嵌套子数组里的对象不捞(模型没把它当顶层记忆产出),坏对象照旧丢弃。
1450
+ const nested = `[[{"type":"history","title":"nested","content":"kept"}], { " "type":"history"}]`;
1451
+ assert.deepEqual(parseSummaryJson(nested), []);
1452
+ });
1453
+
1454
+ test("parseSummaryJson salvage does not turn string-embedded objects into memories (issue #339 review)", () => {
1455
+ // 全数组解析失败(第二对象坏)+ 第一对象的 content 字符串里嵌着假记忆形状:
1456
+ // 盲扫不得把属性值对象当独立记忆——外层对象整体才是直接子项。
1457
+ const raw = `[
1458
+ {"type":"history","title":"good","content":"note { \\"type\\": \\"history\\", \\"title\\": \\"fake\\" }"},
1459
+ { " "type": "history", "title": "坏", "content": "x" }
1460
+ ]`;
1461
+ const parsed = parseSummaryJson(raw);
1462
+ assert.equal(parsed.length, 1);
1463
+ assert.equal(parsed[0].title, "good");
1464
+ assert.match(parsed[0].content, /fake/);
1465
+ });
@@ -0,0 +1,60 @@
1
+ import test from "node:test";
2
+ import assert from "node:assert/strict";
3
+ import { readFileSync } from "node:fs";
4
+ import { dirname, join } from "node:path";
5
+ import { fileURLToPath } from "node:url";
6
+ import { applyTestCount, readTestCounts } from "../scripts/test-count-sync.mjs";
7
+
8
+ const HERE = dirname(fileURLToPath(import.meta.url));
9
+ const PKG_ROOT = join(HERE, "..");
10
+ const REPO_ROOT = join(PKG_ROOT, "..");
11
+ const READMES = [join(REPO_ROOT, "README.md"), join(PKG_ROOT, "README.md")];
12
+
13
+ // 双 README 是发布门面,同一个数字在里面重复出现三到五次(一个 shields.io 徽章 +
14
+ // 每条开发命令注释一处,root 是双语所以中英各一条)。它们必须永远同数——否则
15
+ // 「这个项目有多少测试」取决于读者恰好看了哪一行。
16
+ //
17
+ // v0.8.11 实际漂移过:徽章 1437、四条注释留在 1431。本用例就是那次漂移的回归锁,
18
+ // 跑在真实 README 上(不是 fixture),所以它能在发版前拦住同类漂移。
19
+ test("双 README 的测试数处处一致(徽章与所有注释同数)", () => {
20
+ for (const f of READMES) {
21
+ const counts = readTestCounts(readFileSync(f, "utf8"));
22
+ const shapes = new Set(counts.map((c) => c.shape));
23
+ assert.ok(counts.length >= 2, `${f} 抽到的测试数出现处太少:${JSON.stringify(counts)}`);
24
+ assert.ok(shapes.has("badge"), `${f} 没抽到徽章:${JSON.stringify(counts)}`);
25
+ const values = [...new Set(counts.map((c) => c.value))];
26
+ assert.equal(values.length, 1, `${f} 测试数不一致:${JSON.stringify(counts)}`);
27
+ }
28
+ });
29
+
30
+ // v0.8.11 的真实漂移样本(徽章已 1437、注释仍 1431)。锁住「徽章 + 四种注释形状」
31
+ // 全覆盖:少任何一种,就会有一处静默落后——release-prep.mjs 原先只覆盖徽章 URL,
32
+ // 自动发版路径因此反倒成了漂移来源。
33
+ test("applyTestCount 覆盖徽章与全部四种注释形状(真实漂移样本)", () => {
34
+ const drifted = [
35
+ '<img src="https://img.shields.io/badge/tests-1431%20passed-3E63DD?style=flat-square" alt="tests">',
36
+ "[![tests](https://img.shields.io/badge/tests-1431%20passed-success)](https://github.com/slow-stack/mneme)",
37
+ "npm test # 1431 个测试",
38
+ "npm test # 运行 1431 个测试",
39
+ "test/ # 1431 个 node:test 测试(审计与三轴线压测不变量)",
40
+ "npm test # 1431 tests"
41
+ ].join("\n");
42
+ const fixed = applyTestCount(drifted, 1437);
43
+ assert.ok(!/\b1431\b/.test(fixed), "仍有 1431 未被替换:\n" + fixed);
44
+ const counts = readTestCounts(fixed);
45
+ assert.equal(counts.length, 6, "六处出现都该被认出来:" + JSON.stringify(counts));
46
+ assert.deepEqual([...new Set(counts.map((c) => c.value))], [1437]);
47
+ });
48
+
49
+ test("applyTestCount 幂等:同一个数重复施加不再产生变化", () => {
50
+ const once = applyTestCount("tests-9%20passed-3E63DD\n# 9 个测试\n# 9 tests", 12);
51
+ assert.equal(applyTestCount(once, 12), once);
52
+ });
53
+
54
+ // 历史版本表里的「745 测试全绿」「790 通过」是各版本当时的真实记录(sync-test-badge
55
+ // 的注释也写明了刻意不改它们)。替换规则只认徽章 URL 与 `#` 前缀注释两种形状,
56
+ // 这条用例锁住那个边界,免得将来放宽正则把历史改写掉。
57
+ test("applyTestCount 不碰历史版本表里的「N 测试全绿」", () => {
58
+ const history = "| **v0.8.0** | 745 测试全绿 |\n| **v0.7.9** | 790 通过 |\n| v0.2.7 | 263 |";
59
+ assert.equal(applyTestCount(history, 1437), history);
60
+ });
@@ -17,6 +17,12 @@ import {
17
17
  ADMISSION_TRIGGER_SOURCE
18
18
  } from "../src/write-admission.js";
19
19
  import { POSITIVE_SAMPLES, NEGATIVE_SAMPLES, SAMPLE_VALUES, referenceScan } from "./helpers/write-admission-samples.js";
20
+ // #164 A2 的真判据 + 真配置:这一组测的是**接线**(index.js 那条路径的等价物),
21
+ // 判据自己的验收在 test/sensitive-scan.test.js。config 用真 schema 而不是手搓对象,
22
+ // 钉住「键名/嵌套形状与生产一致」——手搓的 `{ sensitiveScanEnabled: true }` 在键名
23
+ // 写错时照样过,真 config 才会红。
24
+ import { Config } from "../src/config.js";
25
+ import { createSensitiveScan } from "../src/sensitive-scan.js";
20
26
 
21
27
  // #254 写入准入(第一阶段:只计量,不拦截)。
22
28
  // 本批次没有阈值、没有拦截分支,验收看两件事:默认路径零行为变化(无会话身份的
@@ -551,3 +557,112 @@ test("接线:被拒时 memory_save 返回 action=denied 与可行动的 reason
551
557
  assert.ok(ok.id, "正常路径仍然返回 id");
552
558
  });
553
559
 
560
+ // --- #164 A2 接线:判据自己的闸 × 闸门的 enforce -------------------------------
561
+ // 这一组是 index.js 那条装配路径的等价物:真 config(Config({}))+ createSensitiveScan
562
+ // 工厂 + 写入准入。三层开关的语义由此钉住——判据关(默认)不参与、判据开而 enforce 关
563
+ // 只留审计、两个都开才拦。判据本身的假阳/漏放验收在 test/sensitive-scan.test.js。
564
+
565
+ /** 用真 `Config` 解析默认值,再叠加测试要覆盖的那几个键。 */
566
+ function a2Store(overrides = {}) {
567
+ const cfg = Config(overrides);
568
+ const store = createStore(":memory:");
569
+ const writeAdmission = createWriteAdmission({
570
+ store,
571
+ config: cfg,
572
+ sensitiveScan: createSensitiveScan({ config: cfg })
573
+ });
574
+ const service = createService({ store, mirror: null, config: cfg, writeAdmission });
575
+ return { store, service, cfg };
576
+ }
577
+
578
+ const SECRET_ROW = {
579
+ type: "project",
580
+ title: "调试记录",
581
+ content: `临时代码里贴了 ${SAMPLE_VALUES.githubPat},回头删掉`
582
+ };
583
+
584
+ test("A2 默认关:写有密钥的行照常落库,且连拒绝面都不该出现", () => {
585
+ const { store, service } = a2Store();
586
+ const result = service.saveWithDedupe({ ...SECRET_ROW, _sessionKey: "s" });
587
+ assert.equal(result.action, "created", "判据默认关时这条路径与 #332 逐字段一致");
588
+ assert.equal(rowCount(store), 1);
589
+ // metadata 里不该多出任何 deny/decision 键——「默认关零行为变化」是验收第 1 条,
590
+ // 多一个恒为 allow 的键就把它从事实变成需要解释的说法(同上面 #254 那条)。
591
+ const row = admissionRows(store, "s")[0];
592
+ assert.equal(row.metadata.deny, undefined);
593
+ assert.equal(row.metadata.decision, undefined);
594
+ });
595
+
596
+ test("A2 观察档:判据开、enforce 关 → 写入照常,审计行带 kind 与 enforced=false", () => {
597
+ const { store, service } = a2Store({ sensitiveScanEnabled: true, writeAdmission: { enabled: true } });
598
+ const result = service.saveWithDedupe({ ...SECRET_ROW, _sessionKey: "s" });
599
+ assert.equal(result.action, "created", "#164 口径:默认仅告警");
600
+ assert.equal(rowCount(store), 1);
601
+ const deny = admissionRows(store, "s")[0].metadata.deny;
602
+ assert.equal(deny.reason, "sensitive");
603
+ assert.equal(deny.kind, "github_token");
604
+ assert.equal(deny.enforced, false, "仅告警档的指纹:deny 非空、enforced=false、写入仍发生");
605
+ });
606
+
607
+ test("A2 拦截档:判据开 + enforce 开 → 拒了、没落库、审计标 enforced", () => {
608
+ const { store, service } = a2Store({
609
+ sensitiveScanEnabled: true,
610
+ writeAdmission: { enabled: true, enforce: true }
611
+ });
612
+ const result = service.saveWithDedupe({ ...SECRET_ROW, _sessionKey: "s" });
613
+ assert.equal(result.action, "denied");
614
+ assert.equal(result.reason, "sensitive");
615
+ assert.equal(rowCount(store), 0, "被拒的写入一条都不该落库");
616
+ const deny = admissionRows(store, "s")[0].metadata.deny;
617
+ assert.equal(deny.kind, "github_token");
618
+ assert.equal(deny.enforced, true);
619
+ });
620
+
621
+ test("A2 与第 1 级空白判据互不依赖:只开 A2 不会把空白写入拦下", () => {
622
+ // 两个键是两批判据的闸(空白/噪声 vs 密钥/PII),分开是为了能单独观察 A2 的
623
+ // 命中分布——绑在一个开关上就没法只看这一类的假阳率。
624
+ const { store, service } = a2Store({ sensitiveScanEnabled: true });
625
+ const blank = service.saveWithDedupe({ _sessionKey: "s", type: "project", title: "...", content: "" });
626
+ assert.equal(blank.action, "created", "A2 开着不等于第 1 级判据也开");
627
+ assert.equal(admissionRows(store, "s")[0].metadata.deny, undefined);
628
+ // 反过来:只开第 1 级(writeAdmission.enabled)、A2 关,密钥行照常落库。
629
+ const { store: s2, service: svc2 } = a2Store({ writeAdmission: { enabled: true } });
630
+ assert.equal(svc2.saveWithDedupe({ ...SECRET_ROW, _sessionKey: "s" }).action, "created");
631
+ assert.equal(s2.list({ limit: 10 }).length, 1);
632
+ });
633
+
634
+ test("A2 跑在闸门里:只开 sensitiveScanEnabled(闸门关)时扫描器根本不参与", () => {
635
+ // 判据的唯一调用点是 write-admission 的 firstLevelHit,而闸门要
636
+ // writeAdmission.enabled 打开才走第 1 级判据。所以「本键开着」不等于「会扫」——
637
+ // 配置注释与面板文案都按这条写,否则用户以为单开本键就能拿到 A2 的命中分布。
638
+ const { store, service } = a2Store({ sensitiveScanEnabled: true });
639
+ const result = service.saveWithDedupe({ ...SECRET_ROW, _sessionKey: "s" });
640
+ assert.equal(result.action, "created", "闸门没开时 A2 不参与判定");
641
+ assert.equal(rowCount(store), 1, "写入照常落库");
642
+ const rows = admissionRows(store, "s");
643
+ assert.ok(rows.length > 0, "闸门仍走计量路径(去重 / g2 不受第 1 级开关影响)");
644
+ assert.ok(rows.every((row) => row.metadata.deny === undefined), "一条 deny 审计都没有:第 1 级判据整体没跑");
645
+ });
646
+
647
+ test("A2 负样本在真装配下一条都不误杀(含敏感词但没有值)", () => {
648
+ const { store, service } = a2Store({
649
+ sensitiveScanEnabled: true,
650
+ writeAdmission: { enabled: true, enforce: true }
651
+ });
652
+ for (const sample of NEGATIVE_SAMPLES) {
653
+ const result = service.saveWithDedupe({
654
+ _sessionKey: `sess-${sample.id}`,
655
+ type: "project",
656
+ title: sample.title,
657
+ content: sample.content
658
+ });
659
+ assert.equal(result.action, "created", `${sample.id} 被误杀(${sample.why})`);
660
+ }
661
+ assert.equal(rowCount(store), NEGATIVE_SAMPLES.length);
662
+ for (const sample of NEGATIVE_SAMPLES) {
663
+ for (const row of admissionRows(store, `sess-${sample.id}`)) {
664
+ assert.equal(row.metadata.deny, undefined, `${sample.id} 不该带任何拒绝面`);
665
+ }
666
+ }
667
+ });
668
+