@furongjun1999/dsh-memory 0.9.6 → 0.9.8

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.
Files changed (233) hide show
  1. package/README.md +150 -662
  2. package/codebuddy/CODEBUDDY.md +333 -204
  3. package/data/policy.json +38 -38
  4. package/docs/README.md +18 -0
  5. package/docs/discipline/harnesses.yaml +11 -3
  6. package/docs/discipline/templates/compact.txt.tmpl +20 -18
  7. package/docs/discipline/templates/full.md.tmpl +63 -61
  8. package/docs/discipline/templates/rules.mdc.tmpl +5 -3
  9. package/docs/discipline/templates/skill.md.tmpl +25 -23
  10. package/docs/discipline/templates/spec.txt.tmpl +2 -2
  11. package/docs/discipline/templates/zcode-user.md.tmpl +1 -1
  12. package/dsh/cordis.yml.example +139 -139
  13. package/lib/hooks.d.ts +19 -0
  14. package/lib/hooks.js +30 -7
  15. package/lib/index.js +18 -3
  16. package/lib/init.js +19 -4
  17. package/lib/lib/hook_audit.js +64 -2
  18. package/lib/lib/prompt_safety.js +14 -3
  19. package/lib/tools.d.ts +7 -0
  20. package/lib/tools.js +22 -1
  21. package/md_cg/_guard_kit.py +121 -121
  22. package/md_cg/anchor.py +114 -114
  23. package/md_cg/audit.py +15 -2
  24. package/md_cg/chain.py +3 -2
  25. package/md_cg/config_registry_guard.py +487 -487
  26. package/md_cg/conformance.py +747 -747
  27. package/md_cg/consolidate.py +1793 -1793
  28. package/md_cg/crypto.py +794 -794
  29. package/md_cg/hyperedge.py +262 -262
  30. package/md_cg/interface_schema.py +146 -146
  31. package/md_cg/lifecycle.py +426 -426
  32. package/md_cg/mdcos.py +12 -8
  33. package/md_cg/predict.py +1103 -1103
  34. package/md_cg/protect.py +654 -654
  35. package/md_cg/provenance.py +606 -606
  36. package/md_cg/queue_health.py +130 -130
  37. package/md_cg/refine.py +613 -613
  38. package/md_cg/retrieve.py +128 -128
  39. package/md_cg/revise.py +140 -140
  40. package/md_cg/rollback.py +657 -657
  41. package/md_cg/rollback_cli.py +124 -124
  42. package/md_cg/rotate.py +346 -346
  43. package/md_cg/routing.py +490 -490
  44. package/md_cg/self_surface.py +50 -50
  45. package/md_cg/semantic/canonical.py +144 -144
  46. package/md_cg/semantic/zh_en_atoms.py +141 -141
  47. package/md_cg/sources.py +1091 -1091
  48. package/md_cg/stg.py +3 -2
  49. package/md_cg/sustain.py +10 -1
  50. package/md_cg/test_audit_rotate_parity.py +279 -279
  51. package/md_cg/test_autonomy_modes.py +2013 -2013
  52. package/md_cg/test_cn_recall_grams.py +206 -206
  53. package/md_cg/test_code_kind_forbidden.py +101 -0
  54. package/md_cg/test_condaccept.py +156 -156
  55. package/md_cg/test_condgate.py +141 -141
  56. package/md_cg/test_heartbeat_ledger.py +9 -3
  57. package/md_cg/test_i50e_readside_protection.py +658 -658
  58. package/md_cg/test_issue111_gate_order.py +76 -76
  59. package/md_cg/test_issue111_scoring_contract.py +86 -86
  60. package/md_cg/test_issue121_calibration_bounds.py +293 -293
  61. package/md_cg/test_issue145_sleep_no_silent_rollback.py +167 -167
  62. package/md_cg/test_issue147_pack_id_escape.py +378 -378
  63. package/md_cg/test_issue148_merge_downgrade_leak.py +192 -192
  64. package/md_cg/test_issue149_accel_default_face.py +248 -248
  65. package/md_cg/test_issue150_empty_query_terms.py +328 -328
  66. package/md_cg/test_issue151_153_157_write_cache_index.py +151 -151
  67. package/md_cg/test_issue152_sealed_postings.py +309 -309
  68. package/md_cg/test_issue153b_index_generation_invalidation.py +142 -142
  69. package/md_cg/test_issue157b_index_remainder.py +344 -344
  70. package/md_cg/test_issue189_conclusion_bidirectional.py +223 -223
  71. package/md_cg/test_issue191_import_trust.py +382 -382
  72. package/md_cg/test_issue193_write_scope.py +378 -378
  73. package/md_cg/test_issue212_writeface_gaps.py +349 -349
  74. package/md_cg/test_issue214_reject_sensitivity.py +266 -266
  75. package/md_cg/test_issue215_condition_source_gap.py +272 -272
  76. package/md_cg/test_issue216_clash_routes.py +214 -214
  77. package/md_cg/test_issue217_slot_routes.py +248 -248
  78. package/md_cg/test_issue218_postcondition_value_blind.py +222 -222
  79. package/md_cg/test_issue258_pack_sensitivity.py +468 -468
  80. package/md_cg/test_issue265_coldverify_multiproc.py +438 -438
  81. package/md_cg/test_issue274_read_node_id_none.py +341 -341
  82. package/md_cg/test_issue275_layer_param.py +250 -250
  83. package/md_cg/test_issue277_node_id_traversal.py +384 -384
  84. package/md_cg/test_issue278_neg_separated_tension.py +271 -271
  85. package/md_cg/test_issue278_neg_window.py +294 -294
  86. package/md_cg/test_issue278_negative_layering.py +83 -83
  87. package/md_cg/test_issue284_skip_not_pass.py +291 -291
  88. package/md_cg/test_issue294_flywheel_sensitivity.py +573 -573
  89. package/md_cg/test_issue301_baseline_corpus_gate.py +245 -245
  90. package/md_cg/test_issue303_design_boundaries.py +262 -262
  91. package/md_cg/test_issue315_merge_branch_sensitivity.py +383 -383
  92. package/md_cg/test_issue319_tenant_unregistered_bypass.py +256 -256
  93. package/md_cg/test_issue321_mcp_deep_json.py +304 -304
  94. package/md_cg/test_issue322_node_write_lock.py +727 -727
  95. package/md_cg/test_issue324_write_size_fields.py +214 -214
  96. package/md_cg/test_issue325_audit_poison.py +229 -229
  97. package/md_cg/test_issue326_ingest_auto_whitelist.py +331 -331
  98. package/md_cg/test_issue326_key_perms.py +355 -355
  99. package/md_cg/test_issue326_twin_parser_parity.py +323 -323
  100. package/md_cg/test_issue326_vm_call_frame.py +569 -569
  101. package/md_cg/test_issue345_writelimit_effective_sens.py +233 -233
  102. package/md_cg/test_issue346_overwrite_sensitivity_gate.py +424 -424
  103. package/md_cg/test_issue348_insight_verify_op.py +199 -199
  104. package/md_cg/test_issue348_merge_rmw_lock.py +345 -345
  105. package/md_cg/test_issue350_casefold_collision.py +235 -235
  106. package/md_cg/test_issue351_ingest_root_fallback.py +201 -201
  107. package/md_cg/test_issue352_imgaudit.py +418 -418
  108. package/md_cg/test_issue352_pathsjson.py +537 -537
  109. package/md_cg/test_issue352_refindex.py +412 -412
  110. package/md_cg/test_issue352_rollback.py +604 -604
  111. package/md_cg/test_issue354_p2_writelimit_toctou.py +327 -327
  112. package/md_cg/test_issue354_rust_index_containment.py +571 -571
  113. package/md_cg/test_issue354_rust_wal_containment.py +606 -606
  114. package/md_cg/test_issue358_truncation_observable.py +247 -247
  115. package/md_cg/test_issue360_tidy_private_excerpt.py +195 -195
  116. package/md_cg/test_issue361_blindspot_not_silent_drop.py +494 -494
  117. package/md_cg/test_issue362_neg_condition.py +468 -468
  118. package/md_cg/test_issue363_lexical_idf.py +275 -275
  119. package/md_cg/test_issue370_readcache_assembly.py +488 -488
  120. package/md_cg/test_issue376_heartbeat_failed.py +293 -293
  121. package/md_cg/test_issue377_layer_protect_stamp.py +324 -324
  122. package/md_cg/test_issue378_protected_floor.py +310 -310
  123. package/md_cg/test_issue383_state_event_write_gate.py +462 -462
  124. package/md_cg/test_issue397_sens_eff_wiring.py +435 -435
  125. package/md_cg/test_issue398_toolface_op_parity.py +511 -511
  126. package/md_cg/test_issue399_hive_json_shape.py +317 -317
  127. package/md_cg/test_issue401_wisdom_codegen.py +295 -295
  128. package/md_cg/test_issue404_heal_receipt.py +389 -389
  129. package/md_cg/test_issue409_compact_index_completeness.py +509 -509
  130. package/md_cg/test_issue410_verify_demote_write.py +366 -366
  131. package/md_cg/test_issue411_scrub_idempotence.py +575 -575
  132. package/md_cg/test_issue412_discipline_producer_parity.py +311 -311
  133. package/md_cg/test_issue413_preimage_failclosed.py +239 -239
  134. package/md_cg/test_issue413_preimage_twin.py +339 -339
  135. package/md_cg/test_issue415_deps_gate_probe.py +357 -357
  136. package/md_cg/test_issue416_entry_key_subset.py +525 -525
  137. package/md_cg/test_issue417_twophase_merge_landed.py +423 -423
  138. package/md_cg/test_issue425_ingest_library_path.py +331 -331
  139. package/md_cg/test_issue426c_enqueue_not_silent.py +346 -346
  140. package/md_cg/test_issue426e_restore_overwrite_live.py +310 -310
  141. package/md_cg/test_issue426f_paths_gbk_failclosed.py +301 -301
  142. package/md_cg/test_issue427_serve_status_shape.py +191 -191
  143. package/md_cg/test_issue431_432_468_protect_single_point.py +322 -322
  144. package/md_cg/test_issue433_outlook_threshold_single_point.py +278 -278
  145. package/md_cg/test_issue434_435_float_gate.py +90 -90
  146. package/md_cg/test_issue439_sibling_sensitivity_inherit.py +448 -448
  147. package/md_cg/test_issue43_default_policy.py +874 -874
  148. package/md_cg/test_issue444_scrub_evidence_plaintext.py +281 -281
  149. package/md_cg/test_issue445_metacognition_ledger_gate.py +454 -454
  150. package/md_cg/test_issue446_453_403_verified_evidence.py +382 -382
  151. package/md_cg/test_issue450_sensitivity_fallback_reason.py +51 -51
  152. package/md_cg/test_issue450_writegate_unknown_sens.py +203 -203
  153. package/md_cg/test_issue451_audit_actor.py +313 -313
  154. package/md_cg/test_issue452_ingest_root_sensitivity.py +299 -299
  155. package/md_cg/test_issue463_ghost_prune_guard.py +259 -259
  156. package/md_cg/test_issue466_basis_registry.py +469 -469
  157. package/md_cg/test_issue467_identity_sensitivity_parity.py +360 -360
  158. package/md_cg/test_issue469_scrub_override_passthrough.py +126 -126
  159. package/md_cg/test_issue470_wal_event_durable.py +427 -427
  160. package/md_cg/test_issue471_identity_readable.py +136 -136
  161. package/md_cg/test_issue472_audit_chain.py +90 -90
  162. package/md_cg/test_issue472_prune_ledger.py +105 -105
  163. package/md_cg/test_issue472_rollback_degraded.py +81 -81
  164. package/md_cg/test_issue491_compose_sandbox.py +460 -460
  165. package/md_cg/test_issue498_merge_trace_stale_index.py +280 -280
  166. package/md_cg/test_issue511_scoreboard_bad_files.py +256 -256
  167. package/md_cg/test_issue521_rotate_lock_suffix.py +110 -110
  168. package/md_cg/test_issue524_orphan_noise_no_demote.py +88 -88
  169. package/md_cg/test_issue525_read_null_semantics.py +52 -52
  170. package/md_cg/test_issue547_append_jsonl_whitelist.py +114 -114
  171. package/md_cg/test_issue547_audit_durable.py +96 -96
  172. package/md_cg/test_issue557_r2_write_entries_size_gate.py +83 -83
  173. package/md_cg/test_issue559_refine_prefix.py +69 -69
  174. package/md_cg/test_issue562_retired_faces.py +150 -0
  175. package/md_cg/test_issue71_queue_backlog.py +376 -376
  176. package/md_cg/test_issue72_coldverify_controlled_drain.py +420 -420
  177. package/md_cg/test_issue82_credential_rules.py +271 -271
  178. package/md_cg/test_issue91_verifier_sandbox.py +314 -314
  179. package/md_cg/test_issue93_remember_redaction.py +282 -282
  180. package/md_cg/test_logref.py +1141 -1141
  181. package/md_cg/test_md_access_parity.py +330 -330
  182. package/md_cg/test_md_cg_no_hive_dep.py +139 -139
  183. package/md_cg/test_mutation_residue.py +119 -119
  184. package/md_cg/test_mutation_rollback.py +835 -835
  185. package/md_cg/test_n123_derive_expiry_chain.py +210 -210
  186. package/md_cg/test_n184_keys_concurrent_provision.py +1 -1
  187. package/md_cg/test_n209_verify_write_face_gates.py +466 -466
  188. package/md_cg/test_n62_tenant_bind_failclosed.py +200 -200
  189. package/md_cg/test_neg_tail_honesty.py +733 -733
  190. package/md_cg/test_p21_tokens.py +294 -294
  191. package/md_cg/test_p27_docindex.py +792 -792
  192. package/md_cg/test_p28_refcheck.py +1053 -1053
  193. package/md_cg/test_p2_six_elements.py +476 -476
  194. package/md_cg/test_p33_ccg_wiring.py +300 -300
  195. package/md_cg/test_p3_legacy_closure.py +438 -438
  196. package/md_cg/test_p40_refine_worklist.py +244 -244
  197. package/md_cg/test_p4_freshness.py +781 -781
  198. package/md_cg/test_p9c_dedup_hints.py +288 -288
  199. package/md_cg/test_policy_required_ccg.py +444 -444
  200. package/md_cg/test_read_scope_b27.py +2 -2
  201. package/md_cg/test_retr_s5.py +312 -312
  202. package/md_cg/test_s1_ast_judge.py +109 -109
  203. package/md_cg/test_security_audit_v21.py +249 -249
  204. package/md_cg/test_state_event_op.py +521 -521
  205. package/md_cg/test_stgidx_index_parity.py +1024 -1024
  206. package/md_cg/test_sustain_bad_stamp.py +178 -0
  207. package/md_cg/test_sustain_bounded.py +652 -652
  208. package/md_cg/test_trust_edge_reachability.py +405 -405
  209. package/md_cg/test_w7_redlines.py +659 -659
  210. package/md_cg/test_write_return_shape.py +919 -919
  211. package/md_cg/test_writepipe.py +228 -228
  212. package/md_cg/trust.py +1114 -1114
  213. package/md_cg/twophase.py +303 -303
  214. package/md_cg/whitebox.py +536 -536
  215. package/md_cg/whitebox_kb/wisdom/compose_engine.py +1634 -1634
  216. package/md_cg/whitebox_kb/wisdom/core/condition_vm.py +318 -318
  217. package/md_cg/whitebox_kb/wisdom/core/parser.py +1082 -1082
  218. package/md_cg/whitebox_kb/wisdom/md_access.py +490 -490
  219. package/md_cg/whitebox_kb/wisdom/migrate_wisdom.py +497 -497
  220. package/md_cg/whitebox_kb/wisdom/mini_python.py +995 -995
  221. package/md_cg/whitebox_kb/wisdom/net_units.py +2900 -2900
  222. package/md_cg/whitebox_kb/wisdom/semantic_translate.py +4060 -4060
  223. package/md_cg/writepipe.py +1337 -1337
  224. package/package.json +3 -2
  225. package/scripts/workspace_index.py +328 -0
  226. package/src/hooks.ts +932 -908
  227. package/src/index.ts +21 -6
  228. package/src/init.ts +16 -4
  229. package/src/lib/hook_audit.ts +48 -2
  230. package/src/lib/mdcg_client.ts +469 -469
  231. package/src/lib/prompt_safety.ts +17 -3
  232. package/src/tools.ts +23 -1
  233. package/zcode/AGENTS.md +333 -204
@@ -1,412 +1,412 @@
1
- # -*- coding: utf-8 -*-
2
- # 功能名:index_code/index_doc 的节点 id 不含源根 ⇒ 跨仓静默覆写(issue #352-E)
3
- # 生效条件:python -X utf8 -m md_cg.test_issue352_refindex [--mutate];被测面=md_cg/refindex.py 的 root_clash/add_items + md_cg/mcp_server.py 的 index_code/index_doc + md_cg/sources.py 的 ingest 链
4
- # 子功能:A 组=两仓同名相对路径不互相覆写、先索引一侧保住、冲突在回执里点名、冲突源文件的水位被丢掉(下次增量仍报冲突);K 组=非恒真对照(单仓照常写、同根重复索引不算冲突、同根等价写法不算冲突、不同相对路径不算冲突、无 ref.root 的节点不算冲突);E 组=源码面单点
5
- # 执行:两个临时源仓各放同名 src/main.py,依次经 mcp_server.call_tool(cg, "cg", {op: index_code/index_doc …}) 索引,读节点正文与 frontmatter.code_ref.root
6
- # 验证方式:全部 PASS 即通过;--mutate 走镜像树定点变异,变异后红项必须**恰为**预期集合
7
- # 不适用条件:①**不改 id 键**(把源根并进哈希会动存量 id 的稳定性与幂等,属仓内缺口单 §6.3 的单独立项)②不判 prune_orphans 的清退面(它按 ref.root 判同根,本就不清退别的仓)③不判 logref 日志链的独立面(共用同一 node_id_of,随 id 键改造一起走)
8
- """issue #352-E 守卫:跨仓同名相对路径不得静默覆写(本轮=止血,不改 id 键)。
9
-
10
- 病象(修前):node_id = sha1(**相对源根**路径 + 符号/标题),同一记忆库先后索引两个
11
- 源目录时同名相对路径得到同一个 id —— B 仓的节点静默覆写 A 仓的(正文与 code_ref.root
12
- 一起换成 B),回执只报 indexed;水位按绝对路径记,A 此后增量重索引判「未变」跳过,
13
- 被覆写的节点再也补不回来。
14
-
15
- 处置(**止血,不动 id 键**):写入前比对既有节点的 ref.root(realpath + normcase),
16
- 不同根即不覆写、把该条并入返回体 conflicts 并跳过;调用方把冲突源文件的水位一并丢掉
17
- (否则下次增量把它判成「未变」跳过,冲突从此不可见)。
18
-
19
- **存量兼容边界(E 条特别要求)**:
20
- · 新库 / 单仓用户零变化(同根永远是同一个根,无冲突);
21
- · 已被历史覆写的库**不会自动修复**——那需要按 id 键改造做一次重索引(单独立项);
22
- · 多仓同名节点暂时只保留**先索引的一侧**,另一侧只报冲突(两仓共存要等 id 键改造)。
23
-
24
- ★**过度收紧方向**:K2(同根重复索引不算冲突)、K3(同根的等价写法:尾随 /. 与
25
- 大小写,也不许算冲突)、K4(不同相对路径不算冲突)、K5(无 ref.root 的节点不算冲突)
26
- 四条盯住「闸没把正常面一起关掉」。
27
- """
28
- import json
29
- import os
30
- import shutil
31
- import subprocess
32
- import sys
33
- import tempfile
34
-
35
- sys.stdout.reconfigure(encoding="utf-8", errors="replace")
36
-
37
- _REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
38
- sys.path.insert(0, _REPO)
39
- _TMP = tempfile.mkdtemp(prefix="iss352e_")
40
- os.environ.update({"MDCG_ROOT": _TMP + "/brainroot",
41
- "MDCG_STATE_ROOT": _TMP + "/state",
42
- "MDCG_AUX_ROOT": _TMP + "/auxstore",
43
- "MDCG_DATA_ROOT": _TMP + "/datastore",
44
- "MDCG_EXPORT_ROOT": _TMP,
45
- "MDCG_INGEST_ROOT": _TMP,
46
- "MDCG_SUSTAIN": "0", "MDCG_SLEEP": "0"})
47
-
48
- from md_cg import refindex # noqa: E402
49
- from md_cg import mcp_server # noqa: E402
50
- from md_cg.mdcos import MdCGOS # noqa: E402
51
-
52
- FAILS = []
53
- _RUN = [0]
54
-
55
-
56
- def _check(name, cond, detail=""):
57
- if cond:
58
- print(" PASS " + name)
59
- else:
60
- print(" FAIL " + name + " " + str(detail)[:400])
61
- FAILS.append(name)
62
-
63
-
64
- def _lib():
65
- _RUN[0] += 1
66
- return MdCGOS(os.path.join(_TMP, "brain_%d" % _RUN[0]), autoflush=1)
67
-
68
-
69
- def _call(cg, **a):
70
- r = mcp_server.call_tool(cg, "cg", a)
71
- if isinstance(r, dict) and "content" in r:
72
- return json.loads(r["content"][0]["text"])
73
- return r
74
-
75
-
76
- def _mk_repo(name, doc, rel="src/main.py"):
77
- root = os.path.join(_TMP, name)
78
- d = os.path.dirname(os.path.join(root, rel))
79
- os.makedirs(d, exist_ok=True)
80
- with open(os.path.join(root, rel), "w", encoding="utf-8") as f:
81
- f.write('def main():\n """%s"""\n return 0\n' % doc)
82
- return root
83
-
84
-
85
- def _mk_docrepo(name, body):
86
- root = os.path.join(_TMP, name)
87
- os.makedirs(root, exist_ok=True)
88
- with open(os.path.join(root, "README.md"), "w", encoding="utf-8") as f:
89
- f.write("# 项目\n\n## 安装\n\n%s\n" % body)
90
- return root
91
-
92
-
93
- def _main_id(cg, out):
94
- """从回执 ids 里取 name==main 的那个节点 id(不猜哈希)。"""
95
- for i in (out.get("ids") or []):
96
- n = cg.get(i) or {}
97
- if ((n.get("frontmatter") or {}).get("code_ref") or {}).get("name") == "main":
98
- return i
99
- return None
100
-
101
-
102
- def _root_of(cg, nid):
103
- return (((cg.get(nid) or {}).get("frontmatter") or {}).get("code_ref")
104
- or {}).get("root")
105
-
106
-
107
- _A = _mk_repo("repoA", "仓库A:连接生产库 ALPHA_DB 端口 7001")
108
- _B = _mk_repo("repoB", "仓库B:只打印 hello")
109
- _DOCA = _mk_docrepo("docA", "安装步骤 ALPHA_KEY:先装依赖")
110
- _DOCB = _mk_docrepo("docB", "安装步骤:直接运行")
111
-
112
- print("== A 组:跨仓同 id 不得静默覆写 ==")
113
-
114
- # --- E1:index_code 两仓同名 ---
115
- _c1 = _lib()
116
- _ra = _call(_c1, op="index_code", path=_A)
117
- _nid = _main_id(_c1, _ra)
118
- _rb = _call(_c1, op="index_code", path=_B)
119
- _c1c = (_c1.get(_nid) or {}).get("content") or ""
120
- print(" [读数] E1 A 节点 id=%s 索B 回执 indexed=%s conflict_count=%s "
121
- "节点 root=%s 含 ALPHA_DB=%s"
122
- % (_nid, _rb.get("indexed"), _rb.get("conflict_count"),
123
- os.path.basename(_root_of(_c1, _nid) or "?"),
124
- "ALPHA_DB" in _c1c))
125
- _check("E1 index_code:B 仓同名符号不覆写 A 仓节点(正文与 code_ref.root 仍属 A),"
126
- "且回执点名冲突",
127
- bool(_nid) and "ALPHA_DB" in _c1c
128
- and os.path.normcase(os.path.realpath(_root_of(_c1, _nid) or ""))
129
- == os.path.normcase(os.path.realpath(_A))
130
- and (_rb.get("conflict_count") or 0) >= 1
131
- and _nid in [c.get("id") for c in (_rb.get("conflicts") or [])],
132
- _rb)
133
-
134
- # --- E2:冲突后对 A 增量重索引,A 的节点仍属 A ---
135
- _ra2 = _call(_c1, op="index_code", path=_A, incremental=True)
136
- _c1c2 = (_c1.get(_nid) or {}).get("content") or ""
137
- print(" [读数] E2 A 增量重索引 indexed=%s skipped=%s root=%s 含 ALPHA_DB=%s"
138
- % (_ra2.get("indexed"), _ra2.get("skipped_unchanged"),
139
- os.path.basename(_root_of(_c1, _nid) or "?"), "ALPHA_DB" in _c1c2))
140
- _check("E2 增量重索引 A:节点仍归 A(不存在「被覆写后增量补不回」)",
141
- "ALPHA_DB" in _c1c2
142
- and os.path.normcase(os.path.realpath(_root_of(_c1, _nid) or ""))
143
- == os.path.normcase(os.path.realpath(_A)), _ra2)
144
-
145
- # --- E4:冲突源文件的水位被丢掉 ⇒ 再跑 B 的增量索引**仍然**报冲突 ---
146
- _rb2 = _call(_c1, op="index_code", path=_B, incremental=True)
147
- print(" [读数] E4 再增量索引 B:indexed=%s skipped=%s conflict_count=%s"
148
- % (_rb2.get("indexed"), _rb2.get("skipped_unchanged"),
149
- _rb2.get("conflict_count")))
150
- _check("E4 冲突源文件的水位被丢掉:再增量索引 B 仍报冲突(没被「未变」静默跳过)",
151
- (_rb2.get("conflict_count") or 0) >= 1
152
- and (_rb2.get("skipped_unchanged") or 0) == 0, _rb2)
153
- _c1.close()
154
-
155
- # --- E3:index_doc 同形(README.md 的「## 安装」节)---
156
- _c2 = _lib()
157
- _da = _call(_c2, op="index_doc", path=_DOCA)
158
- _ids_a = list(_da.get("ids") or [])
159
- _db = _call(_c2, op="index_doc", path=_DOCB)
160
- # 冲突条目**不进 B 的 ids**(不覆写即不落盘),故以 A 的 ids 复核:它们必须仍归
161
- # docA 且正文仍是 A 的内容,同时 B 的回执点名冲突。
162
- _doc_ok = bool(_ids_a)
163
- for i in _ids_a:
164
- n = _c2.get(i) or {}
165
- fm = n.get("frontmatter") or {}
166
- r = (fm.get("doc_ref") or {}).get("root")
167
- if not r or os.path.normcase(os.path.realpath(r)) != os.path.normcase(
168
- os.path.realpath(_DOCA)):
169
- _doc_ok = False
170
- if "ALPHA_KEY" not in (n.get("content") or ""):
171
- _doc_ok = False
172
- print(" [读数] E3 A 的 doc 节点数=%d 仍归 A 且含 ALPHA_KEY=%s 索B conflict_count=%s"
173
- % (len(_ids_a), _doc_ok, _db.get("conflict_count")))
174
- _check("E3 index_doc 同形:README.md 的同一节不跨仓覆写(A 的节点仍归 A,冲突在回执里点名)",
175
- _doc_ok and (_db.get("conflict_count") or 0) >= 1,
176
- (_ids_a, _db.get("conflict_count")))
177
- _c2.close()
178
-
179
- # ========================================================= K 组:非恒真对照
180
- print("== K 组:非恒真对照(含**过度收紧**方向)==")
181
-
182
- # --- K1:单仓照常写入 ---
183
- _k1 = _lib()
184
- _r = _call(_k1, op="index_code", path=_A)
185
- print(" [读数] K1 单仓 indexed=%s conflict_count=%s"
186
- % (_r.get("indexed"), _r.get("conflict_count")))
187
- _check("K1 单仓索引照常写入、零冲突(闸没把正常路径关掉)",
188
- (_r.get("indexed") or 0) >= 1 and not _r.get("conflict_count"), _r)
189
-
190
- # --- K2:同根重复索引(全量)不算冲突 ---
191
- _r2 = _call(_k1, op="index_code", path=_A)
192
- print(" [读数] K2 同根重复索引 indexed=%s conflict_count=%s"
193
- % (_r2.get("indexed"), _r2.get("conflict_count")))
194
- _check("K2 同一源根重复索引不算冲突(幂等:同根永远是同一个根)",
195
- (_r2.get("indexed") or 0) >= 1 and not _r2.get("conflict_count"), _r2)
196
-
197
- # --- K3:同根的**等价写法**也不算冲突(尾随 /. 与大小写)---
198
- _variants = [os.path.join(_A, "."), os.path.join(_A, "..", os.path.basename(_A))]
199
- if os.name == "nt":
200
- _variants.append(_A.upper())
201
- _r3 = None
202
- for v in _variants:
203
- _r3 = _call(_k1, op="index_code", path=v)
204
- if _r3.get("conflict_count"):
205
- break
206
- print(" [读数] K3 等价写法 %s → conflict_count=%s"
207
- % (len(_variants), _r3.get("conflict_count")))
208
- _check("K3 同一源根的等价写法(尾随 /. 、.. 折算、Windows 大小写)不算冲突"
209
- "(复用既有 _same_root:normcase + abspath 口径)",
210
- (_r3.get("indexed") or 0) >= 1 and not _r3.get("conflict_count"), _r3)
211
- _k1.close()
212
-
213
- # --- K4:不同相对路径不算冲突 ---
214
- _k4 = _lib()
215
- _call(_k4, op="index_code", path=_A)
216
- _r4 = _call(_k4, op="index_code", path=_mk_repo("repoC", "仓库C:另一个文件",
217
- rel="src/other.py"))
218
- print(" [读数] K4 不同相对路径 indexed=%s conflict_count=%s"
219
- % (_r4.get("indexed"), _r4.get("conflict_count")))
220
- _check("K4 不同相对路径(id 不同)不算冲突——闸只拦「同 id 已被别的源根占用」",
221
- (_r4.get("indexed") or 0) >= 1 and not _r4.get("conflict_count"), _r4)
222
- _k4.close()
223
-
224
- # --- K5:无 ref.root 的节点不算冲突(单元面)---
225
- _k5 = _lib()
226
- _k5.add("manual_node", "PASSED 手工节点(无 code_ref)", layer="knowledge")
227
- _no_prev = refindex.root_clash(_k5, "does_not_exist", "code_ref", _A)
228
- _no_ref = refindex.root_clash(_k5, "manual_node", "code_ref", _A)
229
- print(" [读数] K5 无节点=%s 有节点无 ref=%s" % (_no_prev, _no_ref))
230
- _check("K5 节点不存在 / 存在但无 ref.root 时都不算冲突(不误伤手工节点与老节点)",
231
- _no_prev is None and _no_ref is None, (_no_prev, _no_ref))
232
- _k5.close()
233
-
234
- # ========================================================= E 组:源码面单点
235
- print("== E 组:源码面单点 ==")
236
- _src_ri = open(os.path.join(_REPO, "md_cg", "refindex.py"),
237
- encoding="utf-8").read()
238
- _src_ms = open(os.path.join(_REPO, "md_cg", "mcp_server.py"),
239
- encoding="utf-8").read()
240
- _src_sr = open(os.path.join(_REPO, "md_cg", "sources.py"),
241
- encoding="utf-8").read()
242
- _check("E5 冲突闸单点:refindex.root_clash 定义一处,add_items 写前调用",
243
- _src_ri.count("def root_clash(") == 1
244
- and "_clash = root_clash(cg, nid, kind, root)" in _src_ri
245
- and _src_ri.count("def _same_root(") == 1 # 同根判据复用既有单点,不新增第二份
246
- and "def _norm_root(" in _src_ri)
247
- _check("E6 add_items 接受 conflicts 出参(不覆写即记账,不静默)",
248
- "extra_of=None, conflicts=None):" in _src_ri
249
- and "conflicts.append(dict(_clash" in _src_ri)
250
- _check("E7 mcp_server 的 index_code/index_doc 都传 conflicts 并把冲突文件水位丢掉",
251
- _src_ms.count("conflicts=_cf)") == 2
252
- and _src_ms.count('led.drop(_c.get("src")') == 2
253
- and _src_ms.count('out["conflict_count"] = len(_cf)') == 2)
254
- _check("E8 水位键仍是源文件绝对路径(_src_key 未被改动——跨根同名文件不互相覆盖)",
255
- "os.path.abspath(fp or" in _src_ri
256
- and _src_ri.count("def _src_key(") == 1)
257
- _check("E9 ingest 链同口径(sources.py 也传 conflicts 并 drop 水位)",
258
- "conflicts=_cf)" in _src_sr and "ledger.drop(_c.get(" in _src_sr)
259
-
260
- shutil.rmtree(_TMP, ignore_errors=True)
261
-
262
- print("")
263
- if FAILS:
264
- print("issue #352-E 结果:%d 失败 → %s" % (len(FAILS), ", ".join(FAILS)))
265
- else:
266
- print("issue #352-E 结果:全部通过")
267
-
268
- # ------------------------------------------------------------- 定点变异(镜像树)
269
- _MUTATIONS = (
270
- ("M1 摘掉冲突闸(回到「同 id 直接覆写」的修前形态)",
271
- (("md_cg/refindex.py",
272
- [" _clash = root_clash(cg, nid, kind, root)"],
273
- [" _clash = None"]),),
274
- # E5 也红:它断言写前调用单点那条字面(同一条锚点)。
275
- ("E1", "E2", "E3", "E4", "E5")),
276
- ("M2 摘掉冲突源文件的水位丢弃(冲突被「未变」静默吃掉)",
277
- (("md_cg/mcp_server.py",
278
- [" for _c in _cf:",
279
- ' led.drop(_c.get("src") or os.path.join(root, _c.get("path") or ""))',
280
- " led.save() # 节点已落盘 → 水位随后(两步之间被杀即安全方向)"],
281
- [" for _c in _cf:",
282
- " pass",
283
- " led.save() # 节点已落盘 → 水位随后(两步之间被杀即安全方向)"]),),
284
- # E7 也红:它数 drop 调用点(这条变异恰好摘掉 index_code 的那一处)。
285
- ("E4", "E7")),
286
- ("M3 **过度收紧方向**:同根也判成冲突(把幂等重索引一并拦掉)",
287
- (("md_cg/refindex.py",
288
- [" if not prev_root or not root or _same_root(prev_root, root):"],
289
- [" if not prev_root or not root or False:"]),),
290
- ("K2", "K3")),
291
- ("M4 **过度收紧方向**:去掉「无 ref.root 不算冲突」的豁免(误伤手工节点/老节点)",
292
- (("md_cg/refindex.py",
293
- [" if not prev_root or not root or _same_root(prev_root, root):",
294
- " return None",
295
- " if not os.path.isdir(prev_root):"],
296
- [" if not root or (prev_root is not None",
297
- " and not _same_root(prev_root, root)):",
298
- ' return {"id": nid, "kind": kind, "existing_root": prev_root,',
299
- ' "root": root}',
300
- " if False:"]),),
301
- ("K2", "K3", "K5")),
302
- ("M5 摘掉 index_code 的冲突回执(不覆写但不点名)",
303
- (("md_cg/mcp_server.py",
304
- [' ids, _sens = refindex.add_items(cg, items, kind="code_ref", root=root,',
305
- ' layer=a.get("layer"), conflicts=_cf)'],
306
- [' ids, _sens = refindex.add_items(cg, items, kind="code_ref", root=root,',
307
- ' layer=a.get("layer"))']),),
308
- # E7 也红:conflicts=_cf 的调用点由 2 处变 1 处。
309
- ("E1", "E4", "E7")),
310
- )
311
-
312
-
313
- def _mirror_build():
314
- dst = tempfile.mkdtemp(prefix="iss352e_mut_")
315
- for name in ("md_cg", "scripts"):
316
- src = os.path.join(_REPO, name)
317
- if os.path.isdir(src):
318
- shutil.copytree(src, os.path.join(dst, name),
319
- ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
320
- for name in sorted(os.listdir(_REPO)):
321
- p = os.path.join(_REPO, name)
322
- if os.path.isfile(p) and name.endswith(".py"):
323
- shutil.copy2(p, os.path.join(dst, name))
324
- return dst
325
-
326
-
327
- def _nl_of(path):
328
- with open(path, "rb") as fh:
329
- raw = fh.read(8192)
330
- return "\r\n" if b"\r\n" in raw else "\n"
331
-
332
-
333
- def _run_in(tree):
334
- env = dict(os.environ)
335
- env["PYTHONPATH"] = tree
336
- env["PYTHONUTF8"] = "1"
337
- env["PYTHONDONTWRITEBYTECODE"] = "1"
338
- pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
339
- "md_cg.test_issue352_refindex"],
340
- capture_output=True, text=True, encoding="utf-8",
341
- errors="replace", cwd=tree, env=env, timeout=1800)
342
- out = (pr.stdout or "") + (pr.stderr or "")
343
- reds = [ln.split("FAIL ", 1)[1].strip()
344
- for ln in out.splitlines() if "FAIL " in ln]
345
- return pr.returncode, reds, out
346
-
347
-
348
- def _mutate():
349
- print("!! 定点变异自证:把修复点改回改动前形态,守卫必须转红")
350
- tree = _mirror_build()
351
- try:
352
- rc, reds, out = _run_in(tree)
353
- print(" 未变异镜像基线:rc=%d 红项=%d(必须 rc=0 且 0 红)" % (rc, len(reds)))
354
- if rc != 0 or reds:
355
- print(chr(10).join(out.splitlines()[-30:]))
356
- for ln in out.splitlines():
357
- if "[读数]" in ln:
358
- print(" 修后读数(未变异镜像):" + ln.strip())
359
- okc, bad = 0, []
360
- for desc, edits, exp in _MUTATIONS:
361
- backups, miss = [], []
362
- for rel, oldp, newp in edits:
363
- p = os.path.join(tree, rel)
364
- nl = _nl_of(p)
365
- old, new = nl.join(oldp), nl.join(newp)
366
- with open(p, encoding="utf-8", newline="") as fh:
367
- t = fh.read()
368
- if t.count(old) != 1:
369
- miss.append("%s —— 锚点命中 %d 次" % (rel, t.count(old)))
370
- continue
371
- backups.append((p, t))
372
- with open(p, "w", encoding="utf-8", newline="") as fh:
373
- fh.write(t.replace(old, new, 1))
374
- if miss:
375
- bad.append("%s —— %s" % (desc, ";".join(miss)))
376
- print(" ANCHOR-MISS " + desc)
377
- for p, t in backups:
378
- with open(p, "w", encoding="utf-8", newline="") as fh:
379
- fh.write(t)
380
- continue
381
- rc2, reds2, out2 = _run_in(tree)
382
- for p, t in backups:
383
- with open(p, "w", encoding="utf-8", newline="") as fh:
384
- fh.write(t)
385
- hit = sorted({e for r in reds2 for e in exp if r.startswith(e + " ")})
386
- if rc2 != 0 and hit == sorted(exp) and len(reds2) == len(exp):
387
- okc += 1
388
- print(" OK %s 红项=%d 指定命中=%d/%d"
389
- % (desc, len(reds2), len(hit), len(exp)))
390
- else:
391
- bad.append(desc)
392
- print(" MISMATCH %s 红项=%d 指定命中=%d/%d rc=%d"
393
- % (desc, len(reds2), len(hit), len(exp), rc2))
394
- for r in reds2[:14]:
395
- print(" FAIL " + r)
396
- print("定点变异自证:%s(%d 条不合格)"
397
- % ("PASS" if not bad else "FAIL", len(bad)))
398
- for b in bad:
399
- print(" 不合格:" + b)
400
- finally:
401
- shutil.rmtree(tree, ignore_errors=True)
402
-
403
-
404
- def main():
405
- if "--mutate" in sys.argv:
406
- _mutate()
407
- return 1 if FAILS else 0
408
- return 0 if not FAILS else 1
409
-
410
-
411
- if __name__ == "__main__":
412
- sys.exit(main())
1
+ # -*- coding: utf-8 -*-
2
+ # 功能名:index_code/index_doc 的节点 id 不含源根 ⇒ 跨仓静默覆写(issue #352-E)
3
+ # 生效条件:python -X utf8 -m md_cg.test_issue352_refindex [--mutate];被测面=md_cg/refindex.py 的 root_clash/add_items + md_cg/mcp_server.py 的 index_code/index_doc + md_cg/sources.py 的 ingest 链
4
+ # 子功能:A 组=两仓同名相对路径不互相覆写、先索引一侧保住、冲突在回执里点名、冲突源文件的水位被丢掉(下次增量仍报冲突);K 组=非恒真对照(单仓照常写、同根重复索引不算冲突、同根等价写法不算冲突、不同相对路径不算冲突、无 ref.root 的节点不算冲突);E 组=源码面单点
5
+ # 执行:两个临时源仓各放同名 src/main.py,依次经 mcp_server.call_tool(cg, "cg", {op: index_code/index_doc …}) 索引,读节点正文与 frontmatter.code_ref.root
6
+ # 验证方式:全部 PASS 即通过;--mutate 走镜像树定点变异,变异后红项必须**恰为**预期集合
7
+ # 不适用条件:①**不改 id 键**(把源根并进哈希会动存量 id 的稳定性与幂等,属仓内缺口单 §6.3 的单独立项)②不判 prune_orphans 的清退面(它按 ref.root 判同根,本就不清退别的仓)③不判 logref 日志链的独立面(共用同一 node_id_of,随 id 键改造一起走)
8
+ """issue #352-E 守卫:跨仓同名相对路径不得静默覆写(本轮=止血,不改 id 键)。
9
+
10
+ 病象(修前):node_id = sha1(**相对源根**路径 + 符号/标题),同一记忆库先后索引两个
11
+ 源目录时同名相对路径得到同一个 id —— B 仓的节点静默覆写 A 仓的(正文与 code_ref.root
12
+ 一起换成 B),回执只报 indexed;水位按绝对路径记,A 此后增量重索引判「未变」跳过,
13
+ 被覆写的节点再也补不回来。
14
+
15
+ 处置(**止血,不动 id 键**):写入前比对既有节点的 ref.root(realpath + normcase),
16
+ 不同根即不覆写、把该条并入返回体 conflicts 并跳过;调用方把冲突源文件的水位一并丢掉
17
+ (否则下次增量把它判成「未变」跳过,冲突从此不可见)。
18
+
19
+ **存量兼容边界(E 条特别要求)**:
20
+ · 新库 / 单仓用户零变化(同根永远是同一个根,无冲突);
21
+ · 已被历史覆写的库**不会自动修复**——那需要按 id 键改造做一次重索引(单独立项);
22
+ · 多仓同名节点暂时只保留**先索引的一侧**,另一侧只报冲突(两仓共存要等 id 键改造)。
23
+
24
+ ★**过度收紧方向**:K2(同根重复索引不算冲突)、K3(同根的等价写法:尾随 /. 与
25
+ 大小写,也不许算冲突)、K4(不同相对路径不算冲突)、K5(无 ref.root 的节点不算冲突)
26
+ 四条盯住「闸没把正常面一起关掉」。
27
+ """
28
+ import json
29
+ import os
30
+ import shutil
31
+ import subprocess
32
+ import sys
33
+ import tempfile
34
+
35
+ sys.stdout.reconfigure(encoding="utf-8", errors="replace")
36
+
37
+ _REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
38
+ sys.path.insert(0, _REPO)
39
+ _TMP = tempfile.mkdtemp(prefix="iss352e_")
40
+ os.environ.update({"MDCG_ROOT": _TMP + "/brainroot",
41
+ "MDCG_STATE_ROOT": _TMP + "/state",
42
+ "MDCG_AUX_ROOT": _TMP + "/auxstore",
43
+ "MDCG_DATA_ROOT": _TMP + "/datastore",
44
+ "MDCG_EXPORT_ROOT": _TMP,
45
+ "MDCG_INGEST_ROOT": _TMP,
46
+ "MDCG_SUSTAIN": "0", "MDCG_SLEEP": "0"})
47
+
48
+ from md_cg import refindex # noqa: E402
49
+ from md_cg import mcp_server # noqa: E402
50
+ from md_cg.mdcos import MdCGOS # noqa: E402
51
+
52
+ FAILS = []
53
+ _RUN = [0]
54
+
55
+
56
+ def _check(name, cond, detail=""):
57
+ if cond:
58
+ print(" PASS " + name)
59
+ else:
60
+ print(" FAIL " + name + " " + str(detail)[:400])
61
+ FAILS.append(name)
62
+
63
+
64
+ def _lib():
65
+ _RUN[0] += 1
66
+ return MdCGOS(os.path.join(_TMP, "brain_%d" % _RUN[0]), autoflush=1)
67
+
68
+
69
+ def _call(cg, **a):
70
+ r = mcp_server.call_tool(cg, "cg", a)
71
+ if isinstance(r, dict) and "content" in r:
72
+ return json.loads(r["content"][0]["text"])
73
+ return r
74
+
75
+
76
+ def _mk_repo(name, doc, rel="src/main.py"):
77
+ root = os.path.join(_TMP, name)
78
+ d = os.path.dirname(os.path.join(root, rel))
79
+ os.makedirs(d, exist_ok=True)
80
+ with open(os.path.join(root, rel), "w", encoding="utf-8") as f:
81
+ f.write('def main():\n """%s"""\n return 0\n' % doc)
82
+ return root
83
+
84
+
85
+ def _mk_docrepo(name, body):
86
+ root = os.path.join(_TMP, name)
87
+ os.makedirs(root, exist_ok=True)
88
+ with open(os.path.join(root, "README.md"), "w", encoding="utf-8") as f:
89
+ f.write("# 项目\n\n## 安装\n\n%s\n" % body)
90
+ return root
91
+
92
+
93
+ def _main_id(cg, out):
94
+ """从回执 ids 里取 name==main 的那个节点 id(不猜哈希)。"""
95
+ for i in (out.get("ids") or []):
96
+ n = cg.get(i) or {}
97
+ if ((n.get("frontmatter") or {}).get("code_ref") or {}).get("name") == "main":
98
+ return i
99
+ return None
100
+
101
+
102
+ def _root_of(cg, nid):
103
+ return (((cg.get(nid) or {}).get("frontmatter") or {}).get("code_ref")
104
+ or {}).get("root")
105
+
106
+
107
+ _A = _mk_repo("repoA", "仓库A:连接生产库 ALPHA_DB 端口 7001")
108
+ _B = _mk_repo("repoB", "仓库B:只打印 hello")
109
+ _DOCA = _mk_docrepo("docA", "安装步骤 ALPHA_KEY:先装依赖")
110
+ _DOCB = _mk_docrepo("docB", "安装步骤:直接运行")
111
+
112
+ print("== A 组:跨仓同 id 不得静默覆写 ==")
113
+
114
+ # --- E1:index_code 两仓同名 ---
115
+ _c1 = _lib()
116
+ _ra = _call(_c1, op="index_code", path=_A)
117
+ _nid = _main_id(_c1, _ra)
118
+ _rb = _call(_c1, op="index_code", path=_B)
119
+ _c1c = (_c1.get(_nid) or {}).get("content") or ""
120
+ print(" [读数] E1 A 节点 id=%s 索B 回执 indexed=%s conflict_count=%s "
121
+ "节点 root=%s 含 ALPHA_DB=%s"
122
+ % (_nid, _rb.get("indexed"), _rb.get("conflict_count"),
123
+ os.path.basename(_root_of(_c1, _nid) or "?"),
124
+ "ALPHA_DB" in _c1c))
125
+ _check("E1 index_code:B 仓同名符号不覆写 A 仓节点(正文与 code_ref.root 仍属 A),"
126
+ "且回执点名冲突",
127
+ bool(_nid) and "ALPHA_DB" in _c1c
128
+ and os.path.normcase(os.path.realpath(_root_of(_c1, _nid) or ""))
129
+ == os.path.normcase(os.path.realpath(_A))
130
+ and (_rb.get("conflict_count") or 0) >= 1
131
+ and _nid in [c.get("id") for c in (_rb.get("conflicts") or [])],
132
+ _rb)
133
+
134
+ # --- E2:冲突后对 A 增量重索引,A 的节点仍属 A ---
135
+ _ra2 = _call(_c1, op="index_code", path=_A, incremental=True)
136
+ _c1c2 = (_c1.get(_nid) or {}).get("content") or ""
137
+ print(" [读数] E2 A 增量重索引 indexed=%s skipped=%s root=%s 含 ALPHA_DB=%s"
138
+ % (_ra2.get("indexed"), _ra2.get("skipped_unchanged"),
139
+ os.path.basename(_root_of(_c1, _nid) or "?"), "ALPHA_DB" in _c1c2))
140
+ _check("E2 增量重索引 A:节点仍归 A(不存在「被覆写后增量补不回」)",
141
+ "ALPHA_DB" in _c1c2
142
+ and os.path.normcase(os.path.realpath(_root_of(_c1, _nid) or ""))
143
+ == os.path.normcase(os.path.realpath(_A)), _ra2)
144
+
145
+ # --- E4:冲突源文件的水位被丢掉 ⇒ 再跑 B 的增量索引**仍然**报冲突 ---
146
+ _rb2 = _call(_c1, op="index_code", path=_B, incremental=True)
147
+ print(" [读数] E4 再增量索引 B:indexed=%s skipped=%s conflict_count=%s"
148
+ % (_rb2.get("indexed"), _rb2.get("skipped_unchanged"),
149
+ _rb2.get("conflict_count")))
150
+ _check("E4 冲突源文件的水位被丢掉:再增量索引 B 仍报冲突(没被「未变」静默跳过)",
151
+ (_rb2.get("conflict_count") or 0) >= 1
152
+ and (_rb2.get("skipped_unchanged") or 0) == 0, _rb2)
153
+ _c1.close()
154
+
155
+ # --- E3:index_doc 同形(README.md 的「## 安装」节)---
156
+ _c2 = _lib()
157
+ _da = _call(_c2, op="index_doc", path=_DOCA)
158
+ _ids_a = list(_da.get("ids") or [])
159
+ _db = _call(_c2, op="index_doc", path=_DOCB)
160
+ # 冲突条目**不进 B 的 ids**(不覆写即不落盘),故以 A 的 ids 复核:它们必须仍归
161
+ # docA 且正文仍是 A 的内容,同时 B 的回执点名冲突。
162
+ _doc_ok = bool(_ids_a)
163
+ for i in _ids_a:
164
+ n = _c2.get(i) or {}
165
+ fm = n.get("frontmatter") or {}
166
+ r = (fm.get("doc_ref") or {}).get("root")
167
+ if not r or os.path.normcase(os.path.realpath(r)) != os.path.normcase(
168
+ os.path.realpath(_DOCA)):
169
+ _doc_ok = False
170
+ if "ALPHA_KEY" not in (n.get("content") or ""):
171
+ _doc_ok = False
172
+ print(" [读数] E3 A 的 doc 节点数=%d 仍归 A 且含 ALPHA_KEY=%s 索B conflict_count=%s"
173
+ % (len(_ids_a), _doc_ok, _db.get("conflict_count")))
174
+ _check("E3 index_doc 同形:README.md 的同一节不跨仓覆写(A 的节点仍归 A,冲突在回执里点名)",
175
+ _doc_ok and (_db.get("conflict_count") or 0) >= 1,
176
+ (_ids_a, _db.get("conflict_count")))
177
+ _c2.close()
178
+
179
+ # ========================================================= K 组:非恒真对照
180
+ print("== K 组:非恒真对照(含**过度收紧**方向)==")
181
+
182
+ # --- K1:单仓照常写入 ---
183
+ _k1 = _lib()
184
+ _r = _call(_k1, op="index_code", path=_A)
185
+ print(" [读数] K1 单仓 indexed=%s conflict_count=%s"
186
+ % (_r.get("indexed"), _r.get("conflict_count")))
187
+ _check("K1 单仓索引照常写入、零冲突(闸没把正常路径关掉)",
188
+ (_r.get("indexed") or 0) >= 1 and not _r.get("conflict_count"), _r)
189
+
190
+ # --- K2:同根重复索引(全量)不算冲突 ---
191
+ _r2 = _call(_k1, op="index_code", path=_A)
192
+ print(" [读数] K2 同根重复索引 indexed=%s conflict_count=%s"
193
+ % (_r2.get("indexed"), _r2.get("conflict_count")))
194
+ _check("K2 同一源根重复索引不算冲突(幂等:同根永远是同一个根)",
195
+ (_r2.get("indexed") or 0) >= 1 and not _r2.get("conflict_count"), _r2)
196
+
197
+ # --- K3:同根的**等价写法**也不算冲突(尾随 /. 与大小写)---
198
+ _variants = [os.path.join(_A, "."), os.path.join(_A, "..", os.path.basename(_A))]
199
+ if os.name == "nt":
200
+ _variants.append(_A.upper())
201
+ _r3 = None
202
+ for v in _variants:
203
+ _r3 = _call(_k1, op="index_code", path=v)
204
+ if _r3.get("conflict_count"):
205
+ break
206
+ print(" [读数] K3 等价写法 %s → conflict_count=%s"
207
+ % (len(_variants), _r3.get("conflict_count")))
208
+ _check("K3 同一源根的等价写法(尾随 /. 、.. 折算、Windows 大小写)不算冲突"
209
+ "(复用既有 _same_root:normcase + abspath 口径)",
210
+ (_r3.get("indexed") or 0) >= 1 and not _r3.get("conflict_count"), _r3)
211
+ _k1.close()
212
+
213
+ # --- K4:不同相对路径不算冲突 ---
214
+ _k4 = _lib()
215
+ _call(_k4, op="index_code", path=_A)
216
+ _r4 = _call(_k4, op="index_code", path=_mk_repo("repoC", "仓库C:另一个文件",
217
+ rel="src/other.py"))
218
+ print(" [读数] K4 不同相对路径 indexed=%s conflict_count=%s"
219
+ % (_r4.get("indexed"), _r4.get("conflict_count")))
220
+ _check("K4 不同相对路径(id 不同)不算冲突——闸只拦「同 id 已被别的源根占用」",
221
+ (_r4.get("indexed") or 0) >= 1 and not _r4.get("conflict_count"), _r4)
222
+ _k4.close()
223
+
224
+ # --- K5:无 ref.root 的节点不算冲突(单元面)---
225
+ _k5 = _lib()
226
+ _k5.add("manual_node", "PASSED 手工节点(无 code_ref)", layer="knowledge")
227
+ _no_prev = refindex.root_clash(_k5, "does_not_exist", "code_ref", _A)
228
+ _no_ref = refindex.root_clash(_k5, "manual_node", "code_ref", _A)
229
+ print(" [读数] K5 无节点=%s 有节点无 ref=%s" % (_no_prev, _no_ref))
230
+ _check("K5 节点不存在 / 存在但无 ref.root 时都不算冲突(不误伤手工节点与老节点)",
231
+ _no_prev is None and _no_ref is None, (_no_prev, _no_ref))
232
+ _k5.close()
233
+
234
+ # ========================================================= E 组:源码面单点
235
+ print("== E 组:源码面单点 ==")
236
+ _src_ri = open(os.path.join(_REPO, "md_cg", "refindex.py"),
237
+ encoding="utf-8").read()
238
+ _src_ms = open(os.path.join(_REPO, "md_cg", "mcp_server.py"),
239
+ encoding="utf-8").read()
240
+ _src_sr = open(os.path.join(_REPO, "md_cg", "sources.py"),
241
+ encoding="utf-8").read()
242
+ _check("E5 冲突闸单点:refindex.root_clash 定义一处,add_items 写前调用",
243
+ _src_ri.count("def root_clash(") == 1
244
+ and "_clash = root_clash(cg, nid, kind, root)" in _src_ri
245
+ and _src_ri.count("def _same_root(") == 1 # 同根判据复用既有单点,不新增第二份
246
+ and "def _norm_root(" in _src_ri)
247
+ _check("E6 add_items 接受 conflicts 出参(不覆写即记账,不静默)",
248
+ "extra_of=None, conflicts=None):" in _src_ri
249
+ and "conflicts.append(dict(_clash" in _src_ri)
250
+ _check("E7 mcp_server 的 index_code/index_doc 都传 conflicts 并把冲突文件水位丢掉",
251
+ _src_ms.count("conflicts=_cf)") == 2
252
+ and _src_ms.count('led.drop(_c.get("src")') == 2
253
+ and _src_ms.count('out["conflict_count"] = len(_cf)') == 2)
254
+ _check("E8 水位键仍是源文件绝对路径(_src_key 未被改动——跨根同名文件不互相覆盖)",
255
+ "os.path.abspath(fp or" in _src_ri
256
+ and _src_ri.count("def _src_key(") == 1)
257
+ _check("E9 ingest 链同口径(sources.py 也传 conflicts 并 drop 水位)",
258
+ "conflicts=_cf)" in _src_sr and "ledger.drop(_c.get(" in _src_sr)
259
+
260
+ shutil.rmtree(_TMP, ignore_errors=True)
261
+
262
+ print("")
263
+ if FAILS:
264
+ print("issue #352-E 结果:%d 失败 → %s" % (len(FAILS), ", ".join(FAILS)))
265
+ else:
266
+ print("issue #352-E 结果:全部通过")
267
+
268
+ # ------------------------------------------------------------- 定点变异(镜像树)
269
+ _MUTATIONS = (
270
+ ("M1 摘掉冲突闸(回到「同 id 直接覆写」的修前形态)",
271
+ (("md_cg/refindex.py",
272
+ [" _clash = root_clash(cg, nid, kind, root)"],
273
+ [" _clash = None"]),),
274
+ # E5 也红:它断言写前调用单点那条字面(同一条锚点)。
275
+ ("E1", "E2", "E3", "E4", "E5")),
276
+ ("M2 摘掉冲突源文件的水位丢弃(冲突被「未变」静默吃掉)",
277
+ (("md_cg/mcp_server.py",
278
+ [" for _c in _cf:",
279
+ ' led.drop(_c.get("src") or os.path.join(root, _c.get("path") or ""))',
280
+ " led.save() # 节点已落盘 → 水位随后(两步之间被杀即安全方向)"],
281
+ [" for _c in _cf:",
282
+ " pass",
283
+ " led.save() # 节点已落盘 → 水位随后(两步之间被杀即安全方向)"]),),
284
+ # E7 也红:它数 drop 调用点(这条变异恰好摘掉 index_code 的那一处)。
285
+ ("E4", "E7")),
286
+ ("M3 **过度收紧方向**:同根也判成冲突(把幂等重索引一并拦掉)",
287
+ (("md_cg/refindex.py",
288
+ [" if not prev_root or not root or _same_root(prev_root, root):"],
289
+ [" if not prev_root or not root or False:"]),),
290
+ ("K2", "K3")),
291
+ ("M4 **过度收紧方向**:去掉「无 ref.root 不算冲突」的豁免(误伤手工节点/老节点)",
292
+ (("md_cg/refindex.py",
293
+ [" if not prev_root or not root or _same_root(prev_root, root):",
294
+ " return None",
295
+ " if not os.path.isdir(prev_root):"],
296
+ [" if not root or (prev_root is not None",
297
+ " and not _same_root(prev_root, root)):",
298
+ ' return {"id": nid, "kind": kind, "existing_root": prev_root,',
299
+ ' "root": root}',
300
+ " if False:"]),),
301
+ ("K2", "K3", "K5")),
302
+ ("M5 摘掉 index_code 的冲突回执(不覆写但不点名)",
303
+ (("md_cg/mcp_server.py",
304
+ [' ids, _sens = refindex.add_items(cg, items, kind="code_ref", root=root,',
305
+ ' layer=a.get("layer"), conflicts=_cf)'],
306
+ [' ids, _sens = refindex.add_items(cg, items, kind="code_ref", root=root,',
307
+ ' layer=a.get("layer"))']),),
308
+ # E7 也红:conflicts=_cf 的调用点由 2 处变 1 处。
309
+ ("E1", "E4", "E7")),
310
+ )
311
+
312
+
313
+ def _mirror_build():
314
+ dst = tempfile.mkdtemp(prefix="iss352e_mut_")
315
+ for name in ("md_cg", "scripts"):
316
+ src = os.path.join(_REPO, name)
317
+ if os.path.isdir(src):
318
+ shutil.copytree(src, os.path.join(dst, name),
319
+ ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
320
+ for name in sorted(os.listdir(_REPO)):
321
+ p = os.path.join(_REPO, name)
322
+ if os.path.isfile(p) and name.endswith(".py"):
323
+ shutil.copy2(p, os.path.join(dst, name))
324
+ return dst
325
+
326
+
327
+ def _nl_of(path):
328
+ with open(path, "rb") as fh:
329
+ raw = fh.read(8192)
330
+ return "\r\n" if b"\r\n" in raw else "\n"
331
+
332
+
333
+ def _run_in(tree):
334
+ env = dict(os.environ)
335
+ env["PYTHONPATH"] = tree
336
+ env["PYTHONUTF8"] = "1"
337
+ env["PYTHONDONTWRITEBYTECODE"] = "1"
338
+ pr = subprocess.run([sys.executable, "-X", "utf8", "-m",
339
+ "md_cg.test_issue352_refindex"],
340
+ capture_output=True, text=True, encoding="utf-8",
341
+ errors="replace", cwd=tree, env=env, timeout=1800)
342
+ out = (pr.stdout or "") + (pr.stderr or "")
343
+ reds = [ln.split("FAIL ", 1)[1].strip()
344
+ for ln in out.splitlines() if "FAIL " in ln]
345
+ return pr.returncode, reds, out
346
+
347
+
348
+ def _mutate():
349
+ print("!! 定点变异自证:把修复点改回改动前形态,守卫必须转红")
350
+ tree = _mirror_build()
351
+ try:
352
+ rc, reds, out = _run_in(tree)
353
+ print(" 未变异镜像基线:rc=%d 红项=%d(必须 rc=0 且 0 红)" % (rc, len(reds)))
354
+ if rc != 0 or reds:
355
+ print(chr(10).join(out.splitlines()[-30:]))
356
+ for ln in out.splitlines():
357
+ if "[读数]" in ln:
358
+ print(" 修后读数(未变异镜像):" + ln.strip())
359
+ okc, bad = 0, []
360
+ for desc, edits, exp in _MUTATIONS:
361
+ backups, miss = [], []
362
+ for rel, oldp, newp in edits:
363
+ p = os.path.join(tree, rel)
364
+ nl = _nl_of(p)
365
+ old, new = nl.join(oldp), nl.join(newp)
366
+ with open(p, encoding="utf-8", newline="") as fh:
367
+ t = fh.read()
368
+ if t.count(old) != 1:
369
+ miss.append("%s —— 锚点命中 %d 次" % (rel, t.count(old)))
370
+ continue
371
+ backups.append((p, t))
372
+ with open(p, "w", encoding="utf-8", newline="") as fh:
373
+ fh.write(t.replace(old, new, 1))
374
+ if miss:
375
+ bad.append("%s —— %s" % (desc, ";".join(miss)))
376
+ print(" ANCHOR-MISS " + desc)
377
+ for p, t in backups:
378
+ with open(p, "w", encoding="utf-8", newline="") as fh:
379
+ fh.write(t)
380
+ continue
381
+ rc2, reds2, out2 = _run_in(tree)
382
+ for p, t in backups:
383
+ with open(p, "w", encoding="utf-8", newline="") as fh:
384
+ fh.write(t)
385
+ hit = sorted({e for r in reds2 for e in exp if r.startswith(e + " ")})
386
+ if rc2 != 0 and hit == sorted(exp) and len(reds2) == len(exp):
387
+ okc += 1
388
+ print(" OK %s 红项=%d 指定命中=%d/%d"
389
+ % (desc, len(reds2), len(hit), len(exp)))
390
+ else:
391
+ bad.append(desc)
392
+ print(" MISMATCH %s 红项=%d 指定命中=%d/%d rc=%d"
393
+ % (desc, len(reds2), len(hit), len(exp), rc2))
394
+ for r in reds2[:14]:
395
+ print(" FAIL " + r)
396
+ print("定点变异自证:%s(%d 条不合格)"
397
+ % ("PASS" if not bad else "FAIL", len(bad)))
398
+ for b in bad:
399
+ print(" 不合格:" + b)
400
+ finally:
401
+ shutil.rmtree(tree, ignore_errors=True)
402
+
403
+
404
+ def main():
405
+ if "--mutate" in sys.argv:
406
+ _mutate()
407
+ return 1 if FAILS else 0
408
+ return 0 if not FAILS else 1
409
+
410
+
411
+ if __name__ == "__main__":
412
+ sys.exit(main())