@furongjun1999/dsh-memory 0.9.16 → 0.9.18
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 +123 -0
- package/README.md +2 -2
- package/lib/hooks.d.ts +9 -1
- package/lib/hooks.js +78 -19
- package/md_cg/mcp_server.py +9 -0
- package/md_cg/mdcg.py +26 -1
- package/md_cg/mdcos.py +112 -18
- package/md_cg/security.py +27 -4
- package/md_cg/test_generation_guard.py +2 -1
- package/md_cg/test_i50c_meta_passthrough.py +3 -3
- package/md_cg/test_issue708_writegate_observable.py +141 -0
- package/md_cg/test_issue709_review_chain_enforce.py +132 -0
- package/md_cg/test_issue712_session_window_attribution.py +225 -0
- package/md_cg/test_p45_session_identity.py +6 -4
- package/md_cg/writegate.py +37 -0
- package/package.json +1 -1
- package/src/hooks.ts +84 -7
|
@@ -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())
|
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:#712 会话窗口四要素组装 + 分档会话隔离(方案 C)守卫
|
|
3
|
+
# 生效条件:python -X utf8 -m md_cg.test_issue712_session_window_attribution;被测面=remember_event 的 id / recent_events 派生 / session_recall 的取窗顺序与四要素 / Principal.sessions_read
|
|
4
|
+
# 子功能:①事件有稳定键且确定性派生 ②注入面 recent 条目含 session/sensitivity/actor/id 四要素 ③**取窗顺序**:按会话收窄时先取全量再过滤再截(修前会得到空窗口)④falsy 会话进 degraded 不再静默 ⑤sessions_read 仅集合生效、can_admin 不被削弱
|
|
5
|
+
# 执行:临时库造两会话交错事件,按窗口小于本会话消息数的条件断言不空;再验四要素与权限分档
|
|
6
|
+
# 验证方式:全部 PASS exit 0;每条守卫都能独立变红(见各 ok() 的失败面)
|
|
7
|
+
# 不适用条件:不判 hooks.ts 的渲染格式(本批未改渲染);不判 MCP 序列化;不判 DSH 宿主是否转发 stderr
|
|
8
|
+
"""#712:会话窗口消息组装(会话·时间·身份·id)+ 分档会话隔离。
|
|
9
|
+
|
|
10
|
+
病灶(取证见 PR #712 审查):
|
|
11
|
+
① 事件无 id,模型无法引用「哪一条」;
|
|
12
|
+
② 注入面条目只留 role/text/t ⇒ 模型不知道「哪个会话说的、私有还是共有、谁说的」;
|
|
13
|
+
③ **取窗顺序 bug**:先截末 N 条再按会话过滤 ⇒ 多会话并发时本会话消息被挤出窗口,
|
|
14
|
+
session="A" 可能拿到**空 recent**(false-negative,极难被发现);
|
|
15
|
+
④ session 为 falsy 时静默退回全局窗口,无任何留痕。
|
|
16
|
+
"""
|
|
17
|
+
import os
|
|
18
|
+
import shutil
|
|
19
|
+
import sys
|
|
20
|
+
import tempfile
|
|
21
|
+
|
|
22
|
+
ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
23
|
+
sys.path.insert(0, ROOT)
|
|
24
|
+
|
|
25
|
+
_PASS, _FAIL = [], []
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
def ok(cond, msg, detail=""):
|
|
29
|
+
(_PASS if cond else _FAIL).append(msg)
|
|
30
|
+
print((" PASS " if cond else " FAIL ") + msg + ((" <- " + str(detail)) if detail and not cond else ""))
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
def main():
|
|
34
|
+
T = tempfile.mkdtemp(prefix="i712g_")
|
|
35
|
+
try:
|
|
36
|
+
for k in list(os.environ):
|
|
37
|
+
if k.startswith("MDCG_"):
|
|
38
|
+
del os.environ[k]
|
|
39
|
+
os.environ.update(MDCG_ROOT=os.path.join(T, "brain"),
|
|
40
|
+
MDCG_STATE_ROOT=os.path.join(T, "stroot"),
|
|
41
|
+
MDCG_AUX_ROOT=os.path.join(T, "auxroot"),
|
|
42
|
+
MDCG_DATA_ROOT=os.path.join(T, "dataroot"),
|
|
43
|
+
MDCG_EXPORT_ROOT=T, MDCG_SUSTAIN="0", MDCG_SLEEP="0")
|
|
44
|
+
from md_cg.mdcos import MdCGSecure
|
|
45
|
+
from md_cg.security import Principal
|
|
46
|
+
from md_cg.tokens import role_spec
|
|
47
|
+
|
|
48
|
+
sg = role_spec("designer")
|
|
49
|
+
p = Principal(role="designer", clearance="secret", can_write=sg["can_write"],
|
|
50
|
+
can_admin=sg["can_admin"], layers_allow=sg["layers_allow"],
|
|
51
|
+
ops_allow=sg["ops_allow"], session="sessX")
|
|
52
|
+
cg = MdCGSecure(os.path.join(T, "brain"), principal=p, autoflush=1)
|
|
53
|
+
|
|
54
|
+
print("== A 事件稳定键")
|
|
55
|
+
r1 = cg.remember_event("user", "hello A", meta={"session": "sessA"})
|
|
56
|
+
ev = r1.get("event") or {}
|
|
57
|
+
ok(bool(ev.get("id")), "A1 事件带 id", ev.get("id"))
|
|
58
|
+
ok(str(ev.get("id") or "").startswith("re_"), "A2 id 形如 re_<ms>_<hex>", ev.get("id"))
|
|
59
|
+
ok("actor" in (ev.get("meta") or {}), "A3 meta.actor 键存在(值为 None 亦可)", ev.get("meta"))
|
|
60
|
+
ok("actor" not in ev, "A4 **不加**顶层 actor 键(顶层形状不被动)", list(ev)[:8])
|
|
61
|
+
# 确定性:同 t 同 text 派生同 id
|
|
62
|
+
from md_cg.mdcg import _event_suffix
|
|
63
|
+
ok(_event_suffix("abc") == _event_suffix("abc"), "A5 后缀确定性(同一 text 恒同串)")
|
|
64
|
+
|
|
65
|
+
print("== B 取窗顺序(本批核心)")
|
|
66
|
+
# 造交错事件:A 3 条、B 5 条,交替;窗口 recent_limit=3
|
|
67
|
+
cg.remember_event("user", "A-1", meta={"session": "sessA"})
|
|
68
|
+
for i in range(5):
|
|
69
|
+
cg.remember_event("user", "B-%d" % i, meta={"session": "sessB"})
|
|
70
|
+
cg.remember_event("user", "A-2", meta={"session": "sessA"})
|
|
71
|
+
cg.remember_event("user", "A-3", meta={"session": "sessA"})
|
|
72
|
+
pack = cg.session_recall("sessA", limit=1, recent_limit=3)
|
|
73
|
+
rec = pack.get("recent") or []
|
|
74
|
+
ok(len(rec) > 0,
|
|
75
|
+
"B1 session=sessA 且 A 的消息数(3) >= 窗口(3) 时**不空**(修前:先截后滤 ⇒ 可能空)",
|
|
76
|
+
len(rec))
|
|
77
|
+
ok(all((x.get("session") == "sessA") for x in rec),
|
|
78
|
+
"B2 窗口里**只有** sessA 的条目(无跨会话泄漏)",
|
|
79
|
+
[x.get("session") for x in rec][:5])
|
|
80
|
+
# 更极端:A 只有 1 条,且被大量 B 消息夹在中间
|
|
81
|
+
cg2 = MdCGSecure(os.path.join(T, "brain2"), principal=p, autoflush=1)
|
|
82
|
+
for i in range(20):
|
|
83
|
+
cg2.remember_event("user", "Bx-%d" % i, meta={"session": "sessB2"})
|
|
84
|
+
cg2.remember_event("user", "A-only", meta={"session": "sessA2"})
|
|
85
|
+
for i in range(20):
|
|
86
|
+
cg2.remember_event("user", "By-%d" % i, meta={"session": "sessB2"})
|
|
87
|
+
pack2 = cg2.session_recall("sessA2", limit=1, recent_limit=3)
|
|
88
|
+
rec2 = pack2.get("recent") or []
|
|
89
|
+
ok(len(rec2) == 1 and (rec2[0].get("text") or "").startswith("A-only"),
|
|
90
|
+
"B3 **A 仅 1 条且被 40 条 B 夹住**时仍能取到(修前必空——这是核心回归)",
|
|
91
|
+
[(x.get("session"), (x.get("text") or "")[:8]) for x in rec2][:4])
|
|
92
|
+
cg2.close()
|
|
93
|
+
|
|
94
|
+
print("== C 四要素齐备")
|
|
95
|
+
ok(rec, "C0 有条目可查", len(rec))
|
|
96
|
+
if rec:
|
|
97
|
+
keys = set(rec[0].keys())
|
|
98
|
+
ok({"role", "text", "t", "id", "session", "sensitivity", "actor"} <= keys,
|
|
99
|
+
"C1 条目含 role/text/t/id/session/sensitivity/actor", sorted(keys))
|
|
100
|
+
ok(rec[0].get("session") == "sessA", "C2 session 取值正确", rec[0].get("session"))
|
|
101
|
+
|
|
102
|
+
print("== D falsy 会话留痕")
|
|
103
|
+
pack3 = cg.session_recall(None, limit=1, recent_limit=3)
|
|
104
|
+
ok("recent_global_window" in (pack3.get("degraded") or []),
|
|
105
|
+
"D1 session=None 时 degraded 含 recent_global_window(不再静默)",
|
|
106
|
+
pack3.get("degraded"))
|
|
107
|
+
pack4 = cg.session_recall("sessA", limit=1, recent_limit=3)
|
|
108
|
+
ok("recent_global_window" not in (pack4.get("degraded") or []),
|
|
109
|
+
"D2 给了会话则**不**打该标记(不误报)", pack4.get("degraded"))
|
|
110
|
+
|
|
111
|
+
print("== E sessions_read 分档(方案 C)")
|
|
112
|
+
ok(p.sessions_read is None, "E1 缺省 None(旧行为,不限制)", p.sessions_read)
|
|
113
|
+
p_none = Principal(role="designer", clearance="secret", can_write=True,
|
|
114
|
+
can_admin=False, layers_allow=["*"], session="sessX")
|
|
115
|
+
cg3 = MdCGSecure(os.path.join(T, "brain"), principal=p_none, autoflush=1)
|
|
116
|
+
pk = cg3.session_recall("sessA", limit=1, recent_limit=5)
|
|
117
|
+
ok(len(pk.get("recent") or []) > 0, "E2 sessions_read=None 时按参数正常取(旧行为)",
|
|
118
|
+
len(pk.get("recent") or []))
|
|
119
|
+
cg3.close()
|
|
120
|
+
p_nar = Principal(role="designer", clearance="secret", can_write=True,
|
|
121
|
+
can_admin=False, layers_allow=["*"], session="sessX",
|
|
122
|
+
sessions_read=["sessB"])
|
|
123
|
+
cg4 = MdCGSecure(os.path.join(T, "brain"), principal=p_nar, autoflush=1)
|
|
124
|
+
pk4 = cg4.session_recall("sessA", limit=1, recent_limit=10)
|
|
125
|
+
ok(all((x.get("session") == "sessB") for x in (pk4.get("recent") or [])),
|
|
126
|
+
"E3 sessions_read={sessB} 时**读不到** sessA(收紧生效)",
|
|
127
|
+
[x.get("session") for x in (pk4.get("recent") or [])][:5])
|
|
128
|
+
cg4.close()
|
|
129
|
+
p_all = Principal(role="designer", clearance="secret", can_write=True,
|
|
130
|
+
can_admin=False, layers_allow=["*"], session="sessX",
|
|
131
|
+
sessions_read=["*"])
|
|
132
|
+
cg5 = MdCGSecure(os.path.join(T, "brain"), principal=p_all, autoflush=1)
|
|
133
|
+
pk5 = cg5.session_recall("sessA", limit=1, recent_limit=10)
|
|
134
|
+
ok(len(pk5.get("recent") or []) > 0, "E4 sessions_read 为星号时全读(不收窄)",
|
|
135
|
+
len(pk5.get("recent") or []))
|
|
136
|
+
cg5.close()
|
|
137
|
+
|
|
138
|
+
print("== F 窗口上限(验证单元指出的零守卫项)")
|
|
139
|
+
# 若把 `evs = evs[:_win]` 整行删掉(回到「收窄后全量返回」= 另一种回归),
|
|
140
|
+
# 下面是唯一能抓到它的断言:收窄后条数**不得超过** recent_limit。
|
|
141
|
+
cgf = MdCGSecure(os.path.join(T, "brainf"), principal=p, autoflush=1)
|
|
142
|
+
for i in range(15):
|
|
143
|
+
cgf.remember_event("user", "FA-%d" % i, meta={"session": "sessFA"})
|
|
144
|
+
for i in range(15):
|
|
145
|
+
cgf.remember_event("user", "FB-%d" % i, meta={"session": "sessFB"})
|
|
146
|
+
pkf = cgf.session_recall("sessFA", limit=1, recent_limit=4)
|
|
147
|
+
recf = pkf.get("recent") or []
|
|
148
|
+
ok(len(recf) == 4,
|
|
149
|
+
"F1 收窄后**必须截回** recent_limit(删 evs[:_win] 即红:会返回 15 条)", len(recf))
|
|
150
|
+
ok(all((x.get("session") == "sessFA") for x in recf),
|
|
151
|
+
"F2 且全部属于本会话", [x.get("session") for x in recf][:4])
|
|
152
|
+
# 确定性:同一会话连着取两次,id 序列必须一致(读侧派生不得随机)
|
|
153
|
+
a1 = [x.get("id") for x in recf]
|
|
154
|
+
a2 = [x.get("id") for x in (cgf.session_recall("sessFA", limit=1, recent_limit=4).get("recent") or [])]
|
|
155
|
+
ok(a1 == a2, "F3 两次读取的 id 序列一致(派生确定性)", (a1[:2], a2[:2]))
|
|
156
|
+
cgf.close()
|
|
157
|
+
|
|
158
|
+
print("== G session_compact 的同型取窗 bug(验证单元发现)")
|
|
159
|
+
cgc = MdCGSecure(os.path.join(T, "brainc"), principal=p, autoflush=1)
|
|
160
|
+
for i in range(25):
|
|
161
|
+
cgc.remember_event("user", "CB-%d 这是一条足够长的测试消息内容" % i,
|
|
162
|
+
meta={"session": "sessCB"})
|
|
163
|
+
cgc.remember_event("user", "CA-only 本会话唯一的一条足够长的消息内容",
|
|
164
|
+
meta={"session": "sessCA"})
|
|
165
|
+
for i in range(25):
|
|
166
|
+
cgc.remember_event("user", "CC-%d 另一条足够长的测试消息内容" % i,
|
|
167
|
+
meta={"session": "sessCC"})
|
|
168
|
+
cpk = cgc.session_compact(session="sessCA", limit=5)
|
|
169
|
+
ok((cpk.get("events") or 0) >= 1,
|
|
170
|
+
"G1 session_compact 在「本会话仅 1 条、被 50 条夹住」时**不空**",
|
|
171
|
+
cpk.get("events"))
|
|
172
|
+
cgc.close()
|
|
173
|
+
|
|
174
|
+
print("== H 身份归属(actor 不得恒为 None)")
|
|
175
|
+
cgh = MdCGSecure(os.path.join(T, "brainh"), principal=p, autoflush=1)
|
|
176
|
+
cgh.remember_event("user", "谁说的?", meta={"session": "sessH"})
|
|
177
|
+
pkh = cgh.session_recall("sessH", limit=1, recent_limit=3)
|
|
178
|
+
rech = pkh.get("recent") or []
|
|
179
|
+
ok(rech, "H0 有条目", len(rech))
|
|
180
|
+
if rech:
|
|
181
|
+
ok(rech[0].get("actor") is not None,
|
|
182
|
+
"H1 **actor 非 None**(修前恒 None——「谁说的」要素空心)", rech[0].get("actor"))
|
|
183
|
+
ok(rech[0].get("actor") == p.actor or rech[0].get("actor") == "designer",
|
|
184
|
+
"H2 actor 取自 principal.actor", (rech[0].get("actor"), p.actor))
|
|
185
|
+
ok(rech[0].get("sensitivity") is not None,
|
|
186
|
+
"H3 sensitivity 非 None(经安全档写入时必落)", rech[0].get("sensitivity"))
|
|
187
|
+
cgh.close()
|
|
188
|
+
|
|
189
|
+
|
|
190
|
+
print("== I 身份三维(理论《身份与人格》R2 最小归因四元组)")
|
|
191
|
+
cgi = MdCGSecure(os.path.join(T, "braini"), principal=p, autoflush=1)
|
|
192
|
+
cgi.remember_event("user", "身份三维测试", meta={"session": "sessI"})
|
|
193
|
+
pki = cgi.session_recall("sessI", limit=1, recent_limit=3)
|
|
194
|
+
reci = pki.get("recent") or []
|
|
195
|
+
ok(reci, "I0 有条目", len(reci))
|
|
196
|
+
if reci:
|
|
197
|
+
it = reci[0]
|
|
198
|
+
# 编号口径(理论《身份与人格》补注):令牌模式 = token_id;
|
|
199
|
+
# **直连模式(auth_mode=direct)没有令牌**,以 session 代之——
|
|
200
|
+
# 两者至少一个非空即满足「编号」要素。
|
|
201
|
+
_no = it.get("token_id") or it.get("session")
|
|
202
|
+
ok(bool(it.get("session")) and bool(it.get("id"))
|
|
203
|
+
and bool(it.get("actor")) and bool(_no),
|
|
204
|
+
"I1 **最小归因四元组齐**(会话/编号/名字/id;直连模式以 session 作编号)",
|
|
205
|
+
(it.get("session"), it.get("id"), it.get("actor"), _no))
|
|
206
|
+
ok(it.get("identity_role") is not None,
|
|
207
|
+
"I2 identity_role 非 None(职业身份)", it.get("identity_role"))
|
|
208
|
+
ok("clearance" not in it and "ops_allow" not in it and "layers_allow" not in it,
|
|
209
|
+
"I3 **不含权限快照**(理论第 7 条:权限不写入事件)", sorted(it.keys()))
|
|
210
|
+
cgi.close()
|
|
211
|
+
|
|
212
|
+
cg.close()
|
|
213
|
+
finally:
|
|
214
|
+
shutil.rmtree(T, ignore_errors=True)
|
|
215
|
+
|
|
216
|
+
print()
|
|
217
|
+
print("#712 守卫:%d 通过 / %d 失败" % (len(_PASS), len(_FAIL)))
|
|
218
|
+
if _FAIL:
|
|
219
|
+
for f in _FAIL:
|
|
220
|
+
print(" -", f)
|
|
221
|
+
return 0 if not _FAIL else 1
|
|
222
|
+
|
|
223
|
+
|
|
224
|
+
if __name__ == "__main__":
|
|
225
|
+
raise SystemExit(main())
|
|
@@ -357,10 +357,12 @@ def _r65_group():
|
|
|
357
357
|
# 每条变异声明**期望转红的断言项**;实跑红项与期望必须**恰好相等**——多红=断言语义
|
|
358
358
|
# 纠缠,少红=该判据空转(本仓教训:test_neg_condition_hits 的「整条命中档」曾 31 条
|
|
359
359
|
# 断言全绿而分支已删)。锚点漂移(命中次数 ≠1)→ ANCHOR-MISS + 退出码 2(fail-closed)。
|
|
360
|
+
# issue #712(2026-10-30):会话过滤改为「先算 _sess_arg、再具名判定」,锚点随之更新。
|
|
361
|
+
# **变异语义不变**:删掉 if _sess_arg 与其过滤体 ⇒ recent 回到全进程窗口。
|
|
360
362
|
_R65_A_BLOCK = (
|
|
361
|
-
' if
|
|
363
|
+
' if _sess_arg:\n'
|
|
362
364
|
' evs = [r for r in evs if (r.get("meta") or {}).get("session") == session]\n')
|
|
363
|
-
_R65_A_COND = 'if session and str(session).strip() != "*"
|
|
365
|
+
_R65_A_COND = '_sess_arg = session if (session and str(session).strip() != "*") else None'
|
|
364
366
|
_R65_A_STRIP = 'str(session).strip() != "*"'
|
|
365
367
|
_R65_A_FILTER = ('evs = [r for r in evs '
|
|
366
368
|
'if (r.get("meta") or {}).get("session") == session]')
|
|
@@ -370,7 +372,7 @@ _R65_ANCHORS = (_R65_A_BLOCK, _R65_A_COND, _R65_A_STRIP, _R65_A_FILTER, _R65_A_D
|
|
|
370
372
|
_R65_MUTATIONS = (
|
|
371
373
|
("①删整段会话过滤(recent 回到全进程窗口)", _R65_A_BLOCK, "",
|
|
372
374
|
{"R65.1", "R65.2", "R65.3", "R65.6a", "R65.9"}),
|
|
373
|
-
("②删 \"*\" 例外(星号也过滤)", _R65_A_COND, "if session
|
|
375
|
+
("②删 \"*\" 例外(星号也过滤)", _R65_A_COND, "_sess_arg = session if session else None",
|
|
374
376
|
{"R65.4a", "R65.4b"}),
|
|
375
377
|
("③去 strip(\" * \" 不再按汇总处理)", _R65_A_STRIP, 'str(session) != "*"',
|
|
376
378
|
{"R65.4b"}),
|
|
@@ -464,4 +466,4 @@ def _r65_self_proof():
|
|
|
464
466
|
|
|
465
467
|
if __name__ == "__main__":
|
|
466
468
|
_rc = main()
|
|
467
|
-
sys.exit(_rc if _rc in (0, 2) else 1)
|
|
469
|
+
sys.exit(_rc if _rc in (0, 2) else 1)
|
package/md_cg/writegate.py
CHANGED
|
@@ -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
package/src/hooks.ts
CHANGED
|
@@ -493,8 +493,12 @@ export function renderIdentityAnchors(payload: unknown): string {
|
|
|
493
493
|
const WINDOW_BUDGET_TOKENS = 600
|
|
494
494
|
/** 单条窗口条目预览上限(字符)。 */
|
|
495
495
|
const WINDOW_ITEM_CHARS = 120
|
|
496
|
-
/** 窗口块总长上限(字符)。
|
|
497
|
-
|
|
496
|
+
/** 窗口块总长上限(字符)。
|
|
497
|
+
*
|
|
498
|
+
* issue #712(2026-10-30):归因前缀(`[MM-DD HH:mm|会话|密级] `,约 20 字符/行)
|
|
499
|
+
* 会占预算,故由 800 上调到 **900**(10 行 × 20 = 200,实测内容量持平)。
|
|
500
|
+
* 该块定位仍是「存在性锚点 / 接续提示」——宁可少注入几条,不挤占宿主上下文。 */
|
|
501
|
+
const WINDOW_MAX_CHARS = 900
|
|
498
502
|
/** 单条窗口条目的 role 字段上限(字符,issue #354 [P1-12])。
|
|
499
503
|
*
|
|
500
504
|
* 缺陷:`text` 有 120 字上限,`role` 却**完全不限长**——一条 3000 字的恶意
|
|
@@ -515,7 +519,18 @@ const WINDOW_ROLE_CHARS = 32
|
|
|
515
519
|
*
|
|
516
520
|
* 空载荷 / 无 recent 段 / 全空条目 → 返回空串(调用方据此**不 push** 第二块)。 */
|
|
517
521
|
// issue #563:同上,导出仅为可测。
|
|
518
|
-
export
|
|
522
|
+
export interface SessionWindowOptions {
|
|
523
|
+
/** 当前会话 id;提供时用于标注「本会话」还是「其他会话」(不用于过滤——
|
|
524
|
+
* 过滤由服务端 `session_recall` 按 `meta.session` 完成,前端再滤一次
|
|
525
|
+
* 会与服务端判据分裂成两份,本仓已多次栽在这上面)。 */
|
|
526
|
+
session?: string
|
|
527
|
+
/** 是否渲染归因前缀(默认 true)。设 false 可得旧格式(仅测试/回退用)。 */
|
|
528
|
+
attribution?: boolean
|
|
529
|
+
}
|
|
530
|
+
|
|
531
|
+
export function formatSessionWindow(
|
|
532
|
+
payload: unknown, limit: number, opts: SessionWindowOptions = {},
|
|
533
|
+
): string {
|
|
519
534
|
const items = (payload && typeof payload === 'object'
|
|
520
535
|
&& Array.isArray((payload as { recent?: unknown }).recent))
|
|
521
536
|
? (payload as { recent: Array<Record<string, unknown>> }).recent
|
|
@@ -523,6 +538,32 @@ export function formatSessionWindow(payload: unknown, limit: number): string {
|
|
|
523
538
|
const rows: string[] = []
|
|
524
539
|
const max = Math.max(1, Math.floor(limit) || 10)
|
|
525
540
|
let used = 0
|
|
541
|
+
const curSid = String(opts.session ?? '').trim()
|
|
542
|
+
const wantAttr = opts.attribution !== false
|
|
543
|
+
// issue #712(2026-10-30):归因前缀——让模型能区分「本会话/其他会话」「私有/共有」
|
|
544
|
+
// 「刚刚/过去」。库层与注入面已带齐四要素(md_cg/mdcos.py 的 recent 段),此处负责
|
|
545
|
+
// **渲染出来**;不渲染等于模型永远看不到,等于没做(这正是 PR #712 的原病灶)。
|
|
546
|
+
// ⚠️ 本改动**变更输出格式**(BREAKING):原 `[role] text` → `[MM-DD HH:mm|会话|密级] [role] text`。
|
|
547
|
+
// 前缀会占预算,故 WINDOW_MAX_CHARS 同步上调(见该常量注释)。
|
|
548
|
+
const stamp = (t: unknown): string => {
|
|
549
|
+
const n = Number(t)
|
|
550
|
+
if (!Number.isFinite(n) || n <= 0) return '??-?? ??:??'
|
|
551
|
+
const d = new Date(n * 1000)
|
|
552
|
+
const p = (x: number): string => String(x).padStart(2, '0')
|
|
553
|
+
return `${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`
|
|
554
|
+
}
|
|
555
|
+
const sessTag = (s: unknown): string => {
|
|
556
|
+
const v = String(s ?? '').trim()
|
|
557
|
+
if (!v) return '?'
|
|
558
|
+
if (curSid && v === curSid) return '本'
|
|
559
|
+
return `会话${v.slice(-4)}`
|
|
560
|
+
}
|
|
561
|
+
const sensTag = (s: unknown): string => {
|
|
562
|
+
const v = String(s ?? '').trim().toLowerCase()
|
|
563
|
+
if (v === 'private' || v === 'secret') return '私'
|
|
564
|
+
if (v === 'public' || v === 'internal' || v === 'restricted') return '共'
|
|
565
|
+
return '?'
|
|
566
|
+
}
|
|
526
567
|
for (const it of items.slice(0, max)) {
|
|
527
568
|
// issue #354 [P1-12]:role 与 text 同受单条上限约束——只限 text 时一条超长
|
|
528
569
|
// role 就能让首行突破整块预算并把后续历史全部挤出(首行 used===0 绕过了
|
|
@@ -535,7 +576,10 @@ export function formatSessionWindow(payload: unknown, limit: number): string {
|
|
|
535
576
|
const body = safe.length > WINDOW_ITEM_CHARS
|
|
536
577
|
? safe.slice(0, WINDOW_ITEM_CHARS) + '…'
|
|
537
578
|
: safe
|
|
538
|
-
const
|
|
579
|
+
const attr = wantAttr
|
|
580
|
+
? `[${stamp(it['t'])}|${sessTag(it['session'])}|${sensTag(it['sensitivity'])}] `
|
|
581
|
+
: ''
|
|
582
|
+
const row = `${attr}[${role}] ${body}`
|
|
539
583
|
const next = used === 0 ? row.length : used + 1 + row.length
|
|
540
584
|
// issue #354 [P1-12]:单条超预算时不再「首条整放」——超过 WINDOW_MAX_CHARS 的
|
|
541
585
|
// 行一律不放(截断 body 已在上面做完,理论上不可达,作 fail-closed 兜底)。
|
|
@@ -711,6 +755,7 @@ export function installMemoryHooks(ctx: Context, mdcg: MdcgClient | null, opts:
|
|
|
711
755
|
* **逐位等价**(差异窗口「本实例未观测 ∧ 模块单点非空」单实例下不可达;
|
|
712
756
|
* HMR 重载时新实例回落 '' 属更保守行为)。 */
|
|
713
757
|
let observedSession = false
|
|
758
|
+
let warnedEmptySid = false
|
|
714
759
|
|
|
715
760
|
/** 记忆沉淀(fire-and-forget)。认知图未就绪则跳过并告警(不退回 AEIS)。
|
|
716
761
|
* `role`=null 表示**读预热**(user-recall)——审计只统计写入路径,
|
|
@@ -800,6 +845,12 @@ export function installMemoryHooks(ctx: Context, mdcg: MdcgClient | null, opts:
|
|
|
800
845
|
const hostCtx = (_ctx as unknown) as { agent?: { session?: unknown } } | undefined
|
|
801
846
|
const sid = sessionIdOf(hostCtx?.agent?.session)
|
|
802
847
|
|| (observedSession ? currentSession() : '')
|
|
848
|
+
// 会话 id 为空时后端会退回全局滚动窗口(跨会话串台)。只告警一次,
|
|
849
|
+
// 避免每个 assemble step 刷日志;不改注入内容或数据路径。
|
|
850
|
+
if (!sid && !warnedEmptySid) {
|
|
851
|
+
warnedEmptySid = true
|
|
852
|
+
ctx.logger.warn('dsh-memory: 会话 id 为空,短期窗口可能退回全局滚动窗口(跨会话串台);请检查 host.agent.session 或会话观测是否可用')
|
|
853
|
+
}
|
|
803
854
|
// 逢十轮提醒的消费面(#657):不受 autoRecall 门控。
|
|
804
855
|
if (sid) {
|
|
805
856
|
const pending = pendingReminder.get(sid)
|
|
@@ -829,8 +880,25 @@ export function installMemoryHooks(ctx: Context, mdcg: MdcgClient | null, opts:
|
|
|
829
880
|
// 非永久层 → 既有「最近记忆」块;self/anchor → 独立「身份锚点」块(独立预算)。
|
|
830
881
|
const identityOn = opts.autoRecallIdentity === true
|
|
831
882
|
const timelinePayload = await graph.timeline(
|
|
832
|
-
|
|
883
|
+
recallLimit,
|
|
833
884
|
sid ? { session: sid } : {})
|
|
885
|
+
// issue #715(2026-10-30 外部报告,逐行复现):**身份块必须单独取数**。
|
|
886
|
+
//
|
|
887
|
+
// 病灶:此前身份块复用上面这份**带会话过滤**的 payload(还把 limit 加 3 试图
|
|
888
|
+
// 「多取 3 条」),但 `self`/`anchor` 节点的 `session` **恒为 `unattributed`**
|
|
889
|
+
// ——身份锚点在语义上就注定跨会话(`identity` 写入不带 session_id 时即如此,
|
|
890
|
+
// 状态卡与关系节点同理)。两者叠加 ⇒ 永久层被会话过滤全部滤掉 ⇒
|
|
891
|
+
// `renderIdentityAnchors` 拿到空集 ⇒ **块从不出现且无任何报错**(静默失效)。
|
|
892
|
+
//
|
|
893
|
+
// 这正是《身份与人格》理论的 R3:**人格的可见性不该由会话决定**。
|
|
894
|
+
// 用会话过滤去筛人格节点是**类别错误**,不是参数没调好。
|
|
895
|
+
//
|
|
896
|
+
// 故身份块改为**不带会话过滤**取数(不传 session ⇒ 跨会话视图),
|
|
897
|
+
// 再由 `renderIdentityAnchors` 只挑 self/anchor(其余层照样被它跳过)。
|
|
898
|
+
// 「最近记忆」块保持会话隔离不变——那是工作记忆,本就该跟会话走。
|
|
899
|
+
const identityPayload = identityOn
|
|
900
|
+
? await graph.timeline(IDENTITY_MAX_ITEMS * 3, {})
|
|
901
|
+
: null
|
|
834
902
|
const text = formatTimelineDecayed(timelinePayload)
|
|
835
903
|
if (text) {
|
|
836
904
|
// 注入边界转义(issue #16):宿主 system-prompt 对 context 文本做严格
|
|
@@ -866,13 +934,21 @@ export function installMemoryHooks(ctx: Context, mdcg: MdcgClient | null, opts:
|
|
|
866
934
|
}
|
|
867
935
|
if (identityOn) {
|
|
868
936
|
try {
|
|
869
|
-
|
|
937
|
+
// issue #715:用**独立取数**的 payload(不带会话过滤),不再复用已滤会话的那份。
|
|
938
|
+
const idText = renderIdentityAnchors(identityPayload)
|
|
870
939
|
if (idText) {
|
|
871
940
|
assembly.contexts.push({
|
|
872
941
|
name: 'lingshu:identity-anchor',
|
|
873
942
|
text: escapePromptBraces(renderUntrustedMemoryBlock(
|
|
874
943
|
'【灵枢身份锚点】(self/anchor 层,独立预算)\n' + idText)),
|
|
875
944
|
})
|
|
945
|
+
} else {
|
|
946
|
+
// issue #715(静默失效):此前「开关开了但块从不出现」与「库里确实没有
|
|
947
|
+
// self/anchor 节点」**完全不可分辨**——catch 不触发(没抛错),也没有任何
|
|
948
|
+
// 提示。开着的功能不生效却无声,比报错更难查。故此处显式留痕。
|
|
949
|
+
ctx.logger.info(
|
|
950
|
+
'dsh-memory: autoRecallIdentity 已开启但无可注入的身份节点'
|
|
951
|
+
+ '(self/anchor 层为空——请用 cg(op=identity, action=anchor) 建立锚点)')
|
|
876
952
|
}
|
|
877
953
|
} catch (err) {
|
|
878
954
|
// issue #128 同款纪律:fail-soft 但不静默——空 catch 会被
|
|
@@ -892,7 +968,8 @@ export function installMemoryHooks(ctx: Context, mdcg: MdcgClient | null, opts:
|
|
|
892
968
|
if (cwEnabled) {
|
|
893
969
|
try {
|
|
894
970
|
const win = await graph.sessionRecall(sid, cwTurns, WINDOW_BUDGET_TOKENS)
|
|
895
|
-
|
|
971
|
+
// issue #712:传 sid 用于**标注**(本会话/其他会话),不用于过滤。
|
|
972
|
+
const winText = formatSessionWindow(win, cwTurns, { session: sid })
|
|
896
973
|
if (winText) {
|
|
897
974
|
// 注入边界同规(文件头硬约束):不可信内容边界 + `{{` 转义,
|
|
898
975
|
// 都只改注入副本——窗口原文在库内保真。
|