@furongjun1999/dsh-memory 0.5.0 → 0.5.1

package/md_cg/ccgc.py

@@ -38,6 +38,7 @@ from dataclasses import asdict, dataclass, field
 from typing import Any, Dict, List, Optional
 
 from . import nodefile
+from .readcache import direct_read
 
 # ---- 四态：复用 audit / judge_qualification 的裁决语汇（不新造状态机） ----
 ACCEPT, REJECT, DEFER, BLINDSPOT = "ACCEPT", "REJECT", "DEFER", "BLINDSPOT"
@@ -754,7 +755,7 @@ def link(compiled: CompileResult, attestation: Optional[AttestResult], *,
         return out
 
     from . import crypto
-    fm, content = _cg._read(entry)
+    fm, content = direct_read(_cg, entry)   # 写前重查走盘上真值（读缓存口径）
     if fm is None or crypto.is_encrypted(content):
         out.errors.append("E004 " + E_CODES["E004"])
         return out
@@ -838,7 +839,7 @@ def recalibrate(node_id: str, corrections: Dict[str, Any], verifier: str,
         return out
 
     from . import crypto
-    fm, content = _cg._read(entry)
+    fm, content = direct_read(_cg, entry)   # 写前重查走盘上真值（读缓存口径）
     if fm is None or crypto.is_encrypted(content):
         out.errors.append("E004 " + E_CODES["E004"])
         return out

package/md_cg/chain.py

@@ -123,7 +123,7 @@ def node_conditions(cg, nid):
     return pos
 
 
-# 生效条件：cg 已有 _chain_adj 且其 [0] 等于 bool(include_hierarchy) 时直接返回缓存的 [1]；否则以 cg.index["nodes"]（无 index 或无该键时视为无节点）逐节点收集 frontmatter.edges 中 edge_target 非空的出边，include_hierarchy 为真时再为 subgraph.nodes 各合成一条 relation_type="part_of"、confidence=1.0 的层级边，仅对有出边的 nid 建表，写回 cg._chain_adj=(bool(include_hierarchy), adj) 后返回 adj；
+# 生效条件：cg 已有 _chain_adj 且其 [0] 等于 bool(include_hierarchy)、[1] 等于可见性闸存在位时直接返回缓存的 [2]；否则以 cg.index["nodes"]（无 index 或无该键时视为无节点）逐节点收集 frontmatter.edges 中 edge_target 非空的出边，include_hierarchy 为真时再为 subgraph.nodes 各合成一条 relation_type="part_of"、confidence=1.0 的层级边，仅对有出边的 nid 建表，写回 cg._chain_adj=(bool(include_hierarchy), 闸存在位, adj) 后返回 adj；cg 提供 _chain_visible(nid) 谓词（读隔离，MdCGSecure 注入）时不可见 nid 的出边整体不入表、指向不可见目标的边（含层级合成边）截断——不可见节点 id、其边条件与下游拓扑对调用方不存在（walk/explain/causal_path/expand_from_seeds 全部消费者同闸）；
 def adjacency(cg, include_hierarchy=True):
     """出邻接表：nid → [(target_id, edge_dict)]。
 
@@ -131,28 +131,43 @@ def adjacency(cg, include_hierarchy=True):
       1. 节点 frontmatter.edges（关系边，含 relation_type）
       2. 节点 frontmatter.subgraph.nodes（层级边，合成 part_of）
     只读索引快照，不读文件正文；结果缓存在 `cg._chain_adj`。
+
+    读隔离（2026-09-25）：cg._chain_visible(nid) 谓词在位（MdCGSecure 注入，
+    = 索引有条目 ∧ _readable）时按其过滤——不可见节点不入表、指向不可见
+    目标的边截断；谓词缺席（基类）行为零变化。缓存键含闸存在位；闸语义
+    实例内稳定（_readable 绑定档判定恒用 principal.session，见 mdcos
+    _readable），同一实例不会跨身份串台。
     """
     cached = getattr(cg, "_chain_adj", None)
-    if cached is not None and cached[0] == bool(include_hierarchy):
-        return cached[1]
+    vis = getattr(cg, "_chain_visible", None)
+    vis_on = vis is not None
+    if (cached is not None and cached[0] == bool(include_hierarchy)
+            and cached[1] == vis_on):
+        return cached[2]
     from . import subgraph as _sg
     nodes = ((getattr(cg, "index", None) or {}).get("nodes") or {})
     adj = {}
     for nid in nodes:
+        if vis is not None and not vis(nid):
+            continue          # 不可见节点：其出边与条件整体不可见（不解析 fm）
         fm = _sg._fm(cg, nid)
         out = []
         for e in (fm.get("edges") or []):
             tgt = edge_target(e)
             if tgt:
+                if vis is not None and not vis(tgt):
+                    continue  # 拓扑边界：指向不可见目标的边对调用方不存在
                 out.append((tgt, e if isinstance(e, dict) else {"target": tgt}))
         if include_hierarchy:
             for ch in _sg.declared(fm)["nodes"]:
+                if vis is not None and not vis(ch):
+                    continue
                 out.append((ch, {"target": ch, "relation_type": "part_of",
                                  "confidence": 1.0, "verified": 0}))
         if out:
             adj[nid] = out
     try:
-        cg._chain_adj = (bool(include_hierarchy), adj)
+        cg._chain_adj = (bool(include_hierarchy), vis_on, adj)
     except Exception:
         pass
     return adj

package/md_cg/consolidate.py

@@ -85,6 +85,7 @@ import urllib.request
 from . import crypto, evolution, nodefile, routing
 from .fsutil import append_jsonl
 from .mdcg import BUCKETED_LAYERS, bigrams, expand_query_terms_weighted
+from .readcache import direct_read
 from .mdcos import (MdCGOS, _ccg_field, _declared_conditions, _neg_hit, _sig,
                     _weighted_coverage)
 
@@ -675,7 +676,7 @@ def consolidate(root: str, layer: str = None, limit: int = None, apply: bool = F
         if limit is not None and rep["targeted"] >= limit:
             break
         nid = os.path.basename(e["path"])[:-3]
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 写前重查走盘上真值（读缓存口径，见 readcache.direct_read）
         if fm is None:
             _bump("read_failed")
             continue
@@ -811,7 +812,7 @@ def fill_verification_basis(root: str, basis: str, layer: str = None,
     for e in entries:
         if limit is not None and rep["written"] >= limit:
             break
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 写前重查走盘上真值（读缓存口径）
         if fm is None:
             continue
         if crypto.is_encrypted(content):
@@ -891,7 +892,7 @@ def promote_memories(root, source_layer="contextual", target_layer="knowledge",
     for e in entries:
         if limit is not None and rep["written"] >= int(limit):
             break
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 写前重查走盘上真值（读缓存口径）
         if fm is None:
             continue
         if crypto.is_encrypted(content):
@@ -962,7 +963,7 @@ def rollback_promotion(root, node_ids=None, batch=None, actor="maintain") -> dic
         e = (cg.index.get("nodes") or {}).get(nid)
         if not e:
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 回滚比对走盘上真值（读缓存口径）
         if fm is None or crypto.is_encrypted(content):
             continue
         back = rec.get("from") or "contextual"
@@ -1064,7 +1065,7 @@ def contextualize_prefixes(root, prefixes=None, node_ids=None,
         nid = _entry_id(e)
         if not _hit(e):
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 写前重查走盘上真值（读缓存口径）
         if fm is None:
             continue
         if crypto.is_encrypted(content):
@@ -1122,7 +1123,7 @@ def rollback_contextualize(root, node_ids=None, batch=None, actor="maintain") ->
         e = (cg.index.get("nodes") or {}).get(nid)
         if not e:
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 回滚比对走盘上真值（读缓存口径）
         if fm is None or crypto.is_encrypted(content):
             continue
         back = rec.get("from") or "knowledge"

package/md_cg/crosscheck.py

@@ -36,6 +36,7 @@ from .backfill import (BASIS_ENUM_DEFAULT, BASIS_TEXT, INTERNAL_LAYERS,
 from .consolidate import _has_ccg_line, _upsert_ccg_line
 from .fsutil import append_jsonl, read_jsonl
 from .mdcos import _ccg_field
+from .readcache import direct_read
 
 # ---- 常量 ----------------------------------------------------------------
 
@@ -341,7 +342,7 @@ def _scan(cg, layer=None, ids=None, prefix=None):
         if not _readable_guard(cg, e):
             yield {"status": "skip", "reason": "denied", "id": nid}
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 扫描读喂写面：走盘上真值（读缓存口径）
         if fm is None:
             yield {"status": "skip", "reason": "unreadable", "id": nid}
             continue
@@ -783,7 +784,7 @@ def crosscheck(x, layer=None, limit=None, ids=None, reflect_fn=None,
         rep["targeted"] += 1
         nid = row["id"]
         e = cg.index["nodes"].get(nid)
-        fm, content = cg._read(e) if e else (None, None)
+        fm, content = direct_read(cg, e) if e else (None, None)   # 写前重查走盘上真值
         if fm is None or crypto.is_encrypted(content):
             rep["skipped_locked"] += 1
             continue
@@ -938,7 +939,7 @@ def rollback(x, batch=None, entry_ids=None, actor=None) -> dict:
         if not e:
             rep["skipped_drift"] += 1
             continue
-        fm, content = cg._read(e)
+        fm, content = direct_read(cg, e)   # 回滚比对走盘上真值（write_id 防护所验 fm 同源）
         if fm is None or crypto.is_encrypted(content):
             rep["skipped_drift"] += 1
             continue