@furongjun1999/dsh-memory 0.9.6 → 0.9.7
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/data/policy.json +38 -38
- package/docs/discipline/templates/spec.txt.tmpl +1 -1
- package/dsh/cordis.yml.example +139 -139
- package/lib/hooks.d.ts +19 -0
- package/lib/hooks.js +29 -6
- package/lib/index.js +11 -2
- package/lib/lib/hook_audit.js +38 -2
- package/lib/lib/prompt_safety.js +14 -3
- package/lib/tools.d.ts +7 -0
- package/lib/tools.js +22 -1
- package/md_cg/_guard_kit.py +121 -121
- package/md_cg/anchor.py +114 -114
- package/md_cg/audit.py +15 -2
- package/md_cg/chain.py +3 -2
- package/md_cg/config_registry_guard.py +487 -487
- package/md_cg/conformance.py +747 -747
- package/md_cg/consolidate.py +1793 -1793
- package/md_cg/crypto.py +794 -794
- package/md_cg/hyperedge.py +262 -262
- package/md_cg/interface_schema.py +146 -146
- package/md_cg/lifecycle.py +426 -426
- package/md_cg/mdcos.py +12 -8
- package/md_cg/predict.py +1103 -1103
- package/md_cg/protect.py +654 -654
- package/md_cg/provenance.py +606 -606
- package/md_cg/queue_health.py +130 -130
- package/md_cg/refine.py +613 -613
- package/md_cg/retrieve.py +128 -128
- package/md_cg/revise.py +140 -140
- package/md_cg/rollback.py +657 -657
- package/md_cg/rollback_cli.py +124 -124
- package/md_cg/rotate.py +346 -346
- package/md_cg/routing.py +490 -490
- package/md_cg/self_surface.py +50 -50
- package/md_cg/semantic/canonical.py +144 -144
- package/md_cg/semantic/zh_en_atoms.py +141 -141
- package/md_cg/sources.py +1091 -1091
- package/md_cg/stg.py +3 -2
- package/md_cg/test_audit_rotate_parity.py +279 -279
- package/md_cg/test_autonomy_modes.py +2013 -2013
- package/md_cg/test_cn_recall_grams.py +206 -206
- package/md_cg/test_code_kind_forbidden.py +101 -0
- package/md_cg/test_condaccept.py +156 -156
- package/md_cg/test_condgate.py +141 -141
- package/md_cg/test_heartbeat_ledger.py +557 -557
- package/md_cg/test_i50e_readside_protection.py +658 -658
- package/md_cg/test_issue111_gate_order.py +76 -76
- package/md_cg/test_issue111_scoring_contract.py +86 -86
- package/md_cg/test_issue121_calibration_bounds.py +293 -293
- package/md_cg/test_issue145_sleep_no_silent_rollback.py +167 -167
- package/md_cg/test_issue147_pack_id_escape.py +378 -378
- package/md_cg/test_issue148_merge_downgrade_leak.py +192 -192
- package/md_cg/test_issue149_accel_default_face.py +248 -248
- package/md_cg/test_issue150_empty_query_terms.py +328 -328
- package/md_cg/test_issue151_153_157_write_cache_index.py +151 -151
- package/md_cg/test_issue152_sealed_postings.py +309 -309
- package/md_cg/test_issue153b_index_generation_invalidation.py +142 -142
- package/md_cg/test_issue157b_index_remainder.py +344 -344
- package/md_cg/test_issue189_conclusion_bidirectional.py +223 -223
- package/md_cg/test_issue191_import_trust.py +382 -382
- package/md_cg/test_issue193_write_scope.py +378 -378
- package/md_cg/test_issue212_writeface_gaps.py +349 -349
- package/md_cg/test_issue214_reject_sensitivity.py +266 -266
- package/md_cg/test_issue215_condition_source_gap.py +272 -272
- package/md_cg/test_issue216_clash_routes.py +214 -214
- package/md_cg/test_issue217_slot_routes.py +248 -248
- package/md_cg/test_issue218_postcondition_value_blind.py +222 -222
- package/md_cg/test_issue258_pack_sensitivity.py +468 -468
- package/md_cg/test_issue265_coldverify_multiproc.py +438 -438
- package/md_cg/test_issue274_read_node_id_none.py +341 -341
- package/md_cg/test_issue275_layer_param.py +250 -250
- package/md_cg/test_issue277_node_id_traversal.py +384 -384
- package/md_cg/test_issue278_neg_separated_tension.py +271 -271
- package/md_cg/test_issue278_neg_window.py +294 -294
- package/md_cg/test_issue278_negative_layering.py +83 -83
- package/md_cg/test_issue284_skip_not_pass.py +291 -291
- package/md_cg/test_issue294_flywheel_sensitivity.py +573 -573
- package/md_cg/test_issue301_baseline_corpus_gate.py +245 -245
- package/md_cg/test_issue303_design_boundaries.py +262 -262
- package/md_cg/test_issue315_merge_branch_sensitivity.py +383 -383
- package/md_cg/test_issue319_tenant_unregistered_bypass.py +256 -256
- package/md_cg/test_issue321_mcp_deep_json.py +304 -304
- package/md_cg/test_issue322_node_write_lock.py +727 -727
- package/md_cg/test_issue324_write_size_fields.py +214 -214
- package/md_cg/test_issue325_audit_poison.py +229 -229
- package/md_cg/test_issue326_ingest_auto_whitelist.py +331 -331
- package/md_cg/test_issue326_key_perms.py +355 -355
- package/md_cg/test_issue326_twin_parser_parity.py +323 -323
- package/md_cg/test_issue326_vm_call_frame.py +569 -569
- package/md_cg/test_issue345_writelimit_effective_sens.py +233 -233
- package/md_cg/test_issue346_overwrite_sensitivity_gate.py +424 -424
- package/md_cg/test_issue348_insight_verify_op.py +199 -199
- package/md_cg/test_issue348_merge_rmw_lock.py +345 -345
- package/md_cg/test_issue350_casefold_collision.py +235 -235
- package/md_cg/test_issue351_ingest_root_fallback.py +201 -201
- package/md_cg/test_issue352_imgaudit.py +418 -418
- package/md_cg/test_issue352_pathsjson.py +537 -537
- package/md_cg/test_issue352_refindex.py +412 -412
- package/md_cg/test_issue352_rollback.py +604 -604
- package/md_cg/test_issue354_p2_writelimit_toctou.py +327 -327
- package/md_cg/test_issue354_rust_index_containment.py +571 -571
- package/md_cg/test_issue354_rust_wal_containment.py +606 -606
- package/md_cg/test_issue358_truncation_observable.py +247 -247
- package/md_cg/test_issue360_tidy_private_excerpt.py +195 -195
- package/md_cg/test_issue361_blindspot_not_silent_drop.py +494 -494
- package/md_cg/test_issue362_neg_condition.py +468 -468
- package/md_cg/test_issue363_lexical_idf.py +275 -275
- package/md_cg/test_issue370_readcache_assembly.py +488 -488
- package/md_cg/test_issue376_heartbeat_failed.py +293 -293
- package/md_cg/test_issue377_layer_protect_stamp.py +324 -324
- package/md_cg/test_issue378_protected_floor.py +310 -310
- package/md_cg/test_issue383_state_event_write_gate.py +462 -462
- package/md_cg/test_issue397_sens_eff_wiring.py +435 -435
- package/md_cg/test_issue398_toolface_op_parity.py +511 -511
- package/md_cg/test_issue399_hive_json_shape.py +317 -317
- package/md_cg/test_issue401_wisdom_codegen.py +295 -295
- package/md_cg/test_issue404_heal_receipt.py +389 -389
- package/md_cg/test_issue409_compact_index_completeness.py +509 -509
- package/md_cg/test_issue410_verify_demote_write.py +366 -366
- package/md_cg/test_issue411_scrub_idempotence.py +575 -575
- package/md_cg/test_issue412_discipline_producer_parity.py +311 -311
- package/md_cg/test_issue413_preimage_failclosed.py +239 -239
- package/md_cg/test_issue413_preimage_twin.py +339 -339
- package/md_cg/test_issue415_deps_gate_probe.py +357 -357
- package/md_cg/test_issue416_entry_key_subset.py +525 -525
- package/md_cg/test_issue417_twophase_merge_landed.py +423 -423
- package/md_cg/test_issue425_ingest_library_path.py +331 -331
- package/md_cg/test_issue426c_enqueue_not_silent.py +346 -346
- package/md_cg/test_issue426e_restore_overwrite_live.py +310 -310
- package/md_cg/test_issue426f_paths_gbk_failclosed.py +301 -301
- package/md_cg/test_issue427_serve_status_shape.py +191 -191
- package/md_cg/test_issue431_432_468_protect_single_point.py +322 -322
- package/md_cg/test_issue433_outlook_threshold_single_point.py +278 -278
- package/md_cg/test_issue434_435_float_gate.py +90 -90
- package/md_cg/test_issue439_sibling_sensitivity_inherit.py +448 -448
- package/md_cg/test_issue43_default_policy.py +874 -874
- package/md_cg/test_issue444_scrub_evidence_plaintext.py +281 -281
- package/md_cg/test_issue445_metacognition_ledger_gate.py +454 -454
- package/md_cg/test_issue446_453_403_verified_evidence.py +382 -382
- package/md_cg/test_issue450_sensitivity_fallback_reason.py +51 -51
- package/md_cg/test_issue450_writegate_unknown_sens.py +203 -203
- package/md_cg/test_issue451_audit_actor.py +313 -313
- package/md_cg/test_issue452_ingest_root_sensitivity.py +299 -299
- package/md_cg/test_issue463_ghost_prune_guard.py +259 -259
- package/md_cg/test_issue466_basis_registry.py +469 -469
- package/md_cg/test_issue467_identity_sensitivity_parity.py +360 -360
- package/md_cg/test_issue469_scrub_override_passthrough.py +126 -126
- package/md_cg/test_issue470_wal_event_durable.py +427 -427
- package/md_cg/test_issue471_identity_readable.py +136 -136
- package/md_cg/test_issue472_audit_chain.py +90 -90
- package/md_cg/test_issue472_prune_ledger.py +105 -105
- package/md_cg/test_issue472_rollback_degraded.py +81 -81
- package/md_cg/test_issue491_compose_sandbox.py +460 -460
- package/md_cg/test_issue498_merge_trace_stale_index.py +280 -280
- package/md_cg/test_issue511_scoreboard_bad_files.py +256 -256
- package/md_cg/test_issue521_rotate_lock_suffix.py +110 -110
- package/md_cg/test_issue524_orphan_noise_no_demote.py +88 -88
- package/md_cg/test_issue525_read_null_semantics.py +52 -52
- package/md_cg/test_issue547_append_jsonl_whitelist.py +114 -114
- package/md_cg/test_issue547_audit_durable.py +96 -96
- package/md_cg/test_issue557_r2_write_entries_size_gate.py +83 -83
- package/md_cg/test_issue559_refine_prefix.py +69 -69
- package/md_cg/test_issue562_retired_faces.py +150 -0
- package/md_cg/test_issue71_queue_backlog.py +376 -376
- package/md_cg/test_issue72_coldverify_controlled_drain.py +420 -420
- package/md_cg/test_issue82_credential_rules.py +271 -271
- package/md_cg/test_issue91_verifier_sandbox.py +314 -314
- package/md_cg/test_issue93_remember_redaction.py +282 -282
- package/md_cg/test_logref.py +1141 -1141
- package/md_cg/test_md_access_parity.py +330 -330
- package/md_cg/test_md_cg_no_hive_dep.py +139 -139
- package/md_cg/test_mutation_residue.py +119 -119
- package/md_cg/test_mutation_rollback.py +835 -835
- package/md_cg/test_n123_derive_expiry_chain.py +210 -210
- package/md_cg/test_n209_verify_write_face_gates.py +466 -466
- package/md_cg/test_n62_tenant_bind_failclosed.py +200 -200
- package/md_cg/test_neg_tail_honesty.py +733 -733
- package/md_cg/test_p21_tokens.py +294 -294
- package/md_cg/test_p27_docindex.py +792 -792
- package/md_cg/test_p28_refcheck.py +1053 -1053
- package/md_cg/test_p2_six_elements.py +476 -476
- package/md_cg/test_p33_ccg_wiring.py +300 -300
- package/md_cg/test_p3_legacy_closure.py +438 -438
- package/md_cg/test_p40_refine_worklist.py +244 -244
- package/md_cg/test_p4_freshness.py +781 -781
- package/md_cg/test_p9c_dedup_hints.py +288 -288
- package/md_cg/test_policy_required_ccg.py +444 -444
- package/md_cg/test_retr_s5.py +312 -312
- package/md_cg/test_s1_ast_judge.py +109 -109
- package/md_cg/test_state_event_op.py +521 -521
- package/md_cg/test_stgidx_index_parity.py +1024 -1024
- package/md_cg/test_sustain_bounded.py +652 -652
- package/md_cg/test_trust_edge_reachability.py +405 -405
- package/md_cg/test_w7_redlines.py +659 -659
- package/md_cg/test_write_return_shape.py +919 -919
- package/md_cg/test_writepipe.py +228 -228
- package/md_cg/trust.py +1114 -1114
- package/md_cg/twophase.py +303 -303
- package/md_cg/whitebox.py +536 -536
- package/md_cg/whitebox_kb/wisdom/compose_engine.py +1634 -1634
- package/md_cg/whitebox_kb/wisdom/core/condition_vm.py +318 -318
- package/md_cg/whitebox_kb/wisdom/core/parser.py +1082 -1082
- package/md_cg/whitebox_kb/wisdom/md_access.py +490 -490
- package/md_cg/whitebox_kb/wisdom/migrate_wisdom.py +497 -497
- package/md_cg/whitebox_kb/wisdom/mini_python.py +995 -995
- package/md_cg/whitebox_kb/wisdom/net_units.py +2900 -2900
- package/md_cg/whitebox_kb/wisdom/semantic_translate.py +4060 -4060
- package/md_cg/writepipe.py +1337 -1337
- package/package.json +3 -2
- package/scripts/workspace_index.py +328 -0
- package/src/hooks.ts +30 -6
- package/src/index.ts +14 -5
- package/src/lib/hook_audit.ts +282 -256
- package/src/lib/mdcg_client.ts +469 -469
- package/src/lib/prompt_safety.ts +17 -3
- package/src/tools.ts +23 -1
|
@@ -1,168 +1,168 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
r"""#145 守卫:sleep 合并**不得静默回滚**首轮之后的主库编辑。
|
|
3
|
-
|
|
4
|
-
病象(修前,沙箱实测):主库只在**首轮**入册 `lib.git`(`if not _has_head(G, root)`),
|
|
5
|
-
而影子是 `worktree add -b <branch> S BASE_BRANCH`(从**冻结基线** fork)⇒
|
|
6
|
-
「首轮入库 → 主库编辑 v2 → 再物化 → 影子 Δ → 合并」序列里,影子带回的是 v1,
|
|
7
|
-
`gate_delta` 的两方比对(base vs 当前 main)恰好放行 ⇒ 旧副本写回主库,
|
|
8
|
-
`merge ok=True`、无冲突、无 deferred —— **静默回滚**。
|
|
9
|
-
|
|
10
|
-
判据:
|
|
11
|
-
A1 主库编辑 v2 在整轮合并后**幸存**(无静默回滚)
|
|
12
|
-
A2 每轮物化都把真源面入册(`baseline.committed is True`)且回传 `base_commit`
|
|
13
|
-
A3 影子 fork 点 = 当前 HEAD(影子拿到的是含 v2 的版本)
|
|
14
|
-
A4 **不误伤**:影子侧的合法编辑被正常重放(正对照)
|
|
15
|
-
A5 **正对照·无编辑**:主库无新编辑时,物化—合并行为不变(仍 ok/merged)
|
|
16
|
-
A6 #145③:影子陈旧(fork 点落后于 HEAD)时**拒绝重放**(aborted=stale_shadow,主库不被写)
|
|
17
|
-
运行:
|
|
18
|
-
python -X utf8 -m md_cg.test_issue145_sleep_no_silent_rollback
|
|
19
|
-
python -X utf8 -m md_cg.test_issue145_sleep_no_silent_rollback --mutate=twoside # 期望 A1/A2 红
|
|
20
|
-
python -X utf8 -m md_cg.test_issue145_sleep_no_silent_rollback --mutate=nofork # 期望 A6 红
|
|
21
|
-
"""
|
|
22
|
-
from __future__ import annotations
|
|
23
|
-
|
|
24
|
-
import os
|
|
25
|
-
import shutil
|
|
26
|
-
import subprocess
|
|
27
|
-
import sys
|
|
28
|
-
import tempfile
|
|
29
|
-
|
|
30
|
-
PASS = 0
|
|
31
|
-
FAIL = 0
|
|
32
|
-
FAILS = []
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
def ok(cond, label, detail=""):
|
|
36
|
-
global PASS, FAIL
|
|
37
|
-
if cond:
|
|
38
|
-
PASS += 1
|
|
39
|
-
else:
|
|
40
|
-
FAIL += 1
|
|
41
|
-
FAILS.append(label)
|
|
42
|
-
print(" [%s] %s%s" % ("PASS" if cond else "FAIL", label,
|
|
43
|
-
(" · " + str(detail)) if detail else ""))
|
|
44
|
-
return bool(cond)
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
def _mk_sandbox(tag):
|
|
48
|
-
# 沙箱根一律取系统临时目录(**不得**硬编码本机路径:那会把探针产物
|
|
49
|
-
# 写到仓外固定位置,且本机路径不许进追踪面——本仓 check_local_paths 硬门禁)。
|
|
50
|
-
sb = tempfile.mkdtemp(prefix="iss145_%s_" % tag)
|
|
51
|
-
root = os.path.join(sb, "lib")
|
|
52
|
-
os.makedirs(os.path.join(root, "knowledge"))
|
|
53
|
-
os.makedirs(os.path.join(root, "structural"))
|
|
54
|
-
return sb, root, os.path.join(sb, "state", "lib.git"), os.path.join(sb, "state", "shadow")
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
def _node(t, ver):
|
|
58
|
-
return ("---\nid: %s\nlayer: knowledge\nverification_basis: test\n---\n%s %s PASSED\n"
|
|
59
|
-
% (t, t.upper(), ver))
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
def _tail(p):
|
|
63
|
-
with open(p, encoding="utf-8") as f:
|
|
64
|
-
return f.read().splitlines()[-1]
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
def _write(p, s):
|
|
68
|
-
with open(p, "w", encoding="utf-8") as f:
|
|
69
|
-
f.write(s)
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
def _mutate(which):
|
|
73
|
-
"""把被验实现退回病灶形态(注入在**实现侧**,不是断言侧)。"""
|
|
74
|
-
from md_cg import sleep as SL
|
|
75
|
-
if which == "twoside": # 退回「只在首轮入册」
|
|
76
|
-
real = SL._stage_and_commit
|
|
77
|
-
|
|
78
|
-
def only_first(g, w, msg):
|
|
79
|
-
if SL._has_head(g, w):
|
|
80
|
-
return {"committed": False, "reason": "已有基线提交(变异:退回首轮语义)"}
|
|
81
|
-
return real(g, w, msg)
|
|
82
|
-
SL._stage_and_commit = only_first
|
|
83
|
-
elif which == "nofork": # 拆掉 ③ 的 fork 点写前复核
|
|
84
|
-
real_ok = SL._git_ok
|
|
85
|
-
|
|
86
|
-
def blind(g, w, *a):
|
|
87
|
-
if a and a[0] == "merge-base":
|
|
88
|
-
return real_ok(g, w, "rev-parse", "HEAD")
|
|
89
|
-
return real_ok(g, w, *a)
|
|
90
|
-
SL._git_ok = blind
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
def main(argv=None) -> int:
|
|
94
|
-
argv = list(sys.argv[1:] if argv is None else argv)
|
|
95
|
-
mut = ""
|
|
96
|
-
for a in argv:
|
|
97
|
-
if a.startswith("--mutate="):
|
|
98
|
-
mut = a.split("=", 1)[1]
|
|
99
|
-
if mut:
|
|
100
|
-
_mutate(mut)
|
|
101
|
-
print("(变异=%s:注入在实现侧)" % mut)
|
|
102
|
-
from md_cg import sleep as SL
|
|
103
|
-
from md_cg.mdcos import MdCGOS
|
|
104
|
-
|
|
105
|
-
sb, root, G, S = _mk_sandbox("a")
|
|
106
|
-
try:
|
|
107
|
-
bp = os.path.join(root, "structural", "b.md")
|
|
108
|
-
_write(os.path.join(root, "knowledge", "a.md"), _node("a", "v1"))
|
|
109
|
-
_write(bp, _node("b", "v1"))
|
|
110
|
-
cg = MdCGOS(root, autoflush=0)
|
|
111
|
-
m1 = SL.materialize(root, git_dir_path=G, shadow=S, ts="g1")
|
|
112
|
-
ok(m1.get("ok"), "A0 首轮物化成功", m1.get("error"))
|
|
113
|
-
_write(bp, _node("b", "v2-主库编辑版")) # 首轮之后的编辑
|
|
114
|
-
m2 = SL.materialize(root, git_dir_path=G, shadow=S, ts="g2")
|
|
115
|
-
ok((m2.get("baseline") or {}).get("committed") is True,
|
|
116
|
-
"A2 每轮物化都把真源面入册(baseline.committed is True)", m2.get("baseline"))
|
|
117
|
-
ok(bool(m2.get("base_commit")), "A2b 物化回传 base_commit", m2.get("base_commit"))
|
|
118
|
-
ok("v2-主库编辑版" in _tail(os.path.join(S, "structural", "b.md")),
|
|
119
|
-
"A3 影子 fork 自含 v2 的提交(影子侧 b 是 v2)", _tail(os.path.join(S, "structural", "b.md")))
|
|
120
|
-
_write(os.path.join(S, "knowledge", "a.md"), _node("a", "v2-影子迭代"))
|
|
121
|
-
delta = SL.semantic_delta(root, S)
|
|
122
|
-
gated = SL.gate_delta(cg, delta, baseline_face=m2.get("base_face"), shadow_root=S)
|
|
123
|
-
out = SL.merge_cycle(cg, root, git_dir_path=G, branch=m2["branch"], shadow=S,
|
|
124
|
-
delta=delta, accepted=gated["accepted"], batch="guard")
|
|
125
|
-
ok("v2-主库编辑版" in _tail(bp),
|
|
126
|
-
"A1 主库编辑在整轮合并后幸存(无静默回滚)", _tail(bp))
|
|
127
|
-
ok("v2-影子迭代" in _tail(os.path.join(root, "knowledge", "a.md")),
|
|
128
|
-
"A4 不误伤:影子侧合法编辑被重放", _tail(os.path.join(root, "knowledge", "a.md")))
|
|
129
|
-
# 注:`deferred=tree_divergence` 是**既有**的 fail-closed 行为(两侧树不同即挂起、
|
|
130
|
-
# 不自动解决)——它不写回任何内容,故不是本件要钉的面。A5 只钉「轮次不失败」。
|
|
131
|
-
ok(out.get("ok") is True,
|
|
132
|
-
"A5 正对照:正常轮次不失败(ok=True;deferred 属既有挂起语义,不在本件面内)",
|
|
133
|
-
{k: out.get(k) for k in ("ok", "deferred", "merged")})
|
|
134
|
-
finally:
|
|
135
|
-
shutil.rmtree(sb, ignore_errors=True)
|
|
136
|
-
|
|
137
|
-
# A6 影子陈旧 ⇒ ③ 拒绝重放
|
|
138
|
-
sb, root, G, S = _mk_sandbox("b")
|
|
139
|
-
try:
|
|
140
|
-
bp = os.path.join(root, "structural", "b.md")
|
|
141
|
-
_write(os.path.join(root, "knowledge", "a.md"), _node("a", "v1"))
|
|
142
|
-
_write(bp, _node("b", "v1"))
|
|
143
|
-
cg = MdCGOS(root, autoflush=0)
|
|
144
|
-
m1 = SL.materialize(root, git_dir_path=G, shadow=S, ts="s1")
|
|
145
|
-
_write(bp, _node("b", "v2"))
|
|
146
|
-
# 另起一个提交把 HEAD 推前(模拟「两次物化之间主库被别的写方推进」)
|
|
147
|
-
SL._stage_and_commit(G, root, "sleep: 他方推进")
|
|
148
|
-
_write(os.path.join(S, "knowledge", "a.md"), _node("a", "影子迭代"))
|
|
149
|
-
delta = SL.semantic_delta(root, S)
|
|
150
|
-
gated = SL.gate_delta(cg, delta, baseline_face=m1.get("base_face"), shadow_root=S)
|
|
151
|
-
out = SL.merge_cycle(cg, root, git_dir_path=G, branch=m1["branch"], shadow=S,
|
|
152
|
-
delta=delta, accepted=gated["accepted"], batch="stale")
|
|
153
|
-
ok(out.get("aborted") == "stale_shadow",
|
|
154
|
-
"A6 影子陈旧 ⇒ 拒绝重放(aborted=stale_shadow)",
|
|
155
|
-
{k: out.get(k) for k in ("ok", "aborted", "error")})
|
|
156
|
-
ok("v2" in _tail(bp), "A6b 拒绝后主库未被写(b 仍 v2)", _tail(bp))
|
|
157
|
-
finally:
|
|
158
|
-
shutil.rmtree(sb, ignore_errors=True)
|
|
159
|
-
|
|
160
|
-
print("\nissue145_sleep_no_silent_rollback: %d pass / %d fail%s"
|
|
161
|
-
% (PASS, FAIL, ("(变异=%s)" % mut) if mut else ""))
|
|
162
|
-
for f in FAILS:
|
|
163
|
-
print(" - 红:%s" % f)
|
|
164
|
-
return 1 if FAIL else 0
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
if __name__ == "__main__":
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
r"""#145 守卫:sleep 合并**不得静默回滚**首轮之后的主库编辑。
|
|
3
|
+
|
|
4
|
+
病象(修前,沙箱实测):主库只在**首轮**入册 `lib.git`(`if not _has_head(G, root)`),
|
|
5
|
+
而影子是 `worktree add -b <branch> S BASE_BRANCH`(从**冻结基线** fork)⇒
|
|
6
|
+
「首轮入库 → 主库编辑 v2 → 再物化 → 影子 Δ → 合并」序列里,影子带回的是 v1,
|
|
7
|
+
`gate_delta` 的两方比对(base vs 当前 main)恰好放行 ⇒ 旧副本写回主库,
|
|
8
|
+
`merge ok=True`、无冲突、无 deferred —— **静默回滚**。
|
|
9
|
+
|
|
10
|
+
判据:
|
|
11
|
+
A1 主库编辑 v2 在整轮合并后**幸存**(无静默回滚)
|
|
12
|
+
A2 每轮物化都把真源面入册(`baseline.committed is True`)且回传 `base_commit`
|
|
13
|
+
A3 影子 fork 点 = 当前 HEAD(影子拿到的是含 v2 的版本)
|
|
14
|
+
A4 **不误伤**:影子侧的合法编辑被正常重放(正对照)
|
|
15
|
+
A5 **正对照·无编辑**:主库无新编辑时,物化—合并行为不变(仍 ok/merged)
|
|
16
|
+
A6 #145③:影子陈旧(fork 点落后于 HEAD)时**拒绝重放**(aborted=stale_shadow,主库不被写)
|
|
17
|
+
运行:
|
|
18
|
+
python -X utf8 -m md_cg.test_issue145_sleep_no_silent_rollback
|
|
19
|
+
python -X utf8 -m md_cg.test_issue145_sleep_no_silent_rollback --mutate=twoside # 期望 A1/A2 红
|
|
20
|
+
python -X utf8 -m md_cg.test_issue145_sleep_no_silent_rollback --mutate=nofork # 期望 A6 红
|
|
21
|
+
"""
|
|
22
|
+
from __future__ import annotations
|
|
23
|
+
|
|
24
|
+
import os
|
|
25
|
+
import shutil
|
|
26
|
+
import subprocess
|
|
27
|
+
import sys
|
|
28
|
+
import tempfile
|
|
29
|
+
|
|
30
|
+
PASS = 0
|
|
31
|
+
FAIL = 0
|
|
32
|
+
FAILS = []
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
def ok(cond, label, detail=""):
|
|
36
|
+
global PASS, FAIL
|
|
37
|
+
if cond:
|
|
38
|
+
PASS += 1
|
|
39
|
+
else:
|
|
40
|
+
FAIL += 1
|
|
41
|
+
FAILS.append(label)
|
|
42
|
+
print(" [%s] %s%s" % ("PASS" if cond else "FAIL", label,
|
|
43
|
+
(" · " + str(detail)) if detail else ""))
|
|
44
|
+
return bool(cond)
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
def _mk_sandbox(tag):
|
|
48
|
+
# 沙箱根一律取系统临时目录(**不得**硬编码本机路径:那会把探针产物
|
|
49
|
+
# 写到仓外固定位置,且本机路径不许进追踪面——本仓 check_local_paths 硬门禁)。
|
|
50
|
+
sb = tempfile.mkdtemp(prefix="iss145_%s_" % tag)
|
|
51
|
+
root = os.path.join(sb, "lib")
|
|
52
|
+
os.makedirs(os.path.join(root, "knowledge"))
|
|
53
|
+
os.makedirs(os.path.join(root, "structural"))
|
|
54
|
+
return sb, root, os.path.join(sb, "state", "lib.git"), os.path.join(sb, "state", "shadow")
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
def _node(t, ver):
|
|
58
|
+
return ("---\nid: %s\nlayer: knowledge\nverification_basis: test\n---\n%s %s PASSED\n"
|
|
59
|
+
% (t, t.upper(), ver))
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
def _tail(p):
|
|
63
|
+
with open(p, encoding="utf-8") as f:
|
|
64
|
+
return f.read().splitlines()[-1]
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
def _write(p, s):
|
|
68
|
+
with open(p, "w", encoding="utf-8") as f:
|
|
69
|
+
f.write(s)
|
|
70
|
+
|
|
71
|
+
|
|
72
|
+
def _mutate(which):
|
|
73
|
+
"""把被验实现退回病灶形态(注入在**实现侧**,不是断言侧)。"""
|
|
74
|
+
from md_cg import sleep as SL
|
|
75
|
+
if which == "twoside": # 退回「只在首轮入册」
|
|
76
|
+
real = SL._stage_and_commit
|
|
77
|
+
|
|
78
|
+
def only_first(g, w, msg):
|
|
79
|
+
if SL._has_head(g, w):
|
|
80
|
+
return {"committed": False, "reason": "已有基线提交(变异:退回首轮语义)"}
|
|
81
|
+
return real(g, w, msg)
|
|
82
|
+
SL._stage_and_commit = only_first
|
|
83
|
+
elif which == "nofork": # 拆掉 ③ 的 fork 点写前复核
|
|
84
|
+
real_ok = SL._git_ok
|
|
85
|
+
|
|
86
|
+
def blind(g, w, *a):
|
|
87
|
+
if a and a[0] == "merge-base":
|
|
88
|
+
return real_ok(g, w, "rev-parse", "HEAD")
|
|
89
|
+
return real_ok(g, w, *a)
|
|
90
|
+
SL._git_ok = blind
|
|
91
|
+
|
|
92
|
+
|
|
93
|
+
def main(argv=None) -> int:
|
|
94
|
+
argv = list(sys.argv[1:] if argv is None else argv)
|
|
95
|
+
mut = ""
|
|
96
|
+
for a in argv:
|
|
97
|
+
if a.startswith("--mutate="):
|
|
98
|
+
mut = a.split("=", 1)[1]
|
|
99
|
+
if mut:
|
|
100
|
+
_mutate(mut)
|
|
101
|
+
print("(变异=%s:注入在实现侧)" % mut)
|
|
102
|
+
from md_cg import sleep as SL
|
|
103
|
+
from md_cg.mdcos import MdCGOS
|
|
104
|
+
|
|
105
|
+
sb, root, G, S = _mk_sandbox("a")
|
|
106
|
+
try:
|
|
107
|
+
bp = os.path.join(root, "structural", "b.md")
|
|
108
|
+
_write(os.path.join(root, "knowledge", "a.md"), _node("a", "v1"))
|
|
109
|
+
_write(bp, _node("b", "v1"))
|
|
110
|
+
cg = MdCGOS(root, autoflush=0)
|
|
111
|
+
m1 = SL.materialize(root, git_dir_path=G, shadow=S, ts="g1")
|
|
112
|
+
ok(m1.get("ok"), "A0 首轮物化成功", m1.get("error"))
|
|
113
|
+
_write(bp, _node("b", "v2-主库编辑版")) # 首轮之后的编辑
|
|
114
|
+
m2 = SL.materialize(root, git_dir_path=G, shadow=S, ts="g2")
|
|
115
|
+
ok((m2.get("baseline") or {}).get("committed") is True,
|
|
116
|
+
"A2 每轮物化都把真源面入册(baseline.committed is True)", m2.get("baseline"))
|
|
117
|
+
ok(bool(m2.get("base_commit")), "A2b 物化回传 base_commit", m2.get("base_commit"))
|
|
118
|
+
ok("v2-主库编辑版" in _tail(os.path.join(S, "structural", "b.md")),
|
|
119
|
+
"A3 影子 fork 自含 v2 的提交(影子侧 b 是 v2)", _tail(os.path.join(S, "structural", "b.md")))
|
|
120
|
+
_write(os.path.join(S, "knowledge", "a.md"), _node("a", "v2-影子迭代"))
|
|
121
|
+
delta = SL.semantic_delta(root, S)
|
|
122
|
+
gated = SL.gate_delta(cg, delta, baseline_face=m2.get("base_face"), shadow_root=S)
|
|
123
|
+
out = SL.merge_cycle(cg, root, git_dir_path=G, branch=m2["branch"], shadow=S,
|
|
124
|
+
delta=delta, accepted=gated["accepted"], batch="guard")
|
|
125
|
+
ok("v2-主库编辑版" in _tail(bp),
|
|
126
|
+
"A1 主库编辑在整轮合并后幸存(无静默回滚)", _tail(bp))
|
|
127
|
+
ok("v2-影子迭代" in _tail(os.path.join(root, "knowledge", "a.md")),
|
|
128
|
+
"A4 不误伤:影子侧合法编辑被重放", _tail(os.path.join(root, "knowledge", "a.md")))
|
|
129
|
+
# 注:`deferred=tree_divergence` 是**既有**的 fail-closed 行为(两侧树不同即挂起、
|
|
130
|
+
# 不自动解决)——它不写回任何内容,故不是本件要钉的面。A5 只钉「轮次不失败」。
|
|
131
|
+
ok(out.get("ok") is True,
|
|
132
|
+
"A5 正对照:正常轮次不失败(ok=True;deferred 属既有挂起语义,不在本件面内)",
|
|
133
|
+
{k: out.get(k) for k in ("ok", "deferred", "merged")})
|
|
134
|
+
finally:
|
|
135
|
+
shutil.rmtree(sb, ignore_errors=True)
|
|
136
|
+
|
|
137
|
+
# A6 影子陈旧 ⇒ ③ 拒绝重放
|
|
138
|
+
sb, root, G, S = _mk_sandbox("b")
|
|
139
|
+
try:
|
|
140
|
+
bp = os.path.join(root, "structural", "b.md")
|
|
141
|
+
_write(os.path.join(root, "knowledge", "a.md"), _node("a", "v1"))
|
|
142
|
+
_write(bp, _node("b", "v1"))
|
|
143
|
+
cg = MdCGOS(root, autoflush=0)
|
|
144
|
+
m1 = SL.materialize(root, git_dir_path=G, shadow=S, ts="s1")
|
|
145
|
+
_write(bp, _node("b", "v2"))
|
|
146
|
+
# 另起一个提交把 HEAD 推前(模拟「两次物化之间主库被别的写方推进」)
|
|
147
|
+
SL._stage_and_commit(G, root, "sleep: 他方推进")
|
|
148
|
+
_write(os.path.join(S, "knowledge", "a.md"), _node("a", "影子迭代"))
|
|
149
|
+
delta = SL.semantic_delta(root, S)
|
|
150
|
+
gated = SL.gate_delta(cg, delta, baseline_face=m1.get("base_face"), shadow_root=S)
|
|
151
|
+
out = SL.merge_cycle(cg, root, git_dir_path=G, branch=m1["branch"], shadow=S,
|
|
152
|
+
delta=delta, accepted=gated["accepted"], batch="stale")
|
|
153
|
+
ok(out.get("aborted") == "stale_shadow",
|
|
154
|
+
"A6 影子陈旧 ⇒ 拒绝重放(aborted=stale_shadow)",
|
|
155
|
+
{k: out.get(k) for k in ("ok", "aborted", "error")})
|
|
156
|
+
ok("v2" in _tail(bp), "A6b 拒绝后主库未被写(b 仍 v2)", _tail(bp))
|
|
157
|
+
finally:
|
|
158
|
+
shutil.rmtree(sb, ignore_errors=True)
|
|
159
|
+
|
|
160
|
+
print("\nissue145_sleep_no_silent_rollback: %d pass / %d fail%s"
|
|
161
|
+
% (PASS, FAIL, ("(变异=%s)" % mut) if mut else ""))
|
|
162
|
+
for f in FAILS:
|
|
163
|
+
print(" - 红:%s" % f)
|
|
164
|
+
return 1 if FAIL else 0
|
|
165
|
+
|
|
166
|
+
|
|
167
|
+
if __name__ == "__main__":
|
|
168
168
|
sys.exit(main())
|