@modusensus/dsh-mneme 0.7.32 → 0.8.1

package/test/scope-storage.test.js

@@ -0,0 +1,255 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { createStore } from "../src/store.js";
+import { createService } from "../src/service.js";
+import { createTools } from "../src/tools.js";
+import { createScopeResolver } from "../src/scope.js";
+
+// v0.8.0 A1（issue #17）：scope 隔离存储层。
+// 四列可空（agent_scope/workspace_scope/sensitivity/occurred_at）、迁移纯增量
+// 不带 DEFAULT；写入标注走 scopeEnabled 门控；去重键扩展 (type, title, scope…)。
+
+test("migration adds four nullable scope columns without defaults", () => {
+  const store = createStore(":memory:");
+  const cols = store.db.prepare("PRAGMA table_info(memories)").all();
+  for (const name of ["agent_scope", "workspace_scope", "sensitivity", "occurred_at"]) {
+    const col = cols.find((c) => c.name === name);
+    assert.ok(col, `column ${name} should exist`);
+    assert.equal(col.notnull, 0, `${name} must be nullable`);
+    assert.equal(col.dflt_value, null, `${name} must not carry a DEFAULT (存量零重写)`);
+  }
+});
+
+test("rows written without scope fields read back unscoped (legacy semantics)", () => {
+  const store = createStore(":memory:");
+  const row = store.save({ type: "project", title: "legacy shape", content: "body" });
+  assert.equal(row.agent_scope, undefined);
+  assert.equal(row.workspace_scope, undefined);
+  assert.equal(row.sensitivity, undefined);
+  assert.equal(row.occurred_at, undefined);
+});
+
+test("store.save persists and normalizes scope fields; dirty input lands as NULL", () => {
+  const store = createStore(":memory:");
+  const kept = store.save({
+    type: "project",
+    title: "scoped",
+    content: "c",
+    agent_scope: "  coder-agent  ",
+    workspace_scope: "D:\\proj",
+    sensitivity: "personal",
+    occurred_at: "2026-09-13T10:00:00+08:00"
+  });
+  assert.equal(kept.agent_scope, "coder-agent");
+  assert.equal(kept.workspace_scope, "D:\\proj");
+  assert.equal(kept.sensitivity, "personal");
+  // 时区归一：A2 的时间过滤按 ISO 字典序直接比较。
+  assert.equal(kept.occurred_at, "2026-09-13T02:00:00.000Z");
+
+  const dirty = store.save({
+    type: "project",
+    title: "dirty",
+    content: "c",
+    agent_scope: "   ",
+    workspace_scope: 42,
+    sensitivity: "",
+    occurred_at: "not-a-date"
+  });
+  assert.equal(dirty.agent_scope, undefined);
+  assert.equal(dirty.workspace_scope, undefined);
+  assert.equal(dirty.sensitivity, undefined);
+  assert.equal(dirty.occurred_at, undefined);
+});
+
+test("store.update keeps scope columns untouched (write-time annotation is immutable)", () => {
+  const store = createStore(":memory:");
+  const saved = store.save({ type: "decision", title: "t", content: "old", agent_scope: "a1", workspace_scope: "w1" });
+  store.update(saved.id, { content: "new", importance: 4 });
+  const row = store.getById(saved.id);
+  assert.equal(row.content, "new");
+  assert.equal(row.agent_scope, "a1");
+  assert.equal(row.workspace_scope, "w1");
+});
+
+test("scopeEnabled=false: cross-scope same-title does NOT merge (issue #170 复核项 1)", () => {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config: {} });
+  // A1 时代本测试断言「flag 关=跨 scope 合并」；显式声明落地后那是内容挂错
+  // 归属的 bug（strictScope 下原主人反而看不见）——去重键恒按 scope 比较。
+  store.save({ type: "project", title: "T", content: "scoped body", agent_scope: "agentA" });
+  const { action } = service.saveWithDedupe({ type: "project", title: "T", content: "new body" });
+  assert.equal(action, "created", "unscoped write never merges into a labeled row (flag off included)");
+  assert.equal(store.count("project"), 2);
+});
+
+test("scopeEnabled=true: dedupe key extends with agent_scope/workspace_scope/sensitivity", () => {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config: { scopeEnabled: true } });
+  const save = (fields) => service.saveWithDedupe({ type: "project", title: "T", content: "body", ...fields });
+
+  assert.equal(save({ agent_scope: "agentA" }).action, "created");
+  // 同标题、不同 agent_scope → 独立行，绝不互相合并。
+  assert.equal(save({ agent_scope: "agentB" }).action, "created");
+  // 不同 workspace_scope → 独立行。
+  assert.equal(save({ agent_scope: "agentA", workspace_scope: "D:\\proj-a" }).action, "created");
+  // 不同 sensitivity → 独立行。
+  assert.equal(save({ agent_scope: "agentA", sensitivity: "personal" }).action, "created");
+  // 三元组全同 → 合并。
+  assert.equal(save({ agent_scope: "agentA" }).action, "merged");
+  assert.equal(store.count("project"), 4);
+});
+
+test("scopeEnabled=true: unscoped writes match legacy NULL rows but not stamped ones", () => {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config: { scopeEnabled: true } });
+  // 存量形状（NULL scope）。
+  store.save({ type: "preference", title: "P", content: "legacy" });
+  // 未标注新写入与存量 NULL 行互相匹配。
+  assert.equal(service.saveWithDedupe({ type: "preference", title: "P", content: "x" }).action, "merged");
+  // 已标注行与 NULL 行不匹配 → 独立新行。
+  assert.equal(service.saveWithDedupe({ type: "preference", title: "P", content: "x", agent_scope: "agentA" }).action, "created");
+  assert.equal(store.count("preference"), 2);
+});
+
+test("scopeEnabled=true: _mergeInto across scopes is rejected and falls back to a fresh row", () => {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config: { scopeEnabled: true } });
+  const scoped = store.save({ type: "project", title: "S", content: "scoped", agent_scope: "agentA" });
+  const cross = service.saveWithDedupe({
+    type: "project", title: "S", content: "summary text", _mergeInto: scoped.id
+  });
+  assert.equal(cross.action, "created", "cross-scope semantic merge must not leak into the scoped row");
+  const same = service.saveWithDedupe({
+    type: "project", title: "S2", content: "more text", agent_scope: "agentA", _mergeInto: scoped.id
+  });
+  assert.equal(same.action, "merged", "same-scope explicit target still merges");
+  assert.equal(same.memory.id, scoped.id);
+});
+
+function setupTools(config) {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config });
+  const registered = [];
+  createTools(
+    { tools: { register(def) { registered.push(def); return () => {}; } } },
+    service,
+    config
+  );
+  const memorySave = registered.find((def) => def.name === "memory_save");
+  assert.ok(memorySave, "memory_save registered");
+  return { store, memorySave };
+}
+
+async function runMemorySave(memorySave, args, exec) {
+  const handler = memorySave.execute.bind(memorySave);
+  return handler(args, exec);
+}
+
+test("memory_save stamps resolved scope onto the row when the flag is on", async () => {
+  const { store, memorySave } = setupTools({ scopeEnabled: true });
+  const exec = { agent: { session: { id: "s1", header: { agentPreset: "coder", cwd: "D:\\proj" } } } };
+  const args = { type: "pitfall", title: "T", content: "c", sensitivity: "personal", occurred_at: "2026-09-12T00:00:00Z" };
+  const out = await runMemorySave(memorySave, args, exec);
+  const row = store.getById(out.id);
+  assert.equal(row.agent_scope, "coder");
+  assert.equal(row.workspace_scope, "D:\\proj");
+  assert.equal(row.sensitivity, "personal");
+  assert.equal(row.occurred_at, "2026-09-12T00:00:00.000Z");
+});
+
+test("memory_save without exec context writes unscoped rows (flag on, nothing resolvable)", async () => {
+  const { store, memorySave } = setupTools({ scopeEnabled: true });
+  const out = await runMemorySave(memorySave, { type: "pitfall", title: "T", content: "c" }, undefined);
+  const row = store.getById(out.id);
+  assert.equal(row.agent_scope, undefined);
+  assert.equal(row.workspace_scope, undefined);
+});
+
+test("memory_save with the flag off writes rows without any scope annotation", async () => {
+  const { store, memorySave } = setupTools({});
+  const exec = { agent: { session: { id: "s1", header: { agentPreset: "coder", cwd: "D:\\proj" } } } };
+  const out = await runMemorySave(memorySave, { type: "pitfall", title: "T", content: "c" }, exec);
+  const row = store.getById(out.id);
+  assert.equal(row.agent_scope, undefined);
+  assert.equal(row.workspace_scope, undefined);
+});
+
+test("createScopeResolver returns identity even when scopeEnabled is off (gate lives at the write-annotation site, issue #170 复核项 2)", () => {
+  const resolve = createScopeResolver({ ctx: {}, config: {} });
+  // flag 关只关自动标注：读取侧（strictVisibility/get/注入）与显式声明仍需身份。
+  assert.deepEqual(
+    resolve({ agent: { session: { id: "s1", header: { agentPreset: "coder", cwd: "D:\\p" } } } }),
+    { agent_scope: "coder", workspace_scope: "D:\\p" }
+  );
+  // 真解析不到 → 双 null 对象（fail-closed 读取侧据此只放行未标注/非显式行）。
+  assert.deepEqual(resolve({ agent: { session: { id: "s1" } } }), { agent_scope: null, workspace_scope: null });
+});
+
+test("resolver stamps agentPreset and header cwd; registry hit wins over header cwd", () => {
+  const resolve = createScopeResolver({
+    config: { scopeEnabled: true },
+    ctx: { workspaceRegistry: { list: () => [{ path: "C:\\canon", sessionIds: ["s1"] }] } }
+  });
+  const exec = { agent: { session: { id: "s1", header: { agentPreset: "coder", cwd: "D:\\raw" } } } };
+  assert.deepEqual(resolve(exec), { agent_scope: "coder", workspace_scope: "C:\\canon" });
+
+  const resolveNoHit = createScopeResolver({
+    config: { scopeEnabled: true },
+    ctx: { workspaceRegistry: { list: () => [{ path: "C:\\canon", sessionIds: ["other"] }] } }
+  });
+  assert.deepEqual(resolveNoHit(exec), { agent_scope: "coder", workspace_scope: "D:\\raw" });
+});
+
+test("resolver falls back to the static .header property on old hosts", () => {
+  const resolve = createScopeResolver({ config: { scopeEnabled: true }, ctx: {} });
+  const exec = { agent: { session: { id: "s1", header: { agentPreset: "novelist" } } } };
+  assert.deepEqual(resolve(exec), { agent_scope: "novelist", workspace_scope: null });
+});
+
+test("session.header wins over requestHeader() (EpochHeader must not shadow the durable header)", () => {
+  const resolve = createScopeResolver({ config: { scopeEnabled: true }, ctx: {} });
+  // 本地 web 复验（2026-09-13）实测踩中的形状：requestHeader() 返回请求级
+  // EpochHeader（模型路由头，无 agentPreset/cwd），曾在首个请求后遮蔽
+  // session.header，导致标注全空。
+  const exec = {
+    agent: {
+      session: {
+        id: "s1",
+        header: { agentPreset: "coder", cwd: "D:\\proj" },
+        requestHeader: () => ({ config: { provider: "deepseek-official", model: "deepseek-v4-flash" } })
+      }
+    }
+  };
+  assert.deepEqual(resolve(exec), { agent_scope: "coder", workspace_scope: "D:\\proj" });
+});
+
+test("hosts without .header fall back to requestHeader().config shape", () => {
+  const resolve = createScopeResolver({ config: { scopeEnabled: true }, ctx: {} });
+  const exec = {
+    agent: {
+      session: {
+        id: "s2",
+        requestHeader: () => ({ config: { agentPreset: "legacy", cwd: "E:\\old" } })
+      }
+    }
+  };
+  assert.deepEqual(resolve(exec), { agent_scope: "legacy", workspace_scope: "E:\\old" });
+});
+
+test("resolver never throws: registry explosion degrades to header cwd and warns once", () => {
+  const warnings = [];
+  const resolve = createScopeResolver({
+    config: { scopeEnabled: true },
+    ctx: { workspaceRegistry: { list: () => { throw new Error("boom"); } } },
+    logger: { warn: (m) => warnings.push(String(m)) }
+  });
+  const exec = { agent: { session: { id: "s1", header: { agentPreset: "coder", cwd: "D:\\raw" } } } };
+  assert.deepEqual(resolve(exec), { agent_scope: "coder", workspace_scope: "D:\\raw" });
+  assert.equal(warnings.length, 1, "warn exactly once, never block the write path");
+});
+
+test("resolver without a session or header lands all-NULL", () => {
+  const resolve = createScopeResolver({ config: { scopeEnabled: true }, ctx: {} });
+  assert.deepEqual(resolve(undefined), { agent_scope: null, workspace_scope: null });
+  assert.deepEqual(resolve({ agent: { session: { id: "s2" } } }), { agent_scope: null, workspace_scope: null });
+});

package/test/scope-strict.test.js

@@ -0,0 +1,231 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { createStore } from "../src/store.js";
+import { createService } from "../src/service.js";
+import { createTools } from "../src/tools.js";
+
+// v0.8.0 A3（issue #17）→ v0.8.1 第 3 步（issue #170 4.3，作者已确认）：
+// strictScope 硬过滤只认显式声明。可见性公式收窄为：记忆可见 ⇔ 对每一维
+// （该维标注存在且来源=explicit 时：命中当前会话）AND。
+//   - explicit 行为硬墙：他者维度不可见（含 memory_get 无存在性泄漏）；
+//   - auto / 存量 NULL 来源（v0.8.0 自动标注）不进硬过滤，只吃 A2 软加权
+//     （foreign ×0.5 保留可见）；
+//   - 当前会话维度解析不到 → 该维 explicit 行一律不可见（fail-closed 收窄）。
+
+function setup(config) {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config });
+  return { store, service };
+}
+
+test("visibility predicate: explicit rows keep four-quadrant semantics", () => {
+  const { service } = setup({ scopeEnabled: true, strictScope: true });
+  const vis = service.isVisibleInScope;
+  const me = { agent_scope: "coder", workspace_scope: "D:\\p" };
+  const E = "explicit";
+
+  // 全局（未标注）对谁都可见。
+  assert.equal(vis({}, me), true);
+  // agent 专属：同 agent 任意 workspace 可见，他人不可见。
+  assert.equal(vis({ agent_scope: "coder", agent_scope_source: E }, me), true);
+  assert.equal(vis({ agent_scope: "novelist", agent_scope_source: E }, me), false);
+  // workspace 专属：同 workspace 任意 agent 可见，别的 workspace 不可见。
+  assert.equal(vis({ workspace_scope: "D:\\p", workspace_scope_source: E }, me), true);
+  assert.equal(vis({ workspace_scope: "D:\\q", workspace_scope_source: E }, me), false);
+  // 双标注：精确命中才可见。
+  assert.equal(vis({ agent_scope: "coder", agent_scope_source: E, workspace_scope: "D:\\p", workspace_scope_source: E }, me), true);
+  assert.equal(vis({ agent_scope: "coder", agent_scope_source: E, workspace_scope: "D:\\q", workspace_scope_source: E }, me), false);
+  assert.equal(vis({ agent_scope: "novelist", agent_scope_source: E, workspace_scope: "D:\\p", workspace_scope_source: E }, me), false);
+});
+
+test("visibility predicate: auto and legacy rows are NOT hard walls (soft only)", () => {
+  const { service } = setup({ scopeEnabled: true, strictScope: true });
+  const vis = service.isVisibleInScope;
+  const me = { agent_scope: "coder", workspace_scope: "D:\\p" };
+
+  // auto（v0.8.1 载体自动标注）与存量 NULL 来源（v0.8.0 自动标注）他者维度
+  // 也可见——硬过滤只认 explicit。
+  assert.equal(vis({ agent_scope: "novelist" }, me), true, "legacy NULL source");
+  assert.equal(vis({ agent_scope: "novelist", agent_scope_source: "auto" }, me), true);
+  assert.equal(vis({ workspace_scope: "D:\\q", workspace_scope_source: "auto" }, me), true);
+  // 混合：agent 维 auto + workspace 维 explicit → 只 workspace 维构成硬墙。
+  assert.equal(vis({ agent_scope: "novelist", agent_scope_source: "auto", workspace_scope: "D:\\q", workspace_scope_source: "explicit" }, me), false);
+  assert.equal(vis({ agent_scope: "novelist", agent_scope_source: "explicit", workspace_scope: "D:\\q", workspace_scope_source: "auto" }, me), false);
+});
+
+test("visibility predicate: anonymous session fail-closes only explicit rows", () => {
+  const { service } = setup({ scopeEnabled: true, strictScope: true });
+  const vis = service.isVisibleInScope;
+  const anon = { agent_scope: null, workspace_scope: null };
+  assert.equal(vis({}, anon), true);
+  assert.equal(vis({ agent_scope: "coder", agent_scope_source: "explicit" }, anon), false);
+  assert.equal(vis({ workspace_scope: "D:\\p", workspace_scope_source: "explicit" }, anon), false);
+  // auto/存量行照常可见（不冒认，但也不因身份缺失误杀软标注）。
+  assert.equal(vis({ agent_scope: "coder" }, anon), true);
+  assert.equal(vis({ agent_scope: "coder", agent_scope_source: "auto" }, anon), true);
+});
+
+test("searchMemories: explicit foreign filtered, auto/legacy foreign stay visible under strictScope", async () => {
+  const { store, service } = setup({ scopeEnabled: true, strictScope: true });
+  store.save({ type: "project", title: "global needle", content: "x" });
+  store.save({ type: "project", title: "mine needle", content: "x", agent_scope: "me", agent_scope_source: "explicit" });
+  store.save({ type: "project", title: "explicit foreign needle", content: "x", agent_scope: "other", agent_scope_source: "explicit" });
+  store.save({ type: "project", title: "auto foreign needle", content: "x", agent_scope: "other", agent_scope_source: "auto" });
+  store.save({ type: "project", title: "legacy foreign needle", content: "x", agent_scope: "other" });
+
+  const rows = await service.searchMemories("needle", {
+    mode: "keyword",
+    scope: { agent_scope: "me", workspace_scope: null }
+  });
+  // explicit 他者出局；auto/存量他者保留（A2 降权仍可见）；未标注与命中行保留。
+  assert.deepEqual(rows.map((m) => m.title).sort(), [
+    "auto foreign needle", "global needle", "legacy foreign needle", "mine needle"
+  ]);
+});
+
+test("strictScope off keeps A2 behavior: foreign rows demoted but visible", async () => {
+  const { store, service } = setup({ scopeEnabled: true });
+  store.save({ type: "project", title: "foreign needle", content: "x", agent_scope: "other" });
+  const rows = await service.searchMemories("needle", {
+    mode: "keyword",
+    scope: { agent_scope: "me", workspace_scope: null }
+  });
+  assert.deepEqual(rows.map((m) => m.title), ["foreign needle"]);
+});
+
+test("store.list/count visibility: explicit hard wall + auto/legacy pass, consistent totals", () => {
+  const { store } = setup({ scopeEnabled: true, strictScope: true });
+  store.save({ type: "decision", title: "g", content: "x" });
+  store.save({ type: "decision", title: "mine", content: "x", agent_scope: "me", agent_scope_source: "explicit", workspace_scope: "D:\\p", workspace_scope_source: "explicit" });
+  store.save({ type: "decision", title: "theirs-explicit", content: "x", agent_scope: "other", agent_scope_source: "explicit" });
+  store.save({ type: "decision", title: "theirs-auto", content: "x", agent_scope: "other", agent_scope_source: "auto" });
+  store.save({ type: "decision", title: "theirs-legacy", content: "x", agent_scope: "other" });
+  store.save({ type: "decision", title: "other-ws-explicit", content: "x", workspace_scope: "D:\\q", workspace_scope_source: "explicit" });
+
+  const vis = { agentScope: "me", workspaceScope: "D:\\p" };
+  const titles = store.list({ visibility: vis }).map((m) => m.title).sort();
+  assert.deepEqual(titles, ["g", "mine", "theirs-auto", "theirs-legacy"]);
+  assert.equal(store.count("decision", { visibility: vis }), 4);
+
+  // 匿名会话：explicit 行全出局，auto/存量/未标注放行。
+  const anonTitles = store.list({ visibility: { agentScope: null, workspaceScope: null } }).map((m) => m.title).sort();
+  assert.deepEqual(anonTitles, ["g", "theirs-auto", "theirs-legacy"]);
+  assert.equal(store.count("decision", { visibility: { agentScope: null, workspaceScope: null } }), 3);
+});
+
+test("injectCandidates hard-filters explicit foreign rows when strictScope is on", () => {
+  const { store, service } = setup({ scopeEnabled: true, strictScope: true });
+  store.save({ type: "decision", title: "global", content: "x", importance: 4 });
+  store.save({ type: "decision", title: "foreign", content: "x", importance: 4, agent_scope: "other", agent_scope_source: "explicit" });
+  store.save({ type: "decision", title: "auto-foreign", content: "x", importance: 4, agent_scope: "other", agent_scope_source: "auto" });
+
+  const injected = service.injectCandidates({
+    maxItems: 5,
+    threshold: 3,
+    scope: { agent_scope: "me", workspace_scope: null }
+  });
+  assert.deepEqual(injected.map((m) => m.title).sort(), ["auto-foreign", "global"]);
+
+  // flag 下（scope 不传）→ 他 scope 照常注入（A2 前行为）。
+  const unscoped = service.injectCandidates({ maxItems: 5, threshold: 3 });
+  assert.deepEqual(unscoped.map((m) => m.title).sort(), ["auto-foreign", "foreign", "global"]);
+});
+
+test("memory_update/memory_delete hide explicit foreign-scope rows under strictScope (review item 4, aligned with memory_get)", async () => {
+  const { store, pick } = setupTools({ scopeEnabled: true, strictScope: true });
+  const theirs = store.save({ type: "pitfall", title: "theirs", content: "c", agent_scope: "other", agent_scope_source: "explicit" });
+  const autoTheirs = store.save({ type: "pitfall", title: "auto-theirs", content: "c", agent_scope: "other", agent_scope_source: "auto" });
+  const update = pick("memory_update");
+  const del = pick("memory_delete");
+
+  // explicit 他 scope：update 按不存在拒绝、delete 视作不存在——不能凭 id 直改直删。
+  await assert.rejects(() => runHandler(update, { id: theirs.id, content: "tampered" }, STRICT_EXEC), /memory not found/);
+  assert.equal(store.getById(theirs.id).content, "c", "row untouched by the rejected update");
+  const delOut = await runHandler(del, { id: theirs.id }, STRICT_EXEC);
+  assert.equal(delOut.deleted, false, "delete treats invisible rows as absent (no existence leak)");
+  assert.ok(store.getById(theirs.id), "row NOT deleted");
+
+  // auto 他 scope：不构成硬墙，照常可改（与 get 的可见性口径一致）。
+  const updAuto = await runHandler(update, { id: autoTheirs.id, content: "updated" }, STRICT_EXEC);
+  assert.equal(updAuto.memory.id, autoTheirs.id);
+
+  // 行主人自己照常可改。
+  const ownerOut = await runHandler(update, { id: theirs.id, content: "owner edit" }, OTHER_EXEC);
+  assert.equal(ownerOut.memory.id, theirs.id);
+
+  // strictScope 关：update/delete 不做可见性校验（管理语义回归）。
+  const { store: store2, pick: pick2 } = setupTools({ scopeEnabled: true });
+  const t2 = store2.save({ type: "pitfall", title: "theirs", content: "c", agent_scope: "other", agent_scope_source: "explicit" });
+  await runHandler(pick2("memory_update"), { id: t2.id, content: "edited" }, STRICT_EXEC);
+  assert.equal(store2.getById(t2.id).content, "edited");
+  const del2 = await runHandler(pick2("memory_delete"), { id: t2.id }, STRICT_EXEC);
+  assert.equal(del2.deleted, true);
+});
+
+function setupTools(config) {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config });
+  const registered = [];
+  createTools(
+    { tools: { register(def) { registered.push(def); return () => {}; } } },
+    service,
+    config
+  );
+  const pick = (name) => registered.find((def) => def.name === name);
+  return { store, pick };
+}
+
+async function runHandler(def, args, exec) {
+  const handler = def.execute.bind(def);
+  return handler(args, exec);
+}
+
+const STRICT_EXEC = { agent: { session: { id: "s1", header: { agentPreset: "me", cwd: "D:\\p" } } } };
+const OTHER_EXEC = { agent: { session: { id: "s2", header: { agentPreset: "other", cwd: "D:\\q" } } } };
+
+test("memory_get hides explicit foreign-scope rows under strictScope, resolvable for the owner", async () => {
+  const { store, pick } = setupTools({ scopeEnabled: true, strictScope: true });
+  const mine = store.save({ type: "pitfall", title: "mine", content: "c", agent_scope: "me", agent_scope_source: "explicit" });
+  const theirs = store.save({ type: "pitfall", title: "theirs", content: "c", agent_scope: "other", agent_scope_source: "explicit" });
+  const autoTheirs = store.save({ type: "pitfall", title: "auto-theirs", content: "c", agent_scope: "other", agent_scope_source: "auto" });
+  const get = pick("memory_get");
+
+  const out = await runHandler(get, { id: mine.id }, STRICT_EXEC);
+  assert.equal(out.memory.title, "mine");
+
+  // explicit 他 scope → 按不存在处理（无存在性泄漏）。
+  await assert.rejects(() => runHandler(get, { id: theirs.id }, STRICT_EXEC), /memory not found/);
+  // auto 他 scope → 可见（软加权不进硬过滤）。
+  const autoOut = await runHandler(get, { id: autoTheirs.id }, STRICT_EXEC);
+  assert.equal(autoOut.memory.title, "auto-theirs");
+  // 行主人自己照常可取。
+  const ownerOut = await runHandler(get, { id: theirs.id }, OTHER_EXEC);
+  assert.equal(ownerOut.memory.title, "theirs");
+});
+
+test("memory_get without strictScope returns any row regardless of scope annotation", async () => {
+  const { store, pick } = setupTools({ scopeEnabled: true });
+  const theirs = store.save({ type: "pitfall", title: "theirs", content: "c", agent_scope: "other", agent_scope_source: "explicit" });
+  const get = pick("memory_get");
+  const out = await runHandler(get, { id: theirs.id }, STRICT_EXEC);
+  assert.equal(out.memory.title, "theirs");
+});
+
+test("memory_list filters explicit rows and keeps total consistent under strictScope", async () => {
+  const { store, pick } = setupTools({ scopeEnabled: true, strictScope: true });
+  store.save({ type: "decision", title: "g", content: "x" });
+  store.save({ type: "decision", title: "mine", content: "x", agent_scope: "me", agent_scope_source: "explicit" });
+  store.save({ type: "decision", title: "theirs", content: "x", agent_scope: "other", agent_scope_source: "explicit" });
+  const list = pick("memory_list");
+
+  const out = await runHandler(list, { type: "decision" }, STRICT_EXEC);
+  assert.deepEqual(out.items.map((m) => m.title).sort(), ["g", "mine"]);
+  assert.equal(out.total, 2);
+
+  // flag 关（A2 默认）：他 scope 的行照常出现在浏览视图。
+  const { store: store2, pick: pick2 } = setupTools({ scopeEnabled: true });
+  store2.save({ type: "decision", title: "theirs", content: "x", agent_scope: "other", agent_scope_source: "explicit" });
+  const out2 = await runHandler(pick2("memory_list"), { type: "decision" }, STRICT_EXEC);
+  assert.deepEqual(out2.items.map((m) => m.title), ["theirs"]);
+  assert.equal(out2.total, 1);
+});

package/test/service.test.js

@@ -327,3 +327,79 @@ test("Bug7: injection ranking re-weights by quality_score (degraded memories ran
   assert.equal(candidates[0].title, "高质量", "100-quality preference leads the degraded one");
   assert.equal(candidates[1].title, "元记忆");
 });
+
+// v0.8.0 冲突集中处理：resolveConflictPending 盖章 + 处置落地（与 dream 非冻结
+// conflict 同款：胜者正文追加已否决注记、败者归档），以及队列视图的联表形状。
+test("resolveConflictPending applies the dream-style disposition on human confirmation", () => {
+  const { store, service } = setup();
+  const a = store.save({ type: "history", title: "界面暗色偏好", content: "用户当前使用暗色界面主题", importance: 3 });
+  const b = store.save({ type: "history", title: "界面亮色切换", content: "用户界面亮色切换计划", importance: 3 });
+  const pending = store.saveConflictPending({ memory_a: a.id, memory_b: b.id, reason: "主题偏好前后矛盾" });
+  // store 会把 pair 按 id 字典序归一（防重复入队），A/B 只是排序位——
+  // 人工确认前先从队列行反查「界面亮色切换」（keeper，恒为 b）落在哪一侧，
+  // 再选那一侧保留；loser 恒为 a（「界面暗色偏好」），与侧位字母无关。
+  const queued = service.listConflictQueue().find((q) => q.id === pending.id);
+  const winnerSide = queued.memory_a.id === b.id ? "a" : "b";
+  const loserId = a.id;
+
+  const resolved = service.resolveConflictPending(pending.id, { winner: winnerSide, apply: true });
+  assert.ok(resolved, "returns the stamped row");
+  assert.ok(resolved.resolved_at, "stamps resolved_at");
+  assert.equal(resolved.resolved_winner, b.id, "resolved_winner records the chosen memory id");
+  assert.equal(resolved.disposition?.ok, true, "disposition landed");
+
+  // 败者归档 + 胜者保留——与 dream applyConflict 同款（胜者正文由
+  // applyDecisions 追加已否决注记）。
+  assert.equal(store.getById(loserId).archived, true, "loser archived");
+  assert.equal(store.getById(b.id).archived, false, "winner kept active");
+  assert.notEqual(store.getById(b.id).content, b.content, "winner content carries the veto note");
+  // 处置后队列不再返回该冲突。
+  assert.equal(service.listConflictQueue().length, 0);
+});
+
+test("resolveConflictPending with winner=null only stamps (mark reviewed)", () => {
+  const { store, service } = setup();
+  const a = store.save({ type: "project", title: "甲", content: "内容甲" });
+  const b = store.save({ type: "project", title: "乙", content: "内容乙" });
+  const pending = store.saveConflictPending({ memory_a: a.id, memory_b: b.id, reason: "r" });
+  const resolved = service.resolveConflictPending(pending.id, { winner: null });
+  assert.ok(resolved.resolved_at);
+  assert.equal(resolved.disposition, null, "no disposition applied");
+  assert.equal(store.getById(a.id).archived, false);
+  assert.equal(store.getById(b.id).archived, false);
+});
+
+test("resolveConflictPending unknown id returns undefined", () => {
+  const { service } = setup();
+  assert.equal(service.resolveConflictPending("nope", { winner: "a" }), undefined);
+});
+
+// Review 守卫（#166 时序修复）：盖章必须先于处置的**反面**契约——处置失败时
+// 不得盖章。单线程下 casGuard 的 snapshot 与读取之间没有异步介入点，CAS 冲突
+// 实际不可达（这是原 PR 没测它的原因），但它一旦因未来改动可达（异步 store、
+// update/archive 抛错），先盖章会让行已 resolved、从队列消失却未处置。这条源码
+// 断言把顺序固化下来（与 client.test.js 断言 ConflictsQueue 存在同一惯例），
+// 防止未来有人再把盖章挪回处置之前。
+test("resolveConflictPending stamps only after disposition succeeds (review ordering guard)", () => {
+  const source = readFileSync(new URL("../src/service.js", import.meta.url), "utf8");
+  const fn = source.slice(source.indexOf("function resolveConflictPending"));
+  const applyAt = fn.indexOf("applyDecisions(");
+  const stampAt = fn.indexOf("store.resolveConflictPending(");
+  assert.ok(applyAt !== -1, "resolveConflictPending must call applyDecisions");
+  assert.ok(stampAt !== -1, "resolveConflictPending must call store.resolveConflictPending");
+  assert.ok(stampAt > applyAt, "stamp must happen after applyDecisions — a failed disposition must not mark the conflict resolved");
+  assert.ok(fn.includes("if (failures.length)"), "apply failures must short-circuit before stamping");
+});
+
+test("listConflictQueue joins both sides and tolerates missing memories", () => {
+  const { store, service } = setup();
+  const a = store.save({ type: "decision", title: "现存方", content: "现存内容", importance: 4 });
+  const pending = store.saveConflictPending({ memory_a: a.id, memory_b: "ghost-id", reason: "对方已被删除" });
+  const queue = service.listConflictQueue();
+  assert.equal(queue.length, 1);
+  assert.equal(queue[0].id, pending.id);
+  assert.equal(queue[0].memory_a?.title, "现存方", "side A joined from the store");
+  assert.equal(queue[0].memory_a?.archived, false);
+  assert.equal(queue[0].memory_b?.missing, true, "ghost side marked missing");
+  assert.equal(queue[0].reason, "对方已被删除");
+});