@modusensus/dsh-mneme 0.8.0 → 0.8.1

package/src/version-check.js

@@ -0,0 +1,122 @@
+// 版本自检（issue #174 后续，2026-09-15 拍板）：独立插件不把「用户在用哪个
+// 版本」托付给插件市场——市场收录有 ~26h 年龄闸门 + 30min 缓存，且安装时
+// 精确指定过版本的 profile 会被 pnpm 钉子挡住（update 尊重既有 semver 范围，
+// 永不跨 minor/major，#174 的报障者正是这样用着 0.7.32 的行为模型来报 bug）。
+//
+// 本模块只做三件事：
+//   1. 向 npm registry 查 @modusensus/dsh-mneme 的 latest dist-tag（带 TTL
+//      缓存 + 超时 + 全失败静默——离线/被墙/registry 异常都返回 null，调用方
+//      据 null 渲染「未知」，前端不打扰）；
+//   2. 与运行版本做纯函数比对（classify）；
+//   3. 对外暴露 registry URL 白名单校验（validateRegistryUrl）——发请求前
+//      强制 https + 精确 host，构造上排除本机与内网地址。
+import { readFileSync } from "node:fs";
+
+// 运行版本：src/ 与 lib/ 都在插件根下一层，相对 import.meta.url 解析一致；
+// 读取失败（打包/受限环境）降级 "unknown"，横幅随之静默。
+const PACKAGE_VERSION = (() => {
+  try {
+    return JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version ?? "unknown";
+  } catch {
+    return "unknown";
+  }
+})();
+
+// registry 查询地址是模块常量而非用户输入；validateRegistryUrl 仍作为发请求
+// 前的强制闸（构造上即排除非 https 与非白名单 host，双保险且可单测）。
+const REGISTRY_URL = "https://registry.npmjs.org/@modusensus%2Fdsh-mneme/latest";
+const REGISTRY_HOST = "registry.npmjs.org";
+// 市场收录本身有 ~1 天年龄闸门，1h 的 registry 缓存远低于该粒度，足够新鲜。
+const CACHE_TTL_MS = 60 * 60 * 1000;
+const FETCH_TIMEOUT_MS = 5000;
+
+// 精确 host 白名单：协议必须 https，且 host 逐字等于 registry.npmjs.org。
+// 这一条即构造性排除本机回环、私有网段与保留地址——不做任何
+// 「看起来像公网」的宽松判断，将来换源必须显式改这里的常量。
+export function validateRegistryUrl(candidate) {
+  let url;
+  try {
+    url = new URL(candidate);
+  } catch {
+    return false;
+  }
+  return url.protocol === "https:" && url.hostname === REGISTRY_HOST;
+}
+
+/** 解析 `x.y.z` / `x.y.z-后缀` 为可比较结构；解析失败返回 null。 */
+function parseVersion(text) {
+  if (typeof text !== "string") return null;
+  const match = text.trim().match(/^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?$/);
+  if (!match) return null;
+  return {
+    major: Number(match[1]),
+    minor: Number(match[2]),
+    patch: Number(match[3]),
+    // 有 prerelease 后缀的同号版本视为更旧（0.9.0-rc.1 < 0.9.0）。
+    prerelease: match[4] !== undefined
+  };
+}
+
+/**
+ * 三元组语义化比较：a<b → -1，a>b → 1，无法比较 → null（调用方归入 unknown）。
+ * 仅比较数字部分；数字相等时，带 prerelease 的一方更旧（0.9.0-rc.1 < 0.9.0），
+ * 两侧都带则视为同版——横幅只关心「是否落后于 latest」，不追求完整 semver 序。
+ */
+export function compareVersions(a, b) {
+  const va = parseVersion(a);
+  const vb = parseVersion(b);
+  if (!va || !vb) return null;
+  for (const key of ["major", "minor", "patch"]) {
+    if (va[key] !== vb[key]) return va[key] < vb[key] ? -1 : 1;
+  }
+  if (va.prerelease !== vb.prerelease) return va.prerelease ? -1 : 1;
+  return 0;
+}
+
+/**
+ * 运行版本 vs registry latest 的展示归类。latest 为 null（查询失败/离线）
+ * 或任一侧解析失败时归 unknown——前端对 unknown 完全静默。
+ */
+export function classify(version, latest) {
+  const cmp = compareVersions(version, latest);
+  if (cmp === null) return "unknown";
+  if (cmp < 0) return "outdated";
+  if (cmp > 0) return "ahead";
+  return "up-to-date";
+}
+
+// 模块级缓存：面板可能多处/多次拉取，TTL 内一律复用，不重复打 registry。
+// at 用 -Infinity 作「从未拉取」哨兵：任何时钟下 now-at 都是正无穷，首轮
+// 必然真实请求（测试的假时钟从 0 起也不会被误判成新鲜缓存）。
+let cache = { at: -Infinity, latest: null };
+
+/**
+ * 查询 registry latest。TTL 内直接命中缓存；任何失败（网络/超时/非 2xx/
+ * 响应形状不对/URL 校验不过）都静默返回 null——版本提示是锦上添花，绝不
+ * 让它成为新的故障面。失败不写缓存：TTL 起点保持旧值，下次调用立刻重试。
+ */
+export async function fetchLatestVersion({ fetchImpl = typeof fetch === "function" ? fetch : () => Promise.reject(new Error("no fetch")), now = Date.now } = {}) {
+  if (now() - cache.at < CACHE_TTL_MS) return cache.latest;
+  if (!validateRegistryUrl(REGISTRY_URL)) return null;
+  let manifest;
+  try {
+    const response = await fetchImpl(REGISTRY_URL, {
+      signal: AbortSignal.timeout(FETCH_TIMEOUT_MS),
+      headers: { accept: "application/json" }
+    });
+    if (!response.ok) return null;
+    manifest = await response.json();
+  } catch {
+    return null;
+  }
+  const latest = typeof manifest?.version === "string" && manifest.version ? manifest.version : null;
+  cache = { at: now(), latest };
+  return latest;
+}
+
+/** 仅供测试：清空模块级缓存与时间戳。 */
+export function resetCacheForTest() {
+  cache = { at: -Infinity, latest: null };
+}
+
+export { PACKAGE_VERSION, REGISTRY_URL, CACHE_TTL_MS };

package/test/conflict-freeze.test.js

@@ -111,13 +111,23 @@ test("store: countConflictPending 只统计未决行", () => {
   store.close();
 });
 
-test("store: 已解决的同一对后续可再次 pending", () => {
+test("store: 已解决的同一对在内容变化后才可再次 pending（issue #170 复核项 4）", async () => {
   const store = openStore();
-  const p1 = store.saveConflictPending({ memory_a: "a", memory_b: "b", reason: "r" });
+  const a = store.save({ type: "project", title: "对A", content: "内容A" });
+  const b = store.save({ type: "project", title: "对B", content: "内容B" });
+  const p1 = store.saveConflictPending({ memory_a: a.id, memory_b: b.id, 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, "已解决行不参与去重");
+  // 内容未变 → 已裁决对不重新入队：「保留双方」是有效决定，不是待办。
+  const suppressed = store.saveConflictPending({ memory_a: b.id, memory_b: a.id, reason: "again" });
+  assert.equal(suppressed, undefined, "未变化的已裁决对被抑制");
+  assert.equal(store.countConflictPending(), 0);
+  // 任一侧被改过（updated_at 晚于 resolved_at）→ 重新入队产生新 pending。
+  // 留真实时间间隔：updated_at/resolved_at 毫秒精度，同毫秒算未变。
+  await new Promise((resolve) => setTimeout(resolve, 5));
+  store.update(a.id, { content: "内容A（改）" });
+  const p2 = store.saveConflictPending({ memory_a: b.id, memory_b: a.id, reason: "changed" });
+  assert.ok(p2, "内容变化后的对重新入队");
+  assert.notEqual(p2.id, p1.id, "新 pending 是新行");
   assert.equal(p2.resolved_at, undefined);
   assert.equal(store.countConflictPending(), 1);
   store.close();

package/test/scope-candidates.test.js

@@ -0,0 +1,239 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+import { runSleep } from "../src/dream/sleep.js";
+import { createDreamScheduler } from "../src/dream.js";
+import { createStore } from "../src/store.js";
+import { createService } from "../src/service.js";
+import { createVectorIndex } from "../src/vector-index.js";
+
+// v0.8.1（issue #170 第 2 步）：sleep 冲突阶段的跨 scope 分流。
+// 同一内容落在两个归属下（任一维标注键不等，含「一侧未标注=全局」）时，
+// 不允许自动裁决（freeze 或 LLM）——归档败者可能销毁某归属下的唯一副本，
+// 归属裁决是用户的决定。跨 scope 对一律停车到 conflict_pending（专属 reason），
+// 同 scope 对维持既有路径。夹具为中性主题（构建笔记/编辑器主题）。
+
+const embedder = {
+  embedSingle: async () => [1, 0, 0],
+  // 契约形状：按输入条数返回等长向量数组。update 会失效缓存并调度重嵌入，
+  // sleep 的回填走 embed()——返回单向量会让回填静默失败（no usable vectors）。
+  embed: async (texts) => (Array.isArray(texts) ? texts : [texts]).map(() => [1, 0, 0]),
+  schedule: () => {},
+  modelHash: "mock#1",
+  dimension: 3
+};
+
+function setup() {
+  const store = createStore(":memory:");
+  const service = createService({ store, mirror: null, config: {} });
+  const vectorIndex = createVectorIndex({ store });
+  service.setEmbedder(embedder);
+  service.setVectorIndex(vectorIndex);
+  return { store, service, vectorIndex };
+}
+
+function baseConfig(overrides = {}) {
+  return {
+    sleepModeEnabled: true,
+    sleepIdleMinutes: 5,
+    sleepMinIntervalHours: 8,
+    sleepConflictStrictness: "normal",
+    sleepArchiveDays: 30,
+    sleepCompressDays: 90,
+    sleepPatternMinMemories: 10,
+    sleepMaxPatternPerRun: 3,
+    ...overrides
+  };
+}
+
+function llmCtx(captured = [], selection = { provider: "mock", model: "sleep-model" }) {
+  return {
+    logger: { warn: () => {}, info: () => {} },
+    agentDefaultModel: { currentSelection: () => selection },
+    llm: {
+      async *stream(options) {
+        captured.push(options);
+        const userText = options.messages.find((m) => m.role === "user")?.content?.[0]?.text ?? "";
+        yield { type: "text-delta", index: 0, text: userText.startsWith("候选冲突") || userText.startsWith("Candidate conflicts") ? "[]" : "[]" };
+        yield { type: "finish", reason: { kind: "stop" } };
+      }
+    }
+  };
+}
+
+function noRouteCtx() {
+  return { logger: { warn: () => {}, info: () => {} } };
+}
+
+/** 保存一对高相似记忆并预填向量。返回 [新, 旧]（updated_at DESC 序）。 */
+function savePair(service, vectorIndex, titleA, titleB, scopeA, scopeB) {
+  const a = service.saveWithDedupe({
+    type: "project", title: titleA, content: `${titleA} 的正文`,
+    ...(scopeA?.agent ? { agent_scope: scopeA.agent } : {}),
+    ...(scopeA?.workspace ? { workspace_scope: scopeA.workspace } : {})
+  }).memory;
+  const b = service.saveWithDedupe({
+    type: "project", title: titleB, content: `${titleB} 的正文`,
+    ...(scopeB?.agent ? { agent_scope: scopeB.agent } : {}),
+    ...(scopeB?.workspace ? { workspace_scope: scopeB.workspace } : {})
+  }).memory;
+  vectorIndex.saveEmbedding(a.id, [1, 0, 0]);
+  vectorIndex.saveEmbedding(b.id, [1, 0, 0]);
+  return [a, b];
+}
+
+test("freeze mode: cross-scope pair parks with the scope-candidate reason; same-scope pair keeps the plain reason", async () => {
+  const { store, service, vectorIndex } = setup();
+  // updated_at DESC 序决定贪心配对：后保存的对先配。x 对=跨 scope，y 对=同 scope。
+  const [yNew, yOld] = savePair(service, vectorIndex, "构建笔记A", "构建笔记B", { agent: "coder" }, { agent: "coder" });
+  const [xNew, xOld] = savePair(service, vectorIndex, "编辑器主题A", "编辑器主题B", { agent: "coder" }, { agent: "writer" });
+
+  const result = await runSleep(llmCtx(), service, baseConfig({ conflictFreezeEnabled: true }), { warn: () => {}, info: () => {} }, { embedder, vectorIndex }, null);
+  assert.equal(result.status, "ok");
+
+  const queue = store.listConflictPending();
+  assert.equal(queue.length, 2, "both pairs parked exactly once");
+  const crossRow = queue.find((q) => [q.memory_a, q.memory_b].includes(xNew.id));
+  const sameRow = queue.find((q) => [q.memory_a, q.memory_b].includes(yNew.id));
+  assert.ok(crossRow, "cross-scope pair must be parked");
+  assert.match(crossRow.reason, /跨作用域|cross-scope/, "cross pair carries the dedicated reason");
+  assert.ok(sameRow, "same-scope pair still parked in freeze mode");
+  assert.doesNotMatch(sameRow.reason, /跨作用域|cross-scope/, "same-scope pair keeps the plain similarity reason");
+
+  // 再跑一轮：同一对不去重不重复入队。
+  await runSleep(llmCtx(), service, baseConfig({ conflictFreezeEnabled: true }), { warn: () => {}, info: () => {} }, { embedder, vectorIndex }, null);
+  assert.equal(store.countConflictPending(), 2, "pair-level dedupe survives reruns");
+  store.close();
+});
+
+test("NULL (unlabeled) vs labeled counts as a cross-scope pair", async () => {
+  const { store, service, vectorIndex } = setup();
+  savePair(service, vectorIndex, "部署清单A", "部署清单B", {}, { agent: "coder" });
+  const result = await runSleep(llmCtx(), service, baseConfig({ conflictFreezeEnabled: true }), { warn: () => {}, info: () => {} }, { embedder, vectorIndex }, null);
+  assert.equal(result.status, "ok");
+  const queue = store.listConflictPending();
+  assert.equal(queue.length, 1);
+  assert.match(queue[0].reason, /跨作用域|cross-scope/, "global(unlabeled) copy vs scoped copy is an ownership decision");
+  store.close();
+});
+
+test("non-freeze without an LLM route: cross-scope pair still parks; nothing is auto-adjudicated", async () => {
+  const { store, service, vectorIndex } = setup();
+  const [newer, older] = savePair(service, vectorIndex, "发布流程A", "发布流程B", { agent: "coder" }, { agent: "writer" });
+  const result = await runSleep(noRouteCtx(), service, baseConfig(), { warn: () => {}, info: () => {} }, { embedder, vectorIndex }, null);
+
+  const queue = store.listConflictPending();
+  assert.equal(queue.length, 1, "cross-scope pair parks even with no LLM route");
+  assert.match(queue[0].reason, /跨作用域|cross-scope/);
+  assert.equal(store.getById(newer.id).archived, false, "no side is auto-archived");
+  assert.equal(store.getById(older.id).archived, false);
+  assert.ok(queue[0].resolved_at === undefined);
+  store.close();
+});
+
+test("reviewed pair does not re-queue until one of its sides changes (review item 4)", async () => {
+  const { store, service, vectorIndex } = setup();
+  const [newer, older] = savePair(service, vectorIndex, "备份策略A", "备份策略B", { agent: "coder" }, { agent: "writer" });
+  await runSleep(llmCtx(), service, baseConfig({ conflictFreezeEnabled: true }), { warn: () => {}, info: () => {} }, { embedder, vectorIndex }, null);
+  assert.equal(store.countConflictPending(), 1);
+
+  // 人工「保留双方」（winner=null）后，内容未变 → 下一轮不再入队。
+  const row = store.listConflictPending()[0];
+  store.resolveConflictPending(row.id, { winner: null });
+  assert.equal(store.countConflictPending(), 0);
+  const rerun = await runSleep(llmCtx(), service, baseConfig({ conflictFreezeEnabled: true }), { warn: () => {}, info: () => {} }, { embedder, vectorIndex }, null);
+  assert.equal(store.countConflictPending(), 0, "unchanged reviewed pair must stay dismissed");
+  assert.equal(rerun.status, "noop", "suppressed parks count as noop");
+
+  // 任一侧被改过（updated_at 晚于裁决）→ 重新入队（新决策）。
+  // 留出真实时间间隔：updated_at/resolved_at 都是毫秒精度，同毫秒内
+  // 「裁决后立即修改」会算作未变（生产中人为修改不可能同毫秒）。
+  await new Promise((resolve) => setTimeout(resolve, 5));
+  service.update(newer.id, { content: "备份策略A 的正文（改）" });
+  await runSleep(llmCtx(), service, baseConfig({ conflictFreezeEnabled: true }), { warn: () => {}, info: () => {} }, { embedder, vectorIndex }, null);
+  assert.equal(store.countConflictPending(), 1, "changed pair is worth a fresh review");
+  store.close();
+});
+
+test("dream (non-freeze): cross-scope conflict parks for review instead of being adjudicated (review item 3)", async () => {
+  const { store, service } = setup();
+  const w = service.saveWithDedupe({ type: "decision", title: "发布时间", content: "8月20日", importance: 4, agent_scope: "coder", agent_scope_source: "explicit" }).memory;
+  const l = service.saveWithDedupe({ type: "decision", title: "发布时间旧", content: "8月15日", importance: 4, agent_scope: "writer", agent_scope_source: "explicit" }).memory;
+  const ctx = {
+    llm: { stream: async function* () {
+      yield { type: "text-delta", text: JSON.stringify([{ action: "conflict", winner: w.id, loser: l.id, reason: "日期更新" }]) };
+      yield { type: "finish", reason: { kind: "ok" } };
+    } },
+    logger: { warn: () => {}, info: () => {} }
+  };
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, { dreamProvider: "mock", dreamModel: "mock-chat" });
+  assert.equal(result.ok, true);
+  assert.equal(result.applied, 0, "cross-scope conflict is NOT auto-adjudicated");
+  assert.equal(result.frozen, 1, "parked pair shows up in the run summary");
+  const pending = store.listConflictPending();
+  assert.equal(pending.length, 1);
+  assert.match(pending[0].reason, /跨作用域|cross-scope/, "dedicated reason");
+  assert.equal(store.getById(l.id).archived, false, "loser NOT archived");
+  assert.ok(!store.getById(w.id).content.includes("已否决旧信息"), "winner untouched");
+  store.close();
+});
+
+test("dream (non-freeze): same-scope conflict is still auto-adjudicated (regression)", async () => {
+  const { store, service } = setup();
+  const w = service.saveWithDedupe({ type: "decision", title: "发布时间", content: "8月20日", importance: 4, agent_scope: "coder", agent_scope_source: "explicit" }).memory;
+  const l = service.saveWithDedupe({ type: "decision", title: "发布时间旧", content: "8月15日", importance: 4, agent_scope: "coder", agent_scope_source: "explicit" }).memory;
+  const ctx = {
+    llm: { stream: async function* () {
+      yield { type: "text-delta", text: JSON.stringify([{ action: "conflict", winner: w.id, loser: l.id, reason: "日期更新" }]) };
+      yield { type: "finish", reason: { kind: "ok" } };
+    } },
+    logger: { warn: () => {}, info: () => {} }
+  };
+  const dream = createDreamScheduler({ thresholdCount: 1, thresholdChars: 0, delayMs: 0 });
+  const result = await dream.runDream(ctx, service, { dreamProvider: "mock", dreamModel: "mock-chat" });
+  assert.equal(result.ok, true);
+  assert.equal(result.applied, 1, "same-scope conflict adjudicated as before");
+  assert.equal(result.frozen, 0);
+  assert.equal(store.listConflictPending().length, 0);
+  assert.equal(store.getById(l.id).archived, true);
+  store.close();
+});
+
+test("non-freeze with an LLM: cross-scope pair bypasses adjudication; same-scope pair is adjudicated", async () => {
+  const { store, service, vectorIndex } = setup();
+  const [yNew, yOld] = savePair(service, vectorIndex, "缓存策略A", "缓存策略B", { agent: "coder" }, { agent: "coder" });
+  const [xNew, xOld] = savePair(service, vectorIndex, "编辑器主题A", "编辑器主题B", { agent: "coder" }, { agent: "writer" });
+
+  const captured = [];
+  const ctx = llmCtx(captured);
+  // 同 scope 对由 LLM 裁决：保留 yNew、归档 yOld。跨 scope 对绝不进 prompt。
+  ctx.llm.stream = async function* (options) {
+    captured.push(options);
+    const userText = options.messages.find((m) => m.role === "user")?.content?.[0]?.text ?? "";
+    const isConflictPass = userText.startsWith("候选冲突") || userText.startsWith("Candidate conflicts");
+    const text = isConflictPass
+      ? JSON.stringify([{ action: "conflict", winner: yNew.id, loser: yOld.id, reason: "同归属重复" }])
+      : "[]";
+    yield { type: "text-delta", index: 0, text };
+    yield { type: "finish", reason: { kind: "stop" } };
+  };
+
+  const result = await runSleep(ctx, service, baseConfig(), ctx.logger, { embedder, vectorIndex }, null);
+  assert.equal(result.status, "ok");
+
+  const conflictPassTexts = captured
+    .map((o) => o.messages.find((m) => m.role === "user")?.content?.[0]?.text ?? "")
+    .filter((t) => t.startsWith("候选冲突") || t.startsWith("Candidate conflicts"));
+  assert.ok(conflictPassTexts.length >= 1, "conflict pass ran for the same-scope pair");
+  for (const t of conflictPassTexts) {
+    assert.ok(!t.includes(xNew.id) && !t.includes(xOld.id), "cross-scope pair must never enter the LLM prompt");
+    assert.ok(t.includes(yNew.id) && t.includes(yOld.id), "same-scope pair is adjudicated");
+  }
+
+  const queue = store.listConflictPending();
+  assert.equal(queue.length, 1);
+  assert.match(queue[0].reason, /跨作用域|cross-scope/);
+  assert.equal(store.getById(xOld.id).archived, false, "cross-scope loser is NOT archived by the LLM");
+  assert.equal(store.getById(yOld.id).archived, true, "same-scope loser is adjudicated as usual");
+  store.close();
+});