@furongjun1999/dsh-memory 0.9.22 → 0.9.23
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.en.md +404 -0
- package/CHANGELOG.md +45 -0
- package/README.en.md +240 -0
- package/README.md +3 -1
- package/docs/README.md +2 -0
- package/docs/en/README.md +190 -0
- package/docs/en/TRANSLATION.md +78 -0
- package/docs/en/TRANSLATION_MANIFEST.json +170 -0
- package/docs/en/TRANSLATION_REPORT.md +11 -0
- package/docs/en/dev/README.md +10 -0
- package/docs/en/dev/coding-testing.md +72 -0
- package/docs/en/dev/switch-matrix.md +10 -0
- package/docs/en/glossary.md +97 -0
- package/docs/en/harnesses/claude.md +100 -0
- package/docs/en/harnesses/codebuddy.md +93 -0
- package/docs/en/harnesses/codex.md +88 -0
- package/docs/en/harnesses/dsh.md +84 -0
- package/docs/en/harnesses/zcode.md +42 -0
- package/docs/en/mdcg/ccg.md +32 -0
- package/docs/en/mdcg/generated-docs.md +20 -0
- package/docs/en/mdcg/guardrail-charter.md +170 -0
- package/docs/en/mdcg/mcp-tool-names.md +43 -0
- package/docs/en/mdcg/multi-harness.md +43 -0
- package/docs/en/mdcg/recall-metadata.md +30 -0
- package/docs/en/mdcg/world-model-endpoint.md +379 -0
- package/docs/en/mdcg/write-aliases.md +130 -0
- package/docs/en/ops/README.md +11 -0
- package/docs/en/ops/environment-known-issues.md +244 -0
- package/docs/en/ops/install.md +72 -0
- package/docs/en/ops/operations-troubleshooting.md +86 -0
- package/docs/en/ops/permissions-review.md +79 -0
- package/docs/en/ops/release-governance.md +49 -0
- package/docs/en/ops/tool-name-migration.md +30 -0
- package/docs/en/ops/ui-install-troubleshooting.md +53 -0
- package/docs/en/standards/ai-coding-standard-checklist.md +71 -0
- package/docs/en/standards/ai-coding-standard-lingshu.md +47 -0
- package/docs/en/standards/ai-coding-standard.md +185 -0
- package/docs/en/ui/minimal.md +62 -0
- package/docs/mdcg/cogmap_ops.md +15 -15
- package/lib/hooks.d.ts +22 -0
- package/lib/hooks.js +124 -32
- package/lib/index.js +19 -3
- package/lib/lib/console_web.mjs +30 -3
- package/lib/lib/hook_audit.d.ts +3 -2
- package/lib/lib/hook_audit.js +14 -4
- package/lib/lib/mdcg_client.d.ts +5 -2
- package/lib/lib/mdcg_client.js +8 -4
- package/lib/lib/prompt_safety.d.ts +24 -0
- package/lib/lib/prompt_safety.js +77 -1
- package/lib/lib/token_store.js +5 -2
- package/lib/tools.js +5 -3
- package/md_cg/fsutil.py +80 -25
- package/md_cg/mcp_server.py +5761 -5557
- package/md_cg/mdcg.py +570 -73
- package/md_cg/mdcos.py +36 -11
- package/md_cg/nodefile.py +147 -23
- package/md_cg/op_table.py +14 -4
- package/md_cg/reconcile.py +9 -11
- package/md_cg/rollback.py +16 -1
- package/md_cg/scrub.py +94 -14
- package/md_cg/security.py +4 -2
- package/md_cg/test_cond_term_fold.py +183 -0
- package/md_cg/test_cond_terms_colon.py +348 -0
- package/md_cg/test_generation_guard.py +63 -42
- package/md_cg/test_issue362_neg_condition.py +44 -7
- package/md_cg/test_issue39_utf8_stdio.py +3 -3
- package/md_cg/test_issue444_scrub_evidence_plaintext.py +14 -8
- package/md_cg/test_issue677_flush_batch_io.py +139 -0
- package/md_cg/test_issue677_info_fast.py +82 -0
- package/md_cg/test_issue677_remember_dedupe.py +106 -0
- package/md_cg/test_issue712_tokens_sessions_read.py +199 -0
- package/md_cg/test_issue722_strict_conditions.py +96 -0
- package/md_cg/test_issue730_narrowing_audit.py +121 -0
- package/md_cg/test_issue733_verify_override.py +193 -0
- package/md_cg/test_issue733_verify_override_and_overwrite_inherit.py +315 -0
- package/md_cg/test_issue740_filelock_fd_leak.py +218 -0
- package/md_cg/test_issue741_content_hash_same_source.py +158 -0
- package/md_cg/test_issue747_slot_contradiction.py +125 -0
- package/md_cg/test_issue754_nested_root_guard.py +197 -0
- package/md_cg/test_issue757_index_hash_compare.py +85 -0
- package/md_cg/test_issue758_disk_hash_single.py +67 -0
- package/md_cg/test_issue759_twophase_hash.py +67 -0
- package/md_cg/test_n204_n205_n226_n227_n228_n229_exit_gates.py +545 -542
- package/md_cg/test_n209_verify_write_face_gates.py +5 -2
- package/md_cg/test_neg_condition_hits.py +336 -333
- package/md_cg/test_scrub_source_line_false_positive.py +64 -0
- package/md_cg/test_twophase.py +286 -286
- package/md_cg/tokens.py +55 -7
- package/md_cg/twophase.py +15 -6
- package/md_cg/writepipe.py +35 -3
- package/package.json +137 -134
- package/scripts/workspace_index.py +2 -0
- package/src/hooks.ts +139 -33
- package/src/index.ts +19 -3
- package/src/lib/console_web.mjs +30 -3
- package/src/lib/hook_audit.ts +15 -5
- package/src/lib/mdcg_client.ts +8 -4
- package/src/lib/prompt_safety.ts +73 -1
- package/src/lib/token_store.ts +5 -2
- package/src/tools.ts +5 -3
- package/ui/minimal/integrity.json +2 -2
- package/ui/minimal/payload/lib/lib/console_web.mjs +30 -3
- package/ui/minimal/payload/src/lib/console_web.mjs +30 -3
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""scrub 误判守卫:引用/出处行(「…(源:src_x)」)不得被当成可断言的键值对。"""
|
|
3
|
+
from __future__ import annotations
|
|
4
|
+
|
|
5
|
+
import os
|
|
6
|
+
import sys
|
|
7
|
+
|
|
8
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
9
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
10
|
+
sys.path.insert(0, _REPO)
|
|
11
|
+
|
|
12
|
+
from md_cg import scrub # noqa: E402
|
|
13
|
+
|
|
14
|
+
FAILS = []
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
def ok(cond, name, detail=""):
|
|
18
|
+
if cond:
|
|
19
|
+
print(" PASS " + name)
|
|
20
|
+
else:
|
|
21
|
+
print(" FAIL " + name + " " + str(detail)[:300])
|
|
22
|
+
FAILS.append(name)
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
PREFIX = "# 功能名:甲\n\n同一句前缀(源:"
|
|
26
|
+
TAIL = "src_aaa、src_bbb)"
|
|
27
|
+
TAIL2 = "src_ccc)"
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
class FakeCG:
|
|
31
|
+
def __init__(self, nodes):
|
|
32
|
+
self._n = nodes
|
|
33
|
+
|
|
34
|
+
def get(self, nid):
|
|
35
|
+
return self._n.get(nid)
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
def main():
|
|
39
|
+
print("=" * 68)
|
|
40
|
+
print("scrub · 引用行误判守卫")
|
|
41
|
+
print("=" * 68)
|
|
42
|
+
# A1:括号类键不再被抽出(本地实测:切出来是「…(源」)
|
|
43
|
+
kv = scrub._kv_pairs(PREFIX + TAIL)
|
|
44
|
+
ok(not any("(" in k for k in kv), "A1 含括号的前缀键不再进入断言键集", kv)
|
|
45
|
+
ok(kv == {}, "A1b 该行一个键都不抽", kv)
|
|
46
|
+
# A2:值侧兜底——虽键合法但值是引用 id 列表
|
|
47
|
+
kv2 = scrub._kv_pairs("出处:src_a、src_b")
|
|
48
|
+
ok("出处" not in kv2, "A2 值是 src_ 列表的键被排除", kv2)
|
|
49
|
+
# A3:端到端——同前缀 + 不同源 ⇒ 不得判矛盾
|
|
50
|
+
cg = FakeCG({"peer": {"content": PREFIX + TAIL2}})
|
|
51
|
+
hit = scrub._contradiction(cg, PREFIX + TAIL, [{"node_id": "peer", "via": "lexical"}])
|
|
52
|
+
ok(hit is None, "A3 同前缀不同源不再判 contradiction", hit)
|
|
53
|
+
# A4:真矛盾仍要抓到(键合法、值不同)
|
|
54
|
+
cg2 = FakeCG({"peer2": {"content": "# 功能名:乙\n\n端口:8080"}})
|
|
55
|
+
hit2 = scrub._contradiction(cg2, "# 功能名:甲\n\n端口:9090",
|
|
56
|
+
[{"node_id": "peer2", "via": "lexical"}])
|
|
57
|
+
ok(bool(hit2) and "同键不同值" in str(hit2.get("why")), "A4 真矛盾仍被抓到", hit2)
|
|
58
|
+
print()
|
|
59
|
+
print("scrub 引用行守卫:%d 项失败" % len(FAILS) if FAILS else "scrub 引用行守卫:全部通过")
|
|
60
|
+
return 1 if FAILS else 0
|
|
61
|
+
|
|
62
|
+
|
|
63
|
+
if __name__ == "__main__":
|
|
64
|
+
sys.exit(main())
|
package/md_cg/test_twophase.py
CHANGED
|
@@ -1,286 +1,286 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
"""test_twophase · 写入两段式提交(Pi 可学习优点 ③)
|
|
3
|
-
|
|
4
|
-
验收口径(交接文档 §3③):
|
|
5
|
-
- 写入在**闸门通过后先落 intent**(含内容指纹),落盘完成再落 outcome;
|
|
6
|
-
- 「kill -9 模拟半途写入后重启」→ 对账**正确补账**(内容确已落盘)或
|
|
7
|
-
**如实标记**(未落盘 / 指纹不符),不假装成功;
|
|
8
|
-
- 对账幂等、账本 append-only、不重放写入;
|
|
9
|
-
- 未落盘的分支(闸门拒绝 / 入队)不产生 intent——没打算写就不记账。
|
|
10
|
-
|
|
11
|
-
运行:python -m md_cg.test_twophase
|
|
12
|
-
"""
|
|
13
|
-
from __future__ import annotations
|
|
14
|
-
|
|
15
|
-
import json
|
|
16
|
-
import os
|
|
17
|
-
import shutil
|
|
18
|
-
import tempfile
|
|
19
|
-
import traceback
|
|
20
|
-
|
|
21
|
-
from . import twophase, writepipe
|
|
22
|
-
from .mdcos import MdCGSecure
|
|
23
|
-
from .security import Principal
|
|
24
|
-
|
|
25
|
-
_ok = 0
|
|
26
|
-
_fail = []
|
|
27
|
-
_seq = [0]
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
def check(name, cond, detail=""):
|
|
31
|
-
global _ok
|
|
32
|
-
if cond:
|
|
33
|
-
_ok += 1
|
|
34
|
-
print("[ok] " + name)
|
|
35
|
-
else:
|
|
36
|
-
_fail.append(name)
|
|
37
|
-
print("[FAIL] %s · %s" % (name, str(detail)[:240]))
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
def _mk_cg(tmp, role="designer"):
|
|
41
|
-
_seq[0] += 1
|
|
42
|
-
root = os.path.join(tmp, "root_%02d_%s" % (_seq[0], role))
|
|
43
|
-
p = Principal(tenant="default", actor="t_" + role, role=role,
|
|
44
|
-
can_write=(role != "guest"), can_admin=(role == "designer"))
|
|
45
|
-
return MdCGSecure(root, principal=p)
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
def _policy(tmp, required=("PASSED",), forbidden=("FORBIDDEN_WORD",)):
|
|
49
|
-
path = os.path.join(tmp, "policy.json")
|
|
50
|
-
with open(path, "w", encoding="utf-8") as f:
|
|
51
|
-
json.dump({"forbidden": list(forbidden),
|
|
52
|
-
"required": list(required)}, f)
|
|
53
|
-
os.environ["MDCG_POLICY_FILE"] = path
|
|
54
|
-
return path
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
def _lines(cg):
|
|
58
|
-
p = twophase.log_path(cg)
|
|
59
|
-
if not os.path.isfile(p):
|
|
60
|
-
return []
|
|
61
|
-
with open(p, encoding="utf-8", errors="replace") as f:
|
|
62
|
-
return [x for x in f.read().splitlines() if x.strip()]
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
def _recs(cg):
|
|
66
|
-
return twophase.records(cg)
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
def _idx(cg, nid):
|
|
70
|
-
return (cg.index.get("nodes") or {}).get(nid) or {}
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
def _phases(cg, nid=None):
|
|
74
|
-
return [r.get("phase") for r in _recs(cg)
|
|
75
|
-
if nid is None or r.get("id") == nid]
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
def _run(tmp):
|
|
79
|
-
_policy(tmp)
|
|
80
|
-
pipe = writepipe.install_default_gates(writepipe.WritePipeline())
|
|
81
|
-
|
|
82
|
-
# ---------- ① 正常落盘:intent + outcome 成对 ----------
|
|
83
|
-
cg = _mk_cg(tmp)
|
|
84
|
-
out = pipe.execute(cg, {"content_kind": "text",
|
|
85
|
-
"content": "两段式正常落盘 PASSED",
|
|
86
|
-
"layer": "knowledge"})
|
|
87
|
-
nid = out.get("id")
|
|
88
|
-
check("①1 写入成功(committed)", out.get("committed") is True, out)
|
|
89
|
-
recs = _recs(cg)
|
|
90
|
-
ph = [r["phase"] for r in recs if r.get("id") == nid]
|
|
91
|
-
check("①2 账本两行成对(intent → outcome)", ph == ["intent", "outcome"], ph)
|
|
92
|
-
intent = [r for r in recs if r.get("id") == nid
|
|
93
|
-
and r["phase"] == "intent"][0]
|
|
94
|
-
oc = [r for r in recs if r.get("id") == nid and r["phase"] == "outcome"][0]
|
|
95
|
-
check("①3 intent 带内容指纹(对账的判据)",
|
|
96
|
-
bool(intent.get("content_hash")), intent)
|
|
97
|
-
check("①4 outcome 记 committed + 同 iid",
|
|
98
|
-
oc.get("status") == twophase.STATUS_COMMITTED
|
|
99
|
-
and oc.get("iid") == intent.get("iid"), oc)
|
|
100
|
-
check("①5 指纹走 nodefile 唯一真源(含写盘尾换行归一)",
|
|
101
|
-
intent.get("content_hash")
|
|
102
|
-
== twophase.nodefile.content_hash("两段式正常落盘 PASSED"),
|
|
103
|
-
(intent.get("content_hash"),
|
|
104
|
-
twophase.nodefile.content_hash("两段式正常落盘 PASSED")))
|
|
105
|
-
check("①6 正常写入后无未结清意图", cg.pending_writes() == [])
|
|
106
|
-
|
|
107
|
-
# ---------- ② intent 真的**先于**落盘(真实执行路径内观测) ----------
|
|
108
|
-
cg2 = _mk_cg(tmp)
|
|
109
|
-
_orig = writepipe._executor
|
|
110
|
-
seen = {}
|
|
111
|
-
|
|
112
|
-
def _probe(ctx):
|
|
113
|
-
seen["has_intent"] = any(
|
|
114
|
-
r.get("phase") == "intent" and r.get("id") == ctx["nid"]
|
|
115
|
-
for r in _recs(ctx["cg"]))
|
|
116
|
-
seen["has_outcome"] = any(
|
|
117
|
-
r.get("phase") == "outcome" and r.get("id") == ctx["nid"]
|
|
118
|
-
for r in _recs(ctx["cg"]))
|
|
119
|
-
seen["node_exists"] = bool(ctx["cg"].get(ctx["nid"]))
|
|
120
|
-
return _orig(ctx)
|
|
121
|
-
|
|
122
|
-
writepipe._executor = _probe
|
|
123
|
-
try:
|
|
124
|
-
pipe.execute(cg2, {"content_kind": "text",
|
|
125
|
-
"content": "先行持久化探针 PASSED",
|
|
126
|
-
"layer": "knowledge"})
|
|
127
|
-
finally:
|
|
128
|
-
writepipe._executor = _orig
|
|
129
|
-
check("②1 进入执行器时 intent 已落账(先行持久化成立)",
|
|
130
|
-
seen.get("has_intent") is True, seen)
|
|
131
|
-
check("②2 进入执行器时**尚无** outcome 且节点未落盘",
|
|
132
|
-
seen.get("has_outcome") is False
|
|
133
|
-
and seen.get("node_exists") is False, seen)
|
|
134
|
-
|
|
135
|
-
# ---------- ③ 半途崩溃:落盘已完成、outcome 未写 ----------
|
|
136
|
-
cg3 = _mk_cg(tmp)
|
|
137
|
-
nid3 = "mem_2pc_c3"
|
|
138
|
-
tok = twophase.begin(cg3, nid3, "崩溃在落盘之后 PASSED", layer="knowledge",
|
|
139
|
-
actor="test:crash")
|
|
140
|
-
cg3.add(nid3, "崩溃在落盘之后 PASSED", layer="knowledge")
|
|
141
|
-
check("③1 崩溃现场:有 intent 无 outcome",
|
|
142
|
-
_phases(cg3, nid3) == ["intent"]
|
|
143
|
-
and len(cg3.pending_writes()) == 1)
|
|
144
|
-
rep = cg3.reconcile_writes()
|
|
145
|
-
check("③2 对账补账(内容指纹吻合 → committed)",
|
|
146
|
-
rep.get("unpaired") == 1 and rep.get("committed") == 1
|
|
147
|
-
and rep.get("interrupted") == 0, rep)
|
|
148
|
-
check("③3 补出的 outcome 标 reconciled + 判据可审计",
|
|
149
|
-
any(r.get("phase") == "outcome" and r.get("reconciled")
|
|
150
|
-
and r.get("reason") == twophase.R_NODE_OK
|
|
151
|
-
for r in _recs(cg3)), _recs(cg3)[-1])
|
|
152
|
-
check("③4 对账后 pending 归零",
|
|
153
|
-
cg3.pending_writes() == [])
|
|
154
|
-
|
|
155
|
-
# ---------- ④ 半途崩溃:根本没落盘 ----------
|
|
156
|
-
cg4 = _mk_cg(tmp)
|
|
157
|
-
twophase.begin(cg4, "mem_2pc_c4", "崩溃在落盘之前 PASSED",
|
|
158
|
-
layer="knowledge")
|
|
159
|
-
rep4 = cg4.reconcile_writes()
|
|
160
|
-
check("④1 未落盘 → 如实标记 interrupted(不假装成功)",
|
|
161
|
-
rep4.get("unpaired") == 1 and rep4.get("interrupted") == 1
|
|
162
|
-
and rep4.get("committed") == 0, rep4)
|
|
163
|
-
check("④2 interrupted 判据 = node_missing",
|
|
164
|
-
rep4["details"][0]["reason"] == twophase.R_NODE_MISSING, rep4)
|
|
165
|
-
check("④3 未落盘节点确实不在库(标记与实际一致)",
|
|
166
|
-
cg4.get("mem_2pc_c4") is None)
|
|
167
|
-
|
|
168
|
-
# ---------- ⑤ 指纹不符:落了别的正文 ----------
|
|
169
|
-
cg5 = _mk_cg(tmp)
|
|
170
|
-
twophase.begin(cg5, "mem_2pc_c5", "意图写的是这一段 PASSED")
|
|
171
|
-
cg5.add("mem_2pc_c5", "实际落的是另一段 PASSED", layer="knowledge")
|
|
172
|
-
rep5 = cg5.reconcile_writes()
|
|
173
|
-
check("⑤1 指纹不符 → interrupted(content_mismatch)",
|
|
174
|
-
rep5.get("interrupted") == 1
|
|
175
|
-
and rep5["details"][0]["reason"] == twophase.R_MISMATCH, rep5)
|
|
176
|
-
check("⑤2 对账**不覆盖**既有正文(只标记不重放)",
|
|
177
|
-
"实际落的是另一段" in (cg5.get("mem_2pc_c5") or {}).get("content", ""))
|
|
178
|
-
|
|
179
|
-
# ---------- ⑥ dry-run / 幂等 / append-only ----------
|
|
180
|
-
cg6 = _mk_cg(tmp)
|
|
181
|
-
twophase.begin(cg6, "mem_2pc_c6", "dry-run 用例 PASSED")
|
|
182
|
-
before = _lines(cg6)
|
|
183
|
-
dry = cg6.reconcile_writes(apply=False)
|
|
184
|
-
check("⑥1 dry-run 报告未结清但不改账本",
|
|
185
|
-
dry.get("unpaired") == 1 and dry.get("applied") is False
|
|
186
|
-
and _lines(cg6) == before, dry)
|
|
187
|
-
cg6.reconcile_writes()
|
|
188
|
-
n_after_first = len(_lines(cg6))
|
|
189
|
-
rep6b = cg6.reconcile_writes()
|
|
190
|
-
check("⑥2 对账幂等(二次无未结清、不追加行)",
|
|
191
|
-
rep6b.get("unpaired") == 0
|
|
192
|
-
and len(_lines(cg6)) == n_after_first, rep6b)
|
|
193
|
-
check("⑥3 账本 append-only(原记录逐字保留)",
|
|
194
|
-
_lines(cg6)[:len(before)] == before)
|
|
195
|
-
snap = _lines(cg6)
|
|
196
|
-
cg6.pending_writes()
|
|
197
|
-
check("⑥4 pending 只读(不改账本)", _lines(cg6) == snap)
|
|
198
|
-
|
|
199
|
-
# ---------- ⑦ 执行器抛异常 → outcome=error,异常照抛 ----------
|
|
200
|
-
cg7 = _mk_cg(tmp, role="guest") # guest 无写权限 → 库层拒绝
|
|
201
|
-
pipe7 = writepipe.WritePipeline() # 不装闸:直接打执行器
|
|
202
|
-
raised = None
|
|
203
|
-
try:
|
|
204
|
-
pipe7.execute(cg7, {"content": "无权限写入 PASSED",
|
|
205
|
-
"layer": "knowledge"})
|
|
206
|
-
except Exception as exc: # AccessDenied 或其子类
|
|
207
|
-
raised = type(exc).__name__
|
|
208
|
-
check("⑦1 库层权限拒绝照抛(两段式不改错误语义)", raised is not None,
|
|
209
|
-
raised)
|
|
210
|
-
check("⑦2 失败也留痕:outcome=error 且无 committed",
|
|
211
|
-
any(r.get("phase") == "outcome"
|
|
212
|
-
and r.get("status") == twophase.STATUS_ERROR
|
|
213
|
-
for r in _recs(cg7)), _recs(cg7))
|
|
214
|
-
check("⑦3 失败不留未结清意图(已配对)", cg7.pending_writes() == [])
|
|
215
|
-
|
|
216
|
-
# ---------- ⑧ 未落盘的分支不记账 ----------
|
|
217
|
-
cg8 = _mk_cg(tmp)
|
|
218
|
-
out8 = pipe.execute(cg8, {"content_kind": "text",
|
|
219
|
-
"content": "这段含 FORBIDDEN_WORD 应被拒",
|
|
220
|
-
"layer": "knowledge"})
|
|
221
|
-
check("⑧1 闸门拒绝分支:committed=False",
|
|
222
|
-
out8.get("committed") is False, out8.get("moved_to"))
|
|
223
|
-
check("⑧2 未落盘 → **不产生** intent(没打算写就不记账)",
|
|
224
|
-
_phases(cg8) == [], _recs(cg8))
|
|
225
|
-
check("⑧3 对账在空账本上恒无未结清",
|
|
226
|
-
cg8.reconcile_writes().get("unpaired") == 0)
|
|
227
|
-
|
|
228
|
-
# ---------- ⑨ gated 替代执行路径也成对 ----------
|
|
229
|
-
cg9 = _mk_cg(tmp)
|
|
230
|
-
out9 = pipe.execute(cg9, {"content_kind": "text",
|
|
231
|
-
"content": "gated 主动遗忘路径 PASSED",
|
|
232
|
-
"layer": "contextual", "gated": True,
|
|
233
|
-
"importance": 0.5})
|
|
234
|
-
nid9 = out9.get("id")
|
|
235
|
-
ph9 = _phases(cg9, nid9)
|
|
236
|
-
check("⑨1 gated 路径账本成对(intent → outcome)",
|
|
237
|
-
ph9 == ["intent", "outcome"], ph9)
|
|
238
|
-
oc9 = [r for r in _recs(cg9)
|
|
239
|
-
if r.get("id") == nid9 and r["phase"] == "outcome"][0]
|
|
240
|
-
check("⑨2 结局与 verdict 一致(committed 当且仅当落盘)",
|
|
241
|
-
(oc9.get("status") == twophase.STATUS_COMMITTED)
|
|
242
|
-
== bool(out9.get("committed")), (oc9, out9.get("committed")))
|
|
243
|
-
check("⑨3 gated 结局无未结清(自己落盘的路径也结清)",
|
|
244
|
-
cg9.pending_writes() == [])
|
|
245
|
-
|
|
246
|
-
# ---------- ⑩ 边界 ----------
|
|
247
|
-
cg10 = _mk_cg(tmp)
|
|
248
|
-
check("⑩1 空账本:records/pending/reconcile 均不炸",
|
|
249
|
-
_recs(cg10) == [] and cg10.pending_writes() == []
|
|
250
|
-
and cg10.reconcile_writes().get("unpaired") == 0)
|
|
251
|
-
bad = os.path.join(cg10.root, "_write_2pc.jsonl")
|
|
252
|
-
with open(bad, "a", encoding="utf-8") as f:
|
|
253
|
-
f.write("{坏行不是 json\n")
|
|
254
|
-
check("⑩2 坏行跳过不炸(账本读侧容错)",
|
|
255
|
-
isinstance(_recs(cg10), list))
|
|
256
|
-
check("⑩3 指纹算法与 nodefile
|
|
257
|
-
twophase.nodefile.content_hash("abc")
|
|
258
|
-
== __import__("hashlib").sha256(b"abc").hexdigest()[:12])
|
|
259
|
-
check("⑩4 账本文件在 root 下(随记忆库一起备份/迁移)",
|
|
260
|
-
os.path.dirname(twophase.log_path(cg10)) == cg10.root)
|
|
261
|
-
check("⑩5 对账只增行不删行(append-only 结构保证)",
|
|
262
|
-
len(_lines(cg10)) >= 1 and all(l.strip() for l in _lines(cg10)))
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
def main():
|
|
266
|
-
tmp = tempfile.mkdtemp(prefix="twophase_")
|
|
267
|
-
old = os.environ.pop("MDCG_POLICY_FILE", None)
|
|
268
|
-
try:
|
|
269
|
-
_run(tmp)
|
|
270
|
-
except Exception:
|
|
271
|
-
traceback.print_exc()
|
|
272
|
-
_fail.append("未捕获异常")
|
|
273
|
-
finally:
|
|
274
|
-
shutil.rmtree(tmp, ignore_errors=True)
|
|
275
|
-
if old is not None:
|
|
276
|
-
os.environ["MDCG_POLICY_FILE"] = old
|
|
277
|
-
else:
|
|
278
|
-
os.environ.pop("MDCG_POLICY_FILE", None)
|
|
279
|
-
print("\ntest_twophase: %d 通过 / %d 失败" % (_ok, len(_fail)))
|
|
280
|
-
if _fail:
|
|
281
|
-
print("失败项:" + "、".join(_fail))
|
|
282
|
-
raise SystemExit(1 if _fail else 0)
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
if __name__ == "__main__":
|
|
286
|
-
main()
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""test_twophase · 写入两段式提交(Pi 可学习优点 ③)
|
|
3
|
+
|
|
4
|
+
验收口径(交接文档 §3③):
|
|
5
|
+
- 写入在**闸门通过后先落 intent**(含内容指纹),落盘完成再落 outcome;
|
|
6
|
+
- 「kill -9 模拟半途写入后重启」→ 对账**正确补账**(内容确已落盘)或
|
|
7
|
+
**如实标记**(未落盘 / 指纹不符),不假装成功;
|
|
8
|
+
- 对账幂等、账本 append-only、不重放写入;
|
|
9
|
+
- 未落盘的分支(闸门拒绝 / 入队)不产生 intent——没打算写就不记账。
|
|
10
|
+
|
|
11
|
+
运行:python -m md_cg.test_twophase
|
|
12
|
+
"""
|
|
13
|
+
from __future__ import annotations
|
|
14
|
+
|
|
15
|
+
import json
|
|
16
|
+
import os
|
|
17
|
+
import shutil
|
|
18
|
+
import tempfile
|
|
19
|
+
import traceback
|
|
20
|
+
|
|
21
|
+
from . import twophase, writepipe
|
|
22
|
+
from .mdcos import MdCGSecure
|
|
23
|
+
from .security import Principal
|
|
24
|
+
|
|
25
|
+
_ok = 0
|
|
26
|
+
_fail = []
|
|
27
|
+
_seq = [0]
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def check(name, cond, detail=""):
|
|
31
|
+
global _ok
|
|
32
|
+
if cond:
|
|
33
|
+
_ok += 1
|
|
34
|
+
print("[ok] " + name)
|
|
35
|
+
else:
|
|
36
|
+
_fail.append(name)
|
|
37
|
+
print("[FAIL] %s · %s" % (name, str(detail)[:240]))
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
def _mk_cg(tmp, role="designer"):
|
|
41
|
+
_seq[0] += 1
|
|
42
|
+
root = os.path.join(tmp, "root_%02d_%s" % (_seq[0], role))
|
|
43
|
+
p = Principal(tenant="default", actor="t_" + role, role=role,
|
|
44
|
+
can_write=(role != "guest"), can_admin=(role == "designer"))
|
|
45
|
+
return MdCGSecure(root, principal=p)
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
def _policy(tmp, required=("PASSED",), forbidden=("FORBIDDEN_WORD",)):
|
|
49
|
+
path = os.path.join(tmp, "policy.json")
|
|
50
|
+
with open(path, "w", encoding="utf-8") as f:
|
|
51
|
+
json.dump({"forbidden": list(forbidden),
|
|
52
|
+
"required": list(required)}, f)
|
|
53
|
+
os.environ["MDCG_POLICY_FILE"] = path
|
|
54
|
+
return path
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
def _lines(cg):
|
|
58
|
+
p = twophase.log_path(cg)
|
|
59
|
+
if not os.path.isfile(p):
|
|
60
|
+
return []
|
|
61
|
+
with open(p, encoding="utf-8", errors="replace") as f:
|
|
62
|
+
return [x for x in f.read().splitlines() if x.strip()]
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
def _recs(cg):
|
|
66
|
+
return twophase.records(cg)
|
|
67
|
+
|
|
68
|
+
|
|
69
|
+
def _idx(cg, nid):
|
|
70
|
+
return (cg.index.get("nodes") or {}).get(nid) or {}
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
def _phases(cg, nid=None):
|
|
74
|
+
return [r.get("phase") for r in _recs(cg)
|
|
75
|
+
if nid is None or r.get("id") == nid]
|
|
76
|
+
|
|
77
|
+
|
|
78
|
+
def _run(tmp):
|
|
79
|
+
_policy(tmp)
|
|
80
|
+
pipe = writepipe.install_default_gates(writepipe.WritePipeline())
|
|
81
|
+
|
|
82
|
+
# ---------- ① 正常落盘:intent + outcome 成对 ----------
|
|
83
|
+
cg = _mk_cg(tmp)
|
|
84
|
+
out = pipe.execute(cg, {"content_kind": "text",
|
|
85
|
+
"content": "两段式正常落盘 PASSED",
|
|
86
|
+
"layer": "knowledge"})
|
|
87
|
+
nid = out.get("id")
|
|
88
|
+
check("①1 写入成功(committed)", out.get("committed") is True, out)
|
|
89
|
+
recs = _recs(cg)
|
|
90
|
+
ph = [r["phase"] for r in recs if r.get("id") == nid]
|
|
91
|
+
check("①2 账本两行成对(intent → outcome)", ph == ["intent", "outcome"], ph)
|
|
92
|
+
intent = [r for r in recs if r.get("id") == nid
|
|
93
|
+
and r["phase"] == "intent"][0]
|
|
94
|
+
oc = [r for r in recs if r.get("id") == nid and r["phase"] == "outcome"][0]
|
|
95
|
+
check("①3 intent 带内容指纹(对账的判据)",
|
|
96
|
+
bool(intent.get("content_hash")), intent)
|
|
97
|
+
check("①4 outcome 记 committed + 同 iid",
|
|
98
|
+
oc.get("status") == twophase.STATUS_COMMITTED
|
|
99
|
+
and oc.get("iid") == intent.get("iid"), oc)
|
|
100
|
+
check("①5 指纹走 nodefile 唯一真源(含写盘尾换行归一)",
|
|
101
|
+
intent.get("content_hash")
|
|
102
|
+
== twophase.nodefile.content_hash("两段式正常落盘 PASSED"),
|
|
103
|
+
(intent.get("content_hash"),
|
|
104
|
+
twophase.nodefile.content_hash("两段式正常落盘 PASSED")))
|
|
105
|
+
check("①6 正常写入后无未结清意图", cg.pending_writes() == [])
|
|
106
|
+
|
|
107
|
+
# ---------- ② intent 真的**先于**落盘(真实执行路径内观测) ----------
|
|
108
|
+
cg2 = _mk_cg(tmp)
|
|
109
|
+
_orig = writepipe._executor
|
|
110
|
+
seen = {}
|
|
111
|
+
|
|
112
|
+
def _probe(ctx):
|
|
113
|
+
seen["has_intent"] = any(
|
|
114
|
+
r.get("phase") == "intent" and r.get("id") == ctx["nid"]
|
|
115
|
+
for r in _recs(ctx["cg"]))
|
|
116
|
+
seen["has_outcome"] = any(
|
|
117
|
+
r.get("phase") == "outcome" and r.get("id") == ctx["nid"]
|
|
118
|
+
for r in _recs(ctx["cg"]))
|
|
119
|
+
seen["node_exists"] = bool(ctx["cg"].get(ctx["nid"]))
|
|
120
|
+
return _orig(ctx)
|
|
121
|
+
|
|
122
|
+
writepipe._executor = _probe
|
|
123
|
+
try:
|
|
124
|
+
pipe.execute(cg2, {"content_kind": "text",
|
|
125
|
+
"content": "先行持久化探针 PASSED",
|
|
126
|
+
"layer": "knowledge"})
|
|
127
|
+
finally:
|
|
128
|
+
writepipe._executor = _orig
|
|
129
|
+
check("②1 进入执行器时 intent 已落账(先行持久化成立)",
|
|
130
|
+
seen.get("has_intent") is True, seen)
|
|
131
|
+
check("②2 进入执行器时**尚无** outcome 且节点未落盘",
|
|
132
|
+
seen.get("has_outcome") is False
|
|
133
|
+
and seen.get("node_exists") is False, seen)
|
|
134
|
+
|
|
135
|
+
# ---------- ③ 半途崩溃:落盘已完成、outcome 未写 ----------
|
|
136
|
+
cg3 = _mk_cg(tmp)
|
|
137
|
+
nid3 = "mem_2pc_c3"
|
|
138
|
+
tok = twophase.begin(cg3, nid3, "崩溃在落盘之后 PASSED", layer="knowledge",
|
|
139
|
+
actor="test:crash")
|
|
140
|
+
cg3.add(nid3, "崩溃在落盘之后 PASSED", layer="knowledge")
|
|
141
|
+
check("③1 崩溃现场:有 intent 无 outcome",
|
|
142
|
+
_phases(cg3, nid3) == ["intent"]
|
|
143
|
+
and len(cg3.pending_writes()) == 1)
|
|
144
|
+
rep = cg3.reconcile_writes()
|
|
145
|
+
check("③2 对账补账(内容指纹吻合 → committed)",
|
|
146
|
+
rep.get("unpaired") == 1 and rep.get("committed") == 1
|
|
147
|
+
and rep.get("interrupted") == 0, rep)
|
|
148
|
+
check("③3 补出的 outcome 标 reconciled + 判据可审计",
|
|
149
|
+
any(r.get("phase") == "outcome" and r.get("reconciled")
|
|
150
|
+
and r.get("reason") == twophase.R_NODE_OK
|
|
151
|
+
for r in _recs(cg3)), _recs(cg3)[-1])
|
|
152
|
+
check("③4 对账后 pending 归零",
|
|
153
|
+
cg3.pending_writes() == [])
|
|
154
|
+
|
|
155
|
+
# ---------- ④ 半途崩溃:根本没落盘 ----------
|
|
156
|
+
cg4 = _mk_cg(tmp)
|
|
157
|
+
twophase.begin(cg4, "mem_2pc_c4", "崩溃在落盘之前 PASSED",
|
|
158
|
+
layer="knowledge")
|
|
159
|
+
rep4 = cg4.reconcile_writes()
|
|
160
|
+
check("④1 未落盘 → 如实标记 interrupted(不假装成功)",
|
|
161
|
+
rep4.get("unpaired") == 1 and rep4.get("interrupted") == 1
|
|
162
|
+
and rep4.get("committed") == 0, rep4)
|
|
163
|
+
check("④2 interrupted 判据 = node_missing",
|
|
164
|
+
rep4["details"][0]["reason"] == twophase.R_NODE_MISSING, rep4)
|
|
165
|
+
check("④3 未落盘节点确实不在库(标记与实际一致)",
|
|
166
|
+
cg4.get("mem_2pc_c4") is None)
|
|
167
|
+
|
|
168
|
+
# ---------- ⑤ 指纹不符:落了别的正文 ----------
|
|
169
|
+
cg5 = _mk_cg(tmp)
|
|
170
|
+
twophase.begin(cg5, "mem_2pc_c5", "意图写的是这一段 PASSED")
|
|
171
|
+
cg5.add("mem_2pc_c5", "实际落的是另一段 PASSED", layer="knowledge")
|
|
172
|
+
rep5 = cg5.reconcile_writes()
|
|
173
|
+
check("⑤1 指纹不符 → interrupted(content_mismatch)",
|
|
174
|
+
rep5.get("interrupted") == 1
|
|
175
|
+
and rep5["details"][0]["reason"] == twophase.R_MISMATCH, rep5)
|
|
176
|
+
check("⑤2 对账**不覆盖**既有正文(只标记不重放)",
|
|
177
|
+
"实际落的是另一段" in (cg5.get("mem_2pc_c5") or {}).get("content", ""))
|
|
178
|
+
|
|
179
|
+
# ---------- ⑥ dry-run / 幂等 / append-only ----------
|
|
180
|
+
cg6 = _mk_cg(tmp)
|
|
181
|
+
twophase.begin(cg6, "mem_2pc_c6", "dry-run 用例 PASSED")
|
|
182
|
+
before = _lines(cg6)
|
|
183
|
+
dry = cg6.reconcile_writes(apply=False)
|
|
184
|
+
check("⑥1 dry-run 报告未结清但不改账本",
|
|
185
|
+
dry.get("unpaired") == 1 and dry.get("applied") is False
|
|
186
|
+
and _lines(cg6) == before, dry)
|
|
187
|
+
cg6.reconcile_writes()
|
|
188
|
+
n_after_first = len(_lines(cg6))
|
|
189
|
+
rep6b = cg6.reconcile_writes()
|
|
190
|
+
check("⑥2 对账幂等(二次无未结清、不追加行)",
|
|
191
|
+
rep6b.get("unpaired") == 0
|
|
192
|
+
and len(_lines(cg6)) == n_after_first, rep6b)
|
|
193
|
+
check("⑥3 账本 append-only(原记录逐字保留)",
|
|
194
|
+
_lines(cg6)[:len(before)] == before)
|
|
195
|
+
snap = _lines(cg6)
|
|
196
|
+
cg6.pending_writes()
|
|
197
|
+
check("⑥4 pending 只读(不改账本)", _lines(cg6) == snap)
|
|
198
|
+
|
|
199
|
+
# ---------- ⑦ 执行器抛异常 → outcome=error,异常照抛 ----------
|
|
200
|
+
cg7 = _mk_cg(tmp, role="guest") # guest 无写权限 → 库层拒绝
|
|
201
|
+
pipe7 = writepipe.WritePipeline() # 不装闸:直接打执行器
|
|
202
|
+
raised = None
|
|
203
|
+
try:
|
|
204
|
+
pipe7.execute(cg7, {"content": "无权限写入 PASSED",
|
|
205
|
+
"layer": "knowledge"})
|
|
206
|
+
except Exception as exc: # AccessDenied 或其子类
|
|
207
|
+
raised = type(exc).__name__
|
|
208
|
+
check("⑦1 库层权限拒绝照抛(两段式不改错误语义)", raised is not None,
|
|
209
|
+
raised)
|
|
210
|
+
check("⑦2 失败也留痕:outcome=error 且无 committed",
|
|
211
|
+
any(r.get("phase") == "outcome"
|
|
212
|
+
and r.get("status") == twophase.STATUS_ERROR
|
|
213
|
+
for r in _recs(cg7)), _recs(cg7))
|
|
214
|
+
check("⑦3 失败不留未结清意图(已配对)", cg7.pending_writes() == [])
|
|
215
|
+
|
|
216
|
+
# ---------- ⑧ 未落盘的分支不记账 ----------
|
|
217
|
+
cg8 = _mk_cg(tmp)
|
|
218
|
+
out8 = pipe.execute(cg8, {"content_kind": "text",
|
|
219
|
+
"content": "这段含 FORBIDDEN_WORD 应被拒",
|
|
220
|
+
"layer": "knowledge"})
|
|
221
|
+
check("⑧1 闸门拒绝分支:committed=False",
|
|
222
|
+
out8.get("committed") is False, out8.get("moved_to"))
|
|
223
|
+
check("⑧2 未落盘 → **不产生** intent(没打算写就不记账)",
|
|
224
|
+
_phases(cg8) == [], _recs(cg8))
|
|
225
|
+
check("⑧3 对账在空账本上恒无未结清",
|
|
226
|
+
cg8.reconcile_writes().get("unpaired") == 0)
|
|
227
|
+
|
|
228
|
+
# ---------- ⑨ gated 替代执行路径也成对 ----------
|
|
229
|
+
cg9 = _mk_cg(tmp)
|
|
230
|
+
out9 = pipe.execute(cg9, {"content_kind": "text",
|
|
231
|
+
"content": "gated 主动遗忘路径 PASSED",
|
|
232
|
+
"layer": "contextual", "gated": True,
|
|
233
|
+
"importance": 0.5})
|
|
234
|
+
nid9 = out9.get("id")
|
|
235
|
+
ph9 = _phases(cg9, nid9)
|
|
236
|
+
check("⑨1 gated 路径账本成对(intent → outcome)",
|
|
237
|
+
ph9 == ["intent", "outcome"], ph9)
|
|
238
|
+
oc9 = [r for r in _recs(cg9)
|
|
239
|
+
if r.get("id") == nid9 and r["phase"] == "outcome"][0]
|
|
240
|
+
check("⑨2 结局与 verdict 一致(committed 当且仅当落盘)",
|
|
241
|
+
(oc9.get("status") == twophase.STATUS_COMMITTED)
|
|
242
|
+
== bool(out9.get("committed")), (oc9, out9.get("committed")))
|
|
243
|
+
check("⑨3 gated 结局无未结清(自己落盘的路径也结清)",
|
|
244
|
+
cg9.pending_writes() == [])
|
|
245
|
+
|
|
246
|
+
# ---------- ⑩ 边界 ----------
|
|
247
|
+
cg10 = _mk_cg(tmp)
|
|
248
|
+
check("⑩1 空账本:records/pending/reconcile 均不炸",
|
|
249
|
+
_recs(cg10) == [] and cg10.pending_writes() == []
|
|
250
|
+
and cg10.reconcile_writes().get("unpaired") == 0)
|
|
251
|
+
bad = os.path.join(cg10.root, "_write_2pc.jsonl")
|
|
252
|
+
with open(bad, "a", encoding="utf-8") as f:
|
|
253
|
+
f.write("{坏行不是 json\n")
|
|
254
|
+
check("⑩2 坏行跳过不炸(账本读侧容错)",
|
|
255
|
+
isinstance(_recs(cg10), list))
|
|
256
|
+
check("⑩3 指纹算法与 nodefile 同源(唯一真源,防漂移;#741 后基准=落盘形态 abc 加一个换行)",
|
|
257
|
+
twophase.nodefile.content_hash("abc")
|
|
258
|
+
== __import__("hashlib").sha256(b"abc\n").hexdigest()[:12])
|
|
259
|
+
check("⑩4 账本文件在 root 下(随记忆库一起备份/迁移)",
|
|
260
|
+
os.path.dirname(twophase.log_path(cg10)) == cg10.root)
|
|
261
|
+
check("⑩5 对账只增行不删行(append-only 结构保证)",
|
|
262
|
+
len(_lines(cg10)) >= 1 and all(l.strip() for l in _lines(cg10)))
|
|
263
|
+
|
|
264
|
+
|
|
265
|
+
def main():
|
|
266
|
+
tmp = tempfile.mkdtemp(prefix="twophase_")
|
|
267
|
+
old = os.environ.pop("MDCG_POLICY_FILE", None)
|
|
268
|
+
try:
|
|
269
|
+
_run(tmp)
|
|
270
|
+
except Exception:
|
|
271
|
+
traceback.print_exc()
|
|
272
|
+
_fail.append("未捕获异常")
|
|
273
|
+
finally:
|
|
274
|
+
shutil.rmtree(tmp, ignore_errors=True)
|
|
275
|
+
if old is not None:
|
|
276
|
+
os.environ["MDCG_POLICY_FILE"] = old
|
|
277
|
+
else:
|
|
278
|
+
os.environ.pop("MDCG_POLICY_FILE", None)
|
|
279
|
+
print("\ntest_twophase: %d 通过 / %d 失败" % (_ok, len(_fail)))
|
|
280
|
+
if _fail:
|
|
281
|
+
print("失败项:" + "、".join(_fail))
|
|
282
|
+
raise SystemExit(1 if _fail else 0)
|
|
283
|
+
|
|
284
|
+
|
|
285
|
+
if __name__ == "__main__":
|
|
286
|
+
main()
|