dsh-memory-core 0.1.2 → 0.1.4

package/lib/defaults.js

@@ -5,10 +5,11 @@ import path from "node:path";
 import os from "node:os";
 
 export const DEFAULTS = {
-	memoryTracks: "lite", // "lite" = 三轨 memory/user/key；"full" = 五轨 memory/user/project/key/daily
+	memoryTracks: "full", // "full" = 五轨 memory/user/project/key/daily（默认）；"lite" = 三轨 memory/user/key
 	presetName: "default",
 	memoryDir: "",
-	writeGuard: true,
+	writeGuard: true, // key 轨写入后进待确认队列（语义闸门，不控制看门狗）
+	perTurnWriteGuard: false, // 看门狗：连续 N 轮没写记忆时在快照末尾提醒（独立开关，对齐 evolve）
 	writeGuardThreshold: 2,
 	snapshotOrder: 500,
 };

package/lib/render.js

@@ -1,18 +1,40 @@
 /**
  * 注入层：记忆注入渲染、预算分配、看门狗提醒拼接。
+ *
+ * 形制对齐 dsh-memory-evolve：
+ * - 每轨一个 `## 标签`，其下逐条 `- ` 开头，标题与正文一一对应（不再把所有正文拼在末尾）；
+ * - key 只注入一次（不再「循环注一份 + 额外补一段」）；
+ * - 写引导与看门狗文案按当前启用的轨生成，full 模式必须指向 daily/project，否则那两轨永远是死档。
  */
 import { ENTRY_DELIMITER } from "./store.js";
-import { TRACK_LABELS } from "./tracks.js";
-import { BUDGETS, TOTAL_BUDGET, KEY_TOP_N, KEY_SCAN_N, KEY_EXTRA_CAP, KEY_HOT_WORDS } from "./budgets.js";
+import { TRACK_LABELS, tracksOf } from "./tracks.js";
+import { BUDGETS, TOTAL_BUDGET, KEY_TOP_N, KEY_SCAN_N, KEY_HOT_WORDS } from "./budgets.js";
 
-export const WRITE_GUIDE =
-	"## 每轮收尾\n用 memory_core 工具写一条：重要事实写 `key`，用户偏好写 `user`，长期记忆写 `memory`。";
+/** 写引导：按启用轨给出收尾动作，full 模式强调 daily + project 一次批量写。 */
+export function writeGuideFor(memoryTracks) {
+	const tracks = tracksOf(memoryTracks);
+	const hasProject = tracks.includes("project");
+	const hasDaily = tracks.includes("daily");
+	if (hasProject && hasDaily) {
+		return (
+			"## 每轮收尾\n" +
+			"用 memory_core 工具写一条：一次调用写 daily（今天做了什么）与 project（本项目的进展/决策/坑），" +
+			"重要事实写 `key`，用户偏好写 `user`，长期记忆写 `memory`。"
+		);
+	}
+	return "## 每轮收尾\n用 memory_core 工具写一条：重要事实写 `key`，用户偏好写 `user`，长期记忆写 `memory`。";
+}
 
-export const WRITE_GUARD_NOTICE =
-	"## 提醒\n你连着几个回合没写记忆了。收尾时记得用 memory_core 工具写一条：重要事实写 `key`，" +
-	"用户偏好写 `user`，长期记忆写 `memory`。";
+/** 看门狗提醒：说明盯的是哪几轨、阈值是多少，并指向补写。 */
+export function writeGuardNoticeFor(memoryTracks, threshold) {
+	const tracks = tracksOf(memoryTracks);
+	const duty = tracks.includes("daily") ? "daily / project" : "memory / user / key";
+	return (
+		`## 提醒\n连续 ${threshold} 轮没写 ${duty} 记忆了。收尾时用 memory_core 工具写一条，把这几轮的进展补上。`
+	);
+}
 
-/** 截断后清理开头的孤立分隔符残留。 */
+/** 截断后清理开头的孤立分隔符与残行。 */
 function trimCutHead(text) {
 	let out = text.replace(/^[ \t]*\n+/, "");
 	while (/^§[ \t]*(\n|$)/.test(out)) out = out.replace(/^§[ \t]*\n?/, "").replace(/^[ \t]*\n+/, "");
@@ -36,59 +58,64 @@ function pickKeyEntries(store, agent) {
 	return weighted.map((row) => row.entry);
 }
 
-/** 渲染常驻记忆注入：按 memory > user > key 优先级分配预算。 */
+/** 把条目渲染成 `- 首行` + 续行缩进两格，避免多行条目在列表里断掉层级。 */
+function asBullet(entry) {
+	const lines = String(entry).split("\n");
+	return "- " + lines[0] + lines.slice(1).map((l) => "\n  " + l).join("");
+}
+
+/**
+ * 渲染常驻记忆注入：按 memory > user > key 顺序分配预算，每轨一个块。
+ * 只注入 memory/user/key 三轨；project/daily 是「按需读取」的轨，不进上下文。
+ */
 export function renderResident(store, agent, tracks) {
 	const order = tracks ?? ["memory", "user", "key"];
 	const parts = [];
 	let used = 0;
 	for (const track of order) {
 		if (used >= TOTAL_BUDGET) break;
-		const budget = Math.min(BUDGETS[track], TOTAL_BUDGET - used);
-		if (budget <= 0) break;
-		const entries = store.entriesOf(track, agent);
+		const budget = Math.min(BUDGETS[track] ?? 0, TOTAL_BUDGET - used);
+		if (!(budget > 0)) continue;
+		const entries = track === "key" ? pickKeyEntries(store, agent) : store.entriesOf(track, agent);
 		if (entries.length === 0) continue;
-		let text = entries.join(ENTRY_DELIMITER);
+		let text = entries.map(asBullet).join("\n");
 		if (text.length > budget) {
 			text = text.slice(text.length - budget);
 			const nl = text.indexOf("\n");
 			if (nl >= 0) text = text.slice(nl + 1);
 			text = trimCutHead(text);
 		}
+		if (text.length === 0) continue;
 		parts.push({ track, text, chars: text.length });
 		used += text.length;
 	}
-	const keyBudget = Math.min(KEY_EXTRA_CAP, TOTAL_BUDGET - used);
-	if (keyBudget > 0) {
-		const keyEntries = pickKeyEntries(store, agent);
-		let keyText = keyEntries.join(ENTRY_DELIMITER);
-		if (keyText.length > keyBudget) {
-			keyText = keyText.slice(keyText.length - keyBudget);
-			const nl = keyText.indexOf("\n");
-			if (nl >= 0) keyText = keyText.slice(nl + 1);
-			keyText = trimCutHead(keyText);
-		}
-		if (keyText.length > 0) {
-			parts.push({ track: "key", text: keyText, chars: keyText.length });
-		}
-	}
 	return parts;
 }
 
-/** 渲染 memory:snapshot 注入文本：常驻记忆 + 恒引导 + 条件看门狗提醒。 */
+/**
+ * 快照净化（对齐 evolve issue #53）：宿主把段正文当模板解析，正文里出现未注册的 `{{name}}`
+ * 会让整段渲染抛错，该会话每一步都起不来且无法用工具自救。记忆正文由模型/用户写入，
+ * 天然可能出现 `{{...}}`，所以出口必须只降级、不展开：`{{session}}` → `{session}`。
+ */
+export function sanitizeSnapshot(content) {
+	return String(content ?? "")
+		.replace(/\{\{\s*([\w.-]+)\s*\}\}/g, "{$1}")
+		.replace(/\{\{/g, "{");
+}
+
+/** 渲染 memory-core:snapshot 注入文本：常驻记忆 + 恒引导 + 条件看门狗提醒。 */
 export function renderSnapshot(store, s, writeGap, context) {
 	const agent = context?.agent;
-	const parts = renderResident(store, agent, s.memoryTracks === "full"
-		? ["memory", "user", "project", "key", "daily"]
-		: ["memory", "user", "key"]);
+	const parts = renderResident(store, agent, ["memory", "user", "key"]);
 	const body = parts.length === 0
 		? ""
-		: `${parts.map((p) => `## ${TRACK_LABELS[p.track]}`).join("\n")}\n\n${parts.map((p) => p.text).join("\n\n")}`;
+		: parts.map((p) => `## ${TRACK_LABELS[p.track]}\n${p.text}`).join("\n\n");
 	const due =
-		s.writeGuard === true &&
+		s.perTurnWriteGuard === true &&
 		writeGap !== null &&
 		agent !== undefined &&
 		agent.session?.header?.origin !== "subagent" &&
 		writeGap.gapOf(agent) >= s.writeGuardThreshold;
-	const notice = due ? WRITE_GUARD_NOTICE : "";
-	return [body, WRITE_GUIDE, notice].filter(Boolean).join("\n\n");
+	const notice = due ? writeGuardNoticeFor(s.memoryTracks, s.writeGuardThreshold) : "";
+	return sanitizeSnapshot([body, writeGuideFor(s.memoryTracks), notice].filter(Boolean).join("\n\n"));
 }

package/lib/runtime-config.js

@@ -0,0 +1,45 @@
+/**
+ * 运行期配置：设置页面板改的值单独存一份覆盖层。
+ *
+ * 为什么不直接改 preset：preset 的 config 是启动装配时的输入，改了要重启才生效；
+ * 而设置页的语义是「修改立即生效并持久化」（对齐 dsh-memory-evolve 的设置页）。
+ * 所以落一份 `<memoryDir>/../memory-core.config.json`，apply 时以 patch 配置为底，
+ * 每轮/每次调用前再叠一层这里（见 index.js 的 refresh）。
+ */
+import { readFileSync, writeFileSync } from "node:fs";
+import { join, dirname } from "node:path";
+
+/** 允许从文件覆盖的键。其余键（presetName / memoryDir）只认 patch，避免面板改坏落点。 */
+export const LIVE_KEYS = ["memoryTracks", "writeGuard", "perTurnWriteGuard", "writeGuardThreshold", "snapshotOrder"];
+
+export function liveConfigPath(memoryDir) {
+	return join(dirname(memoryDir), "memory-core.config.json");
+}
+
+/** 只留下合法值：类型不对的键直接丢弃，不写坏当前运行态。 */
+function pick(raw) {
+	const out = {};
+	const src = raw && typeof raw === "object" ? raw : {};
+	if (src.memoryTracks === "lite" || src.memoryTracks === "full") out.memoryTracks = src.memoryTracks;
+	if (typeof src.writeGuard === "boolean") out.writeGuard = src.writeGuard;
+	if (typeof src.perTurnWriteGuard === "boolean") out.perTurnWriteGuard = src.perTurnWriteGuard;
+	if (Number.isInteger(src.writeGuardThreshold) && src.writeGuardThreshold >= 1) {
+		out.writeGuardThreshold = src.writeGuardThreshold;
+	}
+	if (Number.isInteger(src.snapshotOrder)) out.snapshotOrder = src.snapshotOrder;
+	return out;
+}
+
+export function readLiveConfig(memoryDir) {
+	try {
+		return pick(JSON.parse(readFileSync(liveConfigPath(memoryDir), "utf8")));
+	} catch {
+		return {};
+	}
+}
+
+export function writeLiveConfig(memoryDir, patch) {
+	const next = { ...readLiveConfig(memoryDir), ...pick(patch) };
+	writeFileSync(liveConfigPath(memoryDir), JSON.stringify(next, null, 2) + "\n", "utf8");
+	return next;
+}

package/lib/schema.js

@@ -9,6 +9,7 @@ export const Config = z.object({
 	presetName: z.string().default(DEFAULTS.presetName),
 	memoryDir: z.string().default(DEFAULTS.memoryDir),
 	writeGuard: z.boolean().default(DEFAULTS.writeGuard),
+	perTurnWriteGuard: z.boolean().default(DEFAULTS.perTurnWriteGuard),
 	writeGuardThreshold: z.number().default(DEFAULTS.writeGuardThreshold),
 	snapshotOrder: z.number().default(DEFAULTS.snapshotOrder),
 });

package/lib/store.js

@@ -525,7 +525,11 @@ export class MemoryStore {
 
   /** Read the raw file; a missing file reads as an empty store. */
   readRaw(target, agent) {
-    const path = this.pathOf(target, agent)
+    // project / full 模式的 key 需要会话工作目录：没有 cwd 时读路径降级为空，
+    // 不抛错——注入段和面板都会读这些轨，抛一次就把整段注入带崩。写入仍走 pathOf（会明确报错）。
+    const loc = this.locate(target, agent)
+    if (!loc) return { text: '', size: 0 }
+    const path = join(loc.dir, loc.file)
     try {
       return { text: readFileSync(path, 'utf8'), size: statSync(path).size }
     } catch (error) {