@furongjun1999/dsh-memory 0.4.11 → 0.5.1

package/md_cg/test_blindspot_tickets.py

@@ -1,166 +1,166 @@
-# -*- coding: utf-8 -*-
-"""盲区消解票据（blindspot_tickets.make_tickets）验证。
-
-断言面：
-  ① 空库诚实：无反思记录 → 零票据、零落库（不编造消解价值）
-  ② 预演：apply=False 全 dry_run、零落库
-  ③ 四类分类：task（query 精确命中 unresolved 首行，优先级最高）/
-     grilling（defer 主导）/ research（blindspot>=3）/ prototype（其余）
-  ④ apply 落卡：tasks.list_tasks 可见、tags 带 ticket:<type>
-  ⑤ 幂等：重复 apply → created=0、updated=4（不重复建卡）
-  ⑥ types 仅作分类后落卡过滤（判据恒定不变）
-  ⑦ 非法 types → ok=False、零落库
-  ⑧ grilling 卡如实声明「执行通道=宿主侧访谈」（库内无访谈工具，不越权代答）
-  ⑨ task 卡正文携带关联 unresolved node_id
-  ⑩ min_blindspot 候选资格过滤（b 低且无 defer 的簇不入池）
-
-运行：python -m md_cg.test_blindspot_tickets
-"""
-from __future__ import annotations
-
-import os
-import tempfile
-
-from . import blindspot_tickets, tasks
-from .fsutil import append_jsonl
-from .mdcos import MdCGOS
-
-PASS = FAIL = 0
-FAILS = []
-
-
-def ok(cond, label):
-    global PASS, FAIL
-    if cond:
-        PASS += 1
-    else:
-        FAIL += 1
-        FAILS.append(label)
-        print(f"  FAIL {label}")
-
-
-def _sig(cg, t, query, states):
-    """直写一条反思记录（与 test_autonomy 同构先例：只造信号面，不动检索面）。"""
-    append_jsonl(cg.reflection_log,
-                 {"t": t, "query": query, "d_prev": 1.0, "d_curr": 1.0,
-                  "d_delta": 0.0, "d2": 0.1, "states": states,
-                  "n_results": 1, "feedback": None})
-
-
-def _card(cg, ttype, q):
-    nid = tasks.TASK_PREFIX + tasks.slugify("票据:%s:%s" % (ttype, q[:24]))
-    node = cg.get(nid) or {}
-    return node, nid
-
-
-def main():
-    tmp = tempfile.mkdtemp(prefix="mdcg_tickets_")
-    try:
-        root = os.path.join(tmp, "root")
-        os.makedirs(root, exist_ok=True)
-        cg = MdCGOS(root)
-
-        Q_R = "如何审计蜂巢的 gossip 收敛性"   # blindspot×3 → research
-        Q_G = "上次说的那个修复方案细节"       # defer×2     → grilling
-        Q_P = "数据迁移的回滚口径"             # blindspot×1 → prototype
-        Q_T = "跨库事务一致性边界"             # blindspot×1 + unresolved 首行命中 → task
-
-        # ---------- ① 空库诚实 ----------
-        r0 = blindspot_tickets.make_tickets(cg)
-        ok(r0["ok"] and r0["scanned"] == 0 and r0["created"] == 0
-           and not r0["tickets"],
-           "①空反思日志 → 零票据（不编造消解价值）")
-        r0a = blindspot_tickets.make_tickets(cg, apply=True)
-        ok(r0a["ok"] and r0a["created"] == 0 and len(tasks.list_tasks(cg)["tasks"]) == 0,
-           "①b空库 apply → 零落卡")
-
-        # ---------- ② 造四类信号（t 递增：task/prototype 同 b，last_t 定序） ----------
-        t = 1.0
-        for i in range(3):
-            t += 1
-            _sig(cg, t, Q_R, {"BLINDSPOT": 1})
-        for i in range(2):
-            t += 1
-            _sig(cg, t, Q_G, {"DEFER": 1})
-        _sig(cg, 10.0, Q_P, {"BLINDSPOT": 1})
-        _sig(cg, 11.0, Q_T, {"BLINDSPOT": 1})
-        cg.add("t_unres", Q_T + "\n悬挂：等待架构裁决", layer="unresolved")
-
-        # ---------- ③ 预演 ----------
-        dry = blindspot_tickets.make_tickets(cg)
-        ok(dry["ok"] and dry["scanned"] == 4 and dry["applied"] is False,
-           "③四簇入池、预演不落库")
-        by_q = {tk["query"]: tk for tk in dry["tickets"]}
-        ok(all(tk.get("dry_run") for tk in dry["tickets"]),
-           "③b预演票据全 dry_run 标记")
-        ok(len(tasks.list_tasks(cg)["tasks"]) == 0,
-           "③c预演零落库")
-        ok(by_q[Q_T]["type"] == "task" and by_q[Q_R]["type"] == "research"
-           and by_q[Q_G]["type"] == "grilling" and by_q[Q_P]["type"] == "prototype",
-           "③d四类分类各就位（task 判据优先于 b/d 计数）")
-
-        # ---------- ④ apply 落卡 ----------
-        r1 = blindspot_tickets.make_tickets(cg, apply=True, actor="test")
-        ok(r1["ok"] and r1["created"] == 4 and r1["errors"] == 0,
-           "④apply 建 4 卡、零错误")
-        lt = tasks.list_tasks(cg, status="active")
-        ok(len(lt["tasks"]) == 4, "④b任务清单可见 4 张 active 卡")
-        tags_ok = True
-        for ttype, q in (("research", Q_R), ("grilling", Q_G),
-                         ("prototype", Q_P), ("task", Q_T)):
-            node_i, _ = _card(cg, ttype, q)
-            fm_i = (node_i or {}).get("frontmatter") or {}
-            if "ticket:%s" % ttype not in (fm_i.get("tags") or []):
-                tags_ok = False
-        ok(tags_ok, "④c四卡 fm tags 带 ticket:<type> 族标")
-        # 分类落卡实体抽查
-        node_r, _ = _card(cg, "research", Q_R)
-        ok(node_r and "ticket:research" in (node_r["frontmatter"].get("tags") or []),
-           "④dresearch 卡以 ticket:research 落库")
-
-        # ---------- ⑤ 幂等 ----------
-        r2 = blindspot_tickets.make_tickets(cg, apply=True)
-        ok(r2["ok"] and r2["created"] == 0 and r2["updated"] == 4,
-           "⑤重复 apply → created=0、updated=4（同 slug 不重复建卡）")
-        ok(len(tasks.list_tasks(cg)["tasks"]) == 4, "⑤b卡数不增")
-
-        # ---------- ⑥ types 过滤（仅过滤，不改判据） ----------
-        r3 = blindspot_tickets.make_tickets(cg, types=["research"], apply=True)
-        tk3 = {tk["query"]: tk for tk in r3["tickets"]}
-        ok(r3["ok"] and tk3[Q_R].get("node_id") and tk3[Q_G].get("skipped")
-           and tk3[Q_T].get("skipped") and tk3[Q_P].get("skipped"),
-           "⑥types=research → 其余三类 skipped（判据未被 types 改写）")
-        ok(tk3[Q_R].get("created") is False,
-           "⑥bresearch 卡幂等更新（created=False，重复过滤轮不重复建）")
-
-        # ---------- ⑦ 非法 types ----------
-        r4 = blindspot_tickets.make_tickets(cg, types=["nope"], apply=True)
-        ok(r4["ok"] is False and "nope" in r4["error"]
-           and len(tasks.list_tasks(cg)["tasks"]) == 4,
-           "⑦非法类型 → ok=False 点名可选集、零落库")
-
-        # ---------- ⑧⑨ 卡正文边界与关联 ----------
-        node_g, _ = _card(cg, "grilling", Q_G)
-        plan_g = node_g["content"] if node_g else ""
-        ok(node_g and "宿主侧访谈" in plan_g and "不越权代答" in plan_g,
-           "⑧grilling 卡如实声明执行通道=宿主侧访谈")
-        node_t, _ = _card(cg, "task", Q_T)
-        plan_t = node_t["content"] if node_t else ""
-        ok(node_t and "t_unres" in plan_t and "关联悬挂" in plan_t,
-           "⑨task 卡携带关联 unresolved node_id")
-
-        # ---------- ⑩ min_blindspot 资格过滤 ----------
-        r5 = blindspot_tickets.make_tickets(cg, min_blindspot=3)
-        qs5 = {tk["query"] for tk in r5["tickets"] if not tk.get("skipped")}
-        ok(Q_R in qs5 and Q_G in qs5 and Q_P not in qs5 and Q_T not in qs5,
-           "⑩min_blindspot=3 → 仅 research(b=3) 与 grilling(d≥1) 入池")
-
-        print("[test_blindspot_tickets] PASS=%d FAIL=%d" % (PASS, FAIL))
-        if FAILS:
-            raise SystemExit(1)
-    finally:
-        pass
-
-
-if __name__ == "__main__":
-    main()
+# -*- coding: utf-8 -*-
+"""盲区消解票据（blindspot_tickets.make_tickets）验证。
+
+断言面：
+  ① 空库诚实：无反思记录 → 零票据、零落库（不编造消解价值）
+  ② 预演：apply=False 全 dry_run、零落库
+  ③ 四类分类：task（query 精确命中 unresolved 首行，优先级最高）/
+     grilling（defer 主导）/ research（blindspot>=3）/ prototype（其余）
+  ④ apply 落卡：tasks.list_tasks 可见、tags 带 ticket:<type>
+  ⑤ 幂等：重复 apply → created=0、updated=4（不重复建卡）
+  ⑥ types 仅作分类后落卡过滤（判据恒定不变）
+  ⑦ 非法 types → ok=False、零落库
+  ⑧ grilling 卡如实声明「执行通道=宿主侧访谈」（库内无访谈工具，不越权代答）
+  ⑨ task 卡正文携带关联 unresolved node_id
+  ⑩ min_blindspot 候选资格过滤（b 低且无 defer 的簇不入池）
+
+运行：python -m md_cg.test_blindspot_tickets
+"""
+from __future__ import annotations
+
+import os
+import tempfile
+
+from . import blindspot_tickets, tasks
+from .fsutil import append_jsonl
+from .mdcos import MdCGOS
+
+PASS = FAIL = 0
+FAILS = []
+
+
+def ok(cond, label):
+    global PASS, FAIL
+    if cond:
+        PASS += 1
+    else:
+        FAIL += 1
+        FAILS.append(label)
+        print(f"  FAIL {label}")
+
+
+def _sig(cg, t, query, states):
+    """直写一条反思记录（与 test_autonomy 同构先例：只造信号面，不动检索面）。"""
+    append_jsonl(cg.reflection_log,
+                 {"t": t, "query": query, "d_prev": 1.0, "d_curr": 1.0,
+                  "d_delta": 0.0, "d2": 0.1, "states": states,
+                  "n_results": 1, "feedback": None})
+
+
+def _card(cg, ttype, q):
+    nid = tasks.TASK_PREFIX + tasks.slugify("票据:%s:%s" % (ttype, q[:24]))
+    node = cg.get(nid) or {}
+    return node, nid
+
+
+def main():
+    tmp = tempfile.mkdtemp(prefix="mdcg_tickets_")
+    try:
+        root = os.path.join(tmp, "root")
+        os.makedirs(root, exist_ok=True)
+        cg = MdCGOS(root)
+
+        Q_R = "如何审计蜂巢的 gossip 收敛性"   # blindspot×3 → research
+        Q_G = "上次说的那个修复方案细节"       # defer×2     → grilling
+        Q_P = "数据迁移的回滚口径"             # blindspot×1 → prototype
+        Q_T = "跨库事务一致性边界"             # blindspot×1 + unresolved 首行命中 → task
+
+        # ---------- ① 空库诚实 ----------
+        r0 = blindspot_tickets.make_tickets(cg)
+        ok(r0["ok"] and r0["scanned"] == 0 and r0["created"] == 0
+           and not r0["tickets"],
+           "①空反思日志 → 零票据（不编造消解价值）")
+        r0a = blindspot_tickets.make_tickets(cg, apply=True)
+        ok(r0a["ok"] and r0a["created"] == 0 and len(tasks.list_tasks(cg)["tasks"]) == 0,
+           "①b空库 apply → 零落卡")
+
+        # ---------- ② 造四类信号（t 递增：task/prototype 同 b，last_t 定序） ----------
+        t = 1.0
+        for i in range(3):
+            t += 1
+            _sig(cg, t, Q_R, {"BLINDSPOT": 1})
+        for i in range(2):
+            t += 1
+            _sig(cg, t, Q_G, {"DEFER": 1})
+        _sig(cg, 10.0, Q_P, {"BLINDSPOT": 1})
+        _sig(cg, 11.0, Q_T, {"BLINDSPOT": 1})
+        cg.add("t_unres", Q_T + "\n悬挂：等待架构裁决", layer="unresolved")
+
+        # ---------- ③ 预演 ----------
+        dry = blindspot_tickets.make_tickets(cg)
+        ok(dry["ok"] and dry["scanned"] == 4 and dry["applied"] is False,
+           "③四簇入池、预演不落库")
+        by_q = {tk["query"]: tk for tk in dry["tickets"]}
+        ok(all(tk.get("dry_run") for tk in dry["tickets"]),
+           "③b预演票据全 dry_run 标记")
+        ok(len(tasks.list_tasks(cg)["tasks"]) == 0,
+           "③c预演零落库")
+        ok(by_q[Q_T]["type"] == "task" and by_q[Q_R]["type"] == "research"
+           and by_q[Q_G]["type"] == "grilling" and by_q[Q_P]["type"] == "prototype",
+           "③d四类分类各就位（task 判据优先于 b/d 计数）")
+
+        # ---------- ④ apply 落卡 ----------
+        r1 = blindspot_tickets.make_tickets(cg, apply=True, actor="test")
+        ok(r1["ok"] and r1["created"] == 4 and r1["errors"] == 0,
+           "④apply 建 4 卡、零错误")
+        lt = tasks.list_tasks(cg, status="active")
+        ok(len(lt["tasks"]) == 4, "④b任务清单可见 4 张 active 卡")
+        tags_ok = True
+        for ttype, q in (("research", Q_R), ("grilling", Q_G),
+                         ("prototype", Q_P), ("task", Q_T)):
+            node_i, _ = _card(cg, ttype, q)
+            fm_i = (node_i or {}).get("frontmatter") or {}
+            if "ticket:%s" % ttype not in (fm_i.get("tags") or []):
+                tags_ok = False
+        ok(tags_ok, "④c四卡 fm tags 带 ticket:<type> 族标")
+        # 分类落卡实体抽查
+        node_r, _ = _card(cg, "research", Q_R)
+        ok(node_r and "ticket:research" in (node_r["frontmatter"].get("tags") or []),
+           "④dresearch 卡以 ticket:research 落库")
+
+        # ---------- ⑤ 幂等 ----------
+        r2 = blindspot_tickets.make_tickets(cg, apply=True)
+        ok(r2["ok"] and r2["created"] == 0 and r2["updated"] == 4,
+           "⑤重复 apply → created=0、updated=4（同 slug 不重复建卡）")
+        ok(len(tasks.list_tasks(cg)["tasks"]) == 4, "⑤b卡数不增")
+
+        # ---------- ⑥ types 过滤（仅过滤，不改判据） ----------
+        r3 = blindspot_tickets.make_tickets(cg, types=["research"], apply=True)
+        tk3 = {tk["query"]: tk for tk in r3["tickets"]}
+        ok(r3["ok"] and tk3[Q_R].get("node_id") and tk3[Q_G].get("skipped")
+           and tk3[Q_T].get("skipped") and tk3[Q_P].get("skipped"),
+           "⑥types=research → 其余三类 skipped（判据未被 types 改写）")
+        ok(tk3[Q_R].get("created") is False,
+           "⑥bresearch 卡幂等更新（created=False，重复过滤轮不重复建）")
+
+        # ---------- ⑦ 非法 types ----------
+        r4 = blindspot_tickets.make_tickets(cg, types=["nope"], apply=True)
+        ok(r4["ok"] is False and "nope" in r4["error"]
+           and len(tasks.list_tasks(cg)["tasks"]) == 4,
+           "⑦非法类型 → ok=False 点名可选集、零落库")
+
+        # ---------- ⑧⑨ 卡正文边界与关联 ----------
+        node_g, _ = _card(cg, "grilling", Q_G)
+        plan_g = node_g["content"] if node_g else ""
+        ok(node_g and "宿主侧访谈" in plan_g and "不越权代答" in plan_g,
+           "⑧grilling 卡如实声明执行通道=宿主侧访谈")
+        node_t, _ = _card(cg, "task", Q_T)
+        plan_t = node_t["content"] if node_t else ""
+        ok(node_t and "t_unres" in plan_t and "关联悬挂" in plan_t,
+           "⑨task 卡携带关联 unresolved node_id")
+
+        # ---------- ⑩ min_blindspot 资格过滤 ----------
+        r5 = blindspot_tickets.make_tickets(cg, min_blindspot=3)
+        qs5 = {tk["query"] for tk in r5["tickets"] if not tk.get("skipped")}
+        ok(Q_R in qs5 and Q_G in qs5 and Q_P not in qs5 and Q_T not in qs5,
+           "⑩min_blindspot=3 → 仅 research(b=3) 与 grilling(d≥1) 入池")
+
+        print("[test_blindspot_tickets] PASS=%d FAIL=%d" % (PASS, FAIL))
+        if FAILS:
+            raise SystemExit(1)
+    finally:
+        pass
+
+
+if __name__ == "__main__":
+    main()

package/md_cg/test_branch_discard_tombstone.py

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+"""branches.discard 摘索引落 tombstone 守卫（缺陷：只 pop 内存 → 幽灵条目固化）。
+
+缺陷形态（缺陷报告 2026-09-25 复现证实，medium）：discard()（branches.py:261）
+摘除分支索引条目只 `pop` 内存、不写删除记录（未走 `_unstage`），且其内部
+flush（:262-267）把 fork 阶段仍在 `_dirty` 的分支条目作为 **upsert** 持久化进
+`_index_log`。close 时 compact 的「计数对账重扫 + 日志重放」（mdcg.py:1010-1012
+`_apply_log(self._scan_nodes())`）把已物理移走（publish 至 `_branches/<id>/`，
+LAYERS 之外）的分支 upsert **叠回**干净扫描之上——幽灵条目连同目录指纹一起固化
+进 `_index.json` 快照，此后重开指纹校验放行、幽灵永久存活（get()=None、
+检索候选白跑、dangling 不归零）。
+
+修复口径（forget 的正确模式，mdcos.py:2244-2246 注释明载同构坑）：discard
+摘除分支条目走 `_unstage(nid)`——pop 内存 + `_dirty[nid]=None`（tombstone）
++ 立即 flush，重放时按序 pop 掉 fork upsert。
+
+红守卫 = 缺陷报告复现流程：S1 主支落快照 → S2 fork+discard → S3 close 重开
+断言索引不含 `mem_base@br1` 幽灵条目。B1/B4/B5 锁 discard 既有语义不变
+（返回形态 / 教训节点存活 / 主支完好），B2/B3/B6 为红项。
+运行：python -m md_cg.test_branch_discard_tombstone
+"""
+from __future__ import annotations
+
+import os
+import shutil
+import sys
+import tempfile
+
+from . import branches
+from .fsutil import ShardedLog
+from .mdcg import LAYERS
+from .mdcos import MdCGOS
+
+PASS = FAIL = 0
+FAILS = []
+
+BID = "br1"
+GHOST = "mem_base@br1"
+SUMMARY = "branch_summary_br1"
+SUMMARY_TEXT = "分支假设：改写可提检索命中 实验结果：无提升 教训：回归再上分支"
+
+
+def ok(cond, label):
+    global PASS, FAIL
+    if cond:
+        PASS += 1
+        print(f"  OK   {label}")
+    else:
+        FAIL += 1
+        FAILS.append(label)
+        print(f"  FAIL {label}")
+
+
+def _layer_md_ids(root):
+    """盘面真值：LAYERS 各层目录下现存 .md 的节点 id 集合（含子桶）。"""
+    ids = set()
+    for layer in LAYERS:
+        base = os.path.join(root, layer)
+        for _dp, _dirs, files in os.walk(base):
+            for fn in files:
+                if fn.endswith(".md"):
+                    ids.add(fn[:-3])
+    return ids
+
+
+def main():
+    os.environ.pop("MDCG_READ_CACHE", None)
+    tmp = tempfile.mkdtemp(prefix="mdcg_br_tomb_")
+    try:
+        root = os.path.join(tmp, "root")
+        os.makedirs(root)
+
+        # S1：主支节点入库并 close 落快照（此后 S2 的 close 走 compact 而非 rebuild）
+        cg0 = MdCGOS(root)
+        cg0.add("mem_base", "# 功能名：分支守卫主支\n\n正文：蜂群调度基线。\n",
+                layer="knowledge")
+        cg0.close()
+
+        # S2：fork → discard（fork 后不 flush——fork 阶段条目仍在 _dirty）
+        cg1 = MdCGOS(root)
+        fr = branches.fork(cg1, ["mem_base"], branch_id=BID,
+                           note="守卫：命中提升实验")
+        ok(fr.get("ok") and fr["forked"][0]["to"] == GHOST,
+           f"B0a fork 出分支副本 {GHOST}")
+        r = branches.discard(cg1, BID, SUMMARY_TEXT)
+        ok(r.get("ok") is True and r.get("moved") == 1
+           and r.get("summary_node") == SUMMARY,
+           f"B1 discard 语义不变（ok/moved/summary_node，实测 {r!r}）")
+
+        # B2（机制，红项）：摘除必须落删除记录——discard 返回时 _index_log
+        # 已含该 nid 的 tombstone（e is None），且 _dirty 中无待写 upsert
+        recs = list(ShardedLog.read_all(cg1.index_log_dir))
+        ok(any(x.get("id") == GHOST and x.get("e") is None for x in recs),
+           f"B2 discard 已落 tombstone（日志含 {GHOST} 删除记录；实测"
+           f" {[(x.get('id'), x.get('e') is None) for x in recs]}）")
+        ok(GHOST not in cg1._dirty
+           and GHOST not in cg1.index["nodes"],
+           "B2b 内存索引已摘除且 _dirty 无该节点待写条目")
+        cg1.close()
+
+        # S3：重开——幽灵条目不得复活
+        cg2 = MdCGOS(root)
+        idx_ids = set((cg2.index.get("nodes") or {}).keys())
+        ok(GHOST not in idx_ids,
+           f"B3 重开后索引不含幽灵条目 {GHOST}（实测索引节点 "
+           f"{sorted(idx_ids)}）")
+        ok("mem_base" in idx_ids and SUMMARY in idx_ids,
+           "B4 主支节点与教训节点存活（discard 其余语义不变）")
+        disk_ids = _layer_md_ids(root)
+        ok(idx_ids == disk_ids,
+           f"B5 索引与盘面对账一致（索引 {sorted(idx_ids)} / 盘面 "
+           f"{sorted(disk_ids)}）")
+        ok(cg2.get(GHOST) is None and cg2.get("mem_base") is not None,
+           "B6 幽灵不可取回、主支可正常读取")
+        ok(cg2.get(SUMMARY) is not None
+           and "教训" in (cg2.get(SUMMARY) or {}).get("content", ""),
+           "B7 教训节点内容可读（可检索召回）")
+        # 冷归档物理保留（不违背永不删除）
+        cold = os.path.join(root, branches.COLD_DIR, BID,
+                            GHOST + ".md")
+        ok(os.path.isfile(cold), f"B8 分支文件冷归档保留（{cold}）")
+        cg2.close()
+    finally:
+        os.environ.pop("MDCG_READ_CACHE", None)
+        shutil.rmtree(tmp, ignore_errors=True)
+
+    print("\n" + "=" * 60)
+    print(f"结果：PASS {PASS} / FAIL {FAIL}")
+    if FAILS:
+        for f in FAILS:
+            print(f"  - {f}")
+    return 0 if FAIL == 0 else 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

package/md_cg/test_branches.py

@@ -234,13 +234,23 @@ def _run(tmp):
                     content="分支假设p 实验结果q 教训r")
     _check("insight act=branch_discard", r.get("ok") is True, repr(r))
 
-    # ---------- 6 session 过滤正交不回归 ----------
+    # ---------- 6 分支可见性 × 会话参数（正交，不回归） ----------
+    # issue #35 起：共享档（internal 默认）跨会话可见 ⇒ 查询侧 session 参数
+    # **不再改变可见性**（同口径见 test_p47_session_view 的 D1a/D2/D3）。本段要守
+    # 的是「分支过滤与 session 参数正交」：传别人的会话不得把默认隐身的**分支
+    # 副本**带回来；显式 branch= 才可见；主支节点两种情况都在。
     cg5 = _mk_cg(tmp)
     cg5.add("mem_s1", "会话一内容", layer="knowledge", verification_basis="test",
             consistency=False)
     branches.fork(cg5, ["mem_s1"], branch_id="sx")
-    res, meta = cg5.search("会话一内容", session="sess_zzz")
-    _check("session过滤与branch过滤正交", not res, repr(res))
+    ids_other = _hits(cg5, "会话一内容", session="sess_zzz")
+    _check("共享档跨会话可见：显式他人 session 不缩小可见性",
+           "mem_s1" in ids_other, repr(ids_other))
+    _check("分支副本默认隐身：传他人 session 也带不回来",
+           all("@sx" not in str(i) for i in ids_other), repr(ids_other))
+    ids_br = _hits(cg5, "会话一内容", branch="sx")
+    _check("显式 branch=sx 时分支副本可见（与 session 参数正交）",
+           any("@sx" in str(i) for i in ids_br), repr(ids_br))
     res, meta = cg5.search("会话一内容")
     _check("默认检索主支正常", bool(res), repr(meta))