@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
package/lib/tools.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
// 运行时导入写 `.js`(本仓口径:type-only 才写 `.ts`,tsconfig 未开
|
|
9
9
|
// allowImportingTsExtensions —— 值导入写 `.ts` 会 TS5097 编译失败)。
|
|
10
10
|
import { attributeSession } from './lib/session_state.js';
|
|
11
|
+
import { neutralizeUntrustedBoundary } from './lib/prompt_safety.js';
|
|
11
12
|
/** 默认暴露的核心工具集合:**记忆面已基元化**,只注册 `cg` / `stg` 两个认知基元。
|
|
12
13
|
*
|
|
13
14
|
* 三层拆分 S4 收敛后,插件工具面真源是 `md_cg.mcp_server`(不再是 pip aeis);
|
|
@@ -146,6 +147,13 @@ function toValueSpec(raw) {
|
|
|
146
147
|
}
|
|
147
148
|
}
|
|
148
149
|
/** 从灵枢 content 数组中提取文本(MCP text block 拼接)。 */
|
|
150
|
+
/** 工具面返回文本的插件级兜底上限(issue #563②)。
|
|
151
|
+
*
|
|
152
|
+
* 服务端 `cg(op=read)` 等已有 `offset`/`truncated` 分页(`_clip_text`),本上限**不**替代
|
|
153
|
+
* 它、也不重新定义预算:只兜「一次把整库搬进上下文」的极端形态。取 64KiB——远大于
|
|
154
|
+
* 单页预算(服务端 preview 200 字 / read 分页 KB 级),正常调用不会触发。
|
|
155
|
+
*/
|
|
156
|
+
export const TOOL_RENDER_MAX_CHARS = 65536;
|
|
149
157
|
export function extractText(content) {
|
|
150
158
|
return content
|
|
151
159
|
.map((block) => (block.type === 'text' && typeof block.text === 'string' ? block.text : ''))
|
|
@@ -185,7 +193,20 @@ export async function registerLingshuTools(ctx, bridge, opts) {
|
|
|
185
193
|
output: {
|
|
186
194
|
schema: { type: 'json' },
|
|
187
195
|
render(_args, value) {
|
|
188
|
-
|
|
196
|
+
// issue #563②:工具面与自动注入面同源(都可能含他者写入的记忆原文),
|
|
197
|
+
// 但此前**完全不打断边界标记、也无插件级上限**——同一条记忆在注入面被
|
|
198
|
+
// 打断,在 `cg(op=read)` 的返回里却原样带出,模型可据此提前闭合边界块。
|
|
199
|
+
// 两件事在此单点做:①打断(与注入面同一实现 `neutralizeUntrustedBoundary`);
|
|
200
|
+
// ②兜底上限(服务端已有 offset 分页,插件层只兜一个远大于单页的硬上限,
|
|
201
|
+
// 防止一次把整库搬进上下文;截断必须显式标注,不静默)。
|
|
202
|
+
const raw = extractText(value.content ?? []);
|
|
203
|
+
const safe = neutralizeUntrustedBoundary(raw);
|
|
204
|
+
const text = safe.length > TOOL_RENDER_MAX_CHARS
|
|
205
|
+
? safe.slice(0, TOOL_RENDER_MAX_CHARS)
|
|
206
|
+
+ `
|
|
207
|
+
…[已截断:工具返回超过插件上限 ${TOOL_RENDER_MAX_CHARS} 字符]`
|
|
208
|
+
: safe;
|
|
209
|
+
return [{ type: 'text', text }];
|
|
189
210
|
},
|
|
190
211
|
},
|
|
191
212
|
timeoutMs: 120_000,
|
package/md_cg/_guard_kit.py
CHANGED
|
@@ -1,121 +1,121 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
# 功能名:守卫完备性骨架(防「声称的面 > 实际覆盖的面」,task-16/#421+#422 沉淀)
|
|
3
|
-
# 生效条件:任何**声称「全枚举 / 全表 / 不变量 / 已落仓」**的守卫都应调用本模块的两条判据;
|
|
4
|
-
# 纯单点断言(不声称覆盖面)的守卫不适用。
|
|
5
|
-
# 子功能:
|
|
6
|
-
# ① assert_enumeration_complete —— **枚举完备性自证**:把「应当被抓的第 N 种语法/形态」的
|
|
7
|
-
# **合成样本**喂给**守卫自己的那条枚举逻辑**,必须命中;另喂「不该被抓」的样本,必须不命中
|
|
8
|
-
# (过度收紧方向)。不通过则守卫自身转红。
|
|
9
|
-
# ② assert_revert_reddens —— **回退即绿自证**:在**镜像树**里把被守护的修复实际回退一次,
|
|
10
|
-
# 实跑守卫并核对红项集合;**不接受推演**(#421 的指控点正是「声称有判据、回退却仍绿」)。
|
|
11
|
-
# 执行:由守卫在自身进程内 import 调用;两条判据都返回 (ok, detail) 并可打印。
|
|
12
|
-
# 验证方式:本模块自身的行为由使用它的守卫(test_issue400 / test_issue398)在 --mutate 下覆盖。
|
|
13
|
-
# 不适用条件:不判「枚举逻辑的语义正确性」(那是被守护的判据本体);不做跨进程编排(②在镜像树里
|
|
14
|
-
# 子进程跑守卫,故只适用于**能独立跑起来**的守卫;需要外部依赖的守卫请显式跳过并注明)。
|
|
15
|
-
"""守卫完备性骨架。
|
|
16
|
-
|
|
17
|
-
为什么需要它(本会话三次同形事故):
|
|
18
|
-
· #400:E01 文案声称「hive 内裸 int() 只剩 _int_arg 本体一处」,实际只枚举**内联**
|
|
19
|
-
`int(args.get(...))`——`v = spec.get(k); int(v)` 这种**变量中转**整类逃过(7 处);
|
|
20
|
-
· #421:回复声称「该守卫已随修复落仓」,实际守卫文件在**后一个提交**里才 add;
|
|
21
|
-
· #398:声称的「弱化登记清单」在一次检索范围内不存在(那份检索面窄于声称面)。
|
|
22
|
-
⇒ 共同形态是**守卫声明的面 > 守卫实际覆盖的面**。本模块把两条「防衍生」判据做成可复用函数。
|
|
23
|
-
"""
|
|
24
|
-
from __future__ import annotations
|
|
25
|
-
|
|
26
|
-
import io
|
|
27
|
-
import json
|
|
28
|
-
import os
|
|
29
|
-
import shutil
|
|
30
|
-
import subprocess
|
|
31
|
-
import sys
|
|
32
|
-
import tempfile
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
def assert_enumeration_complete(discover, samples, expect_hits=True):
|
|
36
|
-
"""枚举完备性自证。
|
|
37
|
-
|
|
38
|
-
discover(texts: dict[relpath -> 源码文本]) -> list[命中项]
|
|
39
|
-
**守卫自己的那条枚举逻辑**,写成「源码映射 → 命中列表」的纯函数(喂合成样本即靠这一点)。
|
|
40
|
-
samples: list[(类名, 源码文本, 期望是否命中, relpath)]
|
|
41
|
-
每类「语义等价形态」一个合成样本;含**不该命中**的样本(过度收紧方向)。
|
|
42
|
-
|
|
43
|
-
返回 (ok, detail);ok=False 时守卫应当转红——**这正是「第 N 种形态」的守卫**。
|
|
44
|
-
"""
|
|
45
|
-
bad = []
|
|
46
|
-
seen = []
|
|
47
|
-
for cls, src, want, rel_hint in samples:
|
|
48
|
-
texts = {rel_hint: src}
|
|
49
|
-
try:
|
|
50
|
-
hits = discover(texts)
|
|
51
|
-
except Exception as exc: # noqa: BLE001 —— 枚举逻辑崩了也要可归因
|
|
52
|
-
bad.append((cls, "discover 抛 %s: %s" % (type(exc).__name__, exc)))
|
|
53
|
-
continue
|
|
54
|
-
got = bool(hits)
|
|
55
|
-
seen.append((cls, got, len(hits)))
|
|
56
|
-
if got != bool(want):
|
|
57
|
-
bad.append((cls, "期望命中=%s 实际=%s(命中 %d)" % (want, got, len(hits))))
|
|
58
|
-
detail = {"样本": seen, "不符": bad}
|
|
59
|
-
return (not bad), detail
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
def assert_revert_reddens(build_mirror, revert_edits, run_guard, expect_prefixes,
|
|
63
|
-
rel_path, timeout=1800):
|
|
64
|
-
"""回退即绿自证:在镜像树里**实跑**一次回退,核对红项集合。
|
|
65
|
-
|
|
66
|
-
build_mirror() -> 镜像树根路径(调用方负责其构成;本函数负责删)
|
|
67
|
-
revert_edits -> list[(相对路径, 原文, 替换文)]:**实际的回退**(不是等价改写)
|
|
68
|
-
run_guard(tree) -> (rc, 红项列表, 完整输出)
|
|
69
|
-
expect_prefixes -> 期望转红的前缀元组(如 ("A03", "E03"))
|
|
70
|
-
|
|
71
|
-
返回 (ok, detail)。**不接受推演**:必须真的改文件、真的跑、真的看到红。
|
|
72
|
-
"""
|
|
73
|
-
tree = build_mirror()
|
|
74
|
-
detail = {}
|
|
75
|
-
try:
|
|
76
|
-
rc0, reds0, _out0 = run_guard(tree)
|
|
77
|
-
if rc0 != 0 or reds0:
|
|
78
|
-
detail["基线"] = "镜像基线即红:%s" % (reds0[:5],)
|
|
79
|
-
return False, detail
|
|
80
|
-
eol = None
|
|
81
|
-
for rel, old, new in revert_edits:
|
|
82
|
-
p = os.path.join(tree, rel)
|
|
83
|
-
with io.open(p, encoding="utf-8", newline="") as f:
|
|
84
|
-
txt = f.read()
|
|
85
|
-
if eol is None:
|
|
86
|
-
eol = "\r\n" if "\r\n" in txt else "\n"
|
|
87
|
-
o = old.replace("\n", eol)
|
|
88
|
-
if txt.count(o) != 1:
|
|
89
|
-
detail[rel] = "回退锚点命中 %d 次" % txt.count(o)
|
|
90
|
-
return False, detail
|
|
91
|
-
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
92
|
-
f.write(txt.replace(o, new.replace("\n", eol), 1))
|
|
93
|
-
for root, dd, ff in os.walk(tree):
|
|
94
|
-
if os.path.basename(root) == "__pycache__":
|
|
95
|
-
shutil.rmtree(root, ignore_errors=True)
|
|
96
|
-
rc1, reds1, out1 = run_guard(tree)
|
|
97
|
-
hit = sorted({r.split(" ")[0] for r in reds1})
|
|
98
|
-
detail["回退后 rc"] = rc1
|
|
99
|
-
detail["实际红项"] = hit
|
|
100
|
-
ok = (rc1 != 0) and (hit == sorted(expect_prefixes))
|
|
101
|
-
if not ok:
|
|
102
|
-
detail["输出尾部"] = "\n".join((out1 or "").splitlines()[-8:])
|
|
103
|
-
return ok, detail
|
|
104
|
-
finally:
|
|
105
|
-
shutil.rmtree(tree, ignore_errors=True)
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
def mirror_sources(texts, root):
|
|
109
|
-
"""把 {relpath: 源码} 物化到临时根下(供 discover 之外的端到端复跑用)。返回根。"""
|
|
110
|
-
for rel, src in texts.items():
|
|
111
|
-
p = os.path.join(root, rel)
|
|
112
|
-
os.makedirs(os.path.dirname(p), exist_ok=True)
|
|
113
|
-
with io.open(p, "w", encoding="utf-8") as f:
|
|
114
|
-
f.write(src)
|
|
115
|
-
return root
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
if __name__ == "__main__":
|
|
119
|
-
print(__doc__)
|
|
120
|
-
sys.exit(0)
|
|
121
|
-
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:守卫完备性骨架(防「声称的面 > 实际覆盖的面」,task-16/#421+#422 沉淀)
|
|
3
|
+
# 生效条件:任何**声称「全枚举 / 全表 / 不变量 / 已落仓」**的守卫都应调用本模块的两条判据;
|
|
4
|
+
# 纯单点断言(不声称覆盖面)的守卫不适用。
|
|
5
|
+
# 子功能:
|
|
6
|
+
# ① assert_enumeration_complete —— **枚举完备性自证**:把「应当被抓的第 N 种语法/形态」的
|
|
7
|
+
# **合成样本**喂给**守卫自己的那条枚举逻辑**,必须命中;另喂「不该被抓」的样本,必须不命中
|
|
8
|
+
# (过度收紧方向)。不通过则守卫自身转红。
|
|
9
|
+
# ② assert_revert_reddens —— **回退即绿自证**:在**镜像树**里把被守护的修复实际回退一次,
|
|
10
|
+
# 实跑守卫并核对红项集合;**不接受推演**(#421 的指控点正是「声称有判据、回退却仍绿」)。
|
|
11
|
+
# 执行:由守卫在自身进程内 import 调用;两条判据都返回 (ok, detail) 并可打印。
|
|
12
|
+
# 验证方式:本模块自身的行为由使用它的守卫(test_issue400 / test_issue398)在 --mutate 下覆盖。
|
|
13
|
+
# 不适用条件:不判「枚举逻辑的语义正确性」(那是被守护的判据本体);不做跨进程编排(②在镜像树里
|
|
14
|
+
# 子进程跑守卫,故只适用于**能独立跑起来**的守卫;需要外部依赖的守卫请显式跳过并注明)。
|
|
15
|
+
"""守卫完备性骨架。
|
|
16
|
+
|
|
17
|
+
为什么需要它(本会话三次同形事故):
|
|
18
|
+
· #400:E01 文案声称「hive 内裸 int() 只剩 _int_arg 本体一处」,实际只枚举**内联**
|
|
19
|
+
`int(args.get(...))`——`v = spec.get(k); int(v)` 这种**变量中转**整类逃过(7 处);
|
|
20
|
+
· #421:回复声称「该守卫已随修复落仓」,实际守卫文件在**后一个提交**里才 add;
|
|
21
|
+
· #398:声称的「弱化登记清单」在一次检索范围内不存在(那份检索面窄于声称面)。
|
|
22
|
+
⇒ 共同形态是**守卫声明的面 > 守卫实际覆盖的面**。本模块把两条「防衍生」判据做成可复用函数。
|
|
23
|
+
"""
|
|
24
|
+
from __future__ import annotations
|
|
25
|
+
|
|
26
|
+
import io
|
|
27
|
+
import json
|
|
28
|
+
import os
|
|
29
|
+
import shutil
|
|
30
|
+
import subprocess
|
|
31
|
+
import sys
|
|
32
|
+
import tempfile
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
def assert_enumeration_complete(discover, samples, expect_hits=True):
|
|
36
|
+
"""枚举完备性自证。
|
|
37
|
+
|
|
38
|
+
discover(texts: dict[relpath -> 源码文本]) -> list[命中项]
|
|
39
|
+
**守卫自己的那条枚举逻辑**,写成「源码映射 → 命中列表」的纯函数(喂合成样本即靠这一点)。
|
|
40
|
+
samples: list[(类名, 源码文本, 期望是否命中, relpath)]
|
|
41
|
+
每类「语义等价形态」一个合成样本;含**不该命中**的样本(过度收紧方向)。
|
|
42
|
+
|
|
43
|
+
返回 (ok, detail);ok=False 时守卫应当转红——**这正是「第 N 种形态」的守卫**。
|
|
44
|
+
"""
|
|
45
|
+
bad = []
|
|
46
|
+
seen = []
|
|
47
|
+
for cls, src, want, rel_hint in samples:
|
|
48
|
+
texts = {rel_hint: src}
|
|
49
|
+
try:
|
|
50
|
+
hits = discover(texts)
|
|
51
|
+
except Exception as exc: # noqa: BLE001 —— 枚举逻辑崩了也要可归因
|
|
52
|
+
bad.append((cls, "discover 抛 %s: %s" % (type(exc).__name__, exc)))
|
|
53
|
+
continue
|
|
54
|
+
got = bool(hits)
|
|
55
|
+
seen.append((cls, got, len(hits)))
|
|
56
|
+
if got != bool(want):
|
|
57
|
+
bad.append((cls, "期望命中=%s 实际=%s(命中 %d)" % (want, got, len(hits))))
|
|
58
|
+
detail = {"样本": seen, "不符": bad}
|
|
59
|
+
return (not bad), detail
|
|
60
|
+
|
|
61
|
+
|
|
62
|
+
def assert_revert_reddens(build_mirror, revert_edits, run_guard, expect_prefixes,
|
|
63
|
+
rel_path, timeout=1800):
|
|
64
|
+
"""回退即绿自证:在镜像树里**实跑**一次回退,核对红项集合。
|
|
65
|
+
|
|
66
|
+
build_mirror() -> 镜像树根路径(调用方负责其构成;本函数负责删)
|
|
67
|
+
revert_edits -> list[(相对路径, 原文, 替换文)]:**实际的回退**(不是等价改写)
|
|
68
|
+
run_guard(tree) -> (rc, 红项列表, 完整输出)
|
|
69
|
+
expect_prefixes -> 期望转红的前缀元组(如 ("A03", "E03"))
|
|
70
|
+
|
|
71
|
+
返回 (ok, detail)。**不接受推演**:必须真的改文件、真的跑、真的看到红。
|
|
72
|
+
"""
|
|
73
|
+
tree = build_mirror()
|
|
74
|
+
detail = {}
|
|
75
|
+
try:
|
|
76
|
+
rc0, reds0, _out0 = run_guard(tree)
|
|
77
|
+
if rc0 != 0 or reds0:
|
|
78
|
+
detail["基线"] = "镜像基线即红:%s" % (reds0[:5],)
|
|
79
|
+
return False, detail
|
|
80
|
+
eol = None
|
|
81
|
+
for rel, old, new in revert_edits:
|
|
82
|
+
p = os.path.join(tree, rel)
|
|
83
|
+
with io.open(p, encoding="utf-8", newline="") as f:
|
|
84
|
+
txt = f.read()
|
|
85
|
+
if eol is None:
|
|
86
|
+
eol = "\r\n" if "\r\n" in txt else "\n"
|
|
87
|
+
o = old.replace("\n", eol)
|
|
88
|
+
if txt.count(o) != 1:
|
|
89
|
+
detail[rel] = "回退锚点命中 %d 次" % txt.count(o)
|
|
90
|
+
return False, detail
|
|
91
|
+
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
92
|
+
f.write(txt.replace(o, new.replace("\n", eol), 1))
|
|
93
|
+
for root, dd, ff in os.walk(tree):
|
|
94
|
+
if os.path.basename(root) == "__pycache__":
|
|
95
|
+
shutil.rmtree(root, ignore_errors=True)
|
|
96
|
+
rc1, reds1, out1 = run_guard(tree)
|
|
97
|
+
hit = sorted({r.split(" ")[0] for r in reds1})
|
|
98
|
+
detail["回退后 rc"] = rc1
|
|
99
|
+
detail["实际红项"] = hit
|
|
100
|
+
ok = (rc1 != 0) and (hit == sorted(expect_prefixes))
|
|
101
|
+
if not ok:
|
|
102
|
+
detail["输出尾部"] = "\n".join((out1 or "").splitlines()[-8:])
|
|
103
|
+
return ok, detail
|
|
104
|
+
finally:
|
|
105
|
+
shutil.rmtree(tree, ignore_errors=True)
|
|
106
|
+
|
|
107
|
+
|
|
108
|
+
def mirror_sources(texts, root):
|
|
109
|
+
"""把 {relpath: 源码} 物化到临时根下(供 discover 之外的端到端复跑用)。返回根。"""
|
|
110
|
+
for rel, src in texts.items():
|
|
111
|
+
p = os.path.join(root, rel)
|
|
112
|
+
os.makedirs(os.path.dirname(p), exist_ok=True)
|
|
113
|
+
with io.open(p, "w", encoding="utf-8") as f:
|
|
114
|
+
f.write(src)
|
|
115
|
+
return root
|
|
116
|
+
|
|
117
|
+
|
|
118
|
+
if __name__ == "__main__":
|
|
119
|
+
print(__doc__)
|
|
120
|
+
sys.exit(0)
|
|
121
|
+
|
package/md_cg/anchor.py
CHANGED
|
@@ -1,114 +1,114 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
"""回执(锚定记录)与独立校验——I14 的代码落点。
|
|
3
|
-
|
|
4
|
-
理论依据:智能论 3.4 §3.2.1 结构锚定记录(分层·架构层.md:70-98)。原文五字段:
|
|
5
|
-
|
|
6
|
-
锚定标识 #ANCHOR-[HASH] 唯一标识,由记录单元生成
|
|
7
|
-
授予方 设计者位置标识
|
|
8
|
-
接收方 协议实例标识
|
|
9
|
-
时间戳 结构事件的时间
|
|
10
|
-
状态摘要 锚定时协议实例的结构状态(用于验证锚点与协议版本的一致性)
|
|
11
|
-
|
|
12
|
-
原文三条验证功能需求:**不可篡改**、**可独立校验**(任何持有副本的节点可通过
|
|
13
|
-
状态摘要验证一致性)、**多节点冗余**。
|
|
14
|
-
|
|
15
|
-
本模块的诚实边界:
|
|
16
|
-
* 实现前两条(不可篡改靠内容寻址;可独立校验靠 verify_anchor);
|
|
17
|
-
* **多节点冗余不实现**——那是部署面的事,单库内做不了,不假装。
|
|
18
|
-
* 字段按 §3.2.1 对齐,但本模块服务的是「信息锚定 + 回执校验」(I14),
|
|
19
|
-
不声称实现了完整的「协定式自我赋予」流程(那属 L3 契约面)。
|
|
20
|
-
|
|
21
|
-
I14 的含义落在这里:**回执不得自带真值**——回执只带指针与摘要,不复制原文;
|
|
22
|
-
原文不可读或已变,校验就必须失败。若回执能脱离原文独立"通过",它就不再是回执,
|
|
23
|
-
而是一份冒充原文的投影(I17)。
|
|
24
|
-
"""
|
|
25
|
-
|
|
26
|
-
import hashlib
|
|
27
|
-
import json
|
|
28
|
-
import time
|
|
29
|
-
|
|
30
|
-
__all__ = ["make_anchor", "verify_anchor", "ANCHOR_PREFIX", "STATE_FIELDS"]
|
|
31
|
-
|
|
32
|
-
ANCHOR_PREFIX = "#ANCHOR-"
|
|
33
|
-
|
|
34
|
-
#: 进入「状态摘要」的字段。取**结构状态**而非正文——§3.2.1 要求状态摘要是
|
|
35
|
-
#: 「锚定时协议实例的结构状态」,用于验证锚点与版本的一致性;正文指纹另列
|
|
36
|
-
#: content_hash,两者分开才能分别定位「结构变了」与「内容变了」。
|
|
37
|
-
STATE_FIELDS = ("layer", "condition_space", "lifecycle_state", "edges", "tags")
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
def _sha(text):
|
|
41
|
-
return hashlib.sha256(str(text).encode("utf-8")).hexdigest()
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
def _canonical_state(fm):
|
|
45
|
-
picked = {}
|
|
46
|
-
for k in STATE_FIELDS:
|
|
47
|
-
if k in (fm or {}):
|
|
48
|
-
picked[k] = fm[k]
|
|
49
|
-
return json.dumps(picked, ensure_ascii=False, sort_keys=True, default=str)
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
def make_anchor(cg, node_id, grantor=None, grantee=None):
|
|
53
|
-
"""为一条已存在的信息生成锚定记录(回执)。
|
|
54
|
-
|
|
55
|
-
返回 {"ok": True, "anchor": {...}} 或 {"ok": False, "reason": ...}。
|
|
56
|
-
锚定记录**不含正文**——这是 I14 的前提。
|
|
57
|
-
"""
|
|
58
|
-
node = cg.get(node_id)
|
|
59
|
-
if node is None:
|
|
60
|
-
return {"ok": False, "reason": "节点不存在:%s" % node_id}
|
|
61
|
-
fm = node.get("frontmatter") or {}
|
|
62
|
-
content = node.get("content") or ""
|
|
63
|
-
|
|
64
|
-
state_digest = _sha(_canonical_state(fm))
|
|
65
|
-
content_hash = _sha(content)
|
|
66
|
-
anchor_id = ANCHOR_PREFIX + _sha(node_id + state_digest + content_hash)[:16]
|
|
67
|
-
|
|
68
|
-
return {"ok": True, "anchor": {
|
|
69
|
-
"anchor_id": anchor_id, # 锚定标识
|
|
70
|
-
"node_id": node_id, # 接收方(本条信息)
|
|
71
|
-
"grantor": grantor, # 授予方
|
|
72
|
-
"grantee": grantee or node_id, # 接收方标识
|
|
73
|
-
"created_at": time.time(), # 时间戳
|
|
74
|
-
"state_digest": state_digest, # 状态摘要(§3.2.1)
|
|
75
|
-
"content_hash": content_hash, # 正文指纹(供 I14 校验)
|
|
76
|
-
}}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
def verify_anchor(cg, receipt):
|
|
80
|
-
"""独立校验:只凭回执 + 库内原文判断一致性。
|
|
81
|
-
|
|
82
|
-
三种失败都要**分别归因**(不合并成一句"校验失败"):
|
|
83
|
-
missing_node 原文不可读 → 回执无法被独立校验(I14:回执不得自带真值)
|
|
84
|
-
content_changed 正文已变
|
|
85
|
-
state_changed 结构状态已变(layer/condition_space/生命周期/边/标签)
|
|
86
|
-
|
|
87
|
-
不抛异常:校验失败是结论,不是错误。
|
|
88
|
-
"""
|
|
89
|
-
anc = (receipt or {}).get("anchor") if isinstance(receipt, dict) else None
|
|
90
|
-
if not isinstance(anc, dict):
|
|
91
|
-
return {"ok": False, "reason": "missing_anchor", "detail": "回执结构不合法"}
|
|
92
|
-
|
|
93
|
-
for k in ("anchor_id", "node_id", "state_digest", "content_hash"):
|
|
94
|
-
if not anc.get(k):
|
|
95
|
-
return {"ok": False, "reason": "incomplete_anchor", "detail": "缺字段 %s" % k}
|
|
96
|
-
|
|
97
|
-
node = cg.get(anc["node_id"])
|
|
98
|
-
if node is None:
|
|
99
|
-
# 关键:原文没了,回执**必须**失败——若这里能"通过",回执就自带真值了。
|
|
100
|
-
return {"ok": False, "reason": "missing_node",
|
|
101
|
-
"detail": "原文不可读,回执无法独立校验(I14)"}
|
|
102
|
-
|
|
103
|
-
fm = node.get("frontmatter") or {}
|
|
104
|
-
content = node.get("content") or ""
|
|
105
|
-
cur_state = _sha(_canonical_state(fm))
|
|
106
|
-
cur_content = _sha(content)
|
|
107
|
-
|
|
108
|
-
if cur_content != anc["content_hash"]:
|
|
109
|
-
return {"ok": False, "reason": "content_changed",
|
|
110
|
-
"expected": anc["content_hash"], "actual": cur_content}
|
|
111
|
-
if cur_state != anc["state_digest"]:
|
|
112
|
-
return {"ok": False, "reason": "state_changed",
|
|
113
|
-
"expected": anc["state_digest"], "actual": cur_state}
|
|
114
|
-
return {"ok": True, "anchor_id": anc["anchor_id"], "node_id": anc["node_id"]}
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""回执(锚定记录)与独立校验——I14 的代码落点。
|
|
3
|
+
|
|
4
|
+
理论依据:智能论 3.4 §3.2.1 结构锚定记录(分层·架构层.md:70-98)。原文五字段:
|
|
5
|
+
|
|
6
|
+
锚定标识 #ANCHOR-[HASH] 唯一标识,由记录单元生成
|
|
7
|
+
授予方 设计者位置标识
|
|
8
|
+
接收方 协议实例标识
|
|
9
|
+
时间戳 结构事件的时间
|
|
10
|
+
状态摘要 锚定时协议实例的结构状态(用于验证锚点与协议版本的一致性)
|
|
11
|
+
|
|
12
|
+
原文三条验证功能需求:**不可篡改**、**可独立校验**(任何持有副本的节点可通过
|
|
13
|
+
状态摘要验证一致性)、**多节点冗余**。
|
|
14
|
+
|
|
15
|
+
本模块的诚实边界:
|
|
16
|
+
* 实现前两条(不可篡改靠内容寻址;可独立校验靠 verify_anchor);
|
|
17
|
+
* **多节点冗余不实现**——那是部署面的事,单库内做不了,不假装。
|
|
18
|
+
* 字段按 §3.2.1 对齐,但本模块服务的是「信息锚定 + 回执校验」(I14),
|
|
19
|
+
不声称实现了完整的「协定式自我赋予」流程(那属 L3 契约面)。
|
|
20
|
+
|
|
21
|
+
I14 的含义落在这里:**回执不得自带真值**——回执只带指针与摘要,不复制原文;
|
|
22
|
+
原文不可读或已变,校验就必须失败。若回执能脱离原文独立"通过",它就不再是回执,
|
|
23
|
+
而是一份冒充原文的投影(I17)。
|
|
24
|
+
"""
|
|
25
|
+
|
|
26
|
+
import hashlib
|
|
27
|
+
import json
|
|
28
|
+
import time
|
|
29
|
+
|
|
30
|
+
__all__ = ["make_anchor", "verify_anchor", "ANCHOR_PREFIX", "STATE_FIELDS"]
|
|
31
|
+
|
|
32
|
+
ANCHOR_PREFIX = "#ANCHOR-"
|
|
33
|
+
|
|
34
|
+
#: 进入「状态摘要」的字段。取**结构状态**而非正文——§3.2.1 要求状态摘要是
|
|
35
|
+
#: 「锚定时协议实例的结构状态」,用于验证锚点与版本的一致性;正文指纹另列
|
|
36
|
+
#: content_hash,两者分开才能分别定位「结构变了」与「内容变了」。
|
|
37
|
+
STATE_FIELDS = ("layer", "condition_space", "lifecycle_state", "edges", "tags")
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
def _sha(text):
|
|
41
|
+
return hashlib.sha256(str(text).encode("utf-8")).hexdigest()
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
def _canonical_state(fm):
|
|
45
|
+
picked = {}
|
|
46
|
+
for k in STATE_FIELDS:
|
|
47
|
+
if k in (fm or {}):
|
|
48
|
+
picked[k] = fm[k]
|
|
49
|
+
return json.dumps(picked, ensure_ascii=False, sort_keys=True, default=str)
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def make_anchor(cg, node_id, grantor=None, grantee=None):
|
|
53
|
+
"""为一条已存在的信息生成锚定记录(回执)。
|
|
54
|
+
|
|
55
|
+
返回 {"ok": True, "anchor": {...}} 或 {"ok": False, "reason": ...}。
|
|
56
|
+
锚定记录**不含正文**——这是 I14 的前提。
|
|
57
|
+
"""
|
|
58
|
+
node = cg.get(node_id)
|
|
59
|
+
if node is None:
|
|
60
|
+
return {"ok": False, "reason": "节点不存在:%s" % node_id}
|
|
61
|
+
fm = node.get("frontmatter") or {}
|
|
62
|
+
content = node.get("content") or ""
|
|
63
|
+
|
|
64
|
+
state_digest = _sha(_canonical_state(fm))
|
|
65
|
+
content_hash = _sha(content)
|
|
66
|
+
anchor_id = ANCHOR_PREFIX + _sha(node_id + state_digest + content_hash)[:16]
|
|
67
|
+
|
|
68
|
+
return {"ok": True, "anchor": {
|
|
69
|
+
"anchor_id": anchor_id, # 锚定标识
|
|
70
|
+
"node_id": node_id, # 接收方(本条信息)
|
|
71
|
+
"grantor": grantor, # 授予方
|
|
72
|
+
"grantee": grantee or node_id, # 接收方标识
|
|
73
|
+
"created_at": time.time(), # 时间戳
|
|
74
|
+
"state_digest": state_digest, # 状态摘要(§3.2.1)
|
|
75
|
+
"content_hash": content_hash, # 正文指纹(供 I14 校验)
|
|
76
|
+
}}
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
def verify_anchor(cg, receipt):
|
|
80
|
+
"""独立校验:只凭回执 + 库内原文判断一致性。
|
|
81
|
+
|
|
82
|
+
三种失败都要**分别归因**(不合并成一句"校验失败"):
|
|
83
|
+
missing_node 原文不可读 → 回执无法被独立校验(I14:回执不得自带真值)
|
|
84
|
+
content_changed 正文已变
|
|
85
|
+
state_changed 结构状态已变(layer/condition_space/生命周期/边/标签)
|
|
86
|
+
|
|
87
|
+
不抛异常:校验失败是结论,不是错误。
|
|
88
|
+
"""
|
|
89
|
+
anc = (receipt or {}).get("anchor") if isinstance(receipt, dict) else None
|
|
90
|
+
if not isinstance(anc, dict):
|
|
91
|
+
return {"ok": False, "reason": "missing_anchor", "detail": "回执结构不合法"}
|
|
92
|
+
|
|
93
|
+
for k in ("anchor_id", "node_id", "state_digest", "content_hash"):
|
|
94
|
+
if not anc.get(k):
|
|
95
|
+
return {"ok": False, "reason": "incomplete_anchor", "detail": "缺字段 %s" % k}
|
|
96
|
+
|
|
97
|
+
node = cg.get(anc["node_id"])
|
|
98
|
+
if node is None:
|
|
99
|
+
# 关键:原文没了,回执**必须**失败——若这里能"通过",回执就自带真值了。
|
|
100
|
+
return {"ok": False, "reason": "missing_node",
|
|
101
|
+
"detail": "原文不可读,回执无法独立校验(I14)"}
|
|
102
|
+
|
|
103
|
+
fm = node.get("frontmatter") or {}
|
|
104
|
+
content = node.get("content") or ""
|
|
105
|
+
cur_state = _sha(_canonical_state(fm))
|
|
106
|
+
cur_content = _sha(content)
|
|
107
|
+
|
|
108
|
+
if cur_content != anc["content_hash"]:
|
|
109
|
+
return {"ok": False, "reason": "content_changed",
|
|
110
|
+
"expected": anc["content_hash"], "actual": cur_content}
|
|
111
|
+
if cur_state != anc["state_digest"]:
|
|
112
|
+
return {"ok": False, "reason": "state_changed",
|
|
113
|
+
"expected": anc["state_digest"], "actual": cur_state}
|
|
114
|
+
return {"ok": True, "anchor_id": anc["anchor_id"], "node_id": anc["node_id"]}
|
package/md_cg/audit.py
CHANGED
|
@@ -451,12 +451,24 @@ def _verify_code(payload, ctx):
|
|
|
451
451
|
return _verdict(REJECT, "code", f"语法错误 L{exc.lineno}: {exc.msg}")
|
|
452
452
|
n_def = sum(isinstance(x, (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef))
|
|
453
453
|
for x in ast.walk(tree))
|
|
454
|
+
# 禁表面(2026-10-19 外部实测):此前本验证器只做 AST,**从不调用 _rule_check**
|
|
455
|
+
# ⇒ forbidden(凭据形态)对 content_kind=code 形同不存在,`sk-`/`AKIA`/`ghp_`/
|
|
456
|
+
# 私钥块等以 ACCEPT 明文落盘,且无令牌 guest 经 cg(op=read) 可读回。
|
|
457
|
+
# 而 `_rule_check` 的契约(见其 docstring)与 data/policy.json 的 `_note` 都写明
|
|
458
|
+
# 「forbidden 对所有 content_kind 恒生效」——本调用是让实现对齐该契约。
|
|
459
|
+
# 位置在 AST 之后:语法都不成立的正文不必再跑禁表;Reject 后由 _gate_audit 的
|
|
460
|
+
# 既有 REJECT 分支统一脱敏,不在此处重复打码。
|
|
461
|
+
_st, _ev, _dt = _rule_check(src, ctx.get("rules") or load_rulebook(), "code")
|
|
462
|
+
if _st == REJECT:
|
|
463
|
+
return _verdict(REJECT, "code", f"纪律不合规:{_ev}", _dt)
|
|
454
464
|
# P2-18(批次 30,外部审查报告):test_cmd 只允许服务端 env 配置——
|
|
455
465
|
# payload 是模型可控输入面,一旦接到工具参数顶层即为 RCE 注入点。
|
|
456
466
|
cmd = os.environ.get("MDCG_CODE_TEST_CMD")
|
|
457
467
|
if not cmd:
|
|
468
|
+
_tail = "" if _st == ACCEPT else f"(禁表:{_ev})"
|
|
458
469
|
return _verdict(ACCEPT, "code",
|
|
459
|
-
f"AST 解析通过({n_def} 个定义);未配置 test_cmd,仅静态验证"
|
|
470
|
+
f"AST 解析通过({n_def} 个定义);未配置 test_cmd,仅静态验证"
|
|
471
|
+
+ _tail)
|
|
460
472
|
try:
|
|
461
473
|
argv = shlex.split(cmd)
|
|
462
474
|
except ValueError as exc:
|
|
@@ -479,7 +491,8 @@ def _verify_code(payload, ctx):
|
|
|
479
491
|
# ——超时**不吞**(issue #63)。
|
|
480
492
|
return _verdict(DEFER, "code", f"测试无法执行:{type(exc).__name__}: {exc}")
|
|
481
493
|
if p.returncode == 0:
|
|
482
|
-
|
|
494
|
+
_tail = "" if _st == ACCEPT else f"(禁表:{_ev})"
|
|
495
|
+
return _verdict(ACCEPT, "code", f"实测通过:{cmd}" + _tail)
|
|
483
496
|
tail = ((p.stdout or "")[-300:] + (p.stderr or "")[-300:]).strip()
|
|
484
497
|
return _verdict(REJECT, "code", f"实测失败 rc={p.returncode}:{tail}")
|
|
485
498
|
|
package/md_cg/chain.py
CHANGED
|
@@ -221,14 +221,15 @@ def adjacency(cg, include_hierarchy=True, skip_archived=True):
|
|
|
221
221
|
for e in (fm.get("edges") or []):
|
|
222
222
|
tgt = edge_target(e)
|
|
223
223
|
if tgt:
|
|
224
|
-
|
|
224
|
+
# #562:边目标侧与源侧(:215)同口径——按退役面剔除。
|
|
225
|
+
if skip_archived and _lc.is_retired(nodes.get(tgt)):
|
|
225
226
|
continue # 拓扑边界:指向退役目标的边径直截断
|
|
226
227
|
if vis is not None and not vis(tgt):
|
|
227
228
|
continue # 拓扑边界:指向不可见目标的边对调用方不存在
|
|
228
229
|
out.append((tgt, e if isinstance(e, dict) else {"target": tgt}))
|
|
229
230
|
if include_hierarchy:
|
|
230
231
|
for ch in _sg.declared(fm)["nodes"]:
|
|
231
|
-
if skip_archived and _lc.
|
|
232
|
+
if skip_archived and _lc.is_retired(nodes.get(ch)):
|
|
232
233
|
continue
|
|
233
234
|
if vis is not None and not vis(ch):
|
|
234
235
|
continue
|