dsh-trivium 0.4.20 → 0.4.22

package/README.md

@@ -55,6 +55,8 @@ Then restart `dsh web`.
 
 ## Updating
 
+Before upgrading, stop DSH and back up the entire workspace `.dsh/trivium.tdb*` file group. Default mmap storage also uses `.vec`, `.wal`, `.text`, and other sidecars. Git JSONL omits local-only data and is not a complete backup.
+
 ```sh
 dsh plugin --profile web add dsh-trivium
 ```
@@ -138,7 +140,11 @@ Trivium is a memory kernel, not a journal, calendar, or chat companion. It store
 
 Nodes are `entity` / `preference` / `decision` / `experience`. Business edges are `about`, `decided`, `broke`, `fixed`.
 
-`ctx_find` returns L0 summaries plus edge paths (incoming as `<-label-id`). If the query names an existing entity, unexpired `about` / `decided` / `broke` / `fixed` neighbors come along even when the neighbor text does not contain the query. Decisions with `until` stay hidden after they expire, unless the query itself is asking about that deadline (e.g. “Friday”).
+`ctx_find` returns L0 summaries plus edge paths (incoming as `<-label-id`). Entity-name queries also return `about` / `decided` / `broke` / `fixed` neighbors even when their text omits the query. Relevant expired decisions remain searchable as history, labeled `stale` and ranked lower. Set `include_stale: false` to exclude them. Automatic recall and the opening map still exclude expired decisions.
+
+Dates in prose stay in prose. Set expiry in Settings or the separate `ctx_remember.until` field. Supported labels are `YYYY-MM-DD`, weekdays such as `Friday` / `周五`, `周末`, and `下周` (one week), resolved at the end of the UTC day. An unresolvable replacement label cannot retain the old `untilAt`. Clearing the label clears the timestamp; changing a relative deadline anchors it to the edit, while saving an unchanged label does not extend it.
+
+0.4.22 does not bulk-delete existing expiry fields. Find affected entries with `ctx_find` or Settings → **Show expired decisions**, clear `until`, and save. Later edits to dated prose will not recreate the expiry.
 
 ### Chips (memory whitelist)
 
@@ -183,9 +189,9 @@ Injection detail: autoRecall injects at most 3 L0 hits when the step has user te
 
 | Tool | What it does |
 |---|---|
-| `ctx_find` | Search; L0 summaries and graph paths (incoming `<-label-id`). Entity-name queries also return unexpired about/decided/broke/fixed neighbors. Expired `until` decisions stay out unless the query asks about the deadline |
+| `ctx_find` | Text / optional vector / graph search; L0 summaries and paths. Expired history is labeled `stale` and ranked lower; `include_stale: false` excludes it |
 | `ctx_read` | Full text and incoming edges by id |
-| `ctx_remember` | Manual write |
+| `ctx_remember` | Manual write; optional explicit `until` field for real expiry, never inferred from dates in prose |
 | `ctx_link` | Directed edge between two nodes |
 
 The kernel is still these four. Chips / session layer do not add a fifth tool.
@@ -245,6 +251,12 @@ Off by default. After you turn **Chips (memory whitelist)** on in Settings, the
 
 ## Changelog
 
+**0.4.22** — Fix [issue #3](https://github.com/QWQcool/dsh-trivium/issues/3): expiry is explicit, clearing it persists, and relevant expired history is searchable with a `stale` label. Preserve native text/vector candidates; add multiword fallback, aliases, and two-character Chinese entity anchors. Upgrade TriviumDB to `0.8.11`. Add focused expiry/recall regressions and keep automatic recall restricted to unexpired memories.
+
+The peer ranges now explicitly admit the supported DSH `0.1.5`, `0.2.0`, and `0.2.1` RC lines; a broad stable-version range alone does not include those prereleases under npm rules.
+
+**0.4.21** — Host adaptation for `@deepseek-ai/dsh@0.2.x`. Session format v4 replaced the shared `kind: "plugin"` message source with producer-owned kinds: a third-party producer must write `kind: "plugin:dsh-trivium"` and drop the `plugin` field, or the whole turn fails with "format v4 message requires a producer-owned source kind". The plugin now picks the shape from the installed `dsh-llm` version, so 0.1.x keeps working. `agent/created` (0.1.6+) is handled next to `agent/session-start`, with a one-shot guard in case a host emits both. Peer range widened to `<0.3.0`. New `smoke-p14` pins both source shapes and the version switch. Four tools / short map / find paths unchanged.
+
 **0.4.20** — Storage bump to `triviumdb@0.8.9`. The napi surface is unchanged (`triviumdb.d.ts` and `index.js` hash identically to 0.8.8), so this is a kernel-only update: SM-L2 is now the default QuIVer query path, FIND planning no longer materializes discarded candidates, and the server edition ships an attributed Web Console. All 14 offline smoke scripts pass unchanged. Four tools / short map / find paths unchanged.
 
 **0.4.19** — Fixed the plugin's own UI rendering Simplified Chinese on an English host ([issue #2](https://github.com/QWQcool/dsh-trivium/issues/2)). The `locale` service is now reached through `ctx.inject(["locale"], …)`, so **follow host** no longer depends on composition order, and the plugin fallback is `en` — the host's own `FALLBACK_LOCALE`, and the bucket every other resolved host language lands in. The Settings card and the Chips tab only ever choose between zh and en, so a browser naming no registered language no longer gets a Chinese card. Four tools / short map / find paths unchanged.
@@ -310,7 +322,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.20`](https://www.npmjs.com/package/dsh-trivium)
+- Package version: `0.4.22` · [npm](https://www.npmjs.com/package/dsh-trivium)
 - Tested host: `@deepseek-ai/dsh@0.1.5-rc.1` (also `0.1.1-rc.2` / `0.1.0-rc.8`)
 - License: MIT (depends on [TriviumDB](https://github.com/YoKONCy/TriviumDB), Apache-2.0)
 

package/README.zh-CN.md

@@ -53,6 +53,8 @@ npm test              # 可选：跑全部离线 smoke
 
 ## 更新
 
+升级前先停止 DSH，备份工作区 `.dsh/trivium.tdb*` 整个文件组。默认 mmap 模式还会使用 `.vec`、`.wal`、`.text` 等附属文件；Git JSONL 不含全部本机数据，不能代替完整备份。
+
 ```sh
 dsh plugin --profile web add dsh-trivium
 ```
@@ -134,7 +136,11 @@ Trivium 是记忆内核，不是日记、日历或聊天伴侣。它按**节点
 
 节点类型是 `entity` / `preference` / `decision` / `experience`。业务边是 `about`、`decided`、`broke`、`fixed`。
 
-`ctx_find` 返回 L0 摘要和图路径（入边写成 `<-label-id`）。查询点到已有实体名时，还会带上未过期的 about/decided/broke/fixed 邻居，即使邻居正文不含查询词。带 `until` 的过期决策默认不出现，除非查询本身在问期限（如「周五」）。
+`ctx_find` 返回 L0 摘要和图路径（入边写成 `<-label-id`）。查询点到已有实体名时，还会带上 about/decided/broke/fixed 邻居，即使邻居正文不含查询词。相关的过期决策仍可作为历史返回，标记 `stale` 并降权；设置 `include_stale: false` 可排除过期条目。自动召回和开场短地图仍排除过期决策。
+
+正文中的日期只属于正文。有效期通过设置页或 `ctx_remember` 的独立 `until` 字段指定，支持 `YYYY-MM-DD`、`Friday` / `周五`、`周末`、`下周`，按 UTC 日末解释。无法解析的新标签不会沿用旧 `untilAt`。清空 `until` 会同时移除时间戳，修改为新的相对期限则从本次编辑时计算；仅保存同一期限不会延长它。
+
+0.4.22 不批量删除旧数据的期限。被误标的记忆可重新通过 `ctx_find` 查到，也可在设置里勾选「显示过期决策」找到，清空 `until` 并保存；之后编辑含日期的正文不会再自动生成期限。
 
 ### 芯片（记忆白名单）
 
@@ -179,9 +185,9 @@ Trivium 是记忆内核，不是日记、日历或聊天伴侣。它按**节点
 
 | 工具 | 说明 |
 |---|---|
-| `ctx_find` | 检索，返回 L0 摘要和图路径（含入边 `<-label-id`）。查询点到已有实体名时，还会带上未过期的 about/decided/broke/fixed 邻居。带 `until` 的过期决策默认不出现，除非查询本身在问期限（如「周五」） |
+| `ctx_find` | 文本 / 可选向量 / 图关系检索；返回 L0 和路径。过期历史标记 `stale` 并降权；`include_stale: false` 排除过期条目 |
 | `ctx_read` | 按 id 读全文和入边 |
-| `ctx_remember` | 手动写入 |
+| `ctx_remember` | 手动写入；可用独立 `until` 字段指定真实有效期，不从正文日期推断 |
 | `ctx_link` | 两点之间建有向边 |
 
 内核仍是这四个。芯片 / 会话层不加第五个工具。
@@ -241,6 +247,12 @@ Trivium 是记忆内核，不是日记、日历或聊天伴侣。它按**节点
 
 ## 更新说明
 
+**0.4.22** — 修复 [issue #3](https://github.com/QWQcool/dsh-trivium/issues/3)：期限只由显式字段设置，清空后不再重新生成，相关过期记忆可带 `stale` 标记检索。保留数据库原生文本 / 向量候选，增加中英文多词兜底、别名与两字中文实体锚点。TriviumDB 升至 `0.8.11`。新增期限与召回专项回归，自动召回仍排除过期记忆。
+
+peer 范围显式接受已支持的 DSH `0.1.5`、`0.2.0`、`0.2.1` RC 版本线，修复 npm 普通稳定版范围不会自动接受这些预发布版本的问题。
+
+**0.4.21** — 适配 `@deepseek-ai/dsh@0.2.x`。会话格式 v4 把共享的 `kind: "plugin"` 消息来源改成生产者自有的 kind：第三方生产者必须写 `kind: "plugin:dsh-trivium"` 且去掉 `plugin` 字段，否则整轮会以 "format v4 message requires a producer-owned source kind" 失败。插件按已安装的 `dsh-llm` 版本自动选择形状，0.1.x 仍走旧格式。新增对 `agent/created`（0.1.6+）的监听，与 `agent/session-start` 并存并做一次性去重。peer 范围放宽到 `<0.3.0`。新增 `smoke-p14` 钉住两种 source 形状与版本判定。四工具 / 短地图 / find 路径不变。
+
 **0.4.20** — 存储升到 `triviumdb@0.8.9`。napi 接口零变更（`triviumdb.d.ts` 与 `index.js` 与 0.8.8 哈希完全一致），属纯内核升级：QuIVer 默认走 SM-L2 查询路径，FIND 规划不再物化被丢弃的候选，服务端版本带上带署名的 Web Console。14 个离线冒烟脚本原样通过。四工具 / 短地图 / find 路径不变。
 
 **0.4.19** — 修复插件自身界面在英文宿主上渲染成简体中文（[issue #2](https://github.com/QWQcool/dsh-trivium/issues/2)）。`locale` 服务改经 `ctx.inject(["locale"], …)` 获取，「跟随宿主」不再依赖插件组合顺序；兜底语言改为 `en`——与宿主自己的 `FALLBACK_LOCALE` 一致，也是其它已解析宿主语言的归宿。设置卡与芯片标签只在 zh / en 之间选择，浏览器未命名任何注册语言时不再给出中文卡。四工具 / 短地图 / find 路径不变。
@@ -306,7 +318,7 @@ Trivium 是记忆内核，不是日记、日历或聊天伴侣。它按**节点
 ## 发布信息
 
 - GitHub: https://github.com/QWQcool/dsh-trivium
-- npm: [`dsh-trivium@0.4.20`](https://www.npmjs.com/package/dsh-trivium)
+- 包版本：`0.4.22` · [npm](https://www.npmjs.com/package/dsh-trivium)
 - 测试宿主：`@deepseek-ai/dsh@0.1.5-rc.1`（兼 `0.1.1-rc.2` / `0.1.0-rc.8`）
 - License: MIT（依赖 [TriviumDB](https://github.com/YoKONCy/TriviumDB) 为 Apache-2.0）
 

package/lib/extract.js

@@ -9,7 +9,7 @@ import {
   mergeInto,
   ensureLink,
 } from "./store.js";
-import { parseUntilFromText, resolveUntilAt } from "./until.js";
+import { resolveUntilAt } from "./until.js";
 
 export const PREFERENCE_CUES =
   /记住|以后都|别再|不要再|从现在起|always do|from now on|never again|remember (?:this|that|to)\b/i;
@@ -114,10 +114,6 @@ export function textFromContent(content) {
   return parts.join("\n");
 }
 
-function untilOf(text) {
-  return parseUntilFromText(text);
-}
-
 function isToolDriveTurn(text) {
   return TOOL_DRIVE_CUES.test(String(text || ""));
 }
@@ -256,7 +252,6 @@ export function ruleCandidates(turns) {
         type: "decision",
         name: object,
         text: clip(span, 240),
-        until: untilOf(span),
         linkName: object,
         linkLabel: EDGE_LABELS.decided,
         quote: clip(span, 120),
@@ -377,9 +372,10 @@ export function buildExtractPrompt(turns) {
   const transcript = clip(turnsText(turns), 2400);
   return [
     "Extract durable memory candidates as JSON only.",
-    'Shape: {"candidates":[{"type":"preference|entity|decision|experience","name":"","text":"","linkName":"","linkLabel":"about|decided|broke|fixed","fail":"","fix":"","until":"","quote":""}]}',
+    'Shape: {"candidates":[{"type":"preference|entity|decision|experience","name":"","text":"","linkName":"","linkLabel":"about|decided|broke|fixed","fail":"","fix":"","quote":""}]}',
     "Whitelist: 记住/以后都/别再 → preference; repeated proper names → entity; decision with an object (先别动/下周再/采用方案) → decision; tool fail then success in the same turn → experience.",
     "Do not write chitchat or one-off file edits as preference. Do not store secrets, tool dumps, or whole conversations.",
+    "Keep dates in the fact text. Do not infer expiry or emit until/untilAt; expiry is set explicitly through the memory tools or settings.",
     "If nothing matches, return {\"candidates\":[]}.",
     "",
     transcript,
@@ -481,7 +477,11 @@ export async function distill({ db, turns, sessionId, llmCall, log }) {
   if (typeof llmCall === "function") {
     try {
       const raw = await llmCall(buildExtractPrompt(usable));
-      model = parseModelJson(raw);
+      // Automatic extraction cannot silently turn an event date into expiry,
+      // even when the model emits fields outside the requested schema.
+      model = parseModelJson(raw).map((candidate) => ({
+        ...candidate, until: undefined, untilAt: undefined,
+      }));
     } catch (err) {
       llmFailed = true;
       log?.warn?.(`[dsh-trivium] extract prompt failed: ${err.message}`);

package/lib/host-format.js

@@ -0,0 +1,35 @@
+/**
+ * Host wire-format helpers, kept free of `@deepseek-ai/*` imports so the offline
+ * smoke suite can exercise them without a DSH install.
+ *
+ * Session format v4 (DSH 0.2.0+) replaced the shared `kind: "plugin"` message
+ * source with producer-owned kinds: a third-party producer is `plugin:<name>`
+ * and the `plugin` field is dropped. Writing the old shape into a v4 log fails
+ * the whole turn with "format v4 message requires a producer-owned source kind".
+ * 0.1.x only knows the old shape, so lib/index.js picks by host version.
+ */
+
+/**
+ * Decide whether the host writes session format v4.
+ * @param version - `@deepseek-ai/dsh-llm` version, e.g. "0.1.5-rc.1" / "0.2.1-rc.2".
+ * @returns true for >= 0.2.0, and for an unreadable version (assume the current
+ *   format rather than silently writing a shape the host rejects).
+ */
+export function detectHostFormatV4(version) {
+  const v = String(version || "").trim();
+  if (!v) return true;
+  const [major, minor] = v.split(".").map((n) => parseInt(n, 10) || 0);
+  return major > 0 || minor >= 2;
+}
+
+/**
+ * Build the `source` for one plugin-authored message.
+ * @param hostFormatV4 - result of {@link detectHostFormatV4}.
+ * @param extra - additional source fields (form, sections, ...).
+ * @returns the source object the installed host accepts.
+ */
+export function producerSourceFor(hostFormatV4, extra) {
+  return hostFormatV4
+    ? { kind: "plugin:dsh-trivium", ...extra }
+    : { kind: "plugin", plugin: "dsh-trivium", ...extra };
+}

package/lib/index.js

@@ -1,4 +1,6 @@
+import { createRequire } from "node:module";
 import { BlockAssembler, createUserMessage } from "@deepseek-ai/dsh-llm";
+import { detectHostFormatV4, producerSourceFor } from "./host-format.js";
 import { cwdOf, registerTools } from "./tools.js";
 import {
   buildShortMapReport,
@@ -29,6 +31,27 @@ import { syncSidecarOnOpen } from "./sidecar.js";
 export const name = "dsh-trivium";
 export const inject = ["tools"];
 
+/*
+ * Session format v4 (DSH 0.2.0+) replaced the shared `kind: "plugin"` source
+ * with producer-owned kinds: a third-party producer is `plugin:<name>` and the
+ * `plugin` field is dropped. Writing the old shape into a v4 log fails the
+ * whole turn with "format v4 message requires a producer-owned source kind".
+ * 0.1.x only knows the old shape, so pick by host version.
+ */
+function readHostLlmVersion() {
+  try {
+    return String(createRequire(import.meta.url)("@deepseek-ai/dsh-llm/package.json").version || "");
+  } catch {
+    return "";
+  }
+}
+
+export const HOST_FORMAT_V4 = detectHostFormatV4(readHostLlmVersion());
+
+export function producerSource(extra) {
+  return producerSourceFor(HOST_FORMAT_V4, extra);
+}
+
 const DEFAULTS = {
   autoRecall: false,
   anchorRecall: false,
@@ -127,7 +150,7 @@ function makeLlmCall(ctx, session, agent) {
       messages: [
         createUserMessage({
           content: [{ type: "text", text: prompt }],
-          source: { kind: "plugin", plugin: "dsh-trivium" },
+          source: producerSource(),
         }),
       ],
     };
@@ -253,12 +276,10 @@ function injectShortMap(agent, db, budget) {
   agent.inject(
     createUserMessage({
       content: [{ type: "text", text: map.text }],
-      source: {
-        kind: "plugin",
-        plugin: "dsh-trivium",
+      source: producerSource({
         form: "snapshot",
         sections: [{ name: "dsh-trivium", text: map.text }],
-      },
+      }),
     }),
   );
   return map;
@@ -294,7 +315,19 @@ export function apply(ctx, config = {}) {
 
   registerTools(ctx, optionsOf);
 
-  ctx.on("agent/session-start", async ({ agent }) => {
+  /*
+   * DSH 0.1.6 replaced the serial `agent/session-start` event with
+   * `agent/created` (payload `{ agent, source, signal? }`). 0.1.5 and older
+   * only emit session-start, and a host never emits both, but the started set
+   * keeps the four one-shot steps below from running twice if that changes.
+   */
+  const started = new Set();
+  const onAgentStart = async ({ agent }) => {
+    const startId = sessionKey(agent?.session);
+    if (startId) {
+      if (started.has(startId)) return;
+      started.add(startId);
+    }
     try {
       const ready = await ensureShortMap(agent, optionsOf());
       const cwd = ready?.cwd || cwdOf(agent);
@@ -340,7 +373,10 @@ export function apply(ctx, config = {}) {
     } catch (err) {
       log.warn?.(`[dsh-trivium] session-start skipped: ${err.message}`);
     }
-  });
+  };
+
+  ctx.on("agent/created", onAgentStart);
+  ctx.on("agent/session-start", onAgentStart);
 
   ctx.on("session/event", (session, event) => {
     try {
@@ -457,10 +493,7 @@ export function apply(ctx, config = {}) {
                 // No `form`: "pins" was never in DSH's ContextForm union, so the
                 // client already rendered it as undeclared (opaque) context.
                 // Omitting the field is the documented default for that.
-                source: {
-                  kind: "plugin",
-                  plugin: "dsh-trivium",
-                },
+                source: producerSource(),
               }),
             );
           }
@@ -482,6 +515,7 @@ export function apply(ctx, config = {}) {
             hits = searchNodes(db, query, {
               topK: 3,
               expandDepth: 1,
+              includeStale: false,
               queryVector: queryVector || undefined,
             }).slice(0, 3);
           }
@@ -498,11 +532,7 @@ export function apply(ctx, config = {}) {
             extra.push(
               createUserMessage({
                 content: [{ type: "text", text }],
-                source: {
-                  kind: "plugin",
-                  plugin: "dsh-trivium",
-                  form: "recall",
-                },
+                source: producerSource({ form: "recall" }),
               }),
             );
           }

package/lib/markdown.js

@@ -19,7 +19,6 @@ import {
   applyCandidates,
   firstEntityName,
 } from "./extract.js";
-import { parseUntilFromText } from "./until.js";
 import { listOutgoingBusiness } from "./store.js";
 
 export const EXPORT_MARKER = "dsh-trivium-export";
@@ -192,7 +191,6 @@ function classifyBullet(text, sectionEntity) {
           type: "decision",
           name,
           text: fact,
-          until: parseUntilFromText(body),
           linkName: name,
           linkLabel: "decided",
           quote: clip(body, 120),

package/lib/pins.js

@@ -7,7 +7,7 @@ import { archiveNode, deleteNode, suggestedNeighborIds } from "./store.js";
 import { applyCandidates, DECISION_CUES, EXPLICIT_LINE_CHARS, firstEntityName } from "./extract.js";
 import { clip } from "./schema.js";
 import { payloadLooksDirty, sanitizeForWrite, writeGateMessage } from "./hygiene.js";
-import { parseUntilFromText } from "./until.js";
+import { isStalePayload } from "./until.js";
 
 export const PIN_TOKEN_BUDGET = 300;
 export const CHIP_TYPES = Object.freeze(["preference", "decision", "entity"]);
@@ -117,7 +117,8 @@ export function buildPinInject(db, sessionId, budget = PIN_TOKEN_BUDGET) {
   for (const id of ids) {
     const payload = db.get(Number(id))?.payload;
     if (!payload || payloadLooksDirty(payload)) continue;
-    lines.push(`- [${payload.type}#${id}] ${l0Of(payload)}`);
+    const expiry = isStalePayload(payload) ? ` stale until=${payload.until || payload.untilAt}` : "";
+    lines.push(`- [${payload.type}#${id}${expiry}] ${l0Of(payload)}`);
     used.push(Number(id));
   }
   const full = lines.join("\n");
@@ -200,7 +201,6 @@ function candidateFromChipLine(body) {
           type: "decision",
           name,
           text: clip(text, EXPLICIT_LINE_CHARS),
-          until: parseUntilFromText(text),
           linkName: name,
           linkLabel: "decided",
           quote: clip(text, 120),

package/lib/schema.js

@@ -64,7 +64,7 @@ export function looksSecret(text) {
 }
 
 export function indexTextFor(payload) {
-  const parts = [payload.type, payload.name, payload.text, payload.uri, payload.fail, payload.fix, payload.until]
+  const parts = [payload.type, payload.name, ...(Array.isArray(payload.aliases) ? payload.aliases : []), payload.text, payload.uri, payload.fail, payload.fix, payload.until]
     .filter(Boolean)
     .map(String);
   return parts.join(" ");

package/lib/sidecar.js

@@ -333,7 +333,7 @@ async function applySidecar(db, parsed) {
         createdAt: row.createdAt || "",
         updatedAt: row.updatedAt || "",
       };
-      if (!payload.until) delete payload.until;
+      // Keep the empty label as an explicit clear when reconciling a snapshot.
       if (!payload.untilAt) delete payload.untilAt;
       if (!payload.fail) delete payload.fail;
       if (!payload.fix) delete payload.fix;

package/lib/store.js

@@ -12,7 +12,7 @@ import {
 } from "./sidecar.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";
+import { isStalePayload, queryMentionsUntil, resolveUntilAt } from "./until.js";
 import { embedText, embeddingEnabled } from "./embed.js";
 import { payloadLooksDirty, sanitizeForWrite } from "./hygiene.js";
 
@@ -316,6 +316,7 @@ export function mergeInto(db, id, incoming) {
     incoming.name,
     old.name,
   ]).filter((a) => a !== (incoming.name || old.name));
+  const deadlineChanged = incoming.until !== undefined && String(incoming.until || "").trim() !== String(old.until || "").trim();
   const next = decorateUntil({
     ...old,
     ...incoming,
@@ -326,7 +327,11 @@ export function mergeInto(db, id, incoming) {
     updatedAt: nowIso(),
     status: old.status || "active",
     source: incoming.source || old.source,
-  });
+    // An omitted expiry must not erase an existing one or leave an orphaned
+    // untilAt. A changed label must not inherit the previous absolute instant.
+    until: incoming.until === undefined ? old.until : incoming.until,
+    untilAt: incoming.untilAt || (deadlineChanged ? undefined : old.untilAt),
+  }, deadlineChanged ? nowIso() : old.createdAt);
   db.updatePayload(Number(id), next);
   indexNode(db, Number(id), next);
   persist(db);
@@ -430,14 +435,12 @@ export function updateNode(db, id, patch = {}) {
   if (Array.isArray(patch.aliases)) {
     next.aliases = uniqueStrings(patch.aliases).filter((a) => a !== next.name);
   }
+  let deadlineChanged = false;
   if (patch.until !== undefined) {
     const until = String(patch.until || "").trim();
-    if (until) {
-      next.until = until;
-      const untilAt = resolveUntilAt(until, next.createdAt);
-      if (untilAt) next.untilAt = untilAt;
-    } else {
-      delete next.until;
+    deadlineChanged = until !== String(old.until || "").trim();
+    next.until = until;
+    if (deadlineChanged || !until) {
       delete next.untilAt;
     }
   }
@@ -447,7 +450,7 @@ export function updateNode(db, id, patch = {}) {
     createdAt: old.createdAt,
     status: old.status || "active",
     updatedAt: nowIso(),
-  });
+  }, deadlineChanged ? nowIso() : old.createdAt);
   const gate = sanitizeForWrite([body.name, body.text, body.fail, body.fix].filter(Boolean).join("\n"));
   if (!gate.ok && gate.reason !== "empty") {
     const err = new Error(gate.reason);
@@ -506,7 +509,7 @@ export function mergeNodes(db, keepId, dropId) {
     text: pa.text,
     aliases: [...(pa.aliases || []), ...(pb.aliases || []), pb.name],
     until: pa.until || pb.until,
-    untilAt: pa.untilAt || pb.untilAt,
+    untilAt: pa.until ? pa.untilAt : pb.untilAt,
     source: pa.source || pb.source,
   });
   ensureLink(db, drop, keep, EDGE_LABELS.sameAs);
@@ -574,7 +577,8 @@ export function importGraph(db, graph) {
     let dest = findByUri(db, payload.uri);
     if (dest == null) dest = findMergeTarget(db, payload);
     if (dest != null) {
-      mergeInto(db, dest, payload);
+      // An exported snapshot is authoritative, including a cleared deadline.
+      mergeInto(db, dest, { ...payload, until: payload.until ?? "" });
       idMap.set(oldId, dest);
       merged += 1;
     } else {
@@ -637,14 +641,18 @@ function pickMergedText(oldText, incomingText) {
   return b.length >= a.length ? b : a;
 }
 
-function decorateUntil(payload) {
+function decorateUntil(payload, from = payload.createdAt) {
   const body = { ...payload };
-  if (body.type === "decision" && !body.until) {
-    const until = parseUntilFromText(body.text);
-    if (until) body.until = until;
+  const until = String(body.until || "").trim();
+  if (!until) {
+    delete body.until;
+    delete body.untilAt;
+    return body;
   }
-  if (body.until && !body.untilAt) {
-    const untilAt = resolveUntilAt(body.until, body.createdAt);
+  body.until = until;
+  if (!body.untilAt || !Number.isFinite(Date.parse(body.untilAt))) {
+    delete body.untilAt;
+    const untilAt = resolveUntilAt(until, from);
     if (untilAt) body.untilAt = untilAt;
   }
   return body;
@@ -718,15 +726,30 @@ export async function backfillEmbeddings(db, { log } = {}) {
   return { ok: true, embedded, failed };
 }
 
-export function searchNodes(db, query, { topK = 8, expandDepth = 1, now, queryVector } = {}) {
+export function searchNodes(db, query, { topK = 8, expandDepth = 1, now, queryVector, includeStale = true } = {}) {
   const text = String(query || "").trim();
   if (!text) return [];
   const at = now instanceof Date ? now : new Date();
   const primary = new Map();
-  const consider = (id) => {
+  const terms = queryTerms(text);
+  const hasQueryVector = Array.isArray(queryVector) && queryVector.length === DIM &&
+    queryVector.every(Number.isFinite) && queryVector.some((value) => value !== 0);
+  const identifierQuery = /^[a-z0-9_]+(?:[-./:][a-z0-9_]+)+$/i.test(text);
+  const consider = (id, nativeScore = 0) => {
     const rec = hitRecord(db, id);
     if (!rec) return;
-    const score = primaryScore(rec.payload, text, at);
+    // A native BM25/vector hit is already a retrieval candidate. Lexical
+    // evidence may boost it, but must never veto it with an exact-phrase gate.
+    const lexical = primaryScore(rec.payload, text, at, terms);
+    // Explicit keywords are additive in 0.8.x. A renamed node may still have
+    // an old native keyword: require some current token evidence for text-only
+    // hits, never the whole query phrase. Vector-only hits need no such overlap.
+    const currentText = indexTextFor(rec.payload).toLowerCase();
+    if (!hasQueryVector && lexical <= 0 && !terms.some((term) => currentText.includes(term))) return;
+    // Keep code identifiers atomic: a sparse hit for just "X" must not turn
+    // an exact X-Request-Id lookup into a hit on an unrelated header X fact.
+    if (identifierQuery && !hasQueryVector && lexical <= 0) return;
+    const score = Math.max(lexical, Number.isFinite(nativeScore) ? nativeScore : 0);
     if (score <= 0) return;
     rec.score = score;
     rec.query = text;
@@ -736,13 +759,16 @@ export function searchNodes(db, query, { topK = 8, expandDepth = 1, now, queryVe
   };
   try {
     const vec =
-      Array.isArray(queryVector) && queryVector.length === DIM ? queryVector : zeroVector();
-    const hits = db.searchHybrid(vec, text, Math.max(topK, 16), 0, 0.01, 0.2);
-    for (const hit of hits || []) consider(hit.id);
+      hasQueryVector ? queryVector : zeroVector();
+    const hits = db.searchHybrid(vec, text, Math.max(topK, 16), 0, 0.01, 0.2, {
+      type: { $in: ["entity", "decision", "preference", "experience"] },
+      status: { $ne: "archived" },
+    });
+    for (const hit of hits || []) consider(hit.id, Number(hit.score));
   } catch {
     // fall through to keyword scan
   }
-  for (const hit of keywordFallback(db, text, 64)) consider(hit.id);
+  for (const hit of keywordFallback(db, text, 64, terms)) consider(hit.id);
   for (const id of entityAnchorIds(db, text)) consider(id);
   if (queryMentionsUntil(text)) {
     for (const id of db.allNodeIds?.() || []) consider(id);
@@ -778,13 +804,14 @@ export function searchNodes(db, query, { topK = 8, expandDepth = 1, now, queryVe
   }
   const typeRank = { entity: 0, decision: 1, preference: 2, experience: 3 };
   return [...out.values()]
-    .filter((hit) => !shouldHideStale(hit, text, at))
+    .filter((hit) => includeStale || !isStalePayload(hit.payload, at))
+    .map((hit) => ({ ...hit, includeStale }))
     .sort((a, b) => {
       const rb = rankBoost(db, b, text, at) - rankBoost(db, a, text, at);
       if (rb) return rb;
-      const td = (typeRank[a.payload?.type] ?? 9) - (typeRank[b.payload?.type] ?? 9);
-      if (td) return td;
-      return (b.score || 0) - (a.score || 0);
+      const score = (b.score || 0) - (a.score || 0);
+      if (score) return score;
+      return (typeRank[a.payload?.type] ?? 9) - (typeRank[b.payload?.type] ?? 9);
     })
     .slice(0, topK);
 }
@@ -817,7 +844,7 @@ export function namedRecallHits(db, query, { topK = 8, now } = {}) {
     }
   }
   return [...out.values()]
-    .filter((hit) => !shouldHideStale(hit, text, at))
+    .filter((hit) => !isStalePayload(hit.payload, at))
     .slice(0, topK);
 }
 
@@ -827,12 +854,6 @@ function hasBusinessEdge(db, hit) {
   return incomingBusinessEdges(db, hit.id).length > 0;
 }
 
-function shouldHideStale(hit, query, now) {
-  if (hit.payload?.type !== "decision") return false;
-  if (!isStalePayload(hit.payload, now)) return false;
-  return !queryMentionsUntil(query, hit.payload);
-}
-
 function rankBoost(db, hit, query, now) {
   let n = 0;
   if (hasBusinessEdge(db, hit)) n += 4;
@@ -864,14 +885,18 @@ function hitRecord(db, id) {
 
 const MIN_ENTITY_ANCHOR = 3;
 
+function longEnoughAnchor(label) {
+  return label.length >= MIN_ENTITY_ANCHOR || /^[\p{Script=Han}]{2}$/u.test(label);
+}
+
 function entityAnchorLabels(payload) {
   return uniqueStrings([payload?.name, ...(payload?.aliases || [])]).filter(
-    (s) => s.length >= MIN_ENTITY_ANCHOR,
+    longEnoughAnchor,
   );
 }
 
 function queryMentionsEntityName(queryLower, nameLower) {
-  if (!queryLower || !nameLower || nameLower.length < MIN_ENTITY_ANCHOR) return false;
+  if (!queryLower || !nameLower || !longEnoughAnchor(nameLower)) return false;
   if (queryLower === nameLower) return true;
   if (/^[\x00-\x7f]+$/.test(nameLower)) {
     const escaped = nameLower.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -902,7 +927,31 @@ function entityAnchorIds(db, query) {
   return ids;
 }
 
-function primaryScore(payload, query, now) {
+const wordSegmenter = new Intl.Segmenter("zh", { granularity: "word" });
+const QUERY_STOP_WORDS = new Set(["的", "了", "是", "在", "有", "和", "与", "请", "什么", "哪些", "怎么", "如何", "一下", "这个", "我们", "the", "a", "an", "is", "are", "to", "of", "for", "and", "what", "how"]);
+
+function queryTerms(query) {
+  const chunks = query.toLowerCase().match(/[\p{L}\p{N}_]+(?:[-./:][\p{L}\p{N}_]+)*/gu) || [];
+  return [...new Set(chunks.flatMap((chunk) => /\p{Script=Han}/u.test(chunk)
+    ? [...wordSegmenter.segment(chunk)].filter((part) => part.isWordLike).map((part) => part.segment)
+    : [chunk])
+    .filter((term) => !QUERY_STOP_WORDS.has(term) && (!/\p{Script=Han}/u.test(term) || term.length >= 2)))];
+}
+
+function lexicalScore(payload, query, terms = queryTerms(query)) {
+  const hay = indexTextFor(payload).toLowerCase();
+  if (hay.includes(query)) return 2;
+  if (!terms.length) return 0;
+  const matched = terms.filter((term) => {
+    if (/\p{Script=Han}/u.test(term)) return hay.includes(term);
+    const escaped = term.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    return new RegExp(`(?:^|[^a-z0-9_])${escaped}(?:$|[^a-z0-9_])`, "i").test(hay);
+  }).length;
+  const coverage = matched / terms.length;
+  return coverage >= 0.5 ? coverage : 0;
+}
+
+function primaryScore(payload, query, now, terms) {
   const q = String(query || "").trim().toLowerCase();
   if (!q) return 0;
   const name = String(payload?.name || "").toLowerCase();
@@ -912,7 +961,7 @@ function primaryScore(payload, query, now) {
   if (name === q) score = 4;
   else if (name.includes(q)) score = 3;
   else if (text.includes(q) || until.includes(q)) score = 2;
-  else if (indexTextFor(payload || {}).toLowerCase().includes(q)) score = 2;
+  else score = lexicalScore(payload || {}, q, terms);
   if (
     payload?.type === "decision" &&
     isStalePayload(payload, now) &&
@@ -993,7 +1042,7 @@ function tqlBusinessNeighbors(db, id) {
   }
 }
 
-function keywordFallback(db, text, topK) {
+function keywordFallback(db, text, topK, terms) {
   const q = text.toLowerCase();
   const ids = db.allNodeIds?.() || [];
   const hits = [];
@@ -1007,17 +1056,16 @@ function keywordFallback(db, text, topK) {
     ) {
       continue;
     }
-    const hay = indexTextFor(node.payload || {}).toLowerCase();
-    if (!hay.includes(q)) continue;
+    const score = lexicalScore(node.payload || {}, q, terms);
+    if (!score) continue;
     hits.push({
       id,
-      score: 1,
+      score,
       payload: node.payload,
       edges: node.edges || [],
     });
-    if (hits.length >= topK) break;
   }
-  return hits;
+  return hits.sort((a, b) => b.score - a.score).slice(0, topK);
 }
 
 function nodeLabel(db, id) {
@@ -1054,8 +1102,7 @@ function incomingBusinessEdges(db, id, { query = "", now, hideStale = false } =
     if (!srcNode || srcNode.payload?.status === "archived") return;
     if (
       hideStale &&
-      isStalePayload(srcNode.payload, at) &&
-      !queryMentionsUntil(query, srcNode.payload)
+      isStalePayload(srcNode.payload, at)
     ) {
       return;
     }
@@ -1109,6 +1156,7 @@ function edgePath(db, nodeId, edges, { query = "", now, hideStale = true } = {})
   const seenOut = new Set();
   for (const e of edges || []) {
     const targetId = e.targetId ?? e.target_id;
+    if (hideStale && isStalePayload(db.get(Number(targetId))?.payload, now)) continue;
     const key = `${e.label}->${targetId}`;
     if (seenOut.has(key)) continue;
     seenOut.add(key);
@@ -1170,7 +1218,7 @@ export function formatHit(db, hit, opts = {}) {
     l0: l0.slice(0, 200),
     until: payload.until || "",
     stale,
-    path: edgePath(db, hit.id, node.edges || [], { query, now }),
+    path: edgePath(db, hit.id, node.edges || [], { query, now, hideStale: hit.includeStale !== true }),
   };
 }
 

package/lib/tools.js

@@ -59,10 +59,11 @@ export function registerTools(ctx, optionsOrFn) {
         textTool({
           name: "ctx_find",
           description:
-            "Search local Trivium graph memory. If the query names a known entity, also returns its unexpired about/decided/broke/fixed neighbors. Returns L0 summaries plus edge paths (incoming as <-label-id). Call ctx_read for full text. Do not paste find results verbatim into later thinking.",
+            "Search local Trivium graph memory by keywords, meaning (when embeddings are enabled), and entity relationships. Relevant expired decisions remain searchable, marked stale and ranked lower; treat them as historical, not current instructions. Set include_stale=false for current facts only. Returns L0 summaries and edge paths. Call ctx_read for full text.",
           parameters: {
             query: { type: "string", required: true, description: "Search query." },
             top_k: { type: "integer", description: "Max hits, 1-20." },
+            include_stale: { type: "boolean", description: "Include relevant expired memories (default true). Expired hits are marked stale." },
           },
           async execute(args, exec) {
             try {
@@ -74,6 +75,7 @@ export function registerTools(ctx, optionsOrFn) {
                 topK: k,
                 expandDepth: options.expandDepth ?? 1,
                 queryVector: queryVector || undefined,
+                includeStale: args.include_stale !== false,
               });
               if (!hits.length) return "No memory hits.";
               const grouped = [];
@@ -145,6 +147,7 @@ export function registerTools(ctx, optionsOrFn) {
               description: "entity | preference | decision | experience",
             },
             name: { type: "string", description: "Short name for entities." },
+            until: { type: "string", description: "Optional explicit expiry, only when the user states this fact expires: YYYY-MM-DD, weekday (Friday / 周五), or 下周. A date mentioned in the fact is not an expiry." },
             link_to: { type: "integer", description: "Optional existing node id to link." },
             link_label: { type: "string", description: "Edge label when link_to is set." },
           },
@@ -162,6 +165,7 @@ export function registerTools(ctx, optionsOrFn) {
                 type,
                 name: args.name || undefined,
                 text: args.text,
+                ...(args.until !== undefined ? { until: args.until } : {}),
                 uri: `ctx://${type}/${Date.now()}`,
                 source: { sessionId: String(exec?.agent?.session?.header?.id || exec?.agent?.id || "") },
               };

package/lib/until.js

@@ -10,19 +10,7 @@ const WEEKDAYS = {
   saturday: 6,
 };
 
-/** Pull a display `until` label out of a fact sentence. */
-export function parseUntilFromText(text) {
-  const s = String(text || "");
-  if (/下周/.test(s)) return "下周";
-  const day = s.match(/\buntil\s+(Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)\b/i);
-  if (day) return day[1];
-  const iso = s.match(/\b(\d{4}-\d{2}-\d{2})\b/);
-  if (iso) return iso[1];
-  const cn = s.match(/到?(\d{1,2}\s*月\d{1,2}\s*日|周五|周末)/);
-  if (cn) return cn[1];
-  return undefined;
-}
-
+// Only resolve an explicit expiry field. Dates mentioned in prose are not expiry.
 export function resolveUntilAt(until, from = new Date()) {
   const raw = String(until || "").trim();
   if (!raw) return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-trivium",
-  "version": "0.4.20",
+  "version": "0.4.22",
   "description": "In-process graph memory for DeepSeek Harness, backed by TriviumDB.",
   "license": "MIT",
   "type": "module",
@@ -47,6 +47,8 @@
     "smoke-p11": "node scripts/smoke-p11.mjs",
     "smoke-p12": "node scripts/smoke-p12.mjs",
     "smoke-p13": "node scripts/smoke-p13.mjs",
+    "smoke-p14": "node scripts/smoke-p14.mjs",
+    "smoke-p15": "node scripts/smoke-p15.mjs",
     "preuninstall": "node ./lib/purge.js",
     "verify-live-p2": "node scripts/verify-live-p2.mjs"
   },
@@ -54,11 +56,11 @@
     "node": "^22.19.0 || >=24"
   },
   "peerDependencies": {
-    "@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"
+    "@deepseek-ai/dsh-llm": ">=0.1.0-rc.8 <0.1.1 || >=0.1.1-rc.2 <0.3.0 || >=0.1.5-rc.1 <0.1.6 || >=0.2.0-rc.0 <0.2.1 || >=0.2.1-rc.0 <0.3.0",
+    "@deepseek-ai/dsh-tools": ">=0.1.0-rc.8 <0.1.1 || >=0.1.1-rc.2 <0.3.0 || >=0.1.5-rc.1 <0.1.6 || >=0.2.0-rc.0 <0.2.1 || >=0.2.1-rc.0 <0.3.0"
   },
   "dependencies": {
-    "triviumdb": "^0.8.9"
+    "triviumdb": "^0.8.11"
   },
   "keywords": [
     "dsh-plugin",