@furongjun1999/dsh-memory 0.9.16 → 0.9.17

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.
package/CHANGELOG.md CHANGED
@@ -4,6 +4,47 @@
4
4
 
5
5
  格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/);版本号遵循语义化版本。
6
6
 
7
+ ## [0.9.17] - 2026-10-28
8
+
9
+ ### 修复
10
+
11
+ - **`warn` 档对用户完全不可见(#708 ①)**:`security._write_gate_verdict` 只做 `sys.stderr.write`,而 DSH 不把这条
12
+ 转发进 `desktop-next.log` ⇒ 观察期等于没有。现在 `writegate` 维护**进程内计数**并经 `cg(op=info).write_gate` 透出:
13
+
14
+ ```python
15
+ cg(op="info")["write_gate"]
16
+ # {mode, total, by_layer: {"knowledge@L1": 3}, recent: [{layer,tier,reason}…], hint}
17
+ ```
18
+
19
+ 不依赖 stderr 转发、不写盘;`recent` 只留 `layer/tier/reason`(**无内容、无节点 id**),有界 20 条。
20
+ stderr 那行保留(宿主愿转发时仍实时可见)。
21
+
22
+ - **`enforce` 下裁决审计节点被同一闸挡住(#708 ② / #709)**:`_write_review_record` 写 `structural`(2 档:需 reflect+verify),
23
+ 却不传复核单元 ⇒ `decisions.jsonl` 还在、**可复核的 md 审计节点没了**。现在把本次裁决已取得的 `reviewed_by`
24
+ 一路带进写入:`review_decide → _finish_decision → _record_decision → _write_review_record → add(reviewed_by=…)`。
25
+
26
+ - **同一个漏洞的两个更靠前落点(查 #709 时发现,一并修)**:
27
+ - **`propose` 死锁**:候选入 inbox 本不落记忆盘,却按**目标层**要求复核单元 ⇒ `enforce` 下
28
+ 「要写 knowledge 需 reflect → 要 reflect 需裁决 → 要裁决需提案 → 提案又要 reflect」。
29
+ 现在 `require_layer_write(..., skip_gate=False)` 新增该参数,**只** `propose` 传 `True`;
30
+ 层白名单与密级检查**照常执行**(跳过的只有 write_gate 一档),`accept` 落盘仍走同一道闸。
31
+ - **`accept` 落业务节点**不传 `reviewed_by` ⇒ 「裁决过了、落盘被拦」。现在一并透传。
32
+
33
+ - **`reviewed_by` 不再污染 frontmatter**:它是**写入闸的输入参数,不是记忆元数据**。此前沿用 `kw.get()` 只读不删,
34
+ 会经 `super().add(**kw)` 落进节点 fm(实测 `test_i50c` 的 B1 逐键对拍报出 `reviewed_by: null`)。现在改为 `kw.pop()`。
35
+
36
+ ### 内部
37
+
38
+ - `test/chaos_injection/test_fi_m09_guest_write_denied.py` 的读码锚点从「完整调用串」放宽为「`layer, sens` 两参在位」
39
+ (`require_layer_write` 现在多了 `reviewers=` 实参);同时去掉两处硬编码行号——行号会随改动漂移。
40
+ - `test_generation_guard.py` 的 `NEW_INFO_KEYS` 登记 `write_gate`(`op=info` 的新增诊断键,与 `code_generation` 同类)。
41
+
42
+ ### 升级须知
43
+
44
+ - 本版**无破坏性变更**:`skip_gate` 缺省 `False`;`--gate` 缺省仍是 `strict`;`op=info` 只**新增**一个 `write_gate` 键。
45
+ - 若你在 #708 / #709 里遇到过问题:升级后 `cg(op="info")["write_gate"]` 可看 warn 计数,
46
+ `review accept` 的返回体里 **`record_error` 应为空**。
47
+ - 计数是**进程内累计、重启归零**(不落盘),建议观察一个完整工作日再决定是否切 `enforce`。
7
48
  ## [0.9.16] - 2026-10-28
8
49
 
9
50
  ### 修复
@@ -2573,6 +2573,15 @@ def _cg_dispatch(cg, a):
2573
2573
  h["write_policy"] = audit.policy_report()
2574
2574
  except Exception as _pe: # noqa: BLE001
2575
2575
  h["write_policy"] = audit.unavailable_report(_pe)
2576
+ # issue #708:分层写入闸的**可观测性**(warn 档此前只写子进程 stderr,
2577
+ # DSH 不转发 ⇒ 用户看不到)。此处透出进程内计数,不依赖 stderr。
2578
+ # 诊断面不得把 op=info 拖崩:异常收口成不可用形状。
2579
+ try:
2580
+ from . import writegate as _wg2
2581
+ h["write_gate"] = _wg2.warn_report()
2582
+ except Exception as _wge: # noqa: BLE001
2583
+ h["write_gate"] = {"mode": None, "total": None,
2584
+ "hint": "write_gate 不可用:%s: %s" % (type(_wge).__name__, _wge)}
2576
2585
  h["theory"] = _th.check()
2577
2586
  h["links"] = _lk.ls()
2578
2587
  # 代校验(纯增量,2026-09-30):长驻进程可被问「你现在这一代是不是盘面那一代」。
package/md_cg/mdcos.py CHANGED
@@ -3427,7 +3427,7 @@ class MdCGOS(MdCG):
3427
3427
  return f"rev_{pid.split('_')[-1]}_r{int(round_no)}"
3428
3428
 
3429
3429
  # 生效条件:当 rec 提供 record_node_id/record_hash/pid/round/decision/status/redteam_verdict 等键时(缺键会 KeyError),构造审核裁决 body,并调用 self.add 以 layer="self"、override=True、role=AUDIT_ROLE、sensitivity=DEFAULT_SENSITIVITY(issue #522:审计件保护级由件类型固定,不随裁决者 clearance 漂移)等写入,返回 nid;
3430
- def _write_review_record(self, rec):
3430
+ def _write_review_record(self, rec, reviewers=None):
3431
3431
  """把一轮裁决写成 md 记忆节点(**structural 层**)——外部来源可读、可复核。
3432
3432
 
3433
3433
  2026-10-18 改(方案 A):此前硬编码 layer="self",后果实测为——
@@ -3472,7 +3472,13 @@ class MdCGOS(MdCG):
3472
3472
  # 769 条是这类裁决审计记录(98.6%),把真正的自我锚点挤到只剩 11 条。
3473
3473
  # 审计痕迹的语义是「结构事件」,不属「扮演依据」。
3474
3474
  # 同时打 audit_trace 标签——它是 self_surface 过滤的判据单点。
3475
+ # issue #708(2026-10-28):裁决审计节点写 structural 层,而 structural 属 2 档
3476
+ # (需 reflect + verify)。此前这里**不传 reviewers** ⇒ enforce 档下审计节点被
3477
+ # 同一个闸挡住(jsonl 还在、可复核的 md 节点没了)。
3478
+ # 修法(报告人建议 3):把**本次裁决已经取得的** reviewed_by 一并带进写入——
3479
+ # 它本来就是「本次裁决的复核单元」,不是凭空自证。
3475
3480
  self.add(nid, body, layer="structural", override=True, role=self.AUDIT_ROLE,
3481
+ reviewed_by=reviewers,
3476
3482
  tags=["audit", "audit_trace", self.AUDIT_TAG, f"pid:{rec['pid']}",
3477
3483
  f"round:{rec['round']}"],
3478
3484
  importance=0.2, verification_basis="data",
@@ -3486,7 +3492,7 @@ class MdCGOS(MdCG):
3486
3492
 
3487
3493
  # 生效条件:当 pid/item/decision/status/reason/round_no/rt_verdict/issues/vhash/result 传入时,构造 rec 并写 record_hash,把 result 中 ok/node_id/error/state 保留(result.mutation 为 dict 时另落 rec["mutation"]=变更单执行时点载荷,proposal 链无此键、rec 形状逐位不变);在 strict 锁内追加 decisions_log;随后尝试写 md 审核记录,成功补 record_node_id/record_hash,异常则补 record_error 并 audit review_record_failed;最后 audit review_decide 并返回 result;
3488
3494
  def _record_decision(self, pid, item, decision, status, reason, round_no,
3489
- rt_verdict, issues, vhash, result):
3495
+ rt_verdict, issues, vhash, result, reviewers=None):
3490
3496
  """落盘一轮裁决:jsonl(权威)+ md 审计节点(可复核、供外部审计)。"""
3491
3497
  t = time.time()
3492
3498
  rec = {"t": t, "pid": pid, "decision": decision, "status": status,
@@ -3511,7 +3517,7 @@ class MdCGOS(MdCG):
3511
3517
  append_jsonl(self.decisions_log, rec, strict=True)
3512
3518
  # md 审计节点写失败不影响裁决(jsonl 仍是权威来源)
3513
3519
  try:
3514
- self._write_review_record(rec)
3520
+ self._write_review_record(rec, reviewers=reviewers)
3515
3521
  result["record_node_id"] = rec["record_node_id"]
3516
3522
  result["record_hash"] = rec["record_hash"]
3517
3523
  except Exception as exc: # noqa: BLE001
@@ -3937,8 +3943,10 @@ class MdCGOS(MdCG):
3937
3943
  # accept/edit/merge/noop 链之前。proposal(含存量无 kind 条目)一律不
3938
3944
  # 进此支,下面整条链对它逐位不变。
3939
3945
  if autonomy_modes.order_kind(item) == autonomy_modes.KIND_MUTATION:
3946
+ # issue #709 连带:变更单桥也要把本次裁决的复核单元带下去(审计节点用它过闸)
3940
3947
  return self._decide_mutation(pid, item, decision, reason, override,
3941
- round_no, rt_v, rt_issues, expect)
3948
+ round_no, rt_v, rt_issues, expect,
3949
+ reviewers=reviewed_by)
3942
3950
 
3943
3951
  result = {"pid": pid, "decision": decision, "round": round_no,
3944
3952
  "redteam": rt_v or "absent"}
@@ -4027,8 +4035,13 @@ class MdCGOS(MdCG):
4027
4035
  "原写入者身份裁决。"}
4028
4036
  self._seal_override = ((item["id"],) + _seal_as) if _seal_as else None
4029
4037
  try:
4038
+ # issue #709 连带发现(2026-10-28):accept 落业务节点时,把**本次裁决已取得的**
4039
+ # reviewed_by 一并带入。此前只在审计节点传了、这里没传 ⇒ enforce 下裁决本身
4040
+ # 能过 dual_check,落盘却被同一个闸拒(「批了但写不进去」)。
4041
+ # 层白名单与密级检查照常;dual_check 仍在 accept 之前,复核不被削弱。
4030
4042
  nid = self.add(item["id"], content, layer=layer, tags=tags,
4031
- condition_space=item.get("condition_space"), **extra)
4043
+ condition_space=item.get("condition_space"),
4044
+ reviewed_by=reviewed_by, **extra)
4032
4045
  finally:
4033
4046
  self._seal_override = None
4034
4047
  # 索引增量收尾(2026-09-16 取证):add 只把条目放进本进程内存 _dirty,
@@ -4124,11 +4137,12 @@ class MdCGOS(MdCG):
4124
4137
  result.update(ok=True, node_id=target)
4125
4138
 
4126
4139
  return self._finish_decision(pid, item, decision, reason, round_no,
4127
- rt_v, rt_issues, expect, result)
4140
+ rt_v, rt_issues, expect, result,
4141
+ reviewers=reviewed_by)
4128
4142
 
4129
4143
  # 生效条件:result 为已定好的裁决返回体时,按其 pid/item/decision/reason/round_no/rt_v/rt_issues/expect 调 _record_decision(status 映射统一出口:reject→"rejected"、noop→"noop"、其余→"accepted")落盘 jsonl + 审计节点,再按 item 的 payload_hash(缺失时 _sig(content))调 _cascade_dedup 级联出清(有 closed 时写 result["cascade_closed"]),最后 flush 并返回 result;
4130
4144
  def _finish_decision(self, pid, item, decision, reason, round_no, rt_v,
4131
- rt_issues, expect, result):
4145
+ rt_issues, expect, result, reviewers=None):
4132
4146
  """裁决**统一收尾**(单点):proposal 链与变更单执行桥共用同一收尾。
4133
4147
 
4134
4148
  为何抽出来:三档自治批次② 的变更单走独立执行桥(`_decide_mutation`),
@@ -4141,7 +4155,7 @@ class MdCGOS(MdCG):
4141
4155
  pid, item, decision,
4142
4156
  {DECISION_REJECT: "rejected", DECISION_NOOP: DECISION_NOOP}
4143
4157
  .get(decision, "accepted"),
4144
- reason, round_no, rt_v, rt_issues, expect, result)
4158
+ reason, round_no, rt_v, rt_issues, expect, result, reviewers=reviewers)
4145
4159
  # 级联出清:主提案已终态,同内容兄弟提案(重复入队产物)自动关闭
4146
4160
  casc = self._cascade_dedup(
4147
4161
  pid, item.get("payload_hash") or _sig(item.get("content") or ""),
@@ -4158,7 +4172,7 @@ class MdCGOS(MdCG):
4158
4172
 
4159
4173
  # 生效条件:item 为 kind=mutation 的队列记录——decision 为 accept 时经 _mutation_execute 执行对应动作(返回 ok=False 时**原样返回该错误**、不落裁决、提案保持 pending),为 reject 时只置 ok=True 留痕;decision 非此二者时返回 {"ok": False, "error": "mutation_decision_unsupported", ...} 带 hint(fail-closed,不落裁决);通过者交 _finish_decision 收尾后返回其结果;
4160
4174
  def _decide_mutation(self, pid, item, decision, reason, override, round_no,
4161
- rt_v, rt_issues, expect):
4175
+ rt_v, rt_issues, expect, reviewers=None):
4162
4176
  """变更单的裁决分派(三档自治批次② · 设计 §四):accept 执行 / reject 留痕。
4163
4177
 
4164
4178
  本批只定义 accept/reject 两态;其余裁决(edit/merge/noop)**fail-closed
@@ -4188,7 +4202,8 @@ class MdCGOS(MdCG):
4188
4202
  else:
4189
4203
  result["ok"] = True
4190
4204
  return self._finish_decision(pid, item, decision, reason, round_no,
4191
- rt_v, rt_issues, expect, result)
4205
+ rt_v, rt_issues, expect, result,
4206
+ reviewers=reviewers)
4192
4207
 
4193
4208
  # 生效条件:无输入形参;调用即返回 list(read_jsonl(self.decisions_log)),记录内容取决于 decisions_log 可读结果;
4194
4209
  def decisions(self):
@@ -6787,7 +6802,15 @@ class MdCGSecure(MdCGOS):
6787
6802
  with node_write_lock(self, node_id):
6788
6803
  sens = self._write_sensitivity(node_id, sensitivity)
6789
6804
  _rank(sens)
6790
- self.principal.require_layer_write(layer, sens)
6805
+ # issue #708/#709(2026-10-28):把调用方已经取得的复核单元透传给闸。
6806
+ # 此前这里只传 (layer, sens),`reviewed_by` 虽在 **kw 里却从未被消费 ⇒
6807
+ # 审计节点与 accept 落盘都被同一个闸挡住。
6808
+ #
6809
+ # **必须 pop 而不是 kw.get**:`reviewed_by` 是**写入闸的输入参数**,不是记忆
6810
+ # 的元数据。若留在 kw 里,它会经 super().add(**kw) 落进 frontmatter
6811
+ # (实测:`test_i50c` 的 B1 逐键对拍报出 `reviewed_by: null` 的白名单外差异)。
6812
+ _reviewers = kw.pop("reviewed_by", None)
6813
+ self.principal.require_layer_write(layer, sens, reviewers=_reviewers)
6791
6814
  self._attribution(kw, sens)
6792
6815
  # B2(2026-09-30):`sens` 是归一后的落盘值,`sensitivity` 才是调用方
6793
6816
  # 的**原始声明**(None=未声明)。两者必须分别下传——库层 `_write_node`
@@ -6836,7 +6859,12 @@ class MdCGSecure(MdCGOS):
6836
6859
  # 生效条件:调用方未声明 sensitivity 时先经 _write_sensitivity 解析出 sens(issue #297:既有节点**继承旧密级**——缺省 confirm 档下提案记录若在入队时就已降成 internal,accept 只会照抄该值,故继承必须发生在这里、不能只补落盘面),再 principal.require_layer_write(kw.get("layer", "knowledge"), sens)(缺省与基类 MdCGOS.propose 的 layer="knowledge" 一致——此前误用 or "contextual" 导致校验层与落盘层错位:knowledge-only 身份被误拒 / contextual-only 身份入队成死提案,2026-09-25 缺陷 #5),再按**既有节点真层真密级**调 protect.require_layer(#346:提案者自己落不了盘的覆写不入队),最后转 super().propose(node_id, content, sensitivity=sens) 并返回其结果。
6837
6860
  def propose(self, node_id: str, content: str, sensitivity: str = None, **kw):
6838
6861
  sens = self._write_sensitivity(node_id, sensitivity)
6839
- self.principal.require_layer_write(kw.get("layer", "knowledge"), sens)
6862
+ # issue #709 连带发现(2026-10-28):propose **不落记忆盘**(只把候选写进 inbox),
6863
+ # 却按目标层要求复核单元 ⇒ enforce 下死锁:要写 knowledge 需 reflect、要 reflect
6864
+ # 需裁决、要裁决需有提案、提案又要 reflect。故此处跳过 write_gate。
6865
+ # 注意:层白名单与密级检查照常;accept 落盘时仍走 add() 的同一道闸,复核不被削弱。
6866
+ self.principal.require_layer_write(kw.get("layer", "knowledge"), sens,
6867
+ skip_gate=True)
6840
6868
  # issue #346(2026-10-17 U05a):入队面此前只比**声明值**(上面那行是拿
6841
6869
  # `sens`——显式声明时原样返回——去比写入者自己的 clearance),不比对既有
6842
6870
  # 节点的真层真密级 ⇒ 低权身份能把「自己落不了盘的覆写」塞进审核队列,再由
package/md_cg/security.py CHANGED
@@ -288,7 +288,7 @@ class Principal:
288
288
  f"写入敏感度 {sensitivity} 超出 clearance {self.clearance}")
289
289
 
290
290
  # 生效条件:先要求 self.require_write(sensitivity) 未抛异常;随后将形参 layer 为假值(None/空串)时按 "knowledge" 处理,并要求 self.allows_layer(layer) 为 True;最后按 MDCG_WRITE_GATE 三档过**分层写入严格度闸**(writegate):off 零介入放行、warn 记录并放行、enforce 对 deny/require_review 抛 AccessDenied。
291
- def require_layer_write(self, layer: str, sensitivity: str, reviewers=None):
291
+ def require_layer_write(self, layer: str, sensitivity: str, reviewers=None, *, skip_gate: bool = False):
292
292
  """写层校验:密级 + 层白名单 + **分层复核闸**(2026-10-27 使用者裁定)。
293
293
 
294
294
  分层严格度(writegate.LAYER_TIERS):情景/目标/未解/负记忆 = 0 档
@@ -298,6 +298,14 @@ class Principal:
298
298
 
299
299
  reviewers 为本次写入已取得的复核单元(缺省取环境声明 MDCG_REVIEWERS),
300
300
  只在闸启用(warn/enforce)时有意义;off 档完全不介入,行为与历史逐位相同。
301
+
302
+ **skip_gate(issue #709 连带发现,2026-10-28)**:只给**不落记忆盘**的入队动作用
303
+ (当前唯一调用方=`MdCGSecure.propose`)。理由:propose 只把候选写进 inbox、
304
+ 不写业务节点,却按**目标层**要求复核单元 ⇒ enforce 下形成死锁:
305
+ 「要写 knowledge 需 reflect → 要 reflect 需裁决 → 要裁决需有提案 → 提案又要 reflect」。
306
+ 跳过闸**不等于绕过写入闸**:accept 落盘时仍走 `add()` 的同一道闸,复核不被削弱。
307
+ 层白名单与密级检查**照常执行**(这里跳过的只有 write_gate 一档)。
308
+ **禁止用于任何真正落盘的路径**——那等于关闸。
301
309
  """
302
310
  self.require_write(sensitivity)
303
311
  layer = layer or "knowledge"
@@ -305,6 +313,8 @@ class Principal:
305
313
  raise AccessDenied(
306
314
  f"角色 {self.role} 无权写入 {layer} 层"
307
315
  f"(可写层 {list(self.layers_allow) if self.layers_allow is not None else '不限'})")
316
+ if skip_gate:
317
+ return None
308
318
  _wg_verdict = self._write_gate_verdict(layer, reviewers)
309
319
  if _wg_verdict and _wg_verdict.get("decision") in ("deny", "require_review"):
310
320
  if _wg_verdict.get("mode") == "enforce":
@@ -328,9 +338,15 @@ class Principal:
328
338
  reviewers = tuple(x.strip().lower() for x in raw.split(",") if x.strip())
329
339
  verdict = _wg.decide_write(layer, reviewers=reviewers, mode=mode)
330
340
  if mode == "warn" and verdict.get("decision") in ("deny", "require_review"):
341
+ # issue #708:既要 stderr(宿主愿意转发时实时可见),更要**进程内计数**
342
+ # ——后者经 `cg(op=info).write_gate` 可查,不依赖 DSH 是否转发子进程 stderr。
331
343
  import sys as _sys
332
- _sys.stderr.write("[writegate] warn:%s(未阻断,仅记录)"
344
+ _sys.stderr.write("[writegate] warn:%s(未阻断,仅记录;计数见 cg(op=info).write_gate)"
333
345
  % verdict.get("reason"))
346
+ try:
347
+ _wg.warn_record(layer, verdict.get("tier"), verdict.get("reason"))
348
+ except Exception: # noqa: BLE001 诊断面不得冒泡进写入路径
349
+ pass
334
350
  return verdict
335
351
 
336
352
  # 生效条件:要求 self._require_live() 未抛异常、self.theory_ok 为 True、self.can_admin 为 True 时通过;否则抛 AccessDenied(消息用形参 op 标记操作)。
@@ -54,7 +54,8 @@ PINNED_INFO_KEYS = frozenset({
54
54
  })
55
55
 
56
56
  NEW_INFO_KEYS = ("code_generation", "disk_generation", "stale_on_disk",
57
- "restart_required", "hint")
57
+ "restart_required", "hint",
58
+ "write_gate") # issue #708:分层写入闸的进程内计数(warn 观察期)
58
59
 
59
60
  _FAILED = []
60
61
 
@@ -445,7 +445,7 @@ _NEG_UNION = (' neg = list(fm.get("non_applicable_conditions") or
445
445
  ' neg.append(x)\n'
446
446
  ' fm["non_applicable_conditions"] = neg')
447
447
  _TAGS_MAP = ' tags = list(item.get("tags") or [])'
448
- _CS_MAP = ' condition_space=item.get("condition_space"), **extra)'
448
+ _CS_MAP = ' condition_space=item.get("condition_space"),\n reviewed_by=reviewed_by, **extra)'
449
449
 
450
450
  _MUTATIONS = (
451
451
  # ① 契约指定:DEFER 出口**不再透传 meta**(退回 issue50-b 的只传 sensitivity)。
@@ -503,7 +503,7 @@ _MUTATIONS = (
503
503
  # A3[bucket_zh](route_key 读 cs ⇒ 桶别名变)+ B1 + B2 + B3。
504
504
  ("accept 不再映射 condition_space(削弱既有映射)",
505
505
  MdCGOS, "review_decide", _CS_MAP,
506
- ' condition_space=None, **extra)',
506
+ ' condition_space=None,\n reviewed_by=reviewed_by, **extra)',
507
507
  5),
508
508
  # ⑧ 去掉幂等对账(既有职责)。预期:D2 = 1。
509
509
  ("去掉幂等对账 already_decided(既有职责)",
@@ -534,7 +534,7 @@ _ANCHORS_REQUIRED = (
534
534
  (MdCGOS, "remember_gated", '**kw, defer_reason=_why)'),
535
535
  (MdCGOS, "remember_gated", 'elif v == "DEFER":'),
536
536
  (MdCGOS, "remember_gated", 'forgetting._prefeed_id(content)'),
537
- (MdCGOS, "review_decide", 'condition_space=item.get("condition_space"), **extra)'),
537
+ (MdCGOS, "review_decide", ' condition_space=item.get("condition_space"),\n reviewed_by=reviewed_by, **extra)'),
538
538
  (MdCGOS, "review_decide", 'if pid in self._closed_pids():'),
539
539
  )
540
540
 
@@ -0,0 +1,141 @@
1
+ # -*- coding: utf-8 -*-
2
+ # 功能名:分层写入闸的可观测性与审计链连续性守卫(issue #708)
3
+ # 生效条件:python -X utf8 -m md_cg.test_issue708_writegate_observable;被测面=writegate.warn_report、security warn 计数、_write_review_record 的 reviewers 透传
4
+ # 子功能:①warn 档写入成功且计数可读(不依赖子进程 stderr)②warn_report 形状与有界性 ③enforce 下审计节点**带** reviewers 能落、**不带**仍被拒(对照证明不是放水)④review_decide→_finish_decision→_record_decision→require_layer_write 全链透传锚点
5
+ # 执行:临时库跑三种角色/三档位,断言返回体与 warn_report;再静态断言调用链透传
6
+ # 验证方式:全部 PASS exit 0,否则 exit 1
7
+ # 不适用条件:不判 DSH 是否转发子进程 stderr(宿主面,本守卫只保证"不依赖它");不判 review_decide 的业务语义
8
+ """issue #708:warn 档不可观测 + enforce 下裁决审计节点被同一闸挡住。
9
+
10
+ 病灶(报告人 Starrain08 实测):
11
+ · warn 档只写子进程 stderr,DSH 不转发进 desktop-next.log ⇒ 用户「完全看不到」,等于没有观察期;
12
+ · enforce 档下 `_write_review_record` 写 structural,而 structural 属 2 档(需 reflect+verify),
13
+ 该调用**不传 reviewers** ⇒ 审计节点被同一个闸挡住(jsonl 还在,可复核的 md 节点没了)。
14
+ """
15
+ import os
16
+ import shutil
17
+ import sys
18
+ import tempfile
19
+
20
+ ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
21
+ sys.path.insert(0, ROOT)
22
+
23
+ _PASS, _FAIL = [], []
24
+
25
+
26
+ def ok(cond, msg, detail=""):
27
+ (_PASS if cond else _FAIL).append(msg)
28
+ print((" PASS " if cond else " FAIL ") + msg + ((" <- " + str(detail)) if detail and not cond else ""))
29
+
30
+
31
+ def _clean_env(T):
32
+ for k in list(os.environ):
33
+ if k.startswith("MDCG_"):
34
+ del os.environ[k]
35
+ os.environ.update(MDCG_ROOT=os.path.join(T, "brain"),
36
+ MDCG_STATE_ROOT=os.path.join(T, "stroot"),
37
+ MDCG_AUX_ROOT=os.path.join(T, "auxroot"),
38
+ MDCG_DATA_ROOT=os.path.join(T, "dataroot"),
39
+ MDCG_EXPORT_ROOT=T, MDCG_SUSTAIN="0", MDCG_SLEEP="0")
40
+
41
+
42
+ def main():
43
+ T = tempfile.mkdtemp(prefix="i708g_")
44
+ try:
45
+ _clean_env(T)
46
+ from md_cg import writegate as wg
47
+ from md_cg.mdcos import MdCGSecure
48
+ from md_cg.security import Principal
49
+ from md_cg.tokens import role_spec
50
+
51
+ def P(role, clr="internal"):
52
+ s = role_spec(role)
53
+ return Principal(role=role, clearance=clr, can_write=s["can_write"],
54
+ can_admin=s["can_admin"], layers_allow=s["layers_allow"],
55
+ ops_allow=s["ops_allow"])
56
+
57
+ print("== A warn 档:写入成功 + 计数可读(#708 病灶①)")
58
+ os.environ["MDCG_WRITE_GATE"] = "warn"
59
+ os.environ["MDCG_REVIEW_CHANNELS"] = "subagent"
60
+ os.environ.pop("MDCG_REVIEWERS", None)
61
+ base = wg.warn_report()
62
+ cg = MdCGSecure(os.path.join(T, "brain"), principal=P("record"), autoflush=1)
63
+ nid = cg.add("probe_k1", "probe content one", layer="knowledge")
64
+ cg.close()
65
+ ok(bool(nid), "A1 warn 档 write knowledge 成功(不阻断)", nid)
66
+ rep = wg.warn_report()
67
+ ok(rep["total"] >= base["total"] + 1,
68
+ "A2 warn 计数 +1(修前不可见:只写 stderr)", (base["total"], rep["total"]))
69
+ ok(any(k.startswith("knowledge@L1") for k in rep["by_layer"]),
70
+ "A3 计数按层分桶(knowledge@L1)", list(rep["by_layer"])[:4])
71
+ ok(bool(rep["recent"]) and "reason" in rep["recent"][-1],
72
+ "A4 recent 摘要含 reason(无内容、无节点 id)", rep["recent"][-1] if rep["recent"] else None)
73
+ ok(rep["mode"] == "warn", "A5 mode 透出", rep["mode"])
74
+
75
+ print("== B warn_report 形状与有界性")
76
+ ok(set(rep) >= {"mode", "total", "by_layer", "recent", "hint"}, "B1 键齐全", sorted(rep))
77
+ ok(len(rep["recent"]) <= 5, "B2 recent 最多 5 条", len(rep["recent"]))
78
+ ok(wg.WARN_RECENT_MAX == 20, "B3 有界常量在位", wg.WARN_RECENT_MAX)
79
+
80
+ print("== C enforce:审计节点带 reviewers 能落(#708 病灶②)")
81
+ os.environ["MDCG_WRITE_GATE"] = "enforce"
82
+ sg = role_spec("designer")
83
+ p = Principal(role="designer", clearance="secret", can_write=sg["can_write"],
84
+ can_admin=sg["can_admin"], layers_allow=sg["layers_allow"],
85
+ ops_allow=sg["ops_allow"])
86
+ cg2 = MdCGSecure(os.path.join(T, "brain"), principal=p, autoflush=1)
87
+ rec = {"pid": "p1", "round": 1, "decision": "accept", "status": "accepted",
88
+ "redteam_verdict": "absent", "issues": [], "verify_hash": "vh",
89
+ "t": 1793000000, "actor": "tester", "target_id": "n1",
90
+ "record_node_id": "audit_p1_r1", "record_hash": "a" * 64}
91
+ try:
92
+ out = cg2._write_review_record(rec, reviewers=("reflect", "verify"))
93
+ ok(bool(out), "C1 带 reviewers ⇒ 审计节点落盘成功", out)
94
+ except Exception as e: # noqa: BLE001
95
+ ok(False, "C1 带 reviewers ⇒ 审计节点落盘成功", "%s: %s" % (type(e).__name__, e))
96
+
97
+ try:
98
+ cg2._write_review_record(dict(rec, record_node_id="audit_p2_r1"), reviewers=None)
99
+ ok(False, "C2 不带 reviewers 仍应被拒(对照:不是放水)", "竟然成功了")
100
+ except Exception as e: # noqa: BLE001
101
+ ok("分层复核闸" in str(e) or "AccessDenied" in type(e).__name__,
102
+ "C2 不带 reviewers 仍被拒(对照)", "%s: %s" % (type(e).__name__, str(e)[:60]))
103
+ cg2.close()
104
+
105
+ print("== D 全链透传锚点(静态)")
106
+ src = open(os.path.join(ROOT, "md_cg", "mdcos.py"), encoding="utf-8").read()
107
+ ok("def _write_review_record(self, rec, reviewers=None)" in src,
108
+ "D1 _write_review_record 接 reviewers")
109
+ ok("reviewed_by=reviewers" in src, "D2 add(...) 透传 reviewed_by")
110
+ # 2026-10-28 改:`reviewed_by` 必须 **pop** 掉(它是闸的输入参数,不是记忆元数据),
111
+ # 否则会经 super().add(**kw) 落进 frontmatter(test_i50c 的 B1 曾因此报白名单外差异)。
112
+ ok('kw.pop("reviewed_by", None)' in src and "reviewers=_reviewers" in src,
113
+ "D3 MdCGSecure.add 用 pop 取出 reviewed_by 交给 require_layer_write(不下传 fm)")
114
+ ok("def _record_decision(self, pid, item, decision, status, reason, round_no," in src,
115
+ "D4 _record_decision 存在")
116
+ ok("_write_review_record(rec, reviewers=reviewers)" in src,
117
+ "D5 _record_decision → _write_review_record 透传")
118
+ ok(src.count("reviewers=reviewed_by)") == 2,
119
+ "D6 两处 _finish_decision 调用点都传 reviewed_by", src.count("reviewers=reviewed_by)"))
120
+
121
+ print("== E 透传后仍需齐备(不得变成万能放行)")
122
+ cg3 = MdCGSecure(os.path.join(T, "brain"), principal=p, autoflush=1)
123
+ try:
124
+ cg3._write_review_record(dict(rec, record_node_id="audit_p3_r1"), reviewers=("reflect",))
125
+ ok(False, "E1 只给 reflect(缺 verify)应被拒(2 档需两者)", "竟然成功了")
126
+ except Exception as e: # noqa: BLE001
127
+ ok("AccessDenied" in type(e).__name__, "E1 只给 reflect 仍被拒", str(e)[:60])
128
+ cg3.close()
129
+ finally:
130
+ shutil.rmtree(T, ignore_errors=True)
131
+
132
+ print()
133
+ print("issue #708 守卫:%d 通过 / %d 失败" % (len(_PASS), len(_FAIL)))
134
+ if _FAIL:
135
+ for f in _FAIL:
136
+ print(" -", f)
137
+ return 0 if not _FAIL else 1
138
+
139
+
140
+ if __name__ == "__main__":
141
+ raise SystemExit(main())
@@ -0,0 +1,132 @@
1
+ # -*- coding: utf-8 -*-
2
+ # 功能名:复核模型在 enforce 档下的端到端可用性守卫(issue #709 及其连带发现)
3
+ # 生效条件:python -X utf8 -m md_cg.test_issue709_review_chain_enforce;被测面=propose / review_decide(accept) / 审计节点 在 MDCG_WRITE_GATE=enforce 下的完整链
4
+ # 子功能:①propose 不被写层闸拦(否则死锁:要写 knowledge 需 reflect→要 reflect 需裁决→要裁决需提案→提案又要 reflect)②review_decide(accept, reviewed_by) 落业务节点成功 ③同一次裁决的审计节点也落盘且 record_error 为空 ④skip_gate 只给 propose(不得外溢到落盘路径)⑤层白名单/dual_check 不被削弱
5
+ # 执行:临时库 + enforce 档,按「propose → accept」真实顺序跑一遍,断言返回体关键字段
6
+ # 验证方式:全部 PASS exit 0,否则 exit 1
7
+ # 不适用条件:不判 warn/off 档行为(那两条由 test_issue708 / test_writegate_tiers 覆盖);不判 MCP 层序列化
8
+ """issue #709:enforce 下「批了但审计节点写不进去」,以及修它时连带发现的两个更靠前的缺口。
9
+
10
+ 病灶链(都在同一条 reviewed_by 通路上):
11
+ ① `propose` 不落盘却按目标层要求复核单元 ⇒ enforce 下**连提案都提不进去**(死锁);
12
+ ② `review_decide` 的 accept 落业务节点(`add`)不传 reviewed_by ⇒ **裁决过了、落盘被拦**;
13
+ ③ `_write_review_record` 写 structural 审计节点不传 reviewers ⇒ **审计链断裂**(#709 原文)。
14
+ """
15
+ import os
16
+ import shutil
17
+ import sys
18
+ import tempfile
19
+
20
+ ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
21
+ sys.path.insert(0, ROOT)
22
+
23
+ _PASS, _FAIL = [], []
24
+
25
+
26
+ def ok(cond, msg, detail=""):
27
+ (_PASS if cond else _FAIL).append(msg)
28
+ print((" PASS " if cond else " FAIL ") + msg + ((" <- " + str(detail)) if detail and not cond else ""))
29
+
30
+
31
+ def _fresh(T):
32
+ for k in list(os.environ):
33
+ if k.startswith("MDCG_"):
34
+ del os.environ[k]
35
+ os.environ.update(MDCG_ROOT=os.path.join(T, "brain"),
36
+ MDCG_STATE_ROOT=os.path.join(T, "stroot"),
37
+ MDCG_AUX_ROOT=os.path.join(T, "auxroot"),
38
+ MDCG_DATA_ROOT=os.path.join(T, "dataroot"),
39
+ MDCG_EXPORT_ROOT=T, MDCG_SUSTAIN="0", MDCG_SLEEP="0",
40
+ MDCG_WRITE_GATE="enforce", MDCG_REVIEW_CHANNELS="subagent")
41
+
42
+
43
+ def main():
44
+ T = tempfile.mkdtemp(prefix="i709g_")
45
+ try:
46
+ _fresh(T)
47
+ from md_cg.mdcos import MdCGSecure
48
+ from md_cg.security import Principal
49
+ from md_cg.tokens import role_spec
50
+
51
+ sg = role_spec("designer")
52
+ p = Principal(role="designer", clearance="secret", can_write=sg["can_write"],
53
+ can_admin=sg["can_admin"], layers_allow=sg["layers_allow"],
54
+ ops_allow=sg["ops_allow"])
55
+ cg = MdCGSecure(os.path.join(T, "brain"), principal=p, autoflush=1)
56
+
57
+ print("== A propose 在 enforce 下可用(死锁已解,病灶①)")
58
+ try:
59
+ pid = cg.propose("prop_a", "probe content A", layer="knowledge")
60
+ ok(bool(pid), "A1 propose knowledge 成功(修前:被写层闸拦 ⇒ 死锁)", str(pid))
61
+ except Exception as e: # noqa: BLE001
62
+ ok(False, "A1 propose knowledge 成功", "%s: %s" % (type(e).__name__, e))
63
+ pid = None
64
+ ok(callable(getattr(cg, "propose", None)), "A2 propose 方法仍在(未被移除)")
65
+
66
+ print("== B accept 落业务节点(病灶②)")
67
+ if pid:
68
+ try:
69
+ res = cg.review_decide(str(pid), "accept",
70
+ reviewed_by=["reflect", "verify"], decided_by="tester")
71
+ ok(bool(res.get("ok")), "B1 accept 返回 ok", res.get("error") or res.get("detail"))
72
+ ok(bool(res.get("node_id")), "B2 业务节点已落盘(node_id 有值)", res.get("node_id"))
73
+ ok(not res.get("record_error"),
74
+ "B3 **record_error 为空**(#709 原病灶:审计节点不再被同一闸拒)",
75
+ res.get("record_error"))
76
+ ok(bool(res.get("record_node_id")),
77
+ "B4 审计节点 id 有值(审计链未断)", res.get("record_node_id"))
78
+ except Exception as e: # noqa: BLE001
79
+ ok(False, "B1 accept 返回 ok", "%s: %s" % (type(e).__name__, e))
80
+
81
+ print("== C skip_gate 不得外溢(只有 propose 用)")
82
+ src = open(os.path.join(ROOT, "md_cg", "mdcos.py"), encoding="utf-8").read()
83
+ n_skip = src.count("skip_gate=True")
84
+ ok(n_skip == 1, "C1 全仓只有一处 skip_gate=True(propose)", n_skip)
85
+ sec = open(os.path.join(ROOT, "md_cg", "security.py"), encoding="utf-8").read()
86
+ ok("skip_gate: bool = False" in sec, "C2 require_layer_write 的 skip_gate 缺省 False")
87
+ ok("if skip_gate:" in sec and "return None" in sec, "C3 skip_gate 只跳过闸、不跳过前面两步")
88
+ i_skip = sec.find("if skip_gate:")
89
+ i_allow = sec.find("if not self.allows_layer(layer)")
90
+ ok(0 < i_allow < i_skip,
91
+ "C4 层白名单检查在 skip_gate **之前**(未被跳过)", (i_allow, i_skip))
92
+
93
+ print("== D 层白名单仍生效(propose 不得越权)")
94
+ sg2 = role_spec("verify")
95
+ p2 = Principal(role="verify", clearance="internal", can_write=sg2["can_write"],
96
+ can_admin=sg2["can_admin"], layers_allow=sg2["layers_allow"],
97
+ ops_allow=sg2["ops_allow"])
98
+ cg2 = MdCGSecure(os.path.join(T, "brain"), principal=p2, autoflush=1)
99
+ try:
100
+ cg2.propose("prop_b", "probe content B", layer="knowledge")
101
+ ok(False, "D1 verify 角色 propose knowledge 应被层白名单拒", "竟然成功了")
102
+ except Exception as e: # noqa: BLE001
103
+ ok("无权写入" in str(e), "D1 verify 角色 propose knowledge 被层白名单拒", str(e)[:60])
104
+ cg2.close()
105
+
106
+ print("== E 落盘路径仍受闸(skip_gate 没有削弱写入)")
107
+ try:
108
+ cg.add("probe_direct", "probe content C", layer="knowledge")
109
+ ok(False, "E1 无 reviewed_by 直写 knowledge 应被拒", "竟然成功了")
110
+ except Exception as e: # noqa: BLE001
111
+ ok("分层复核闸" in str(e), "E1 无 reviewed_by 直写 knowledge 仍被拒(闸未被削弱)", str(e)[:60])
112
+ # knowledge 是 1 档(只需 reflect)⇒ 给了 reflect **本就该通过**,这是档位正确的证据。
113
+ try:
114
+ nid2 = cg.add("probe_direct2", "probe content D", layer="knowledge",
115
+ reviewed_by=["reflect"])
116
+ ok(bool(nid2), "E2 只给 reflect 直写 knowledge **通过**(1 档语义正确)", nid2)
117
+ except Exception as e: # noqa: BLE001
118
+ ok(False, "E2 只给 reflect 直写 knowledge 应通过(1 档)", "%s: %s" % (type(e).__name__, str(e)[:60]))
119
+ cg.close()
120
+ finally:
121
+ shutil.rmtree(T, ignore_errors=True)
122
+
123
+ print()
124
+ print("issue #709 守卫:%d 通过 / %d 失败" % (len(_PASS), len(_FAIL)))
125
+ if _FAIL:
126
+ for f in _FAIL:
127
+ print(" -", f)
128
+ return 0 if not _FAIL else 1
129
+
130
+
131
+ if __name__ == "__main__":
132
+ raise SystemExit(main())
@@ -118,6 +118,43 @@ def missing_reviewers(tier, reviewers):
118
118
 
119
119
 
120
120
  # 生效条件:layer/reviewers 传入,channels 与 mode 缺省从环境读取;产出 decision=allow|require_review|deny 及 tier/mode/missing/reason;mode=off 时恒 allow。
121
+
122
+ #: issue #708(2026-10-28):warn 档的**可观测性**。
123
+ #:
124
+ #: 病灶(报告人 Starrain08 实测):`warn` 档只往子进程 stderr 写一行,而 DSH 不把子进程
125
+ #: stderr 转发进 `desktop-next.log` ⇒ 用户「完全看不到任何东西」,等于没有观察期,
126
+ #: 只能盲选要不要切 enforce。
127
+ #:
128
+ #: 修法(报告人建议 2):**进程内计数 + 最近条目摘要**,经 `cg(op=info).write_gate` 可查。
129
+ #: 不依赖 stderr 转发,也不写盘(诊断面,零副作用)。
130
+ #: 有界:最多保留 WARN_RECENT_MAX 条,防长驻进程无限增长。
131
+ WARN_RECENT_MAX = 20
132
+ _warn_counts = {} # {(layer, mode): 次数}
133
+ _warn_recent = [] # [(layer, tier, reason)] 最近若干条,无内容、无节点 id
134
+
135
+
136
+ def warn_record(layer, tier, reason):
137
+ """记录一次「本该复核却按 warn 放行」——供 `cg(op=info)` 读出。"""
138
+ key = (layer or "", tier)
139
+ _warn_counts[key] = _warn_counts.get(key, 0) + 1
140
+ _warn_recent.append((layer or "", tier, (reason or "")[:160]))
141
+ if len(_warn_recent) > WARN_RECENT_MAX:
142
+ del _warn_recent[:-WARN_RECENT_MAX]
143
+
144
+
145
+ def warn_report():
146
+ """生效条件:恒返回可序列化 dict——`{mode, total, by_layer, recent}`。"""
147
+ total = sum(_warn_counts.values())
148
+ by_layer = {"%s@L%s" % k: v for k, v in sorted(_warn_counts.items())}
149
+ return {"mode": gate_mode(),
150
+ "total": total,
151
+ "by_layer": by_layer,
152
+ "recent": [{"layer": a, "tier": b, "reason": c}
153
+ for a, b, c in _warn_recent[-5:]],
154
+ "hint": ("warn 档只记录不阻断;本计数为进程内累计,重启归零。"
155
+ if total else "尚无 warn 记录(要么没触发,要么闸为 off)。")}
156
+
157
+
121
158
  def decide_write(layer, reviewers=None, channels=None, mode=None, environ=None):
122
159
  """写入前判定:allow | require_review | deny。
123
160
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@furongjun1999/dsh-memory",
3
- "version": "0.9.16",
3
+ "version": "0.9.17",
4
4
  "description": "灵枢(Lingshu·líng shū)DeepSeek Harness 插件:完整大脑——长期记忆/知识飞轮/自我认知/递归反思接入 DSH,对话自动沉淀进 md_cg 认知图(md 文档)",
5
5
  "type": "module",
6
6
  "main": "lib/index.js",