Skip to content

Commit ec67fde

Browse files
committed
merge main: 解 CHANGELOG [Unreleased] 撞车(#354 先合,条目并入同一 🆕 段)
2 parents 66d28df + 176e6f7 commit ec67fde

15 files changed

Lines changed: 698 additions & 15 deletions

‎dsh-mneme/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
## 🆕 新增
66

7+
- **写入边界的密钥 / PII 判据(`sensitiveScanEnabled`,默认关)**:写入准入(#254 第 1 级)此前只跑空白 / 噪声两类判据,密钥 / PII 那一档按设计留了注入点而没实现。现在补上 `src/sensitive-scan.js`——纯确定性、零 LLM,先认形状再认关键词(赋值型规则带占位符守卫,所以「把 API key 放进环境变量」这类讨论句不报)。命中落审计 `metadata.deny.reason='sensitive'` + `kind`(密钥 / PII 分档,便于先看分布再决定放行策略),审计位与 #332 定的形状一致。开关分层:本键只决定「这类判据参不参与」,命中之后是仅告警还是真拦仍由 `writeAdmission.enforce` 决定(默认仅告警、拦截 opt-in)。回归样本集(10 条密钥 + 4 条 PII 正样本、12 条负样本)原样跑真判据:正样本不漏、负样本不误杀。
78
- **能力说明补 scope 声明规则(`memory_save` 工具描述)**:`memory_save` 的 `workspace_scope` / `agent_scope` 是必填面,此前的指引只讲「该不该写」,没讲「写给谁看」。现在在 `memory_save` 的工具描述尾部补一条判断规则:只在记忆确实只属于一个 workspace / 一个 agent 时才标注,否则两个都留空(未标注 = 处处可见,是安全的默认)。写进工具描述而不是总则——它是单工具的判据,总则那五条讲的是「何时查 / 何时写 / 何时 no-op」,加第六条会把单工具语义抬成全局纪律。#249 第二批;注入时机(N0 能力说明 / N1 分池 / N2 尾声提醒)未动工。
89

910
## [0.8.12] - 2026-10-01

‎dsh-mneme/lib/api.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ export function createApi(ctx, service, settings, commands, embedder, semantic =
143143
"llmAudit.enabled": ["llmAudit", "enabled"],
144144
"writeAdmission.enabled": ["writeAdmission", "enabled"],
145145
"writeAdmission.enforce": ["writeAdmission", "enforce"]
146+
// sensitiveScanEnabled(#164 A2)是顶层扁平键,不需要进这张表——走 configFlagValue
147+
// 的默认分支即可。
146148
};
147149
function configFlagValue(key) {
148150
const path = NESTED_FLAG_PATHS[key];

‎dsh-mneme/lib/client.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,11 @@ window.__ModuleLoader__.load({
493493
"memory.features.writeAdmission.enabled.hint": "写入前判空白/噪声,命中留审计(不拦)",
494494
"memory.features.writeAdmission.enforce": "写入准入拦截",
495495
"memory.features.writeAdmission.enforce.hint": "真拦下命中的写入;关闭时只留审计不拦",
496+
// #164 A2:密钥/PII 判据自己的闸。文案要写清它管的是哪一批判据(与上面的
497+
// 空白/噪声分开)、它跑在「写入准入判定」里面(那一项关着就不跑),以及
498+
// 「开着也不拦」——拦是上面那项的事。
499+
"memory.features.sensitiveScanEnabled": "密钥/PII 扫描",
500+
"memory.features.sensitiveScanEnabled.hint": "写入前扫密钥与个人信息;需先打开写入准入判定才会执行,命中只留审计,要拦再打开写入准入拦截",
496501
"memory.features.bm25SearchEnabled": "BM25 关键词检索",
497502
"memory.features.bm25SearchEnabled.hint": "传统关键词打分检索,与向量召回互补",
498503
"memory.features.conflictFreezeEnabled": "冲突冻结",
@@ -925,6 +930,12 @@ window.__ModuleLoader__.load({
925930
"memory.features.writeAdmission.enabled.hint": "Flag blank / noise writes before storing, with an audit row (never blocks)",
926931
"memory.features.writeAdmission.enforce": "Write admission enforcement",
927932
"memory.features.writeAdmission.enforce.hint": "Actually reject flagged writes; off keeps the audit row only",
933+
// #164 A2: its own gate for the secret / PII rules (separate from the
934+
// blank/noise pair above), and it runs inside the write admission checks
935+
// above, so with those off it never runs. Hits are audited only;
936+
// enforcement stays with the key above.
937+
"memory.features.sensitiveScanEnabled": "Secret / PII scan",
938+
"memory.features.sensitiveScanEnabled.hint": "Scan writes for credentials and personal data; needs write admission checks to run. Hits are audited only; enforcement needs the enforcement toggle too",
928939
"memory.features.bm25SearchEnabled": "BM25 keyword search",
929940
"memory.features.bm25SearchEnabled.hint": "Classic keyword scoring, complementary to vector recall",
930941
"memory.features.conflictFreezeEnabled": "Conflict freezing",
@@ -2122,7 +2133,7 @@ window.__ModuleLoader__.load({
21222133
// test/inject-parent-gate.test.js 钉住。
21232134
const FEATURE_CHILDREN = { autoInject: ["injectGuidanceEnabled", "continuityRescueEnabled"] };
21242135
const FEATURE_GROUPS = [
2125-
{ key: "group.core", items: ["autoInject", "autoSummarize", "hotMemoryEnabled", "injectTimePrefix", "memoryQualityFilter.enabled", "llmAudit.enabled", "writeAdmission.enabled", "writeAdmission.enforce"] },
2136+
{ key: "group.core", items: ["autoInject", "autoSummarize", "hotMemoryEnabled", "injectTimePrefix", "memoryQualityFilter.enabled", "llmAudit.enabled", "writeAdmission.enabled", "writeAdmission.enforce", "sensitiveScanEnabled"] },
21262137
{ key: "group.enhance", items: ["entityExtractionEnabled", "codingRetrospect", "rerankEnabled", "resilientModelDownload", "searchSemanticDedup", "bm25SearchEnabled", "heatEnabled", "documentMemoryEnabled"] },
21272138
{ key: "group.dream", items: ["autoDream", "sleepModeEnabled"] },
21282139
// v0.8.0 A4(issue #17):作用域隔离组——标注总开关 + 严格硬过滤。

‎dsh-mneme/lib/config.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,25 @@ export const Config = z.object({
651651
enforce: z.boolean().default(false)
652652
}).default({}),
653653

654+
// --- #164 A2: secret / PII scan at the write boundary ----------------------
655+
// 写入边界的密钥 / PII 判据(src/sensitive-scan.js)自身的闸。与 writeAdmission
656+
// 的 enabled 分开是有意的:那一个管 #254 第 1 级的空白 / 噪声判据,本键管 A2 这
657+
// 一类判据,两批的误杀面差一个量级(空白 / 噪声没有解释空间,邮箱 / 手机号有),
658+
// 绑在同一个开关上就没法单独观察 A2 的命中分布。
659+
//
660+
// 分层必须写清:判据的唯一调用点在 #254 第 1 级的闸门里(write-admission.js 的
661+
// firstLevelHit),闸门不走第 1 级就没人来调这个扫描器。所以本键是「闸门内这一批
662+
// 判据参不参与」,不是一条能独立跑的链路——单开本键就是零行为变化:
663+
// writeAdmission.enabled 关 → 第 1 级整个不跑,本键开也没用
664+
// enabled 开 + 本键关 → 只跑空白 / 噪声那一批
665+
// enabled 开 + 本键开 + enforce 关 → 命中留审计,写入照常(观察档)
666+
// enabled 开 + 本键开 + enforce 开 → 命中即拒绝
667+
// 默认关 = 只计量那一阶段的行为逐字节保留(#332 合并时 sensitiveScan 就是 null)。
668+
// #164 的「默认仅告警、拦截 opt-in」落在 enforce 上:命中落一条审计
669+
// (metadata.deny.kind)但照常写入,真要拦得 enabled 与 enforce 同时开。
670+
// 也走 feature_flags(FEATURE_FLAG_BOOLEANS 白名单),面板可启停=线上回滚开关。
671+
sensitiveScanEnabled: z.boolean().default(false),
672+
654673
// --- recall evaluation: test-result storage (v0.4.6, 方案 B) --------------
655674
// Separate retrieval evaluation snapshots from the production recall audit.
656675
// When false (default) evaluateRetrieval still computes precision/recall/mrr

‎dsh-mneme/lib/index.js‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import { resolveDocumentDir } from "./document.js";
55
import { createService } from "./service.js";
66
// #254 写入准入(第一阶段只计量,不拦截):见 src/write-admission.js 的文件头。
77
import { createWriteAdmission } from "./write-admission.js";
8+
// #164 A2:写入边界的密钥 / PII 判据,注入给上面的写入准入。
9+
import { createSensitiveScan } from "./sensitive-scan.js";
810
import { createTools } from "./tools.js";
911
import { createInjector } from "./inject.js";
1012
import { createContinuityRescue } from "./continuity.js";
@@ -278,11 +280,17 @@ export const apply = (ctx, config) => {
278280
// 关掉,在无保留期的表里按写入频次增长是不能接受的)。
279281
//
280282
// sensitiveScan 是密钥 / PII 那一类判据的注入点。按 #254 验收第 4 条它是 #164 A2
281-
// 的判据来源(A2 记在维护者排期里),所以本批不实现它,只把接口形状定在这里——
282-
// 接上时只改这一行:
283-
// createWriteAdmission({ ..., sensitiveScan: createSensitiveScan({ config: cfg }) })
284-
// 缺省 null 时第 1 级只跑空白 / 噪声两类判据,其余一切照旧。
285-
const writeAdmission = createWriteAdmission({ store, config: cfg, logger: ctx.logger });
283+
// 的判据来源,现在由 src/sensitive-scan.js 实现(维护者 09-28 把 A2 的认领转给
284+
// 本侧)。这里只做接线:判据开不开由它自己的键 sensitiveScanEnabled 决定,工厂在
285+
// 关时返回 null,闸门的行为就与 #332 合并时逐字段一致(那一版根本没有这个函数);
286+
// 命中之后是仅告警还是真拦,仍是 writeAdmission.enforce 的事(#164 口径:
287+
// 默认仅告警、拦截 opt-in),判据不碰决策。
288+
const writeAdmission = createWriteAdmission({
289+
store,
290+
config: cfg,
291+
logger: ctx.logger,
292+
sensitiveScan: createSensitiveScan({ config: cfg })
293+
});
286294
const service = createService({ store, mirror, config: cfg, logger: ctx.logger, documentIndex, writeAdmission });
287295

288296
// F-NEW-03: if the mirror sync failed last run (persisted dirty state), retry

0 commit comments

Comments
 (0)