dsh-trivium 0.4.9 → 0.4.10

package/README.md

@@ -49,23 +49,17 @@ Restart **dsh web**. For a source checkout, `git pull` then run `node scripts/li
 
 ## Uninstall
 
+Stop **dsh web** first so the `.tdb` is not locked, then:
+
 ```sh
 dsh plugin --profile web remove dsh-trivium
 ```
 
-After restarting **dsh web**, Settings no longer shows **Trivium memory**, and the title bar no longer shows **Chips**. The four tools are unregistered.
-
-Uninstall does **not** delete memory files. To wipe them, delete:
+`remove` deletes this plugin’s files: `~/.dsh/trivium.json`, and in every workspace the plugin has opened, `.dsh/trivium.tdb` plus `trivium-pending.json`. Other files under `.dsh/` stay. Updating with `dsh plugin add dsh-trivium` does **not** wipe memory.
 
-| Path | Contents |
-|---|---|
-| `<workspace>/.dsh/trivium.tdb` | Graph memory for that workspace (nodes, edges, session-graph boxes) |
-| `<workspace>/.dsh/trivium-pending.json` | Failed-extract replay queue; skip if missing |
-| `~/.dsh/trivium.json` | Injection policy, extract switch, embedding, per-session chip pins |
+Restart **dsh web** afterward: Settings no longer shows **Trivium memory**, the title bar no longer shows **Chips**, and the four tools are unregistered.
 
-Keep `.tdb` after uninstall: reinstall later and that workspace’s memory is still there. Each workspace has its own `.tdb`; deleting one does not affect others.
-
-Disable without uninstall: in that profile’s `cordis.patch.yml` add:
+Workspaces never opened after this version may still have an old `.tdb`; delete that file by hand if you find one. Disable without uninstall (data stays): in that profile’s `cordis.patch.yml` add:
 
 ```yaml
 - id: dsh-trivium
@@ -218,6 +212,8 @@ Off by default. After you turn **Chips** on in Settings and restart, the title b
 
 ## Changelog
 
+**0.4.10** — `dsh plugin remove` deletes known workspace `.tdb` files and `~/.dsh/trivium.json`. Plugin update does not wipe. Disable-in-place still keeps data.
+
 **0.4.9** — Chips tab and session-layer canvas are both off by default. Title bar shows **Chips** only after the Settings switch; session boxes sit under that switch. Kernel (four tools, short map, in-process `.tdb`) unchanged.
 
 **0.4.8** — Write + inject hygiene gate (secrets, mojibake, stutter, JSON envelopes, base64 residue). Settings / session graph follow DSH language. Settings can check npm for updates. One-shot strict import also discovers Claude Code `CLAUDE.md` and Codex `AGENTS.md`. First-turn short map is guaranteed if `session-start` races the first step.
@@ -249,7 +245,7 @@ Off by default. After you turn **Chips** on in Settings and restart, the title b
 | `ctx_find` returns nothing | A new session injects the short map only; the model must call the tool. You can also **Add** on the chip strip or tell the model “remember: …”. Chitchat and one-off file edits are not auto-written. |
 | `.tdb` is locked / will not open | Run one `dsh web`. Do not run two Node processes that both linked this plugin. |
 | Embedding is filled but search is no more accurate | Failures fall back to keyword + graph. Check that `~/.dsh/trivium.json` has an OpenAI-compatible URL (the `/v1` kind). Restart after changing it. |
-| Memory still there after uninstall / pins still there after reinstall | Memory is the workspace `.tdb`; pins are `~/.dsh/trivium.json`. Delete those files if you want a clean wipe (see Uninstall). |
+| Memory still there after uninstall | Stop `dsh web` before `dsh plugin remove`. Leftover `.tdb` is a workspace never opened on 0.4.10+; delete `.dsh/trivium.tdb` in that folder. Disable-in-place does not wipe. |
 | Check for updates fails | That request only hits the npm registry for the latest version. Memory is unaffected; try again later. |
 | Old conversations will not open after rc.8 | That is DSH’s own session-store format change, not a broken `.tdb`. Graph memory still works via `ctx_find`; leftover boxes on unmatched old sessions are plot residue. |
 
@@ -260,7 +256,7 @@ Local source checkout: `npm install`, then `node scripts/link-dsh.mjs`, then res
 ## Release info
 
 - GitHub: https://github.com/QWQcool/dsh-trivium
-- npm: [`dsh-trivium@0.4.9`](https://www.npmjs.com/package/dsh-trivium)
+- npm: [`dsh-trivium@0.4.10`](https://www.npmjs.com/package/dsh-trivium)
 - Tested host: `@deepseek-ai/dsh@0.1.1-rc.2` (also `0.1.0-rc.8`)
 - License: MIT (depends on [TriviumDB](https://github.com/YoKONCy/TriviumDB), Apache-2.0)
 

package/README.zh-CN.md

@@ -47,23 +47,17 @@ dsh plugin --profile web add dsh-trivium
 
 ## 卸载
 
+先停掉 **dsh web**，避免 `.tdb` 被占用，然后：
+
 ```sh
 dsh plugin --profile web remove dsh-trivium
 ```
 
-重启 **dsh web** 后，设置里的「Trivium 记忆」和标题栏「芯片」都会消失。四个工具不再注册。
-
-卸载**不会**自动删记忆文件。要彻底清掉再手动删：
+`remove` 会删掉本插件的文件：`~/.dsh/trivium.json`，以及它打开过的每个工作区里的 `.dsh/trivium.tdb` 和 `trivium-pending.json`。`.dsh/` 下其它文件不动。用 `dsh plugin add dsh-trivium` 升级**不会**清记忆。
 
-| 路径 | 内容 |
-|---|---|
-| `<workspace>/.dsh/trivium.tdb` | 该工作区的图记忆（节点、边、会话图方框） |
-| `<workspace>/.dsh/trivium-pending.json` | 抽取失败待重放的队列；没有则跳过 |
-| `~/.dsh/trivium.json` | 注入策略、抽取开关、embedding、各会话芯片钉选 |
+然后再重启 **dsh web**：设置里不再有「Trivium 记忆」，标题栏不再有「芯片」，四个工具不再注册。
 
-只卸插件、留 `.tdb`：以后再装回来，工作区记忆还在。多个工作区各有自己的 `.tdb`，删一个不影响别的。
-
-临时关掉、先不卸载：在该 profile 的 `cordis.patch.yml` 里加：
+从未用本版打开过的工作区，可能还留着旧 `.tdb`；看到就手动删那个文件。只想停用、不卸载（数据还在）：在该 profile 的 `cordis.patch.yml` 里加：
 
 ```yaml
 - id: dsh-trivium
@@ -216,6 +210,8 @@ Trivium 是记忆内核，不是日记、日历或聊天伴侣。它按**节点
 
 ## 更新说明
 
+**0.4.10** — `dsh plugin remove` 会删掉已知工作区的 `.tdb` 和 `~/.dsh/trivium.json`。升级安装不清记忆。配置里 disabled 仍保留数据。
+
 **0.4.9** — 芯片标签和会话层画布都默认关。设置里打开芯片后标题栏才出现「芯片」；情节方框嵌在其下。内核（四工具、短地图、进程内 `.tdb`）不变。
 
 **0.4.8** — 写入 + 注入卫生闸门（密钥、乱码、复读、JSON envelope、base64 残骸）。设置页 / 会话图跟随 DSH 语言。设置页可检查 npm 更新。一次性严导入同时发现 Claude Code `CLAUDE.md` 与 Codex `AGENTS.md`。若 `session-start` 和第一步赛跑，首轮短地图仍会补上。
@@ -247,7 +243,7 @@ Trivium 是记忆内核，不是日记、日历或聊天伴侣。它按**节点
 | `ctx_find` 什么都没有 | 新会话默认只注入短地图，模型要自己调工具。也可以在芯片条「新增」或对模型说「记住：…」。闲聊和一次性改文件不会自动入库。 |
 | 报 `.tdb` 被占用 / 打不开 | 只开一个 `dsh web`。不要同时跑两份链接了本插件的 Node 进程。 |
 | embedding 填了但检索没变准 | 失败会退回关键词 + 图。看 `~/.dsh/trivium.json` 里 URL 是否 OpenAI 兼容（含 `/v1` 那种）。改完重启。 |
-| 卸载后记忆还在 / 再装后钉选还在 | 记忆在工作区 `.tdb`，钉选在 `~/.dsh/trivium.json`。要清就按上面「卸载」删文件。 |
+| 卸载后记忆还在 | 先停 `dsh web` 再 `dsh plugin remove`。剩下的 `.tdb` 是从未用 0.4.10 打开过的工作区，到该文件夹删 `.dsh/trivium.tdb`。只在配置里 disabled 不会清文件。 |
 | 检查更新失败 | 只请求 npm registry 拿最新版本号，不影响记忆；过一会儿再点即可。 |
 | rc.8 之后旧对话打不开 | 那是 DSH 自己的会话库格式变了，不是 `.tdb` 坏了。图记忆仍可 `ctx_find`；对不上号的旧方框可当情节残留。 |
 
@@ -258,7 +254,7 @@ Trivium 是记忆内核，不是日记、日历或聊天伴侣。它按**节点
 ## 发布信息
 
 - GitHub: https://github.com/QWQcool/dsh-trivium
-- npm: [`dsh-trivium@0.4.9`](https://www.npmjs.com/package/dsh-trivium)
+- npm: [`dsh-trivium@0.4.10`](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/purge.js

@@ -0,0 +1,116 @@
+/** Wipe plugin files on real uninstall. Never run this on dsh web restart. */
+
+import { existsSync, readdirSync, unlinkSync } from "node:fs";
+import { basename, join, resolve } from "node:path";
+import { listedWorkspaces, settingsFilePath } from "./settings.js";
+import { closeAll, listOpenWorkspaces } from "./store.js";
+
+export function isTriviumArtifactName(name) {
+  const n = String(name || "");
+  return n === "trivium-pending.json" || n === "trivium.tdb" || n.startsWith("trivium.tdb");
+}
+
+/**
+ * `dsh plugin remove` / `pnpm remove` should wipe.
+ * `pnpm add` / update / ci reinstall the same package and must keep memory.
+ */
+export function shouldWipeOnUninstall(env = process.env, argv = process.argv) {
+  if (argv.includes("--force-purge")) return true;
+  const event = String(env.npm_lifecycle_event || "").toLowerCase();
+  if (event && event !== "preuninstall" && event !== "uninstall") return false;
+
+  const cmd = String(env.npm_command || "").toLowerCase();
+  if (cmd === "remove" || cmd === "uninstall") return true;
+  if (cmd === "install" || cmd === "add" || cmd === "update" || cmd === "upgrade" || cmd === "ci" || cmd === "dedupe") {
+    return false;
+  }
+
+  const cooked = String(env.npm_config_argv || "").toLowerCase();
+  if (/\b(remove|uninstall)\b/.test(cooked) && !/\b(install|add|update|upgrade)\b/.test(cooked)) return true;
+  if (/\b(install|add|update|upgrade|ci)\b/.test(cooked)) return false;
+
+  // Unknown command: keep memory. Upgrades must never delete the store.
+  return false;
+}
+
+export function collectPurgeCwds(extraCwds = []) {
+  const seen = new Set();
+  const out = [];
+  const add = (cwd) => {
+    const key = String(cwd || "").trim();
+    if (!key) return;
+    const resolved = resolve(key);
+    if (seen.has(resolved)) return;
+    seen.add(resolved);
+    out.push(resolved);
+  };
+  for (const cwd of listedWorkspaces()) add(cwd);
+  for (const row of listOpenWorkspaces()) add(row.cwd);
+  for (const cwd of extraCwds) add(cwd);
+  return out;
+}
+
+function unlinkQuiet(path, files, errors) {
+  try {
+    unlinkSync(path);
+    files.push(path);
+  } catch (err) {
+    if (err && err.code !== "ENOENT") errors.push({ path, message: String(err.message || err) });
+  }
+}
+
+export function purgeWorkspaceArtifacts(cwd, files, errors) {
+  const dir = join(resolve(cwd), ".dsh");
+  if (!existsSync(dir)) return;
+  let names = [];
+  try {
+    names = readdirSync(dir);
+  } catch (err) {
+    errors.push({ path: dir, message: String(err.message || err) });
+    return;
+  }
+  for (const name of names) {
+    if (!isTriviumArtifactName(name)) continue;
+    unlinkQuiet(join(dir, name), files, errors);
+  }
+}
+
+/** Delete known workspace traces and ~/.dsh/trivium.json. Leaves other .dsh files alone. */
+export function purgeAllTraces({ extraCwds = [], close = closeAll } = {}) {
+  const settingsFile = settingsFilePath();
+  const workspaces = collectPurgeCwds(extraCwds);
+  try {
+    close();
+  } catch {
+    // ignore
+  }
+  const files = [];
+  const errors = [];
+  for (const cwd of workspaces) purgeWorkspaceArtifacts(cwd, files, errors);
+  unlinkQuiet(settingsFile, files, errors);
+  return { ok: errors.length === 0, workspaces, files, errors, settingsFile };
+}
+
+function shouldRunCli() {
+  return basename(String(process.argv[1] || "")) === "purge.js";
+}
+
+export function runUninstallPurge(env = process.env, argv = process.argv, log = console) {
+  if (!shouldWipeOnUninstall(env, argv)) {
+    log.info?.("[dsh-trivium] skip data wipe (install/update, not remove)");
+    return { skipped: true };
+  }
+  const result = purgeAllTraces();
+  const n = result.files.length;
+  log.info?.(`[dsh-trivium] removed ${n} plugin file${n === 1 ? "" : "s"} from ${result.workspaces.length} workspace(s)`);
+  if (result.errors.length) {
+    log.warn?.("[dsh-trivium] some files could not be deleted (stop dsh web and delete leftovers):");
+    for (const err of result.errors) log.warn?.(`  ${err.path}: ${err.message}`);
+  }
+  return result;
+}
+
+if (shouldRunCli()) {
+  const result = runUninstallPurge();
+  if (result?.errors?.length) process.exitCode = 1;
+}

package/lib/settings.js

@@ -1,19 +1,68 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
+import { homedir, tmpdir } from "node:os";
+import { dirname, join, relative, resolve, sep } from "node:path";
 import { looksHttpUrl } from "./embed.js";
 
 export const SETTINGS_FILE = join(homedir(), ".dsh", "trivium.json");
 
+/** Tests may set DSH_TRIVIUM_SETTINGS to a temp file so we never touch the live home config. */
+export function settingsFilePath() {
+  const override = String(process.env.DSH_TRIVIUM_SETTINGS || "").trim();
+  return override ? resolve(override) : SETTINGS_FILE;
+}
+
+function persistSettings(next) {
+  const file = settingsFilePath();
+  mkdirSync(dirname(file), { recursive: true });
+  writeFileSync(file, JSON.stringify(next, null, 2), "utf8");
+  return next;
+}
+
 export function readUiSettings() {
   try {
-    const raw = JSON.parse(readFileSync(SETTINGS_FILE, "utf8"));
+    const raw = JSON.parse(readFileSync(settingsFilePath(), "utf8"));
     return raw && typeof raw === "object" ? raw : {};
   } catch {
     return {};
   }
 }
 
+export function listedWorkspaces() {
+  const raw = readUiSettings().workspaces;
+  if (!Array.isArray(raw)) return [];
+  const seen = new Set();
+  const out = [];
+  for (const item of raw) {
+    const cwd = String(item || "").trim();
+    if (!cwd) continue;
+    const key = resolve(cwd);
+    if (seen.has(key)) continue;
+    seen.add(key);
+    out.push(key);
+  }
+  return out;
+}
+
+function isInsideDir(parent, child) {
+  const rel = relative(resolve(parent), resolve(child));
+  return rel === "" || (rel !== ".." && !rel.startsWith(".." + sep));
+}
+
+/** Remember a workspace so uninstall can delete its .tdb. No-op if already listed. */
+export function rememberWorkspace(cwd) {
+  const key = String(cwd || "").trim();
+  if (!key) return listedWorkspaces();
+  const resolved = resolve(key);
+  if (!process.env.DSH_TRIVIUM_SETTINGS && isInsideDir(tmpdir(), resolved)) {
+    return listedWorkspaces();
+  }
+  const prev = readUiSettings();
+  const workspaces = listedWorkspaces();
+  if (workspaces.includes(resolved)) return workspaces;
+  persistSettings({ ...prev, workspaces: [...workspaces, resolved] });
+  return [...workspaces, resolved];
+}
+
 export function recallModeOf(opts = {}) {
   const mode = opts.recallMode;
   if (mode === "auto" || mode === "anchor" || mode === "off") return mode;
@@ -42,7 +91,6 @@ export function applyRecallMode(target, mode) {
 }
 
 export function writeUiSettings(patch) {
-  mkdirSync(join(homedir(), ".dsh"), { recursive: true });
   const prev = readUiSettings();
   const next = { ...prev };
   let mode = recallModeOf(prev);
@@ -76,8 +124,9 @@ export function writeUiSettings(patch) {
   } else if (prev.pinsBySession && typeof prev.pinsBySession === "object") {
     next.pinsBySession = prev.pinsBySession;
   }
-  writeFileSync(SETTINGS_FILE, JSON.stringify(next, null, 2), "utf8");
-  return next;
+  if (Array.isArray(patch.workspaces)) next.workspaces = patch.workspaces;
+  else if (Array.isArray(prev.workspaces)) next.workspaces = prev.workspaces;
+  return persistSettings(next);
 }
 
 export function pinsOf(sessionId) {
@@ -96,11 +145,10 @@ export function writePins(sessionId, ids) {
   if (!key) return nextIds;
   if (!nextIds.length) delete pinsBySession[key];
   else pinsBySession[key] = nextIds;
-  mkdirSync(join(homedir(), ".dsh"), { recursive: true });
-  writeFileSync(SETTINGS_FILE, JSON.stringify({ ...prev, pinsBySession }, null, 2), "utf8");
+  persistSettings({ ...prev, pinsBySession });
   return nextIds;
 }
 
 export function settingsFileExists() {
-  return existsSync(SETTINGS_FILE);
+  return existsSync(settingsFilePath());
 }

package/lib/store.js

@@ -2,6 +2,7 @@ import { mkdirSync } from "node:fs";
 import { createRequire } from "node:module";
 import { join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { rememberWorkspace } from "./settings.js";
 import { DIM, EDGE_LABELS, BUSINESS_EDGES, NODE_TYPES, indexTextFor, nowIso, weightOf, zeroVector } from "./schema.js";
 import { clipToTokenBudget, estimateTokens } from "./tokens.js";
 import { isStalePayload, parseUntilFromText, queryMentionsUntil, resolveUntilAt } from "./until.js";
@@ -78,6 +79,11 @@ export async function openWorkspaceDb(cwd) {
   ensureWorkspaceRoot(db, cwd);
   rebuildTextIndex(db);
   dbs.set(key, db);
+  try {
+    rememberWorkspace(key);
+  } catch {
+    // listing is best-effort; opening the store still succeeds
+  }
   return db;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-trivium",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "description": "In-process graph memory for DeepSeek Harness, backed by TriviumDB.",
   "license": "MIT",
   "type": "module",
@@ -42,6 +42,8 @@
     "smoke-p7": "node scripts/smoke-p7.mjs",
     "smoke-p8": "node scripts/smoke-p8.mjs",
     "smoke-p10": "node scripts/smoke-p10.mjs",
+    "smoke-p11": "node scripts/smoke-p11.mjs",
+    "preuninstall": "node ./lib/purge.js",
     "verify-live-p2": "node scripts/verify-live-p2.mjs"
   },
   "engines": {