dsh-trivium 0.4.2 → 0.4.4

package/README.md

@@ -54,7 +54,7 @@ dsh plugin --profile web add dsh-trivium
 
 - **跨会话** — 会话 A 记下「鉴权走 header X」，会话 B 调用 `ctx_find("鉴权")` 命中，并带上它连着谁（`about` / `decided` / `broke` / `fixed`）。
 - **默认安静** — 新会话只注入一张短地图（≤400 token）。模型要用再调工具，不会每一步灌满。
-- **会话图** — compaction 切一段就收成一个方框；点方框用 DSH 原生 fork 开分支；勾选的记忆芯片从当前这段的下一轮注入。
+- **会话图** — compaction 切一段就收成一个方框；旧会话可点「更新检查点」补上已经发生过的压缩 / 分叉；勾选的记忆芯片从当前这段的下一轮注入。
 - **人能改错** — 会话图芯片条可新增、归档、删除；设置页管搜、改名 / 正文、合并、全局开关。
 - **抽取偏严** — 闲聊、一次性改文件、密钥**不会从对话自动入库**。芯片「新增」按你写的存（点一次整段一条）。
 - **可选 embedding** — 默认关。官方 DeepSeek 对话接口没有 embeddings；可填 OpenAI 兼容地址。
@@ -80,6 +80,7 @@ dsh plugin --profile web add dsh-trivium
 
 - 没压过上下文：只有一个「后续」方框。
 - 一次成功的 compaction 之后：左边历史检查点（摘要来自 DSH），右边仍是「后续」。
+- 装插件之前已经压过 / 分过叉的旧会话：点「更新检查点」，从当前对话里的压缩标记和侧边栏分叉补方框（可重复点，不会双写）。没压过就仍只有「后续」——会话长、工具多不等于 DSH 已经压缩（默认约窗口 80% 才自动压）。
 - 方框自己不压缩。质量来自 DSH 已经做的摘要替换；fork 时不会再总结一遍。
 - 「改名」只改方框标题，不动 DSH 摘要。点方框可跳回对话里对应的检查点，或打开轨迹。
 
@@ -146,7 +147,7 @@ dsh plugin --profile web add dsh-trivium
 - 抽取会漏；脏数据可在芯片条归档 / 删除，或到设置里改、合并。
 - 同一个 `.tdb` 不要两个 Node 进程同时打开（正常只开一个 `dsh web` 即可）。
 - Markdown 导出是给人看的，不能再解析回去。WorkBuddy 导入是一次性，不是双向同步。
-- 会话图只投影 compaction 与 fork，不会按消息条数自己切方框。
+- 会话图只投影 compaction 与 fork，不会按消息条数自己切方框。窗口没到 DSH 压缩线时，「更新检查点」也补不出历史方框。
 - 改插件设置后需要重启 `dsh web`。
 - 宿主升到 rc.8 后，DSH 自己的旧会话库可能打不开（官方 SQLite 格式不兼容）。工作区里的 `.tdb` 图记忆还在；对不上号的旧会话图方框可以当情节残留，不影响 `ctx_find`。
 
@@ -154,6 +155,10 @@ dsh plugin --profile web add dsh-trivium
 
 ## 更新说明
 
+**0.4.4** — 依赖 `triviumdb@0.7.5`：入边、按 label 扩邻、按 label 删边走引擎 API，不再全表扫边。find / 会话图行为不变。
+
+**0.4.3** — 会话图「更新检查点」：把当前对话里 DSH 已有的压缩标记和侧边栏 fork 补进图，给装插件之前的旧会话用。没压过的会话仍然只有「后续」。
+
 **0.4.2** — 会话图芯片条可新增（整段粘贴一条）、批量归档 / 删除。自动抽取仍偏严；芯片新增按你写的入库。
 
 **0.4.1** — 宿主钉到 `@deepseek-ai/dsh@0.1.0-rc.8`。功能与 0.4.0 相同。已在 rc.8 上确认：设置「Trivium 记忆」、新会话短地图、跨会话 `ctx_find`、会话图标签。
@@ -165,6 +170,6 @@ dsh plugin --profile web add dsh-trivium
 ## 发布信息
 
 - GitHub: https://github.com/QWQcool/dsh-trivium
-- npm: [`dsh-trivium@0.4.2`](https://www.npmjs.com/package/dsh-trivium)
+- npm: [`dsh-trivium@0.4.4`](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）
+- License: MIT（依赖 [TriviumDB](https://github.com/YoKONCy/TriviumDB) 为 Apache-2.0）

package/lib/client.js

@@ -980,6 +980,67 @@ window.__ModuleLoader__.load({
       return best;
     }
 
+    function collectChatCompactions(chat) {
+      const nodes = chat?.nodes;
+      if (!nodes || typeof nodes.values !== "function") return [];
+      const rows = [];
+      const seen = new Set();
+      for (const n of nodes.values()) {
+        const kind = n.kind;
+        const data = n.data || {};
+        let seq;
+        let summary = "";
+        let compactionId = "";
+        if (kind === "compaction") {
+          seq = Number(n.anchorSeq ?? data.seq);
+          summary = String(data.summary || "");
+          compactionId = String(data.compactionId || data.id || "");
+        } else if (kind === "manual-compaction") {
+          const landed = data.compaction;
+          if (!landed) continue;
+          seq = Number(landed.seq ?? n.anchorSeq ?? data.command?.seq);
+          summary = String(landed.summary || "");
+          compactionId = String(landed.compactionId || data.command?.commandId || "");
+        } else continue;
+        if (!Number.isFinite(seq) || seen.has(seq)) continue;
+        seen.add(seq);
+        rows.push({ atSeq: seq, compactionId, summary });
+      }
+      return rows.sort((a, b) => a.atSeq - b.atSeq);
+    }
+
+    function parentIdOf(row) {
+      return String(row?.parentSessionId || row?.parentId || "");
+    }
+
+    function collectSessionForks(sessionId, byId, seedLengthOf) {
+      const forks = [];
+      const seen = new Set();
+      const add = (childId, parentId) => {
+        const child = String(childId || "");
+        const parent = String(parentId || "");
+        if (!child || !parent || seen.has(child + ":" + parent)) return;
+        const row = byId[child];
+        if (row?.origin === "subagent") return;
+        seen.add(child + ":" + parent);
+        const seed = typeof seedLengthOf === "function" ? seedLengthOf(child) : null;
+        const n = Number(seed);
+        forks.push({
+          childSessionId: child,
+          parentSessionId: parent,
+          atSeq: Number.isFinite(n) && n > 0 ? n - 1 : undefined,
+        });
+      };
+      const mine = String(sessionId || "");
+      const rows = byId || {};
+      add(mine, parentIdOf(rows[mine]));
+      for (const id of Object.keys(rows)) {
+        const parent = parentIdOf(rows[id]);
+        if (parent && (parent === mine || id === mine)) add(id, parent);
+      }
+      return forks;
+    }
+
     function scrollConversation({ key, bottom }) {
       let n = 0;
       const tick = () => {
@@ -1669,7 +1730,7 @@ window.__ModuleLoader__.load({
 
     let pendingSessionNav = null;
 
-    function SessionMapView({ sessionId, useSessions, useSession, fork, open, renameSession, actions }) {
+    function SessionMapView({ sessionId, useSessions, useSession, fork, open, renameSession, actions, seedLengthOf }) {
       const canSetView = typeof actions?.setView === "function";
       const chat = useSession((s) => s.chat);
       const cwd = useSessions((s) => (sessionId == null ? "" : s.byId[sessionId]?.cwd || ""));
@@ -1701,6 +1762,7 @@ window.__ModuleLoader__.load({
       const [draftOpen, setDraftOpen] = react.useState(false);
       const [draftText, setDraftText] = react.useState("");
       const [forkDraft, setForkDraft] = react.useState(null);
+      const [backfillNote, setBackfillNote] = react.useState("");
       const canvasRef = react.useRef(null);
       const dragRef = react.useRef(null);
       const userMovedRef = react.useRef(false);
@@ -1759,6 +1821,34 @@ window.__ModuleLoader__.load({
         }
       }, [qs, sessionId]);
 
+      const syncCheckpoints = async () => {
+        if (!sessionId || busy) return;
+        setBusy(true);
+        setError("");
+        try {
+          const compactations = collectChatCompactions(chat);
+          const forks = collectSessionForks(sessionId, sessionById, seedLengthOf);
+          const resp = await api("/api/dsh-trivium/map/backfill" + qs, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ sessionId, compactations, forks }),
+          });
+          setNodes(resp.nodes || []);
+          setEdges(resp.edges || []);
+          const checks = Number(resp.checkpoints) || 0;
+          const forkN = Number(resp.forks) || 0;
+          if (!checks && !forkN) {
+            setBackfillNote("没有发现压缩标记或分叉。没压过的会话本来就只有「后续」。");
+          } else {
+            setBackfillNote("已同步 " + checks + " 个检查点、" + forkN + " 条分叉。");
+          }
+        } catch (err) {
+          setError(String(err.message || err));
+        } finally {
+          setBusy(false);
+        }
+      };
+
       react.useEffect(() => {
         load();
       }, [load, lineageKey]);
@@ -2055,17 +2145,31 @@ window.__ModuleLoader__.load({
               jsx("div", {
                 style: mapUi.hint,
                 children:
+                  backfillNote ||
                   "共 " +
-                  chips.length +
-                  " 条，已钉 " +
-                  pinIds.length +
-                  "。默认不勾选：不钉就不会按芯片白名单注入，但仍可能被开场短地图点名带上，模型也能 find 到。",
+                    chips.length +
+                    " 条，已钉 " +
+                    pinIds.length +
+                    "。默认不勾选：不钉就不会按芯片白名单注入，但仍可能被开场短地图点名带上，模型也能 find 到。",
               }),
-              jsx("button", {
-                type: "button",
-                style: mapUi.actionBtn,
-                onClick: () => setChipsOpen((v) => !v),
-                children: chipsOpen ? "收起" : "展开勾选",
+              jsxs("div", {
+                style: mapUi.chipsActions,
+                children: [
+                  jsx("button", {
+                    type: "button",
+                    style: mapUi.actionBtn,
+                    disabled: busy,
+                    title: "读取当前对话里 DSH 已有的压缩标记和侧边栏分叉，生成检查点方框。给插件装上之前的旧会话用。",
+                    onClick: syncCheckpoints,
+                    children: busy ? "更新中…" : "更新检查点",
+                  }),
+                  jsx("button", {
+                    type: "button",
+                    style: mapUi.actionBtn,
+                    onClick: () => setChipsOpen((v) => !v),
+                    children: chipsOpen ? "收起" : "展开勾选",
+                  }),
+                ],
               }),
             ],
           }),
@@ -2406,6 +2510,15 @@ window.__ModuleLoader__.load({
               inject: () => ({
                 fork: (opts) => sessions.fork(opts),
                 open: (id) => sessions.open(id),
+                seedLengthOf: (id) => {
+                  try {
+                    const seed = sessions.binding?.(id)?.session?.header?.seedLength;
+                    const n = Number(seed);
+                    return Number.isFinite(n) && n > 0 ? n : null;
+                  } catch {
+                    return null;
+                  }
+                },
                 renameSession: async (id, title) => {
                   const face = sessions.binding?.(id)?.session;
                   if (!face || typeof face.rename !== "function") {

package/lib/episode.js

@@ -203,6 +203,48 @@ export function syncForkLineage(db, { childSessionId, parentSessionId, atSeq } =
   return { cutId, childTail };
 }
 
+/**
+ * Project DSH's already-landed compactations and fork list onto episode boxes.
+ * Idempotent: same atSeq / child reuses the existing node.
+ */
+export function backfillSessionMap(db, { sessionId, compactations = [], forks = [] } = {}) {
+  const sid = String(sessionId || "");
+  let checkpoints = 0;
+  const seenSeq = new Set();
+  for (const raw of compactations || []) {
+    const atSeq = Number(raw.atSeq);
+    if (!sid || !Number.isFinite(atSeq) || seenSeq.has(atSeq)) continue;
+    seenSeq.add(atSeq);
+    const id = recordCheckpoint(db, {
+      sessionId: sid,
+      atSeq,
+      compactionId: raw.compactionId,
+      summary: raw.summary,
+    });
+    if (id != null) checkpoints += 1;
+  }
+  if (sid) ensureTail(db, sid);
+  let forkLinks = 0;
+  for (const raw of forks || []) {
+    const child = String(raw.childSessionId || "");
+    const parent = String(raw.parentSessionId || "");
+    if (!child || !parent) continue;
+    const atSeq = Number.isFinite(Number(raw.atSeq)) ? Number(raw.atSeq) : undefined;
+    const result = syncForkLineage(db, {
+      childSessionId: child,
+      parentSessionId: parent,
+      atSeq,
+    });
+    if (result?.childTail != null) forkLinks += 1;
+  }
+  return {
+    ok: true,
+    checkpoints,
+    forks: forkLinks,
+    ...sessionMapSnapshot(db, sid),
+  };
+}
+
 export function sessionMapSnapshot(db, sessionId) {
   const sid = String(sessionId || "");
   const all = listEpisodeRecords(db);

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/server.js

@@ -17,7 +17,7 @@ import {
 import { embeddingPublicStatus } from "./embed.js";
 import { recallModeOf, writeUiSettings } from "./settings.js";
 import { discoverWorkbuddyFiles, exportMarkdown, importWorkbuddy } from "./markdown.js";
-import { renameEpisode, sessionMapSnapshot } from "./episode.js";
+import { backfillSessionMap, renameEpisode, sessionMapSnapshot } from "./episode.js";
 import { applyPinsUpdate, addChipsFromText, batchChipAction, listChips, readSessionPins } from "./pins.js";
 
 export { readUiSettings, writeUiSettings } from "./settings.js";
@@ -272,6 +272,23 @@ async function handle(req, res, { liveOptions, status }) {
     return;
   }
 
+  if (path === "/api/dsh-trivium/map/backfill" && method === "POST") {
+    const { cwd, db } = await dbForRequest(url);
+    if (!db) {
+      sendJson(res, 400, { ok: false, message: "no workspace" });
+      return;
+    }
+    const body = JSON.parse((await readBody(req)) || "{}");
+    const sessionId = body.sessionId || url.searchParams.get("sessionId") || "";
+    const result = backfillSessionMap(db, {
+      sessionId,
+      compactations: body.compactations,
+      forks: body.forks,
+    });
+    sendJson(res, 200, { ok: true, cwd, sessionId, ...result });
+    return;
+  }
+
   if (path === "/api/dsh-trivium/chips" && method === "GET") {
     const { cwd, db } = await dbForRequest(url);
     const q = url.searchParams.get("q") || "";

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.2",
+  "version": "0.4.4",
   "description": "In-process graph memory and session map for DeepSeek Harness, backed by TriviumDB.",
   "license": "MIT",
   "type": "module",
@@ -51,7 +51,7 @@
     "@deepseek-ai/dsh-tools": "0.1.0-rc.8"
   },
   "dependencies": {
-    "triviumdb": "^0.7.4"
+    "triviumdb": "^0.7.5"
   },
   "keywords": [
     "dsh-plugin",