@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,315 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:受保护节点可降级(#733)/ 覆写继承元数据(#732)/ superseded 取代 / retag 只改元数据
|
|
3
|
+
# 生效条件:python -X utf8 -m md_cg.test_issue733_verify_override_and_overwrite_inherit;被测面=MdCG.verify(weakened 与 superseded 两分支)、MdCG.add 的覆写继承、MdCG.retag
|
|
4
|
+
# 子功能:G1=weakened 的 override 透传(受保护节点修前恒拒);G2=覆写成「历史与证据」列的继承;G3=superseded 不删除且不动验证态;G4=retag 换桶且正文/证据逐字节不变
|
|
5
|
+
# 执行:每组建独立临时库,直接调库层 API,断言盘面(读 .md)而非回执单面
|
|
6
|
+
# 验证方式:全部 PASS 即退出码 0;任一 FAIL 退出码 1
|
|
7
|
+
# 不适用条件:不判 superseded 的检索面排除(既有 is_retired 已有守卫);不判 edges 的重派生(本批不实现 linkref 重跑,只在正文未变时继承);不判工具面参数校验
|
|
8
|
+
"""守卫:issue #733 + #732 的四条修复。
|
|
9
|
+
|
|
10
|
+
#733(本组 G1):`verify(verdict="weakened", override=True)` 对受保护节点仍被拒。
|
|
11
|
+
根因是 `set_verification()` 调用漏传 `override` —— 而该函数签名里就有这个参数,
|
|
12
|
+
`falsified` 分支也是透传的(对照 `protect.guard_forget(override=...)`)。
|
|
13
|
+
后果:受保护节点(importance≥0.7)**只能被确认、不能被存疑**,`doubted` 恒不可达。
|
|
14
|
+
|
|
15
|
+
#732(本组 G2):`add()` 是全量重建 fm,同 id 覆写会把 created_at 改成现在、
|
|
16
|
+
session 变 unattributed、并丢掉 evidence_log / protected。本组断言这些列被继承,
|
|
17
|
+
且「正文逐字未变」时连 edges / importance 也保住。
|
|
18
|
+
|
|
19
|
+
G3:`falsified` 的语义是**删除**(写 rej_ 存根 + 原文进 trash),而「曾经正确、
|
|
20
|
+
后来被取代」不是「假」。lifecycle 里早有 `superseded`(`active/converged/demoted →
|
|
21
|
+
superseded`,且可回滚),缺的只是工具面入口。本组断言:不删文件、不动
|
|
22
|
+
verification_state、并落 superseded_by。
|
|
23
|
+
|
|
24
|
+
G4:给存量节点补 `domain:` 标签以迁出 `orphan` 桶,此前只能靠同 id 覆写(撞 #732)。
|
|
25
|
+
`retag` 走 add() 的既有写链,但显式保证正文不变 ⇒ 命中 BODY_SAME 继承分支。
|
|
26
|
+
"""
|
|
27
|
+
import os
|
|
28
|
+
import sys
|
|
29
|
+
import tempfile
|
|
30
|
+
|
|
31
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
32
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
33
|
+
if _REPO not in sys.path:
|
|
34
|
+
sys.path.insert(0, _REPO)
|
|
35
|
+
|
|
36
|
+
os.environ.setdefault("MDCG_AUTONOMY", "full")
|
|
37
|
+
|
|
38
|
+
from md_cg.mdcos import MdCGOS # noqa: E402
|
|
39
|
+
|
|
40
|
+
FAILS = []
|
|
41
|
+
_TMP = tempfile.mkdtemp(prefix="iss733_")
|
|
42
|
+
|
|
43
|
+
_CCG = "\n".join([
|
|
44
|
+
"# 功能名:证据节点",
|
|
45
|
+
"# 生效条件:本地合成库",
|
|
46
|
+
"# 子功能:无",
|
|
47
|
+
"# 执行:无",
|
|
48
|
+
"# 验证方式:test",
|
|
49
|
+
"# 不适用条件:无",
|
|
50
|
+
"# 正文:证据节点正文",
|
|
51
|
+
])
|
|
52
|
+
|
|
53
|
+
_CCG2 = _CCG.replace("证据节点正文", "证据节点正文(第二版)")
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
def _check(name, cond, detail=""):
|
|
57
|
+
if cond:
|
|
58
|
+
print(" PASS " + name)
|
|
59
|
+
else:
|
|
60
|
+
print(" FAIL " + name + " " + str(detail)[:240])
|
|
61
|
+
FAILS.append(name)
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
def _new(tag, nid="t_ev", importance=0.8, tags=None):
|
|
65
|
+
d = os.path.join(_TMP, tag)
|
|
66
|
+
os.makedirs(d, exist_ok=True)
|
|
67
|
+
cg = MdCGOS(d)
|
|
68
|
+
cg.add(nid, _CCG, layer="knowledge", importance=importance, tags=tags)
|
|
69
|
+
cg.flush()
|
|
70
|
+
return d, cg
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
def _fm(cg, nid):
|
|
74
|
+
return (cg.get(nid) or {}).get("frontmatter") or {}
|
|
75
|
+
|
|
76
|
+
|
|
77
|
+
print("== G1:verify(weakened) 的 override 必须透传(#733) ==")
|
|
78
|
+
_root1, _cg1 = _new("g1")
|
|
79
|
+
_fm0 = _fm(_cg1, "t_ev")
|
|
80
|
+
_check("G1-0 前置:节点确实受保护(importance≥0.7 自动打位)",
|
|
81
|
+
bool(_fm0.get("protected")), _fm0.get("protected"))
|
|
82
|
+
_r_no = _cg1.verify("t_ev", "证据 A", "weakened")
|
|
83
|
+
_v_no = (_r_no or {}).get("verification") or {}
|
|
84
|
+
_check("G1-1 不给 override ⇒ 仍是 protected(负路由,修前修后都该如此)",
|
|
85
|
+
_v_no.get("code") == "protected" and _v_no.get("ok") is False,
|
|
86
|
+
_v_no)
|
|
87
|
+
_r_yes = _cg1.verify("t_ev", "证据 B", "weakened", override=True)
|
|
88
|
+
_v_yes = (_r_yes or {}).get("verification") or {}
|
|
89
|
+
_check("G1-2 给了 override=True ⇒ 必须放行(修前恒 protected,本组即红点)",
|
|
90
|
+
_v_yes.get("code") == "ok" and _v_yes.get("ok") is True, _v_yes)
|
|
91
|
+
_check("G1-3 放行后盘面验证态真的变成 doubted(不是只改回执)",
|
|
92
|
+
(_fm(_cg1, "t_ev").get("verification_state") or "").strip('"')
|
|
93
|
+
== "doubted",
|
|
94
|
+
_fm(_cg1, "t_ev").get("verification_state"))
|
|
95
|
+
_check("G1-4 两次裁决的证据都记进 evidence_log(负路由不回滚证据计数)",
|
|
96
|
+
len(_fm(_cg1, "t_ev").get("evidence_log") or []) >= 1)
|
|
97
|
+
_cg1.flush()
|
|
98
|
+
_cg1.close()
|
|
99
|
+
|
|
100
|
+
print(chr(10) + "== G1b:连续 weakened 触发降级迁层时,override 也要透传到 _move_layer ==")
|
|
101
|
+
_root1b, _cg1b = _new("g1b", nid="t_dm", importance=0.8)
|
|
102
|
+
_ok = True
|
|
103
|
+
_err = None
|
|
104
|
+
for _i in range(3): # 0.6 → 0.45 → 0.30 → 0.15(< DEMOTE 0.2)
|
|
105
|
+
try:
|
|
106
|
+
_cg1b.verify("t_dm", "连续负证据 #%d" % _i, "weakened", override=True)
|
|
107
|
+
except Exception as _e: # noqa: BLE001
|
|
108
|
+
_ok = False
|
|
109
|
+
_err = "%s: %s" % (type(_e).__name__, _e)
|
|
110
|
+
break
|
|
111
|
+
_check("G1b-1 受保护节点连续 weakened 不抛 ProtectionError(修前第三轮抛)",
|
|
112
|
+
_ok, _err)
|
|
113
|
+
_check("G1b-2 第三轮确实降级迁出到 contextual(按既有 confidence<0.2 规则)",
|
|
114
|
+
((_cg1b.get("t_dm") or {}).get("frontmatter") or {}).get("layer")
|
|
115
|
+
== "contextual",
|
|
116
|
+
((_cg1b.get("t_dm") or {}).get("frontmatter") or {}).get("layer"))
|
|
117
|
+
_cg1b.flush()
|
|
118
|
+
_cg1b.close()
|
|
119
|
+
|
|
120
|
+
|
|
121
|
+
print("\n== G2:覆写继承「历史与证据」列(#732) ==")
|
|
122
|
+
_root2, _cg2 = _new("g2")
|
|
123
|
+
_cg2.verify("t_ev", "首次验证", "confirmed")
|
|
124
|
+
_before = _fm(_cg2, "t_ev")
|
|
125
|
+
_cg2.add("t_ev", _CCG2, layer="knowledge", importance=0.8)
|
|
126
|
+
_after = _fm(_cg2, "t_ev")
|
|
127
|
+
_check("G2-1 created_at 不被重置(出生时间只写一次)",
|
|
128
|
+
_before.get("created_at") == _after.get("created_at"),
|
|
129
|
+
(_before.get("created_at"), _after.get("created_at")))
|
|
130
|
+
_check("G2-2 session 不被重置成 unattributed",
|
|
131
|
+
_before.get("session") == _after.get("session"),
|
|
132
|
+
(_before.get("session"), _after.get("session")))
|
|
133
|
+
_check("G2-3 evidence_log 不被抹掉",
|
|
134
|
+
len(_after.get("evidence_log") or []) == len(
|
|
135
|
+
_before.get("evidence_log") or []),
|
|
136
|
+
_after.get("evidence_log"))
|
|
137
|
+
_check("G2-4 evidence_count 不被归零",
|
|
138
|
+
_after.get("evidence_count") == _before.get("evidence_count"),
|
|
139
|
+
(_before.get("evidence_count"), _after.get("evidence_count")))
|
|
140
|
+
_check("G2-5 protected 位不被撤销(保护单向)",
|
|
141
|
+
bool(_after.get("protected")) is True, _after.get("protected"))
|
|
142
|
+
_check("G2-6 正文确实换成了第二版(继承没有把新内容也挡掉)",
|
|
143
|
+
"第二版" in ((_cg2.get("t_ev") or {}).get("content") or ""))
|
|
144
|
+
_cg2.flush()
|
|
145
|
+
|
|
146
|
+
print(chr(10) + "== G2b:正文逐字未变时,edges 继承 / importance 走「传 None 才继承」 ==")
|
|
147
|
+
_cg2.add("t_ev", _CCG2, layer="knowledge") # 不传 importance ⇒ 应继承旧值
|
|
148
|
+
_same = _fm(_cg2, "t_ev")
|
|
149
|
+
_check("G2b-1 不传 importance 时继承旧值(不再回落 0.5)",
|
|
150
|
+
_same.get("importance") == _after.get("importance"),
|
|
151
|
+
(_after.get("importance"), _same.get("importance")))
|
|
152
|
+
_check("G2b-2 edges 不被清空(auto:linkref 只派生一次,覆写不重跑)",
|
|
153
|
+
(_same.get("edges") or []) == (_after.get("edges") or []),
|
|
154
|
+
(_after.get("edges"), _same.get("edges")))
|
|
155
|
+
_cg2.close()
|
|
156
|
+
|
|
157
|
+
print("\n== G3:superseded = 被取代,不是被证伪(不删除) ==")
|
|
158
|
+
_root3, _cg3 = _new("g3", nid="t_old", importance=0.8)
|
|
159
|
+
_cg3.add("t_new", _CCG2, layer="knowledge", importance=0.8)
|
|
160
|
+
_fm3_before = _fm(_cg3, "t_old")
|
|
161
|
+
try:
|
|
162
|
+
_cg3.verify("t_old", "缺 superseded_by", "superseded")
|
|
163
|
+
_check("G3-1 不给 superseded_by ⇒ 必须报错", False, "没有抛错")
|
|
164
|
+
except ValueError as _e:
|
|
165
|
+
_check("G3-1 不给 superseded_by ⇒ 必须报错(取代要能指名替代者)",
|
|
166
|
+
"superseded_by" in str(_e), _e)
|
|
167
|
+
_r3 = _cg3.verify("t_old", "升级到 t_new", "superseded",
|
|
168
|
+
superseded_by="t_new")
|
|
169
|
+
_check("G3-2 superseded 返回 ok=True(负路由时不吞错)",
|
|
170
|
+
bool((_r3 or {}).get("ok")), _r3)
|
|
171
|
+
_fm3 = _fm(_cg3, "t_old")
|
|
172
|
+
_check("G3-3 lifecycle_state 变成 superseded",
|
|
173
|
+
(_fm3.get("lifecycle_state") or "").strip('"') == "superseded",
|
|
174
|
+
_fm3.get("lifecycle_state"))
|
|
175
|
+
_check("G3-4 superseded_by 指向替代者(可追溯取代关系)",
|
|
176
|
+
(_fm3.get("superseded_by") or "").strip('"') == "t_new",
|
|
177
|
+
_fm3.get("superseded_by"))
|
|
178
|
+
_check("G3-5 节点仍在(不是 falsified 的删除语义)",
|
|
179
|
+
(_cg3.get("t_old") or None) is not None)
|
|
180
|
+
_check("G3-6 verification_state 不被改写(「是否当前版本」与「还成不成立」正交)",
|
|
181
|
+
(_fm3.get("verification_state") or "").strip('"')
|
|
182
|
+
== (_fm3_before.get("verification_state") or "").strip('"'),
|
|
183
|
+
(_fm3_before.get("verification_state"),
|
|
184
|
+
_fm3.get("verification_state")))
|
|
185
|
+
_check("G3-7 正文与证据链原样(不受取代影响)",
|
|
186
|
+
str((_cg3.get("t_old") or {}).get("content") or "").rstrip('\n')
|
|
187
|
+
== _CCG.rstrip('\n'))
|
|
188
|
+
_cg3.flush()
|
|
189
|
+
_cg3.close()
|
|
190
|
+
|
|
191
|
+
print("\n== G4:retag 只改元数据,正文与证据逐字节不变 ==")
|
|
192
|
+
_root4, _cg4 = _new("g4", nid="t_rt", importance=0.8)
|
|
193
|
+
_cg4.verify("t_rt", "先验证一次,留下 evidence_log", "confirmed")
|
|
194
|
+
_fm4_before = _fm(_cg4, "t_rt")
|
|
195
|
+
_body_before = (_cg4.get("t_rt") or {}).get("content")
|
|
196
|
+
_plan = _cg4.retag("t_rt", tags_add=["domain:测试域"], dry_run=True)
|
|
197
|
+
_check("G4-1 dry_run 只算不写:返回将落到的桶(cond_ 前缀)",
|
|
198
|
+
str(_plan.get("bucket") or "").startswith("cond_"),
|
|
199
|
+
_plan.get("bucket"))
|
|
200
|
+
_check("G4-2 dry_run 时盘面没动(路径与 tags 都还是旧的)",
|
|
201
|
+
_fm(_cg4, "t_rt").get("tags") == _fm4_before.get("tags"))
|
|
202
|
+
_real = _cg4.retag("t_rt", tags_add=["domain:测试域"],
|
|
203
|
+
condition_space_patch={"observation_position": "测试域"}, dry_run=False)
|
|
204
|
+
_fm4 = _fm(_cg4, "t_rt")
|
|
205
|
+
_check("G4-3 落盘后 bucket 变成 cond_ 前缀(真的换桶了)",
|
|
206
|
+
str(_real.get("bucket") or "").startswith("cond_"),
|
|
207
|
+
_real.get("bucket"))
|
|
208
|
+
_check("G4-4 tags 里出现了 domain:测试域",
|
|
209
|
+
"domain:测试域" in (_fm4.get("tags") or []), _fm4.get("tags"))
|
|
210
|
+
_check("G4-5 正文逐字节未变",
|
|
211
|
+
(_cg4.get("t_rt") or {}).get("content") == _body_before)
|
|
212
|
+
_check("G4-6 created_at 未变",
|
|
213
|
+
_fm4.get("created_at") == _fm4_before.get("created_at"),
|
|
214
|
+
(_fm4_before.get("created_at"), _fm4.get("created_at")))
|
|
215
|
+
_check("G4-7 evidence_log 未丢",
|
|
216
|
+
len(_fm4.get("evidence_log") or []) == len(
|
|
217
|
+
_fm4_before.get("evidence_log") or []))
|
|
218
|
+
_check("G4-8 protected 未丢",
|
|
219
|
+
bool(_fm4.get("protected")) is True, _fm4.get("protected"))
|
|
220
|
+
_check("G4-9 节点仍可读(换桶没有把索引写坏)",
|
|
221
|
+
(_cg4.get("t_rt") or {}).get("path") == _real.get("to_path"),
|
|
222
|
+
((_cg4.get("t_rt") or {}).get("path"), _real.get("to_path")))
|
|
223
|
+
_cg4.flush()
|
|
224
|
+
_cg4.close()
|
|
225
|
+
|
|
226
|
+
print("\n== G5:maintain action=retag 的工具面分派 ==")
|
|
227
|
+
_root5, _cg5 = _new("g5", nid="t_mt", importance=0.8)
|
|
228
|
+
_d5 = _cg5.maintain(action="retag", node_id="t_mt",
|
|
229
|
+
tags_add=["domain:测试域"], tags_remove=[],
|
|
230
|
+
condition_space_patch={"observation_position": "测试域"},
|
|
231
|
+
apply=False)
|
|
232
|
+
_check("G5-1 apply=False 缺省 dry_run:返回 dry_run=True 且不落盘",
|
|
233
|
+
bool(_d5.get("dry_run")) and
|
|
234
|
+
"domain:测试域" not in (_fm(_cg5, "t_mt").get("tags") or []), _d5)
|
|
235
|
+
_d5b = _cg5.maintain(action="retag", node_id="t_mt",
|
|
236
|
+
tags_add=["domain:测试域"],
|
|
237
|
+
condition_space_patch={"observation_position": "测试域"},
|
|
238
|
+
apply=True)
|
|
239
|
+
_check("G5-2 apply=True 才真落盘:换桶且 tags 到位",
|
|
240
|
+
str(_d5b.get("bucket") or "").startswith("cond_")
|
|
241
|
+
and "domain:测试域" in (_fm(_cg5, "t_mt").get("tags") or []), _d5b)
|
|
242
|
+
_check("G5-3 分派未把正文写坏(仍可读且正文未变)",
|
|
243
|
+
str((_cg5.get("t_mt") or {}).get("content") or "").rstrip(chr(10))
|
|
244
|
+
== _CCG.rstrip(chr(10)))
|
|
245
|
+
_cg5.flush()
|
|
246
|
+
_cg5.close()
|
|
247
|
+
|
|
248
|
+
print(chr(10) + "== G6:write 元数据补丁(只给 tags,不给 content) ==")
|
|
249
|
+
_root6, _cg6 = _new("g6", nid="t_wp", importance=0.8)
|
|
250
|
+
_cg6.add("t_wp_ref", _CCG2, layer="knowledge", importance=0.5)
|
|
251
|
+
_cg6.verify("t_wp", "先验证一次", "confirmed")
|
|
252
|
+
_f6 = _fm(_cg6, "t_wp")
|
|
253
|
+
_b6 = (_cg6.get("t_wp") or {}).get("content")
|
|
254
|
+
from md_cg.mcp_server import _cg_dispatch # noqa: E402
|
|
255
|
+
_r6 = _cg_dispatch(_cg6, {"op": "write", "node_id": "t_wp",
|
|
256
|
+
"tags": ["domain:测试域"]})
|
|
257
|
+
_check("G6-1 直接落盘(不再出变更单):committed=True 且 moved_to 为空",
|
|
258
|
+
bool(_r6.get("committed")) and not _r6.get("moved_to"),
|
|
259
|
+
{k: _r6.get(k) for k in ("committed", "moved_to", "pid")})
|
|
260
|
+
_f6b = _fm(_cg6, "t_wp")
|
|
261
|
+
_check("G6-2 tags 打上了 domain:测试域",
|
|
262
|
+
"domain:测试域" in (_f6b.get("tags") or []), _f6b.get("tags"))
|
|
263
|
+
_check("G6-3 正文逐字节未变(补丁不动正文)",
|
|
264
|
+
str((_cg6.get("t_wp") or {}).get("content") or "").rstrip(chr(10))
|
|
265
|
+
== str(_b6 or "").rstrip(chr(10)))
|
|
266
|
+
_check("G6-4 created_at 未被重置",
|
|
267
|
+
_f6b.get("created_at") == _f6.get("created_at"),
|
|
268
|
+
(_f6.get("created_at"), _f6b.get("created_at")))
|
|
269
|
+
_check("G6-5 evidence_log / protected 未丢",
|
|
270
|
+
len(_f6b.get("evidence_log") or []) == len(_f6.get("evidence_log") or [])
|
|
271
|
+
and bool(_f6b.get("protected")))
|
|
272
|
+
_check("G6-6b importance 不被压回 0.5(_write_values 不得替调用方回落)",
|
|
273
|
+
float(_f6b.get("importance") or 0) == float(_f6.get("importance") or 0),
|
|
274
|
+
(_f6.get("importance"), _f6b.get("importance")))
|
|
275
|
+
_check("G6-6 换桶:路径落到 cond_ 前缀",
|
|
276
|
+
str((_cg6.get("t_wp") or {}).get("path") or "").find("cond_") > 0,
|
|
277
|
+
(_cg6.get("t_wp") or {}).get("path"))
|
|
278
|
+
_check("G6-7 正文真变了的覆写仍然出单(对照腿:换一段正文)",
|
|
279
|
+
bool(_cg_dispatch(_cg6, {"op": "write", "node_id": "t_wp",
|
|
280
|
+
"content": _CCG2,
|
|
281
|
+
"tags": ["domain:测试域"]}).get("moved_to")),
|
|
282
|
+
"对照腿:改了正文应回 review_queue")
|
|
283
|
+
_cg6.flush()
|
|
284
|
+
_cg6.close()
|
|
285
|
+
|
|
286
|
+
|
|
287
|
+
print(chr(10) + "== G7:旧格式正文(无 # 要素行)也能做元数据补丁 ==")
|
|
288
|
+
_root7, _cg7 = _new("g7", nid="t_legacy")
|
|
289
|
+
_LEGACY = "\n".join(["功能名:旧格式节点", "生效条件:当年合法、现在不合新规",
|
|
290
|
+
"子功能:无", "执行:无", "验证方式:test",
|
|
291
|
+
"不适用条件:无"])
|
|
292
|
+
import os as _os # noqa: E402
|
|
293
|
+
_os.remove(_os.path.join(_root7, (_cg7.get("t_legacy") or {}).get("path")))
|
|
294
|
+
_cg7.add("t_legacy", _LEGACY, layer="knowledge", importance=0.8)
|
|
295
|
+
_b7 = (_cg7.get("t_legacy") or {}).get("content")
|
|
296
|
+
_r7 = _cg_dispatch(_cg7, {"op": "write", "node_id": "t_legacy",
|
|
297
|
+
"tags": ["domain:测试域"]})
|
|
298
|
+
_check("G7-1 旧格式正文的元数据补丁不被内容闸拒收(正文没变,不该重判合规)",
|
|
299
|
+
bool(_r7.get("committed")),
|
|
300
|
+
{k: _r7.get(k) for k in ("committed", "error", "moved_to")})
|
|
301
|
+
_check("G7-2 正文原样保留",
|
|
302
|
+
str((_cg7.get("t_legacy") or {}).get("content") or "").rstrip(chr(10))
|
|
303
|
+
== str(_b7 or "").rstrip(chr(10)))
|
|
304
|
+
_check("G7-3 domain 标签已打上",
|
|
305
|
+
"domain:测试域" in ((_fm(_cg7, "t_legacy").get("tags")) or []))
|
|
306
|
+
_cg7.flush()
|
|
307
|
+
_cg7.close()
|
|
308
|
+
|
|
309
|
+
|
|
310
|
+
print("\n== 结果 ==")
|
|
311
|
+
if FAILS:
|
|
312
|
+
print("FAIL %d 项:%s" % (len(FAILS), ", ".join(FAILS)))
|
|
313
|
+
sys.exit(1)
|
|
314
|
+
print("全部 PASS")
|
|
315
|
+
sys.exit(0)
|
|
@@ -0,0 +1,218 @@
|
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""issue #740:`FileLock` 异常路径的 fd 泄漏(进入失败时 `__exit__` 不会被调用)。
|
|
3
|
+
|
|
4
|
+
## 病灶
|
|
5
|
+
`__enter__` 打开 fd 后,两个 raise 路径都不关:
|
|
6
|
+
① strict 超时 `raise TimeoutError`;② 非重试 errno 的裸 `raise`。
|
|
7
|
+
另有两个复核补出的路径:③ `deadline = time.time() + timeout` 抛 TypeError(fd 已开);
|
|
8
|
+
④ `time.sleep` 期间 `KeyboardInterrupt`/`SystemExit`(`except Exception` 接不住)。
|
|
9
|
+
|
|
10
|
+
## 修法
|
|
11
|
+
`try` 紧贴 `open` 之后、`except BaseException` 调 `_close_fd()` 后原样上抛;
|
|
12
|
+
`_close_fd` 单点关闭(None 安全、吞 OSError/ValueError、绝不抛);`__exit__` 复用它;
|
|
13
|
+
重复 enter 先清旧句柄;非 strict 放行时显式 `acquired=False`。
|
|
14
|
+
|
|
15
|
+
## 断言
|
|
16
|
+
- L1 strict 超时 ⇒ TimeoutError 且 fd 已关;
|
|
17
|
+
- L2 非重试 errno(EIO)⇒ OSError 且 fd 已关;
|
|
18
|
+
- L2b sleep 中 KeyboardInterrupt ⇒ 异常原样传播且 fd 已关;
|
|
19
|
+
- L3 非 strict 超时 ⇒ 返回自身、acquired=False,退出后 fd 已关;
|
|
20
|
+
- L4 双击 `__exit__` 幂等不抛;
|
|
21
|
+
- L6 `timeout=None` ⇒ TypeError 且 fd 已关;
|
|
22
|
+
- L5(--mutate)把 `_close_fd` 打桩成 no-op ⇒ L1/L2 必须红(证明守卫依赖清理)。
|
|
23
|
+
|
|
24
|
+
运行:python -X utf8 -m md_cg.test_issue740_filelock_fd_leak [--mutate]
|
|
25
|
+
"""
|
|
26
|
+
from __future__ import annotations
|
|
27
|
+
|
|
28
|
+
import builtins
|
|
29
|
+
import errno
|
|
30
|
+
import os
|
|
31
|
+
import shutil
|
|
32
|
+
import sys
|
|
33
|
+
import tempfile
|
|
34
|
+
import time as _time
|
|
35
|
+
|
|
36
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
37
|
+
|
|
38
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
39
|
+
sys.path.insert(0, _REPO)
|
|
40
|
+
|
|
41
|
+
from md_cg import fsutil # noqa: E402
|
|
42
|
+
|
|
43
|
+
FAILS = []
|
|
44
|
+
MAX = 2
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
def ok(cond, name, detail=""):
|
|
48
|
+
if cond:
|
|
49
|
+
print(" PASS " + name)
|
|
50
|
+
else:
|
|
51
|
+
print(" FAIL " + name + " " + str(detail)[:300])
|
|
52
|
+
FAILS.append(name)
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
class FakeMsvcrt:
|
|
56
|
+
LK_NBLCK = 2
|
|
57
|
+
LK_UNLCK = 0
|
|
58
|
+
|
|
59
|
+
def __init__(self, err):
|
|
60
|
+
self.err = err
|
|
61
|
+
|
|
62
|
+
def locking(self, *_a):
|
|
63
|
+
raise OSError(self.err, "fake lock error")
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
def _install_lock_stub(err):
|
|
67
|
+
old_win, old_m = fsutil.IS_WIN, getattr(fsutil, "msvcrt", None)
|
|
68
|
+
fsutil.IS_WIN = True
|
|
69
|
+
fsutil.msvcrt = FakeMsvcrt(err)
|
|
70
|
+
return old_win, old_m
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
def _restore(old_win, old_m):
|
|
74
|
+
fsutil.IS_WIN = old_win
|
|
75
|
+
if old_m is None:
|
|
76
|
+
try:
|
|
77
|
+
del fsutil.msvcrt
|
|
78
|
+
except AttributeError:
|
|
79
|
+
pass
|
|
80
|
+
else:
|
|
81
|
+
fsutil.msvcrt = old_m
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
def _track_open():
|
|
85
|
+
"""包 `builtins.open`:记录返回的文件对象(只记录,不改行为)。"""
|
|
86
|
+
rec = []
|
|
87
|
+
real = builtins.open
|
|
88
|
+
|
|
89
|
+
def _o(*a, **k):
|
|
90
|
+
f = real(*a, **k)
|
|
91
|
+
rec.append(f)
|
|
92
|
+
return f
|
|
93
|
+
|
|
94
|
+
builtins.open = _o
|
|
95
|
+
return rec, real
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
def _closed_all(rec):
|
|
99
|
+
return all(getattr(f, "closed", True) for f in rec)
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
def main():
|
|
103
|
+
print("=" * 68)
|
|
104
|
+
print("issue #740 · FileLock 异常路径 fd 泄漏")
|
|
105
|
+
print("=" * 68)
|
|
106
|
+
mutate = "--mutate" in sys.argv
|
|
107
|
+
if mutate:
|
|
108
|
+
print("!! 变异:把 _close_fd 打桩成 no-op(期望 L1/L2 红)")
|
|
109
|
+
tmp = tempfile.mkdtemp(prefix="iss740_")
|
|
110
|
+
try:
|
|
111
|
+
# L1 strict 超时
|
|
112
|
+
old = _install_lock_stub(errno.EACCES)
|
|
113
|
+
rec, real = _track_open()
|
|
114
|
+
try:
|
|
115
|
+
lock = fsutil.FileLock(os.path.join(tmp, "a"), timeout=0.05, strict=True)
|
|
116
|
+
if mutate:
|
|
117
|
+
lock._close_fd = lambda: None
|
|
118
|
+
raised = False
|
|
119
|
+
try:
|
|
120
|
+
lock.__enter__()
|
|
121
|
+
except TimeoutError:
|
|
122
|
+
raised = True
|
|
123
|
+
ok(raised, "L1 strict 超时抛 TimeoutError")
|
|
124
|
+
ok(lock._f is None, "L1b 失败后不保留句柄", getattr(lock, "_f", "?"))
|
|
125
|
+
ok(_closed_all(rec), "L1c 打开过的 fd 都已关闭", [(f.name, f.closed) for f in rec])
|
|
126
|
+
finally:
|
|
127
|
+
builtins.open = real
|
|
128
|
+
_restore(*old)
|
|
129
|
+
|
|
130
|
+
# L2 非重试 errno
|
|
131
|
+
old = _install_lock_stub(errno.EIO)
|
|
132
|
+
rec, real = _track_open()
|
|
133
|
+
try:
|
|
134
|
+
lock2 = fsutil.FileLock(os.path.join(tmp, "b"), timeout=0.05, strict=True)
|
|
135
|
+
if mutate:
|
|
136
|
+
lock2._close_fd = lambda: None
|
|
137
|
+
raised2 = False
|
|
138
|
+
try:
|
|
139
|
+
lock2.__enter__()
|
|
140
|
+
except OSError as e:
|
|
141
|
+
raised2 = e.errno == errno.EIO
|
|
142
|
+
ok(raised2, "L2 非重试 errno 原样抛 OSError(EIO)")
|
|
143
|
+
ok(_closed_all(rec), "L2b 打开过的 fd 都已关闭")
|
|
144
|
+
finally:
|
|
145
|
+
builtins.open = real
|
|
146
|
+
_restore(*old)
|
|
147
|
+
|
|
148
|
+
# L2b sleep 中 KeyboardInterrupt
|
|
149
|
+
old = _install_lock_stub(errno.EACCES)
|
|
150
|
+
rec, real = _track_open()
|
|
151
|
+
real_sleep = _time.sleep
|
|
152
|
+
_time.sleep = lambda _s: (_ for _ in ()).throw(KeyboardInterrupt())
|
|
153
|
+
try:
|
|
154
|
+
lock3 = fsutil.FileLock(os.path.join(tmp, "c"), timeout=5.0, strict=True)
|
|
155
|
+
if mutate:
|
|
156
|
+
lock3._close_fd = lambda: None
|
|
157
|
+
raised3 = False
|
|
158
|
+
try:
|
|
159
|
+
lock3.__enter__()
|
|
160
|
+
except KeyboardInterrupt:
|
|
161
|
+
raised3 = True
|
|
162
|
+
ok(raised3, "L2c KeyboardInterrupt 原样传播")
|
|
163
|
+
ok(_closed_all(rec), "L2d 中断路径 fd 也已关闭")
|
|
164
|
+
finally:
|
|
165
|
+
_time.sleep = real_sleep
|
|
166
|
+
builtins.open = real
|
|
167
|
+
_restore(*old)
|
|
168
|
+
|
|
169
|
+
# L6 timeout=None ⇒ TypeError 且已关
|
|
170
|
+
old = _install_lock_stub(errno.EACCES)
|
|
171
|
+
rec, real = _track_open()
|
|
172
|
+
try:
|
|
173
|
+
lock4 = fsutil.FileLock(os.path.join(tmp, "d"), timeout=None, strict=True)
|
|
174
|
+
raised4 = False
|
|
175
|
+
try:
|
|
176
|
+
lock4.__enter__()
|
|
177
|
+
except TypeError:
|
|
178
|
+
raised4 = True
|
|
179
|
+
ok(raised4, "L6 timeout=None ⇒ TypeError")
|
|
180
|
+
ok(_closed_all(rec), "L6b 该类 TypeError 路径 fd 也已关闭")
|
|
181
|
+
finally:
|
|
182
|
+
builtins.open = real
|
|
183
|
+
_restore(*old)
|
|
184
|
+
|
|
185
|
+
# L3 非 strict 放行
|
|
186
|
+
old = _install_lock_stub(errno.EACCES)
|
|
187
|
+
rec, real = _track_open()
|
|
188
|
+
try:
|
|
189
|
+
lock5 = fsutil.FileLock(os.path.join(tmp, "e"), timeout=0.02, strict=False)
|
|
190
|
+
got = lock5.__enter__()
|
|
191
|
+
ok(got is lock5 and lock5.acquired is False, "L3 非 strict 超时放行且标记未持锁")
|
|
192
|
+
lock5.__exit__(None, None, None)
|
|
193
|
+
ok(lock5._f is None, "L3b 退出后句柄已关")
|
|
194
|
+
finally:
|
|
195
|
+
builtins.open = real
|
|
196
|
+
_restore(*old)
|
|
197
|
+
|
|
198
|
+
# L4 双击 exit 幂等
|
|
199
|
+
lock6 = fsutil.FileLock(os.path.join(tmp, "f"), timeout=0.01, strict=False)
|
|
200
|
+
old = _install_lock_stub(errno.EACCES)
|
|
201
|
+
try:
|
|
202
|
+
lock6.__enter__()
|
|
203
|
+
lock6.__exit__(None, None, None)
|
|
204
|
+
lock6.__exit__(None, None, None)
|
|
205
|
+
ok(True, "L4 双击 __exit__ 幂等不抛")
|
|
206
|
+
except Exception as e: # noqa: BLE001
|
|
207
|
+
ok(False, "L4 双击 __exit__ 幂等不抛", e)
|
|
208
|
+
finally:
|
|
209
|
+
_restore(*old)
|
|
210
|
+
finally:
|
|
211
|
+
shutil.rmtree(tmp, ignore_errors=True)
|
|
212
|
+
print()
|
|
213
|
+
print("issue #740:%d 项失败" % len(FAILS) if FAILS else "issue #740:全部通过")
|
|
214
|
+
return 1 if FAILS else 0
|
|
215
|
+
|
|
216
|
+
|
|
217
|
+
if __name__ == "__main__":
|
|
218
|
+
sys.exit(main())
|