@modusensus/dsh-mneme 0.2.8 → 0.2.9

package/README.md

@@ -5,7 +5,7 @@
 [![npm version](https://img.shields.io/npm/v/@modusensus/dsh-mneme?color=blue&label=npm)](https://www.npmjs.com/package/@modusensus/dsh-mneme)
 [![license](https://img.shields.io/badge/license-MIT-green)](LICENSE)
 [![Awesome](https://awesome-dsh-plugin.com/badge.svg)](https://github.com/awesome-dsh-plugin/awesome-dsh-plugin)
-[![tests](https://img.shields.io/badge/tests-263%20passed-success)](https://github.com/modusensus/dsh-mneme)
+[![tests](https://img.shields.io/badge/tests-355%20passed-success)](https://github.com/modusensus/dsh-mneme)
 
 > 给 DeepSeek Harness 的跨会话记忆插件：让 Agent 记住你、记住项目、自动整理记忆。**Mneme**（Μνήμη）——希腊记忆女神 Mnemosyne 之名，掌管记忆与梦境，正如 autoDream 在后台巩固记忆。
 
@@ -225,7 +225,7 @@ src/
 lib/
 ├── client.js         # Web 面板（手写 ModuleLoader bundle）
 └── *.js              # src 的同步分发产物
-test/                 # 263 个 node:test 测试（含审计与三轴线压测不变量）
+test/                 # 355 个 node:test 测试（含审计与三轴线压测不变量）
 scripts/              # e2e-dsh.js 端到端演示 · stress-dsh.js 三轴线压测 · sync-lib.js 同步
 ```
 
@@ -234,7 +234,7 @@ scripts/              # e2e-dsh.js 端到端演示 · stress-dsh.js 三轴线压
 ```bash
 cd dsh-mneme
 npm install        # 安装 peer 依赖（以 devDependencies 形式，用于本地测试）
-npm test           # 运行 263 个测试
+npm test           # 运行 355 个测试
 npm run stress     # 三轴线压测：长会话检索 / 冲突仲裁 / 多 Agent 并发（离线 mock LLM）
 npm run sync       # 把 src/ 同步到 lib/（发布时由 prepack 钩子自动执行）
 ```

package/lib/config.js

@@ -67,5 +67,12 @@ export const Config = z.object({
   reflectionUpdateEnabled: z.boolean().default(true),
   reflectionFailureTracking: z.boolean().default(true),
   reflectionUpdateMaxPerRun: z.natural().min(0).max(5).default(2),
-  reflectionUpdateMinAgeHours: z.natural().min(0).max(168).default(24)
+  reflectionUpdateMinAgeHours: z.natural().min(0).max(168).default(24),
+
+  // --- conflict freeze: manual review for conflicting memories (v0.2.1) ---
+  // Opt-in by default: when true, conflicting memories are not auto-merged
+  // and are marked as pending manual review instead.
+  conflictFreezeEnabled: z.boolean().default(false),
+  // Maximum number of frozen conflicts to keep pending for manual review.
+  conflictFreezeMaxPending: z.natural().min(1).max(1000).default(100),
 });

package/lib/dream.js

@@ -350,6 +350,10 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
     const route = resolveRoute(ctx, config, logger);
     const runId = randomUUID();
     const snapshotHash = hashSnapshot([...snapshot.values()]);
+    // Conflict freeze (opt-in): when enabled, conflict decisions are parked for
+    // manual review instead of auto-adjudicated. Read once up front so the
+    // prompt hint and the apply-split agree on the same gate.
+    const freezeEnabled = config.conflictFreezeEnabled === true;
     // Every exit (success or failure) funnels through `finish`, which writes
     // the audit row + receipt. A record failure is logged, never thrown —
     // auditing must not break the consolidation path. Failed runs still
@@ -440,6 +444,12 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       ).join("\n");
     }
 
+    // Freeze-aware prompt: in freeze mode the conflict branch still outputs
+    // winner/loser (validation requires them) but they are treated as tentative
+    // candidates — the human makes the final call, not the model.
+    const consolidationPrompt = freezeEnabled
+      ? CONSOLIDATION_PROMPT + `\n\n当前为「冲突冻结」模式：检测到内容矛盾的条目时，仍请输出 conflict，并以 winner/loser 作为候选、reason 说明理由；冲突不会被自动裁决，而会冻结待人工确认。`
+      : CONSOLIDATION_PROMPT;
     let decisionText;
     try {
       decisionText = await streamText(ctx, {
@@ -448,7 +458,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
         purpose: "compaction",
         maxTokens: config.dreamMaxTokens ?? 4096,
         messages: [
-          { role: "system", content: [{ type: "text", text: CONSOLIDATION_PROMPT }] },
+          { role: "system", content: [{ type: "text", text: consolidationPrompt }] },
           { role: "user", content: [{ type: "text", text: listText }] }
         ]
       });
@@ -492,10 +502,46 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       }
     }
 
+    // Conflict freeze (opt-in): when enabled, conflict decisions are not
+    // auto-adjudicated — no winner kept, no loser archived. The pair is parked
+    // in conflict_pending for human review instead. Best-effort: a store
+    // failure here must never block the run (fail-safe — the memories are left
+    // untouched and nothing is arbitrated). The cap (conflictFreezeMaxPending)
+    // bounds the review queue; overflow is skipped with a warning.
+    let frozenCount = 0;
+    const frozenIds = [];
+    const applyList = freezeEnabled ? decisions.filter((d) => d.action !== "conflict") : decisions;
+    if (freezeEnabled) {
+      const conflictsToFreeze = decisions.filter((d) => d.action === "conflict");
+      if (conflictsToFreeze.length > 0) {
+        try {
+          const maxPending = Number.isInteger(config.conflictFreezeMaxPending) ? config.conflictFreezeMaxPending : 100;
+          const pendingNow = service.countConflictPending();
+          const budget = Math.max(0, maxPending - pendingNow);
+          const toFreeze = conflictsToFreeze.slice(0, budget);
+          if (conflictsToFreeze.length > budget) {
+            logger?.warn?.(`dsh-mneme dream: conflict freeze queue full (${pendingNow}/${maxPending}), skipped ${conflictsToFreeze.length - budget} conflict(s)`);
+          }
+          for (const d of toFreeze) {
+            try {
+              service.saveConflictPending({ run_id: runId, memory_a: d.winner, memory_b: d.loser, reason: d.reason });
+              frozenCount++;
+              frozenIds.push(d.winner, d.loser);
+            } catch (error) {
+              logger?.warn?.(`dsh-mneme dream: failed to freeze conflict ${d.winner}/${d.loser}: ${String(error)}`);
+            }
+          }
+        } catch (error) {
+          logger?.warn?.(`dsh-mneme dream: conflict freeze lookup failed: ${String(error)}`);
+        }
+      }
+    }
+
     // CAS-guarded, per-decision-transactional apply against the run snapshot:
     // a target changed during the LLM call is skipped and reported as a
-    // conflict instead of being overwritten (item ①).
-    const { applied, conflicts, failures, committed } = applyDecisions(decisions, service, logger, snapshot);
+    // conflict instead of being overwritten (item ①). Frozen conflicts are
+    // excluded from this list (they are parked, not applied).
+    const { applied, conflicts, failures, committed } = applyDecisions(applyList, service, logger, snapshot);
     // Per-record receipt chain: one row per actually-committed merge/conflict/
     // update verdict, stamped with the decision-basis digest + idempotency
     // counters (count_before → count_after). Written here, before the run audit
@@ -521,18 +567,25 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
     // claim "merge-archived" (item ②). Conflicts/failures ride along so the
     // audit row records why the run diverged.
     const outcome = { ...buildOutcome(committed), conflicts, failures };
+    // Frozen conflicts were not adjudicated: mark both sides pending in the
+    // per-id outcome so the audit row shows they were parked, not skipped.
+    if (frozenIds.length) {
+      for (const id of frozenIds) outcome.byId[id] = "conflict-pending";
+    }
     // Decisions validated but not fully committed → reconcile (not ok).
     const partial = conflicts.length > 0 || failures.length > 0;
     // No decision landed (all-keep, or every decision skipped as an idempotent
     // replay) → nothing substantive changed. Distinct from a success: such a
     // run must never be reported as ok, or the audit claims work that never
     // happened and the scheduler refreshes the baseline on a false positive.
-    const noChange = applied === 0 && committed.every((c) => c.action === "keep");
+    // Frozen conflicts are substantive output (parked for review), so a run
+    // that only froze conflicts is not a noop.
+    const noChange = frozenCount === 0 && applied === 0 && committed.every((c) => c.action === "keep");
 
     // Keep the vector index consistent with the post-dream store state.
     if (semantic?.embedder && semantic?.vectorIndex) {
       try {
-        await maintainIndexAfterDream(decisions, service, semantic);
+        await maintainIndexAfterDream(applyList, service, semantic);
       } catch (error) {
         logger?.warn?.(`[dsh-mneme] dream index maintenance failed: ${String(error)}`);
       }
@@ -554,7 +607,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       });
     } catch (error) {
       logger?.warn?.(`dsh-mneme dream: summary llm call failed: ${String(error)}`);
-      return finish({ ok: false, error: "llm failed", applied, decisions: auditDecisions, outcome, summary: false });
+      return finish({ ok: false, error: "llm failed", applied, decisions: auditDecisions, outcome, frozen: frozenCount, summary: false });
     }
     let summaryStored = false;
     if (summaryText !== undefined && summaryText.trim()) {
@@ -601,6 +654,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       outcome,
       conflicts,
       failures,
+      frozen: frozenCount,
       summary: summaryStored
     });
   }

package/lib/service.js

@@ -479,6 +479,12 @@ export function createService({ store, mirror, config, onWrite }) {
     // audit write, never a write-hook-triggering memory mutation).
     saveReceipt: (r) => store.saveReceipt(r),
     getReceipt: (id) => store.getReceipt(id),
-    listReceipts: (opts) => store.listReceipts(opts)
+    listReceipts: (opts) => store.listReceipts(opts),
+    // Conflict freeze bookkeeping (same semantics as the audit passthroughs
+    // above: an audit write, never a write-hook-triggering memory mutation).
+    saveConflictPending: (r) => store.saveConflictPending(r),
+    listConflictPending: (opts) => store.listConflictPending(opts),
+    resolveConflictPending: (id, o) => store.resolveConflictPending(id, o),
+    countConflictPending: () => store.countConflictPending()
   };
 }

package/lib/store.js

@@ -100,6 +100,24 @@ CREATE TABLE IF NOT EXISTS receipt_chain (
 );
 CREATE INDEX IF NOT EXISTS idx_receipt_chain_record ON receipt_chain(record_id);
 CREATE INDEX IF NOT EXISTS idx_receipt_chain_run ON receipt_chain(run_id);
+
+-- conflict_pending: conflicts parked for manual review (conflict freeze mode,
+-- opt-in via config.conflictFreezeEnabled). When enabled, the dream layer does
+-- NOT auto-adjudicate winner/loser — the conflicting pair is parked here until
+-- a human reviews it. resolveConflictPending stamps resolved_at (plus the chosen
+-- winner) so the review action stays auditable. Like the other audit tables this
+-- is bookkeeping: it never triggers write hooks.
+CREATE TABLE IF NOT EXISTS conflict_pending (
+  id              TEXT PRIMARY KEY,
+  run_id          TEXT,
+  memory_a        TEXT NOT NULL,
+  memory_b        TEXT NOT NULL,
+  reason          TEXT,
+  created_at      TEXT NOT NULL,
+  resolved_at     TEXT,
+  resolved_winner TEXT
+);
+CREATE INDEX IF NOT EXISTS idx_conflict_pending_unresolved ON conflict_pending(resolved_at);
 `;
 
 const TYPES = new Set(["preference", "project", "decision", "history", "summary"]);
@@ -183,6 +201,20 @@ function toReceipt(row) {
   };
 }
 
+function toConflictPending(row) {
+  if (!row) return undefined;
+  return {
+    id: row.id,
+    run_id: row.run_id ?? undefined,
+    memory_a: row.memory_a,
+    memory_b: row.memory_b,
+    reason: row.reason ?? undefined,
+    created_at: row.created_at,
+    resolved_at: row.resolved_at ?? undefined,
+    resolved_winner: row.resolved_winner ?? undefined
+  };
+}
+
 function toRecallRun(row) {
   if (!row) return undefined;
   return {
@@ -702,6 +734,66 @@ export function createStore(path) {
     return db.prepare("DELETE FROM failure_memories WHERE created_at < ?").run(before).changes;
   }
 
+  // --- conflict freeze: pending manual review ------------------------------
+
+  /**
+   * Park a detected conflict for human review (conflict freeze mode). The pair
+   * order is normalized (sorted by id) so the same two memories are only ever
+   * pending once — a re-detection in a later dream run is a no-op, never a
+   * duplicate queue entry. Returns the pending row (freshly inserted, or the
+   * existing unresolved row when the pair is already pending).
+   */
+  function saveConflictPending({ run_id, memory_a, memory_b, reason }) {
+    const [a, b] = [memory_a, memory_b].sort();
+    const existing = db.prepare(
+      "SELECT * FROM conflict_pending WHERE memory_a = ? AND memory_b = ? AND resolved_at IS NULL LIMIT 1"
+    ).get(a, b);
+    if (existing) return toConflictPending(existing);
+    const id = randomUUID();
+    const now = nowIso();
+    db.prepare(
+      `INSERT INTO conflict_pending (id, run_id, memory_a, memory_b, reason, created_at)
+       VALUES (?, ?, ?, ?, ?, ?)`
+    ).run(id, run_id ?? null, a, b, reason ?? null, now);
+    return toConflictPending(db.prepare("SELECT * FROM conflict_pending WHERE id = ?").get(id));
+  }
+
+  /**
+   * List pending conflicts, newest first. Unresolved rows only by default;
+   * pass includeResolved to include resolved ones (audit view).
+   */
+  function listConflictPending({ limit = 50, offset = 0, includeResolved = false } = {}) {
+    const { limit: lim, offset: off } = sanitizePage(limit, offset, 50);
+    const clauses = [];
+    const params = [];
+    if (!includeResolved) clauses.push("resolved_at IS NULL");
+    const where = clauses.length ? `WHERE ${clauses.join(" AND ")}` : "";
+    const rows = db.prepare(
+      `SELECT * FROM conflict_pending ${where} ORDER BY created_at DESC, id LIMIT ? OFFSET ?`
+    ).all(...params, lim, off);
+    return rows.map(toConflictPending);
+  }
+
+  /**
+   * Mark a pending conflict as reviewed. winner (optional) records which side
+   * the human chose, keeping the resolution auditable. Returns the updated row,
+   * or undefined for an unknown id.
+   */
+  function resolveConflictPending(id, { winner } = {}) {
+    const row = db.prepare("SELECT * FROM conflict_pending WHERE id = ?").get(id);
+    if (!row) return undefined;
+    db.prepare("UPDATE conflict_pending SET resolved_at = ?, resolved_winner = ? WHERE id = ?")
+      .run(nowIso(), winner ?? null, id);
+    return toConflictPending(db.prepare("SELECT * FROM conflict_pending WHERE id = ?").get(id));
+  }
+
+  /** Number of unresolved (awaiting review) pending conflicts. */
+  function countConflictPending() {
+    return db.prepare(
+      "SELECT count(*) AS c FROM conflict_pending WHERE resolved_at IS NULL"
+    ).get().c;
+  }
+
   function getFailureStats({ since } = {}) {
     const clause = since ? "WHERE created_at >= ?" : "";
     const params = since ? [since] : [];
@@ -744,6 +836,10 @@ export function createStore(path) {
     listFailures,
     getFailureStats,
     deleteOldFailures,
+    saveConflictPending,
+    listConflictPending,
+    resolveConflictPending,
+    countConflictPending,
     close() {
       db.close();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@modusensus/dsh-mneme",
   "description": "Cross-session memory plugin for DeepSeek Harness with autoDream consolidation: SQLite store, Markdown mirrors, 6 model tools, automatic injection, session summarization, user profile/rules, custom slash commands, vector (semantic) search, and a Web GUI panel",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "license": "MIT",
   "type": "module",
   "main": "lib/index.js",

package/src/config.js

@@ -67,5 +67,12 @@ export const Config = z.object({
   reflectionUpdateEnabled: z.boolean().default(true),
   reflectionFailureTracking: z.boolean().default(true),
   reflectionUpdateMaxPerRun: z.natural().min(0).max(5).default(2),
-  reflectionUpdateMinAgeHours: z.natural().min(0).max(168).default(24)
+  reflectionUpdateMinAgeHours: z.natural().min(0).max(168).default(24),
+
+  // --- conflict freeze: manual review for conflicting memories (v0.2.1) ---
+  // Opt-in by default: when true, conflicting memories are not auto-merged
+  // and are marked as pending manual review instead.
+  conflictFreezeEnabled: z.boolean().default(false),
+  // Maximum number of frozen conflicts to keep pending for manual review.
+  conflictFreezeMaxPending: z.natural().min(1).max(1000).default(100),
 });

package/src/dream.js

@@ -350,6 +350,10 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
     const route = resolveRoute(ctx, config, logger);
     const runId = randomUUID();
     const snapshotHash = hashSnapshot([...snapshot.values()]);
+    // Conflict freeze (opt-in): when enabled, conflict decisions are parked for
+    // manual review instead of auto-adjudicated. Read once up front so the
+    // prompt hint and the apply-split agree on the same gate.
+    const freezeEnabled = config.conflictFreezeEnabled === true;
     // Every exit (success or failure) funnels through `finish`, which writes
     // the audit row + receipt. A record failure is logged, never thrown —
     // auditing must not break the consolidation path. Failed runs still
@@ -440,6 +444,12 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       ).join("\n");
     }
 
+    // Freeze-aware prompt: in freeze mode the conflict branch still outputs
+    // winner/loser (validation requires them) but they are treated as tentative
+    // candidates — the human makes the final call, not the model.
+    const consolidationPrompt = freezeEnabled
+      ? CONSOLIDATION_PROMPT + `\n\n当前为「冲突冻结」模式：检测到内容矛盾的条目时，仍请输出 conflict，并以 winner/loser 作为候选、reason 说明理由；冲突不会被自动裁决，而会冻结待人工确认。`
+      : CONSOLIDATION_PROMPT;
     let decisionText;
     try {
       decisionText = await streamText(ctx, {
@@ -448,7 +458,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
         purpose: "compaction",
         maxTokens: config.dreamMaxTokens ?? 4096,
         messages: [
-          { role: "system", content: [{ type: "text", text: CONSOLIDATION_PROMPT }] },
+          { role: "system", content: [{ type: "text", text: consolidationPrompt }] },
           { role: "user", content: [{ type: "text", text: listText }] }
         ]
       });
@@ -492,10 +502,46 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       }
     }
 
+    // Conflict freeze (opt-in): when enabled, conflict decisions are not
+    // auto-adjudicated — no winner kept, no loser archived. The pair is parked
+    // in conflict_pending for human review instead. Best-effort: a store
+    // failure here must never block the run (fail-safe — the memories are left
+    // untouched and nothing is arbitrated). The cap (conflictFreezeMaxPending)
+    // bounds the review queue; overflow is skipped with a warning.
+    let frozenCount = 0;
+    const frozenIds = [];
+    const applyList = freezeEnabled ? decisions.filter((d) => d.action !== "conflict") : decisions;
+    if (freezeEnabled) {
+      const conflictsToFreeze = decisions.filter((d) => d.action === "conflict");
+      if (conflictsToFreeze.length > 0) {
+        try {
+          const maxPending = Number.isInteger(config.conflictFreezeMaxPending) ? config.conflictFreezeMaxPending : 100;
+          const pendingNow = service.countConflictPending();
+          const budget = Math.max(0, maxPending - pendingNow);
+          const toFreeze = conflictsToFreeze.slice(0, budget);
+          if (conflictsToFreeze.length > budget) {
+            logger?.warn?.(`dsh-mneme dream: conflict freeze queue full (${pendingNow}/${maxPending}), skipped ${conflictsToFreeze.length - budget} conflict(s)`);
+          }
+          for (const d of toFreeze) {
+            try {
+              service.saveConflictPending({ run_id: runId, memory_a: d.winner, memory_b: d.loser, reason: d.reason });
+              frozenCount++;
+              frozenIds.push(d.winner, d.loser);
+            } catch (error) {
+              logger?.warn?.(`dsh-mneme dream: failed to freeze conflict ${d.winner}/${d.loser}: ${String(error)}`);
+            }
+          }
+        } catch (error) {
+          logger?.warn?.(`dsh-mneme dream: conflict freeze lookup failed: ${String(error)}`);
+        }
+      }
+    }
+
     // CAS-guarded, per-decision-transactional apply against the run snapshot:
     // a target changed during the LLM call is skipped and reported as a
-    // conflict instead of being overwritten (item ①).
-    const { applied, conflicts, failures, committed } = applyDecisions(decisions, service, logger, snapshot);
+    // conflict instead of being overwritten (item ①). Frozen conflicts are
+    // excluded from this list (they are parked, not applied).
+    const { applied, conflicts, failures, committed } = applyDecisions(applyList, service, logger, snapshot);
     // Per-record receipt chain: one row per actually-committed merge/conflict/
     // update verdict, stamped with the decision-basis digest + idempotency
     // counters (count_before → count_after). Written here, before the run audit
@@ -521,18 +567,25 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
     // claim "merge-archived" (item ②). Conflicts/failures ride along so the
     // audit row records why the run diverged.
     const outcome = { ...buildOutcome(committed), conflicts, failures };
+    // Frozen conflicts were not adjudicated: mark both sides pending in the
+    // per-id outcome so the audit row shows they were parked, not skipped.
+    if (frozenIds.length) {
+      for (const id of frozenIds) outcome.byId[id] = "conflict-pending";
+    }
     // Decisions validated but not fully committed → reconcile (not ok).
     const partial = conflicts.length > 0 || failures.length > 0;
     // No decision landed (all-keep, or every decision skipped as an idempotent
     // replay) → nothing substantive changed. Distinct from a success: such a
     // run must never be reported as ok, or the audit claims work that never
     // happened and the scheduler refreshes the baseline on a false positive.
-    const noChange = applied === 0 && committed.every((c) => c.action === "keep");
+    // Frozen conflicts are substantive output (parked for review), so a run
+    // that only froze conflicts is not a noop.
+    const noChange = frozenCount === 0 && applied === 0 && committed.every((c) => c.action === "keep");
 
     // Keep the vector index consistent with the post-dream store state.
     if (semantic?.embedder && semantic?.vectorIndex) {
       try {
-        await maintainIndexAfterDream(decisions, service, semantic);
+        await maintainIndexAfterDream(applyList, service, semantic);
       } catch (error) {
         logger?.warn?.(`[dsh-mneme] dream index maintenance failed: ${String(error)}`);
       }
@@ -554,7 +607,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       });
     } catch (error) {
       logger?.warn?.(`dsh-mneme dream: summary llm call failed: ${String(error)}`);
-      return finish({ ok: false, error: "llm failed", applied, decisions: auditDecisions, outcome, summary: false });
+      return finish({ ok: false, error: "llm failed", applied, decisions: auditDecisions, outcome, frozen: frozenCount, summary: false });
     }
     let summaryStored = false;
     if (summaryText !== undefined && summaryText.trim()) {
@@ -601,6 +654,7 @@ export function createDreamScheduler({ onRun, thresholdCount = 10, thresholdChar
       outcome,
       conflicts,
       failures,
+      frozen: frozenCount,
       summary: summaryStored
     });
   }

package/src/service.js

@@ -479,6 +479,12 @@ export function createService({ store, mirror, config, onWrite }) {
     // audit write, never a write-hook-triggering memory mutation).
     saveReceipt: (r) => store.saveReceipt(r),
     getReceipt: (id) => store.getReceipt(id),
-    listReceipts: (opts) => store.listReceipts(opts)
+    listReceipts: (opts) => store.listReceipts(opts),
+    // Conflict freeze bookkeeping (same semantics as the audit passthroughs
+    // above: an audit write, never a write-hook-triggering memory mutation).
+    saveConflictPending: (r) => store.saveConflictPending(r),
+    listConflictPending: (opts) => store.listConflictPending(opts),
+    resolveConflictPending: (id, o) => store.resolveConflictPending(id, o),
+    countConflictPending: () => store.countConflictPending()
   };
 }

package/src/store.js

@@ -100,6 +100,24 @@ CREATE TABLE IF NOT EXISTS receipt_chain (
 );
 CREATE INDEX IF NOT EXISTS idx_receipt_chain_record ON receipt_chain(record_id);
 CREATE INDEX IF NOT EXISTS idx_receipt_chain_run ON receipt_chain(run_id);
+
+-- conflict_pending: conflicts parked for manual review (conflict freeze mode,
+-- opt-in via config.conflictFreezeEnabled). When enabled, the dream layer does
+-- NOT auto-adjudicate winner/loser — the conflicting pair is parked here until
+-- a human reviews it. resolveConflictPending stamps resolved_at (plus the chosen
+-- winner) so the review action stays auditable. Like the other audit tables this
+-- is bookkeeping: it never triggers write hooks.
+CREATE TABLE IF NOT EXISTS conflict_pending (
+  id              TEXT PRIMARY KEY,
+  run_id          TEXT,
+  memory_a        TEXT NOT NULL,
+  memory_b        TEXT NOT NULL,
+  reason          TEXT,
+  created_at      TEXT NOT NULL,
+  resolved_at     TEXT,
+  resolved_winner TEXT
+);
+CREATE INDEX IF NOT EXISTS idx_conflict_pending_unresolved ON conflict_pending(resolved_at);
 `;
 
 const TYPES = new Set(["preference", "project", "decision", "history", "summary"]);
@@ -183,6 +201,20 @@ function toReceipt(row) {
   };
 }
 
+function toConflictPending(row) {
+  if (!row) return undefined;
+  return {
+    id: row.id,
+    run_id: row.run_id ?? undefined,
+    memory_a: row.memory_a,
+    memory_b: row.memory_b,
+    reason: row.reason ?? undefined,
+    created_at: row.created_at,
+    resolved_at: row.resolved_at ?? undefined,
+    resolved_winner: row.resolved_winner ?? undefined
+  };
+}
+
 function toRecallRun(row) {
   if (!row) return undefined;
   return {
@@ -702,6 +734,66 @@ export function createStore(path) {
     return db.prepare("DELETE FROM failure_memories WHERE created_at < ?").run(before).changes;
   }
 
+  // --- conflict freeze: pending manual review ------------------------------
+
+  /**
+   * Park a detected conflict for human review (conflict freeze mode). The pair
+   * order is normalized (sorted by id) so the same two memories are only ever
+   * pending once — a re-detection in a later dream run is a no-op, never a
+   * duplicate queue entry. Returns the pending row (freshly inserted, or the
+   * existing unresolved row when the pair is already pending).
+   */
+  function saveConflictPending({ run_id, memory_a, memory_b, reason }) {
+    const [a, b] = [memory_a, memory_b].sort();
+    const existing = db.prepare(
+      "SELECT * FROM conflict_pending WHERE memory_a = ? AND memory_b = ? AND resolved_at IS NULL LIMIT 1"
+    ).get(a, b);
+    if (existing) return toConflictPending(existing);
+    const id = randomUUID();
+    const now = nowIso();
+    db.prepare(
+      `INSERT INTO conflict_pending (id, run_id, memory_a, memory_b, reason, created_at)
+       VALUES (?, ?, ?, ?, ?, ?)`
+    ).run(id, run_id ?? null, a, b, reason ?? null, now);
+    return toConflictPending(db.prepare("SELECT * FROM conflict_pending WHERE id = ?").get(id));
+  }
+
+  /**
+   * List pending conflicts, newest first. Unresolved rows only by default;
+   * pass includeResolved to include resolved ones (audit view).
+   */
+  function listConflictPending({ limit = 50, offset = 0, includeResolved = false } = {}) {
+    const { limit: lim, offset: off } = sanitizePage(limit, offset, 50);
+    const clauses = [];
+    const params = [];
+    if (!includeResolved) clauses.push("resolved_at IS NULL");
+    const where = clauses.length ? `WHERE ${clauses.join(" AND ")}` : "";
+    const rows = db.prepare(
+      `SELECT * FROM conflict_pending ${where} ORDER BY created_at DESC, id LIMIT ? OFFSET ?`
+    ).all(...params, lim, off);
+    return rows.map(toConflictPending);
+  }
+
+  /**
+   * Mark a pending conflict as reviewed. winner (optional) records which side
+   * the human chose, keeping the resolution auditable. Returns the updated row,
+   * or undefined for an unknown id.
+   */
+  function resolveConflictPending(id, { winner } = {}) {
+    const row = db.prepare("SELECT * FROM conflict_pending WHERE id = ?").get(id);
+    if (!row) return undefined;
+    db.prepare("UPDATE conflict_pending SET resolved_at = ?, resolved_winner = ? WHERE id = ?")
+      .run(nowIso(), winner ?? null, id);
+    return toConflictPending(db.prepare("SELECT * FROM conflict_pending WHERE id = ?").get(id));
+  }
+
+  /** Number of unresolved (awaiting review) pending conflicts. */
+  function countConflictPending() {
+    return db.prepare(
+      "SELECT count(*) AS c FROM conflict_pending WHERE resolved_at IS NULL"
+    ).get().c;
+  }
+
   function getFailureStats({ since } = {}) {
     const clause = since ? "WHERE created_at >= ?" : "";
     const params = since ? [since] : [];
@@ -744,6 +836,10 @@ export function createStore(path) {
     listFailures,
     getFailureStats,
     deleteOldFailures,
+    saveConflictPending,
+    listConflictPending,
+    resolveConflictPending,
+    countConflictPending,
     close() {
       db.close();
     }

package/test/conflict-freeze.test.js

@@ -0,0 +1,290 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { Config } from "../src/config.js";
+import { createStore } from "../src/store.js";
+import { createService } from "../src/service.js";
+import { createDreamScheduler } from "../src/dream.js";
+
+// ---------------------------------------------------------------------------
+// conflict freeze (冲突冻结) — 测试用例由 Kimi K2.7 设计，覆盖 config/store/
+// service/dream 单测 + runDream 端到端（mock LLM 输出 conflict）。
+// 核心约定：freeze 默认关闭（自动裁决行为完全不变）；开启后 conflict 不自动
+// 裁决、存入 conflict_pending 待人工确认，outcome 标 conflict-pending。
+// ---------------------------------------------------------------------------
+
+// ---------------------------------------------------------------- config
+
+test("config: conflictFreezeEnabled 默认关闭", () => {
+  const cfg = Config({});
+  assert.equal(cfg.conflictFreezeEnabled, false, "freeze 默认不开启");
+});
+
+test("config: conflictFreezeEnabled 可显式开启", () => {
+  const cfg = Config({ conflictFreezeEnabled: true });
+  assert.equal(cfg.conflictFreezeEnabled, true);
+});
+
+test("config: conflictFreezeMaxPending 默认为 100 且为整数", () => {
+  const cfg = Config({});
+  assert.equal(cfg.conflictFreezeMaxPending, 100);
+  assert.ok(Number.isInteger(cfg.conflictFreezeMaxPending));
+});
+
+test("config: conflictFreezeMaxPending 可显式覆盖", () => {
+  const cfg = Config({ conflictFreezeMaxPending: 5 });
+  assert.equal(cfg.conflictFreezeMaxPending, 5);
+});
+
+test("config: freeze 配置项不影响其它字段", () => {
+  const base = Config({});
+  const tuned = Config({ conflictFreezeEnabled: true, conflictFreezeMaxPending: 7 });
+  assert.equal(tuned.rerankEnabled, base.rerankEnabled, "rerank 不受影响");
+  assert.equal(tuned.autoDream, base.autoDream, "autoDream 不受影响");
+});
+
+// ---------------------------------------------------------------- store
+
+function openStore() {
+  return createStore(":memory:");
+}
+
+test("store: saveConflictPending 插入后 listConflictPending 读回", () => {
+  const store = openStore();
+  const pending = store.saveConflictPending({ run_id: "run-1", memory_a: "a", memory_b: "b", reason: "日期矛盾" });
+  assert.ok(pending.id, "有 id");
+  assert.equal(pending.run_id, "run-1");
+  assert.equal(pending.reason, "日期矛盾");
+  assert.ok(pending.created_at, "有 created_at");
+  assert.equal(pending.resolved_at, undefined, "未决行没有 resolved_at");
+
+  const list = store.listConflictPending();
+  assert.equal(list.length, 1);
+  assert.ok([list[0].memory_a, list[0].memory_b].includes("a"), "pair 包含双方");
+  assert.ok([list[0].memory_a, list[0].memory_b].includes("b"));
+  store.close();
+});
+
+test("store: 对序归一化去重 —— 同一对不管顺序只存一次", () => {
+  const store = openStore();
+  const p1 = store.saveConflictPending({ memory_a: "a", memory_b: "b", reason: "r1" });
+  const p2 = store.saveConflictPending({ memory_a: "b", memory_b: "a", reason: "r2" });
+  assert.equal(p2.id, p1.id, "反序重报返回同一条 pending");
+  assert.equal(p2.reason, "r1", "保留首次 reason");
+  assert.equal(store.countConflictPending(), 1, "绝不重复入队");
+  store.close();
+});
+
+test("store: 不同对不去重", () => {
+  const store = openStore();
+  store.saveConflictPending({ memory_a: "a", memory_b: "b", reason: "ab" });
+  store.saveConflictPending({ memory_a: "a", memory_b: "c", reason: "ac" });
+  assert.equal(store.countConflictPending(), 2);
+  store.close();
+});
+
+test("store: resolveConflictPending 标 resolved + winner，默认列表不再返回", () => {
+  const store = openStore();
+  const pending = store.saveConflictPending({ memory_a: "a", memory_b: "b", reason: "r" });
+  const resolved = store.resolveConflictPending(pending.id, { winner: "a" });
+  assert.ok(resolved.resolved_at, "resolved_at 已盖章");
+  assert.equal(resolved.resolved_winner, "a");
+  assert.equal(store.listConflictPending().length, 0, "已解决默认排除");
+  const all = store.listConflictPending({ includeResolved: true });
+  assert.equal(all.length, 1, "includeResolved 可见");
+  assert.equal(all[0].resolved_winner, "a");
+  store.close();
+});
+
+test("store: resolveConflictPending 未知 id 返回 undefined", () => {
+  const store = openStore();
+  assert.equal(store.resolveConflictPending("ghost"), undefined);
+  store.close();
+});
+
+test("store: countConflictPending 只统计未决行", () => {
+  const store = openStore();
+  store.saveConflictPending({ memory_a: "a", memory_b: "b", reason: "ab" });
+  const p2 = store.saveConflictPending({ memory_a: "b", memory_b: "c", reason: "bc" });
+  assert.equal(store.countConflictPending(), 2);
+  store.resolveConflictPending(p2.id, { winner: "b" });
+  assert.equal(store.countConflictPending(), 1, "已解决不再计入");
+  store.close();
+});
+
+test("store: 已解决的同一对后续可再次 pending", () => {
+  const store = openStore();
+  const p1 = store.saveConflictPending({ memory_a: "a", memory_b: "b", reason: "r" });
+  store.resolveConflictPending(p1.id, { winner: "a" });
+  // 去重只看未决行 —— 已解决后再现同一对应产生新 pending
+  const p2 = store.saveConflictPending({ memory_a: "b", memory_b: "a", reason: "again" });
+  assert.notEqual(p2.id, p1.id, "已解决行不参与去重");
+  assert.equal(p2.resolved_at, undefined);
+  assert.equal(store.countConflictPending(), 1);
+  store.close();
+});
+
+// ---------------------------------------------------------------- service passthrough
+
+function openService() {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config: {} });
+  return { store, service };
+}
+
+test("service: 4 个 conflict freeze passthrough 委托到 store", () => {
+  const { store, service } = openService();
+  const saved = service.saveConflictPending({ run_id: "run-1", memory_a: "a", memory_b: "b", reason: "r" });
+  assert.equal(store.countConflictPending(), 1, "save 落到 store");
+  assert.equal(service.countConflictPending(), 1, "count 读回一致");
+  assert.equal(service.listConflictPending().length, 1, "list 读回一致");
+  const resolved = service.resolveConflictPending(saved.id, { winner: "a" });
+  assert.ok(resolved.resolved_at, "resolve 落到 store");
+  assert.equal(service.listConflictPending().length, 0, "已解决从默认列表消失");
+  store.close();
+});
+
+test("service: passthrough 透传 store 异常", () => {
+  const { store, service } = openService();
+  const original = store.countConflictPending;
+  store.countConflictPending = () => { throw new Error("db boom"); };
+  assert.throws(() => service.countConflictPending(), /db boom/);
+  store.countConflictPending = original;
+  store.close();
+});
+
+// ---------------------------------------------------------------- dream: runDream 端到端
+
+function dreamSetup() {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config: {} });
+  return { store, service };
+}
+
+// mock LLM：第一次调用返回 consolidation decisions，第二次返回 summary。
+function freezeCtx({ conflicts, includes = [], summaryText = "记忆库总览摘要" }) {
+  let calls = 0;
+  const warnings = [];
+  const ctx = {
+    warnings,
+    llm: {
+      stream: async function* () {
+        calls++;
+        const list = [...includes, ...conflicts];
+        yield { type: "text-delta", text: calls === 1 ? JSON.stringify(list) : summaryText };
+        yield { type: "finish", reason: { kind: "ok" } };
+      }
+    },
+    logger: { warn: (m) => warnings.push(m) }
+  };
+  return ctx;
+}
+
+const BASE_CONFIG = { dreamProvider: "deepseek", dreamModel: "deepseek-chat" };
+
+test("dream: freeze=false（默认）conflict 仍自动裁决（回归）", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "日期更新" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, BASE_CONFIG);
+  assert.equal(result.ok, true);
+  assert.equal(result.applied, 1, "conflict 被自动裁决");
+  assert.equal(result.frozen, 0, "无冻结");
+  assert.equal(store.getById(l.id).archived, true, "loser 被归档");
+  assert.ok(store.getById(w.id).content.includes("已否决旧信息"), "winner 附带来源批注");
+  assert.equal(store.listConflictPending().length, 0, "freeze 关闭不产生 pending");
+  store.close();
+});
+
+test("dream: freeze=true conflict 不自动裁决、存入 pending、outcome 标 conflict-pending", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "日期更新，候选取新" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, { ...BASE_CONFIG, conflictFreezeEnabled: true });
+  assert.equal(result.ok, true);
+  assert.equal(result.applied, 0, "conflict 未被应用");
+  assert.equal(result.frozen, 1, "1 个 conflict 被冻结");
+  const pending = store.listConflictPending();
+  assert.equal(pending.length, 1, "pending 记录写入");
+  assert.equal(pending[0].reason, "日期更新，候选取新");
+  assert.equal(store.getById(l.id).archived, false, "loser 未归档");
+  assert.equal(store.getById(w.id).archived, false, "winner 未归档");
+  assert.ok(!store.getById(w.id).content.includes("已否决旧信息"), "无来源批注");
+  const run = store.listDreamRuns()[0];
+  assert.equal(run.outcome.byId[w.id], "conflict-pending", "audit outcome 标记双方 pending");
+  assert.equal(run.outcome.byId[l.id], "conflict-pending");
+  assert.equal(store.listReceipts().length, 0, "冻结 conflict 不写 per-record 收据");
+  store.close();
+});
+
+test("dream: freeze=true 非 conflict 决策照常执行，仅 conflict 冻结", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: a } = service.saveWithDedupe({ type: "project", title: "插件", content: "旧", importance: 3 });
+  const { memory: b } = service.saveWithDedupe({ type: "project", title: "插件2", content: "新细节", importance: 4 });
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({
+    includes: [{ action: "merge", ids: [a.id, b.id], title: "插件总览", content: "合并内容", importance: 5, keepSource: b.id }],
+    conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "日期更新" }]
+  });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, { ...BASE_CONFIG, conflictFreezeEnabled: true });
+  assert.equal(result.applied, 1, "merge 正常应用");
+  assert.equal(result.frozen, 1, "conflict 被冻结");
+  assert.equal(store.getById(b.id).title, "插件总览", "merge keeper 已更新");
+  assert.equal(store.getById(a.id).archived, true, "merge 源已归档");
+  assert.equal(store.getById(l.id).archived, false, "conflict loser 未被本次运行触碰");
+  assert.equal(store.listConflictPending().length, 1);
+  store.close();
+});
+
+test("dream: freeze=true 超过 conflictFreezeMaxPending 上限跳过（不抛错）", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "x" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, {
+    ...BASE_CONFIG, conflictFreezeEnabled: true, conflictFreezeMaxPending: 0
+  });
+  assert.equal(result.frozen, 0, "容量 0 时无冻结");
+  assert.equal(store.listConflictPending().length, 0, "无 pending 写入");
+  assert.ok(ctx.warnings.some((m) => m.includes("freeze queue full")), "超限警告已记录");
+  store.close();
+});
+
+test("dream: freeze=true 存 pending 失败 fail-safe 不阻断 run", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  service.saveConflictPending = () => { throw new Error("pending store boom"); };
+  service.countConflictPending = () => { throw new Error("count boom"); };
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "x" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, { ...BASE_CONFIG, conflictFreezeEnabled: true });
+  assert.equal(result.ok, true, "尽管 pending 存储失败，run 正常完成");
+  assert.equal(result.frozen, 0, "无冻结");
+  assert.ok(ctx.warnings.length >= 1, "freeze 失败已记录");
+  assert.equal(store.getById(l.id).archived, false, "记忆无副作用");
+  assert.equal(store.getById(w.id).content, "8月20日", "winner 未被改动");
+  store.close();
+});
+
+test("dream: freeze=true 同一对跨 run 去重 —— 只保留一条 pending", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "日期矛盾" }] });
+  const r1 = await dream.runDream(ctx, service, { ...BASE_CONFIG, conflictFreezeEnabled: true });
+  // mock LLM 计数器按 run 重置：每次 runDream 用独立的 ctx
+  const ctx2 = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "日期矛盾" }] });
+  const r2 = await dream.runDream(ctx2, service, { ...BASE_CONFIG, conflictFreezeEnabled: true });
+  assert.equal(r1.frozen, 1);
+  assert.equal(r2.frozen, 1, "每次 run 都检出并上报该对");
+  assert.equal(store.countConflictPending(), 1, "但队列只有一条 pending");
+  store.close();
+});

package/test/dream.test.js

@@ -545,3 +545,129 @@ test("applyDecisions merge is atomic: a throwing archive step rolls back the kee
   assert.ok(warnings.length >= 1, "failure logged");
   store.close();
 });
+
+// --- conflict freeze: manual review instead of auto-adjudication ----------
+
+function freezeCtx({ conflicts, includes = [], summaryText = "记忆库总览摘要" }) {
+  let calls = 0;
+  const warnings = [];
+  const ctx = {
+    warnings,
+    llm: {
+      stream: async function* () {
+        calls++;
+        const list = [...includes, ...conflicts];
+        yield { type: "text-delta", text: calls === 1 ? JSON.stringify(list) : summaryText };
+        yield { type: "finish", reason: { kind: "ok" } };
+      }
+    },
+    logger: { warn: (m) => warnings.push(m) }
+  };
+  return ctx;
+}
+
+test("runDream with conflictFreezeEnabled parks conflicts instead of adjudicating", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "日期更新，候选取新" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, {
+    dreamProvider: "deepseek", dreamModel: "deepseek-chat", conflictFreezeEnabled: true
+  });
+  assert.equal(result.ok, true);
+  assert.equal(result.applied, 0, "no conflict applied");
+  assert.equal(result.frozen, 1, "one conflict frozen");
+  // pending row recorded for human review
+  const pending = store.listConflictPending();
+  assert.equal(pending.length, 1);
+  assert.equal(pending[0].reason, "日期更新，候选取新");
+  // neither side was auto-adjudicated
+  assert.equal(store.getById(l.id).archived, false, "loser NOT archived");
+  assert.equal(store.getById(w.id).archived, false, "winner NOT archived");
+  assert.ok(!store.getById(w.id).content.includes("已否决旧信息"), "no provenance note appended");
+  // audit outcome marks both sides pending
+  const run = store.listDreamRuns()[0];
+  assert.equal(run.outcome.byId[w.id], "conflict-pending");
+  assert.equal(run.outcome.byId[l.id], "conflict-pending");
+  assert.equal(run.status, "ok", "summary stored + freeze landed → ok");
+  assert.equal(store.listReceipts().length, 0, "no conflict receipt for a frozen (unapplied) conflict");
+  store.close();
+});
+
+test("runDream freeze keeps auto-adjudication when disabled (default)", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "更新" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, { dreamProvider: "deepseek", dreamModel: "deepseek-chat" });
+  assert.equal(result.ok, true);
+  assert.equal(result.applied, 1, "conflict auto-adjudicated when freeze is off");
+  assert.equal(result.frozen, 0);
+  assert.equal(store.getById(l.id).archived, true, "loser archived");
+  assert.ok(store.getById(w.id).content.includes("已否决旧信息"), "provenance note appended");
+  assert.equal(store.listConflictPending().length, 0, "no pending rows in auto mode");
+  store.close();
+});
+
+test("runDream freeze applies non-conflict decisions while parking conflicts", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: a } = service.saveWithDedupe({ type: "project", title: "插件", content: "旧", importance: 3 });
+  const { memory: b } = service.saveWithDedupe({ type: "project", title: "插件2", content: "新细节", importance: 4 });
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({
+    includes: [{ action: "merge", ids: [a.id, b.id], title: "插件总览", content: "合并内容", importance: 5, keepSource: b.id }],
+    conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "日期更新" }]
+  });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, {
+    dreamProvider: "deepseek", dreamModel: "deepseek-chat", conflictFreezeEnabled: true
+  });
+  assert.equal(result.ok, true);
+  assert.equal(result.applied, 1, "merge applied normally");
+  assert.equal(result.frozen, 1, "conflict frozen");
+  assert.equal(store.getById(b.id).title, "插件总览", "merge keeper updated");
+  assert.equal(store.getById(a.id).archived, true, "merge source archived");
+  assert.equal(store.getById(l.id).archived, false, "conflict loser untouched by the merge run");
+  const pending = store.listConflictPending();
+  assert.equal(pending.length, 1);
+  assert.ok(pending[0].reason.includes("日期更新"));
+  store.close();
+});
+
+test("runDream freeze respects conflictFreezeMaxPending cap and skips overflow", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "x" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, {
+    dreamProvider: "deepseek", dreamModel: "deepseek-chat",
+    conflictFreezeEnabled: true, conflictFreezeMaxPending: 0
+  });
+  assert.equal(result.frozen, 0, "nothing frozen at capacity");
+  assert.equal(store.listConflictPending().length, 0, "no pending rows");
+  assert.ok(ctx.warnings.some((m) => m.includes("freeze queue full")), "capacity warning logged");
+  store.close();
+});
+
+test("runDream freeze store failure never blocks the run (fail-safe)", async () => {
+  const { store, service } = dreamSetup();
+  const { memory: w } = service.saveWithDedupe({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const { memory: l } = service.saveWithDedupe({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  service.saveConflictPending = () => { throw new Error("pending store boom"); };
+  service.countConflictPending = () => { throw new Error("count boom"); };
+  const ctx = freezeCtx({ conflicts: [{ action: "conflict", winner: w.id, loser: l.id, reason: "x" }] });
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, {
+    dreamProvider: "deepseek", dreamModel: "deepseek-chat", conflictFreezeEnabled: true
+  });
+  assert.equal(result.ok, true, "run completes despite freeze store failure");
+  assert.equal(result.frozen, 0, "nothing frozen");
+  assert.ok(ctx.warnings.length >= 1, "freeze failure logged");
+  assert.equal(store.getById(l.id).archived, false, "no side effects on memories");
+  assert.equal(store.getById(w.id).content, "8月20日", "winner untouched");
+  store.close();
+});

package/test/store.test.js

@@ -291,3 +291,70 @@ test("compareAndUpdate on unknown id throws like update", () => {
   assert.throws(() => store.compareAndUpdate("ghost", "any", { content: "x" }), /not found/);
   store.close();
 });
+
+// --- conflict freeze: pending manual review -------------------------------
+
+test("saveConflictPending inserts and listConflictPending excludes resolved by default", () => {
+  const store = openMemory();
+  const a = store.save({ type: "decision", title: "截止", content: "8月20日", importance: 4 });
+  const b = store.save({ type: "decision", title: "截止旧", content: "8月15日", importance: 4 });
+  const pending = store.saveConflictPending({ run_id: "run-1", memory_a: a.id, memory_b: b.id, reason: "日期更新" });
+  assert.ok(pending.id, "has id");
+  assert.equal(pending.run_id, "run-1");
+  assert.equal(pending.reason, "日期更新");
+  assert.ok(pending.created_at);
+  assert.equal(pending.resolved_at, undefined);
+
+  const list = store.listConflictPending();
+  assert.equal(list.length, 1);
+  assert.ok([list[0].memory_a, list[0].memory_b].includes(a.id), "pair holds both sides");
+  assert.ok([list[0].memory_a, list[0].memory_b].includes(b.id));
+
+  const resolved = store.resolveConflictPending(pending.id, { winner: a.id });
+  assert.ok(resolved.resolved_at, "resolution stamped");
+  assert.equal(resolved.resolved_winner, a.id);
+  assert.equal(store.listConflictPending().length, 0, "resolved excluded by default");
+  const all = store.listConflictPending({ includeResolved: true });
+  assert.equal(all.length, 1, "resolved visible with includeResolved");
+  assert.equal(all[0].resolved_winner, a.id);
+  store.close();
+});
+
+test("saveConflictPending dedupes the same pair regardless of order", () => {
+  const store = openMemory();
+  const a = store.save({ type: "decision", title: "截止", content: "x" });
+  const b = store.save({ type: "decision", title: "截止2", content: "y" });
+  const p1 = store.saveConflictPending({ memory_a: a.id, memory_b: b.id, reason: "r1" });
+  const p2 = store.saveConflictPending({ memory_a: b.id, memory_b: a.id, reason: "r2" });
+  assert.equal(p2.id, p1.id, "same pair re-detected returns the existing pending row");
+  assert.equal(p2.reason, "r1", "original reason preserved");
+  assert.equal(store.listConflictPending().length, 1, "never a duplicate queue entry");
+  store.close();
+});
+
+test("countConflictPending counts unresolved rows only; resolve unknown id is undefined", () => {
+  const store = openMemory();
+  const a = store.save({ type: "decision", title: "a", content: "x" });
+  const b = store.save({ type: "decision", title: "b", content: "y" });
+  const c = store.save({ type: "decision", title: "c", content: "z" });
+  store.saveConflictPending({ memory_a: a.id, memory_b: b.id, reason: "ab" });
+  const p2 = store.saveConflictPending({ memory_a: b.id, memory_b: c.id, reason: "bc" });
+  assert.equal(store.countConflictPending(), 2);
+  store.resolveConflictPending(p2.id, { winner: b.id });
+  assert.equal(store.countConflictPending(), 1, "resolved no longer pending");
+  assert.equal(store.resolveConflictPending("ghost"), undefined, "unknown id resolves to undefined");
+  store.close();
+});
+
+test("conflict_pending table persists across store reopen", () => {
+  const dir = mkdtempSync(join(tmpdir(), "dsh-mneme-conflict-"));
+  const path = join(dir, "memory.db");
+  const s1 = createStore(path);
+  s1.saveConflictPending({ run_id: "run-1", memory_a: "ma", memory_b: "mb", reason: "x" });
+  s1.close();
+  const s2 = createStore(path);
+  const pending = s2.listConflictPending();
+  assert.equal(pending.length, 1);
+  assert.equal(pending[0].reason, "x");
+  s2.close();
+});