dsh-trivium 0.4.3 → 0.4.5

package/README.md

@@ -8,7 +8,7 @@ DeepSeek Harness 的跨会话图记忆插件：按节点和边记，默认少注
 
 ## 安装
 
-> 前提：已安装 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 并至少启动过一次 `dsh web`。当前测试宿主：`@deepseek-ai/dsh@0.1.0-rc.8`（从 rc.6 跟过来：设置里的「Trivium 记忆」、新会话短地图、跨会话 `ctx_find`、会话图标签均可用）。
+> 前提：已安装 [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness) 并至少启动过一次 `dsh web`。当前测试宿主：`@deepseek-ai/dsh@0.1.1-rc.2`（`dsh-llm` / `dsh-tools` peer 兼容 `0.1.0-rc.8` 与 `0.1.1-rc.2`）。设置里的「Trivium 记忆」、新会话短地图、跨会话 `ctx_find`、会话图标签均可用。
 
 ```sh
 dsh plugin --profile web add dsh-trivium
@@ -20,7 +20,7 @@ dsh plugin --profile web add dsh-trivium
 <workspace>/.dsh/trivium.tdb
 ```
 
-用 [Dsh_BatStart](https://github.com/QWQcool/Dsh_BatStart) 的（启动器已钉 `0.1.0-rc.8`），双击启动就会装上，不必再执行上面这条。
+用 [Dsh_BatStart](https://github.com/QWQcool/Dsh_BatStart) 的，双击启动就会装上，不必再执行上面这条。
 
 本地跟源码联调：
 
@@ -113,7 +113,7 @@ dsh plugin --profile web add dsh-trivium
 
 ## 界面截图
 
-以下入口在本机 DSH Web（`0.1.0-rc.8`）上仍在。截图摄于较早的 rc.6 界面。
+以下入口在本机 DSH Web（`0.1.1-rc.2`）上仍在。截图摄于较早的 rc.6 界面。
 
 ### 会话 — `ctx_find("鉴权")`
 
@@ -155,6 +155,10 @@ dsh plugin --profile web add dsh-trivium
 
 ## 更新说明
 
+**0.4.5** — 宿主 peer 放宽到 `0.1.0-rc.8` 与 `0.1.1-rc.2`，不再嵌一套旧 `dsh-llm` / `dsh-tools`。
+
+**0.4.4** — 依赖 `triviumdb@0.7.5`：入边、按 label 扩邻、按 label 删边走引擎 API，不再全表扫边。find / 会话图行为不变。
+
 **0.4.3** — 会话图「更新检查点」：把当前对话里 DSH 已有的压缩标记和侧边栏 fork 补进图，给装插件之前的旧会话用。没压过的会话仍然只有「后续」。
 
 **0.4.2** — 会话图芯片条可新增（整段粘贴一条）、批量归档 / 删除。自动抽取仍偏严；芯片新增按你写的入库。
@@ -168,6 +172,6 @@ dsh plugin --profile web add dsh-trivium
 ## 发布信息
 
 - GitHub: https://github.com/QWQcool/dsh-trivium
-- npm: [`dsh-trivium@0.4.3`](https://www.npmjs.com/package/dsh-trivium)
-- 测试宿主：`@deepseek-ai/dsh@0.1.0-rc.8`
-- License: MIT（依赖 [TriviumDB](https://github.com/TriviumDB/triviumdb) 为 Apache-2.0）
+- npm: [`dsh-trivium@0.4.5`](https://www.npmjs.com/package/dsh-trivium)
+- 测试宿主：`@deepseek-ai/dsh@0.1.1-rc.2`（兼 `0.1.0-rc.8`）
+- License: MIT（依赖 [TriviumDB](https://github.com/YoKONCy/TriviumDB) 为 Apache-2.0）

package/lib/schema.js

@@ -25,7 +25,7 @@ export const EDGE_LABELS = Object.freeze({
 
 export const BUSINESS_EDGES = Object.freeze(["about", "decided", "broke", "fixed"]);
 
-/** Weights written on link(). Engine expand currently ignores labels; we still persist them. */
+/** Weights written on link(). Engine neighbors / expandLabels can whitelist labels; we still persist weights. */
 export const EDGE_WEIGHTS = Object.freeze({
   about: 1,
   decided: 1,

package/lib/store.js

@@ -135,6 +135,42 @@ function normalizeTql(rows) {
     .filter(Boolean);
 }
 
+function edgeTarget(e) {
+  return Number(e?.targetId ?? e?.target_id);
+}
+
+function edgeSource(e) {
+  return Number(e?.sourceId ?? e?.source_id ?? e?.fromId);
+}
+
+/** Native incoming edges when triviumdb >= 0.7.5; otherwise null so callers can scan. */
+function nativeIncoming(db, id, label) {
+  if (typeof db.getIncomingEdges !== "function") return null;
+  try {
+    const rows = label
+      ? db.getIncomingEdges(Number(id), label)
+      : db.getIncomingEdges(Number(id));
+    return Array.isArray(rows) ? rows : [];
+  } catch {
+    return null;
+  }
+}
+
+function nativeLabeledNeighbors(db, id, labels) {
+  if (typeof db.neighbors !== "function") return null;
+  try {
+    const rows = db.neighbors(Number(id), 1, [...labels]);
+    return Array.isArray(rows) ? rows.map(Number).filter(Number.isFinite) : [];
+  } catch {
+    try {
+      const rows = db.neighbors(Number(id), 1);
+      return Array.isArray(rows) ? rows.map(Number).filter(Number.isFinite) : null;
+    } catch {
+      return null;
+    }
+  }
+}
+
 function indexNode(db, id, payload) {
   const text = indexTextFor(payload);
   try {
@@ -364,12 +400,18 @@ export function mergeNodes(db, keepId, dropId) {
   if (pa.status === "archived" || pb.status === "archived") {
     return { ok: false, message: "archived" };
   }
-  for (const other of db.allNodeIds?.() || []) {
-    if (Number(other) === drop) continue;
-    const n = db.get(other);
-    for (const e of n?.edges || []) {
-      if (Number(e.targetId ?? e.target_id) === drop) {
-        ensureLink(db, other, keep, e.label);
+  const inbound = nativeIncoming(db, drop);
+  if (inbound) {
+    for (const e of inbound) {
+      const from = edgeSource(e);
+      if (Number.isFinite(from) && from !== keep) ensureLink(db, from, keep, e.label);
+    }
+  } else {
+    for (const other of db.allNodeIds?.() || []) {
+      if (Number(other) === drop) continue;
+      const n = db.get(other);
+      for (const e of n?.edges || []) {
+        if (edgeTarget(e) === drop) ensureLink(db, other, keep, e.label);
       }
     }
   }
@@ -402,7 +444,7 @@ export function exportGraph(db, cwd = "") {
     for (const e of node.edges || []) {
       edges.push({
         from: Number(id),
-        to: Number(e.targetId ?? e.target_id),
+        to: edgeTarget(e),
         label: e.label || "",
         weight: e.weight ?? null,
       });
@@ -474,11 +516,11 @@ export function importGraph(db, graph) {
 export function hasEdge(db, from, to, label) {
   const node = db.get(Number(from));
   return (node?.edges || []).some(
-    (e) => Number(e.targetId ?? e.target_id) === Number(to) && (!label || e.label === label),
+    (e) => edgeTarget(e) === Number(to) && (!label || e.label === label),
   );
 }
 
-/** Link once for a (from, to, label) triple. Engine unlink cannot drop a single label. */
+/** Link once for a (from, to, label) triple. */
 export function ensureLink(db, from, to, label) {
   const src = Number(from);
   const dst = Number(to);
@@ -489,6 +531,22 @@ export function ensureLink(db, from, to, label) {
   return true;
 }
 
+/** Drop one labeled edge when the engine supports unlink(src, dst, label). */
+export function dropLink(db, from, to, label) {
+  const src = Number(from);
+  const dst = Number(to);
+  if (!Number.isFinite(src) || !Number.isFinite(dst)) return false;
+  if (!hasEdge(db, src, dst, label)) return false;
+  try {
+    if (label) db.unlink(src, dst, label);
+    else db.unlink(src, dst);
+    db.flush();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function pickMergedText(oldText, incomingText) {
   const a = String(oldText || "").trim();
   const b = String(incomingText || "").trim();
@@ -756,10 +814,9 @@ function entityAnchorIds(db, query) {
   const q = String(query || "").trim().toLowerCase();
   if (!q) return [];
   const ids = [];
-  for (const id of db.allNodeIds?.() || []) {
-    const node = db.get(id);
-    if (node?.payload?.status === "archived" || node?.payload?.type === "episode") continue;
-    if (entityAnchorScore(node?.payload, q) > 0) ids.push(Number(id));
+  for (const n of findByType(db, "entity")) {
+    if (n.payload?.status === "archived") continue;
+    if (entityAnchorScore(n.payload, q) > 0) ids.push(Number(n.id));
   }
   return ids;
 }
@@ -788,16 +845,27 @@ function primaryScore(payload, query, now) {
 function scanBusinessNeighbors(db, id) {
   const ids = new Set();
   const want = new Set(BUSINESS_EDGES);
-  const node = db.get(Number(id));
-  for (const e of node?.edges || []) {
-    if (want.has(e.label)) ids.add(Number(e.targetId ?? e.target_id));
+  const nid = Number(id);
+  const labeled = nativeLabeledNeighbors(db, nid, BUSINESS_EDGES);
+  if (labeled) {
+    for (const other of labeled) ids.add(other);
+  } else {
+    const node = db.get(nid);
+    for (const e of node?.edges || []) {
+      if (want.has(e.label)) ids.add(edgeTarget(e));
+    }
   }
-  for (const other of db.allNodeIds?.() || []) {
-    if (Number(other) === Number(id)) continue;
-    const n = db.get(other);
-    for (const e of n?.edges || []) {
-      if (want.has(e.label) && Number(e.targetId ?? e.target_id) === Number(id)) {
-        ids.add(Number(other));
+  const inbound = nativeIncoming(db, nid);
+  if (inbound) {
+    for (const e of inbound) {
+      if (want.has(e.label)) ids.add(edgeSource(e));
+    }
+  } else {
+    for (const other of db.allNodeIds?.() || []) {
+      if (Number(other) === nid) continue;
+      const n = db.get(other);
+      for (const e of n?.edges || []) {
+        if (want.has(e.label) && edgeTarget(e) === nid) ids.add(Number(other));
       }
     }
   }
@@ -806,9 +874,11 @@ function scanBusinessNeighbors(db, id) {
 
 export function businessNeighborIds(db, id) {
   const ids = scanBusinessNeighbors(db, id);
-  const viaTql = tqlBusinessNeighbors(db, id);
-  if (viaTql) {
-    for (const nid of viaTql) ids.add(Number(nid));
+  if (typeof db.getIncomingEdges !== "function") {
+    const viaTql = tqlBusinessNeighbors(db, id);
+    if (viaTql) {
+      for (const nid of viaTql) ids.add(Number(nid));
+    }
   }
   return [...ids].filter((n) => Number.isFinite(n));
 }
@@ -885,7 +955,7 @@ function nodeLabel(db, id) {
 function sameAsTarget(db, id) {
   const node = db.get(Number(id));
   for (const e of node?.edges || []) {
-    if (e.label === EDGE_LABELS.sameAs) return Number(e.targetId ?? e.target_id);
+    if (e.label === EDGE_LABELS.sameAs) return edgeTarget(e);
   }
   return null;
 }
@@ -913,6 +983,11 @@ function incomingBusinessEdges(db, id, { query = "", now, hideStale = false } =
     seen.add(key);
     found.push({ fromId: src, label, payload: srcNode.payload });
   };
+  const inbound = nativeIncoming(db, nid);
+  if (inbound) {
+    for (const e of inbound) add(edgeSource(e), e.label);
+    return found;
+  }
   if (typeof db.tql === "function") {
     try {
       for (const label of BUSINESS_EDGES) {
@@ -928,9 +1003,7 @@ function incomingBusinessEdges(db, id, { query = "", now, hideStale = false } =
     const n = db.get(other);
     if (!n || n.payload?.status === "archived") continue;
     for (const e of n.edges || []) {
-      if (want.has(e.label) && Number(e.targetId ?? e.target_id) === nid) {
-        add(other, e.label);
-      }
+      if (want.has(e.label) && edgeTarget(e) === nid) add(other, e.label);
     }
   }
   return found;
@@ -976,7 +1049,7 @@ export function listOutgoingBusiness(db, id) {
   const seen = new Set();
   for (const e of node?.edges || []) {
     if (!want.has(e.label)) continue;
-    const tid = Number(e.targetId ?? e.target_id);
+    const tid = edgeTarget(e);
     if (!Number.isFinite(tid)) continue;
     const key = `${e.label}:${tid}`;
     if (seen.has(key)) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-trivium",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "In-process graph memory and session map for DeepSeek Harness, backed by TriviumDB.",
   "license": "MIT",
   "type": "module",
@@ -47,11 +47,11 @@
     "node": "^22.19.0 || >=24"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.8"
+    "@deepseek-ai/dsh-llm": ">=0.1.0-rc.8 <0.1.1 || >=0.1.1-rc.2 <0.2.0",
+    "@deepseek-ai/dsh-tools": ">=0.1.0-rc.8 <0.1.1 || >=0.1.1-rc.2 <0.2.0"
   },
   "dependencies": {
-    "triviumdb": "^0.7.4"
+    "triviumdb": "^0.7.5"
   },
   "keywords": [
     "dsh-plugin",