@klarkxy/dsh-memory 0.1.2 → 0.1.4

package/README.md

@@ -1,33 +1,35 @@
 # @klarkxy/dsh-memory
 
-Default-enabled Memory with idle Dream consolidation. Stores long-term preferences, project facts, decisions, and lessons. Novel canon stays in author-confirmed worldbook files, not here.
+Descriptive context for DeepSeek Harness: scoped vocabulary, explicit preferences, project facts, decisions and recent activity. Dream observes human context and consolidates it. The shared store can hold procedural lessons, but Self Improve owns their creation and injection. Novel canon stays in authoritative worldbook files.
 
-[简体中文](https://github.com/klarkxy/dsh-editor/blob/main/packages/dsh-memory/docs/README.zh-CN.md)
+[简体中文](docs/README.zh-CN.md)
 
-## Install
+## Standalone DSH Web
 
-Requires Node.js ≥22 and DSH `0.1.7-alpha.1`. The bundle entry starts enabled, but loading it does not start inference or load `@klarkxy/dsh-ai-services`.
-
-Standalone DSH must load the shared service explicitly before this feature can start:
+Requires Node.js ≥22 and DSH `0.1.7-rc.2`. Install and load the shared service explicitly:
 
 ```sh
 dsh plugin --profile web add @klarkxy/dsh-ai-services
 dsh plugin --profile web add @klarkxy/dsh-memory
 ```
 
-Idle Dream is on by default and needs no confirmation: once a session has been idle for 15 minutes, at least 24 hours have passed since the last attempt, and at least 3 records were added or changed since then (deletions count), it runs once and applies automatically — at most once a day. Apply writes candidates only and never overwrites active records; failures back off for the same 24 hours. Turn it off under **Settings → 记忆**, or run the full flow manually via **Organize now**. Memory itself remains independently switchable in plugin settings.
+No Editor packages or Self Improve are required. The bundle starts enabled; merely opening its UI does not call a model. Use Settings → Memory to manage records, prompt injection and the Dream observation/consolidation switch. Editor preinstalls the same public plugin, not a second implementation.
+
+## Context, not procedures
 
-## Behaviour
+`ctx.aiMemory` implements the shared `MemoryService`. New `vocabulary` and `activity` records may carry subject, domain, term/topic key, aliases, host observation time, literal event-time text and activity status. Project scope comes from the native session cwd, never an arbitrary client path. Automatic observation without a cwd is skipped rather than promoted to global.
 
-`ctx.aiMemory` implements the frozen `MemoryService`. Project identity is the shared untruncated `projectIdFromCwd(session.meta.cwd)` (DSH also exposes it as `session.header.cwd`). RPC derives that path from the live session id; clients cannot submit an arbitrary directory. Record ids are UUID-backed and cannot reuse a tombstone after restart. Durable writes are one typed aggregate snapshot.
+At turn end, Dream observes original human messages only. A new session contributes its latest message; later batches include at most four new messages, each capped at 2000 characters. Accepted output requires exact quoted evidence from real human events. Pure continuation acknowledgements do not trigger inference. The `memory.observe-context` purpose uses the normal model role and shared budgets.
 
-Recall injects at most 3–5 active records (~800 tokens) at Host `agent/pre-step`, exact project scope plus explicit global records. Lessons are not injected here (self-improvement owns them). Candidates, rejected, revoked, deleted, expired, and superseded records stay out of prompts.
+Activity has a default seven-day freshness bound. Expiry removes it from recall; it does not prove completion. A new explicit update supersedes the previous matching subject/domain/topic while preserving history. Stable vocabulary has no automatic activity expiry. Existing authoritative task records and project documents remain authoritative.
 
-Human preference and project-fact candidates need evidence or an explicit manual add. Global writes require the global checkbox. Dream produces merge/dedup candidates and applies them automatically under the idle gates above; apply writes candidates only, never overwrites active records or expands project scope to global. Corrections and deletions win over in-flight runs. Deleted ids cannot be resurrected.
+Idle Dream runs after roughly 15 minutes of inactivity, at least 24 hours after the previous attempt, with at least three changes. It never consolidates lessons, crosses kinds or identities, extends source expiry, refreshes observation dates, or confirms candidate sources. Only all-active sources produce active replacements; otherwise the result stays candidate. Old manual records without referenceable evidence are left unchanged rather than assigned invented provenance. Corrections, deletion and lifecycle cancellation invalidate stale results.
 
-Disabling the plugin or injection/Dream switches cancels pending results and injection. Stored records remain.
+Recall contains at most five active records, about 800 tokens including the wrapper. Lessons are omitted. For a continuation request, recent in-scope activity can restore the task context. Candidates, revoked, rejected, deleted, superseded and expired records are not injected. Current instructions and permissions take precedence.
 
-From the repository root:
+Observation cursors are persisted across restart and deletion. The 512-session cursor bound fails closed for new sessions instead of evicting deletion protection. Disabling Dream stops observation and idle consolidation, not Memory storage or Self Improve. Disabling the plugin preserves stored data.
+
+Existing records remain readable without synthetic metadata. Update the shared service and both learning packages together when testing these new fields; merging source does not publish an npm release.
 
 ```sh
 pnpm --filter @klarkxy/dsh-memory typecheck
@@ -35,6 +37,4 @@ pnpm exec vitest run packages/dsh-memory/src
 pnpm --filter @klarkxy/dsh-memory build
 ```
 
-[Publishing](https://github.com/klarkxy/dsh-editor/blob/main/packages/PUBLISHING.md) · [License](https://github.com/klarkxy/dsh-editor/blob/main/packages/dsh-memory/LICENSE)
-
-The Editor preinstalls this feature enabled. In the Editor, use Settings → Plugins to switch it without restarting. Standalone DSH must load `@klarkxy/dsh-ai-services` before this package; installation or removal may require a restart when the host asks for one.
+[Design and limits](../../docs/portable-learning.md) · [Publishing](../PUBLISHING.md) · [License](LICENSE)

package/cordis.patch.yml

@@ -1,4 +1,4 @@
-# Enabled when installed. Memory still does not enable Dream idle processing or load ai-services.
+# Enabled when installed. Dream uses its own persisted switch; load ai-services explicitly.
 - insert:
     - id: memory
       name: '@klarkxy/dsh-memory'

package/docs/README.zh-CN.md

@@ -1,9 +1,30 @@
 # @klarkxy/dsh-memory
 
-默认启用的记忆与闲时梦境整理。保存长期偏好、项目事实、决策和教训。小说设定仍只存在于作者确认的世界书，不写入本插件。
+Dream 负责“怎样理解用户和当前项目”：作者用语、偏好、项目事实、决策与近期状态。Self Improve 负责行动经验；共享存储允许保存 lesson，但 Dream 不整理、不注入 lesson。小说设定仍以世界书等权威文件为准。
 
-[English](https://github.com/klarkxy/dsh-editor/blob/main/packages/dsh-memory/README.md)
+[English](../README.md)
 
-需要 Node.js ≥22、DSH `0.1.7-alpha.1`。安装条目默认启用，但不会自行推理，也不会自动加载共享服务 bundle `@klarkxy/dsh-ai-services`。独立部署须先显式加载该共享服务。
+## 独立 DSH Web 安装
 
-闲时梦境默认开启，无需确认：会话闲置 15 分钟、距上次整理尝试满 24 小时、且自上次以来新增或变更不少于 3 条记录（含删除）时，自动做一次整理并直接生效，每天至多一次；应用只写入候选条目，不覆盖已生效记录，失败同样计入 24 小时退避。可在「设置 → 记忆」关闭自动整理，或点击「立即整理」手动运行完整流程。关闭插件会取消进行中的整理和注入，已存数据保留。
+需要 Node.js ≥22 和 DSH `0.1.7-rc.2`。不依赖任何 Editor 私有包，也不要求安装 Self Improve。
+
+```sh
+dsh plugin --profile web add @klarkxy/dsh-ai-services
+dsh plugin --profile web add @klarkxy/dsh-memory
+```
+
+宿主需明确加载共享服务。插件安装后默认启用，单纯打开界面不发起推理。在「设置 → 记忆」管理条目、提示注入和 Dream 观察与整理开关；Editor 预装的也是同一个公开包。
+
+## 行为
+
+用语按 subject、domain、词条 key 和别名描述，近期状态另带记录时间、原话中的事件时间、状态和默认 7 天新鲜度上限。时间到期只停止回忆，不表示任务完成；新报告可替代同一事项，旧记录保留历史。项目范围来自原生会话 cwd，缺少 cwd 不自动写全局。当前指令、任务记录和权威项目资料优先。
+
+回合结束后只观察原始人类消息。首次启用取最新一条；随后每批最多 4 条、每条 2000 字符。结果必须引用实际 seq 和逐字原话，不用助手自述、工具结果或插件注入作为作者发言。纯“继续”等确认不调用模型。`memory.observe-context` 默认使用 normal 模型角色，通过共享服务限额和取消。
+
+闲置约 15 分钟、距上次尝试至少 24 小时且有至少 3 项变更时整理一次。Dream 不合并不同类型、作者或领域，不把近期状态写成永久词条，不延长来源有效期。只有全部来源已生效时，替代条目才自动生效；包含候选来源时仍为候选。没有可引用依据的旧手动条目保持原样，不伪造来源。
+
+注入最多 5 条、含包装约 800 tokens，仅使用当前项目及明确全局的 active 条目；候选、过期、被替代或撤回内容不注入。删除墓碑与持久化观察游标阻止重启后重放旧消息。游标最多 512 个会话，满后停止新会话观察，不淘汰删除保护。关闭 Dream 不关闭存储或 Self Improve；关闭插件保留数据。
+
+旧记录不强制补造结构化字段。测试新能力时使用同一源码构建的共享服务与学习插件；源码合入不代表已经发布新版 npm 包。
+
+[设计与限制](../../../docs/portable-learning.md) · [发布维护](../../PUBLISHING.md) · [许可证](../LICENSE)

package/lib/client.inner.cjs

@@ -180,8 +180,14 @@ function candidateAvailabilityLabel(count, locale) {
 	return locale === "en" ? "No candidates" : "暂无候选";
 }
 function kindLabel(kind, locale) {
-	if (locale === "en") return kind === "preference" ? "Preference" : kind === "project-fact" ? "Project fact" : kind === "decision" ? "Decision" : "Lesson";
-	return kind === "preference" ? "偏好" : kind === "project-fact" ? "项目事实" : kind === "decision" ? "决策" : "教训";
+	return {
+		preference: ["偏好", "Preference"],
+		"project-fact": ["项目事实", "Project fact"],
+		decision: ["决策", "Decision"],
+		vocabulary: ["用语释义", "Vocabulary"],
+		activity: ["近期状态", "Recent activity"],
+		lesson: ["行动经验", "Method"]
+	}[kind][locale === "en" ? 1 : 0];
 }
 function statusLabel(status, locale) {
 	return locale === "en" ? {
@@ -401,58 +407,33 @@ function MemorySettingsPanel({ client, sessionId, locale }) {
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("article", {
 				className: "dsh-memory-card",
-				children: [
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t(locale, "闲时梦境", "Idle Dream") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						className: "dsh-memory-meta",
-						children: t(locale, "闲时自动整理记忆（每天至多一次，自动生效）。", "Auto-organizes memory while idle (at most once a day, applies automatically).")
-					})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						role: "switch",
-						className: `dsh-memory-switch${draft.dreamIdleEnabled ? " is-on" : ""}`,
-						"aria-checked": draft.dreamIdleEnabled,
-						"aria-label": draft.dreamIdleEnabled ? t(locale, "关闭闲时整理", "Disable idle Dream") : t(locale, "启用闲时整理", "Enable idle Dream"),
-						disabled: busy,
-						onClick: () => void action(async () => {
-							await rpc("settings.update", {
-								expectedRevision: draft.revision,
-								settings: {
-									...editable(draft),
-									dreamIdleEnabled: !draft.dreamIdleEnabled
-								}
-							});
-						}),
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-							className: "dsh-memory-switch-thumb",
-							"aria-hidden": "true"
-						})
-					})] }),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("label", { children: [t(locale, "空闲间隔（分钟）", "Idle interval (minutes)"), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
-						type: "number",
-						min: 1,
-						max: 180,
-						step: 1,
-						disabled: busy,
-						value: Math.round(draft.idleMs / 6e4),
-						onChange: (event) => {
-							settingsDirty.current = true;
-							setDraft({
-								...draft,
-								idleMs: Math.round(Number(event.target.value) * 6e4)
-							});
-						}
-					})] }),
-					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-						type: "button",
-						disabled: busy,
-						onClick: () => void action(async () => {
-							await rpc("settings.update", {
-								expectedRevision: draft.revision,
-								settings: editable(draft)
-							});
-						}),
-						children: t(locale, "保存", "Save")
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("header", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h3", { children: t(locale, "Dream 语境记忆", "Dream context memory") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					className: "dsh-memory-meta",
+					children: t(locale, "从原始用户消息记录用语与近期状态，闲时整理已有语境。行动方法由自我改进负责。", "Records vocabulary and recent activity from original user messages, then consolidates context while idle. Self Improve owns methods.")
+				})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+					type: "button",
+					role: "switch",
+					className: `dsh-memory-switch${draft.dreamIdleEnabled ? " is-on" : ""}`,
+					"aria-checked": draft.dreamIdleEnabled,
+					"aria-label": draft.dreamIdleEnabled ? t(locale, "关闭 Dream 观察与整理", "Disable Dream observation and consolidation") : t(locale, "启用 Dream 观察与整理", "Enable Dream observation and consolidation"),
+					disabled: busy,
+					onClick: () => void action(async () => {
+						await rpc("settings.update", {
+							expectedRevision: draft.revision,
+							settings: {
+								...editable(draft),
+								dreamIdleEnabled: !draft.dreamIdleEnabled
+							}
+						});
+					}),
+					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+						className: "dsh-memory-switch-thumb",
+						"aria-hidden": "true"
 					})
-				]
+				})] }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+					className: "dsh-memory-meta",
+					children: t(locale, "闲时整理在会话空闲约 15 分钟后尝试。", "Idle organization waits about 15 minutes of inactivity.")
+				})]
 			})
 		]
 	});
@@ -716,6 +697,14 @@ function MemoryChatPanel({ client, sessionId, locale }) {
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
 							value: "decision",
 							children: kindLabel("decision", locale)
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+							value: "vocabulary",
+							children: kindLabel("vocabulary", locale)
+						}),
+						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("option", {
+							value: "activity",
+							children: kindLabel("activity", locale)
 						})
 					]
 				})] }),
@@ -814,6 +803,26 @@ function MemoryRow(props) {
 				scope
 			]
 		}),
+		record.context && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
+			className: "dsh-memory-meta",
+			children: [
+				record.context.subject,
+				" · ",
+				record.context.domain,
+				" · ",
+				record.context.key,
+				" · ",
+				t(locale, "记录于", "Observed"),
+				" ",
+				new Date(record.context.observedAt).toLocaleString(locale === "en" ? "en-US" : "zh-CN"),
+				record.context.activityStatus && ` · ${record.context.activityStatus}`,
+				record.context.eventTime && ` · ${record.context.eventTime}`
+			]
+		}),
+		record.kind === "activity" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+			className: "dsh-memory-meta",
+			children: t(locale, "仅表示上次报告的状态；到期不代表任务已完成。", "Last reported state only; expiry never means completion.")
+		}),
 		/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", { children: record.content }),
 		record.evidence.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("p", {
 			className: "dsh-memory-meta",
@@ -904,7 +913,7 @@ function DreamPanel(props) {
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("h4", { children: t(locale, "梦境整理", "Dream") }),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 				className: "dsh-memory-meta",
-				children: t(locale, "闲置且新材料足够时每天至多自动整理一次，结果自动生效。", "Runs at most once a day when idle with enough new material; results apply automatically.")
+				children: t(locale, "每天至多闲时整理一次；不把候选升级为事实，不延长近期状态的有效期。", "Consolidates at most once a day while idle, without confirming candidates or extending activity freshness.")
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 				className: "dsh-memory-row-actions",
@@ -939,23 +948,53 @@ function DreamPanel(props) {
 		]
 	});
 }
-function MemorySettings({ client, props }) {
+function readSelfImprovementReview(host) {
+	if (!host || typeof host !== "object") return void 0;
+	const context = host;
+	if (typeof context.get !== "function") return void 0;
+	let row;
+	try {
+		row = context.get("dshSelfImprovementReview");
+	} catch {
+		return;
+	}
+	if (!row || typeof row !== "object") return void 0;
+	const render = row.render;
+	if (typeof render !== "function") return void 0;
+	return { render };
+}
+function MemorySettings({ client, host, props }) {
 	const seat = useNativeSeat(client, props);
+	const review = readSelfImprovementReview(host);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "dsh-memory-settings-root",
 		"data-testid": "memory-settings-root",
-		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MemorySettingsPanel, {
-			client,
-			sessionId: seat.sessionId,
-			locale: seat.locale
-		}, `settings:${memoryPanelKey(seat.sessionId, seat.locale)}`), seat.sessionId && !seat.hidden ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MemoryChatPanel, {
-			client,
-			sessionId: seat.sessionId,
-			locale: seat.locale
-		}, `manage:${memoryPanelKey(seat.sessionId, seat.locale)}`) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-			className: "dsh-memory-meta",
-			children: t(seat.locale, "选择一个会话后可以管理该会话的记忆。", "Select a session to manage its memory.")
-		})]
+		children: [
+			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(MemorySettingsPanel, {
+				client,
+				sessionId: seat.sessionId,
+				locale: seat.locale
+			}, `settings:${memoryPanelKey(seat.sessionId, seat.locale)}`),
+			review && seat.sessionId && !seat.hidden ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("details", {
+				className: "dsh-memory-si",
+				"data-testid": "self-improvement-entry",
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("summary", { children: t(seat.locale, "自我改进", "Self-improvement") }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					className: "dsh-memory-si-body",
+					children: review.render({
+						sessionId: seat.sessionId,
+						locale: seat.locale
+					})
+				})]
+			}) : null,
+			seat.sessionId && !seat.hidden ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MemoryChatPanel, {
+				client,
+				sessionId: seat.sessionId,
+				locale: seat.locale
+			}, `manage:${memoryPanelKey(seat.sessionId, seat.locale)}`) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+				className: "dsh-memory-meta",
+				children: t(seat.locale, "选择一个会话后可以管理该会话的记忆。", "Select a session to manage its memory.")
+			})
+		]
 	});
 }
 const styles = `
@@ -965,7 +1004,7 @@ const styles = `
 .dsh-memory-settings p,.dsh-memory-chat p{margin:0;line-height:1.5}
 .dsh-memory-meta,.dsh-memory-chat small{font-size:var(--font-size-1,13px);color:var(--gray-11,inherit)}
 .dsh-memory-error{color:var(--red-11,#b42318)}
-.dsh-memory-card,.dsh-memory-dream,.dsh-memory-add{display:grid;gap:10px;padding:14px 16px;border:1px solid var(--gray-6,color-mix(in srgb,currentColor 15%,transparent));border-radius:12px}
+.dsh-memory-card,.dsh-memory-dream,.dsh-memory-add,.dsh-memory-si{display:grid;gap:10px;padding:14px 16px;border:1px solid var(--gray-6,color-mix(in srgb,currentColor 15%,transparent));border-radius:12px}
 .dsh-memory-card header,.dsh-memory-chat-body header{display:flex;justify-content:space-between;gap:12px;align-items:center}
 .dsh-memory-card h3,.dsh-memory-add h4,.dsh-memory-dream h4{margin:0;font-size:var(--font-size-3,16px);font-weight:600}
 .dsh-memory-settings input,.dsh-memory-chat input,.dsh-memory-chat textarea,.dsh-memory-chat select{box-sizing:border-box;width:100%;min-width:0;padding:8px 10px;border:1px solid var(--gray-6,color-mix(in srgb,currentColor 22%,transparent));border-radius:8px;background:var(--color-surface,transparent);color:inherit;font:inherit;transition:border-color 150ms ease,box-shadow 150ms ease}
@@ -985,7 +1024,8 @@ const styles = `
 .dsh-memory-row-actions{display:flex;flex-wrap:wrap;gap:8px}
 .dsh-memory-check{display:flex;gap:8px;align-items:center}
 .dsh-memory-check input{width:auto}
-.dsh-memory-chat>summary{display:flex;flex-wrap:wrap;gap:8px 12px;align-items:baseline;cursor:pointer;min-height:34px;list-style:revert}
+.dsh-memory-chat>summary,.dsh-memory-si>summary{display:flex;flex-wrap:wrap;gap:8px 12px;align-items:baseline;cursor:pointer;min-height:34px;list-style:revert}
+.dsh-memory-si-body{margin-top:8px}
 @media(prefers-reduced-motion:reduce){.dsh-memory-switch-thumb{transition:none}.dsh-memory-settings button:not([role="switch"]),.dsh-memory-chat button:not([role="switch"]),.dsh-memory-settings input,.dsh-memory-chat input,.dsh-memory-chat textarea,.dsh-memory-chat select{transition:none}}
 `;
 function apply(ctx) {
@@ -1005,6 +1045,7 @@ function apply(ctx) {
 		label: "记忆"
 	}, (props) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(MemorySettings, {
 		client,
+		host: ctx,
 		props
 	}))), "dsh-memory.settings");
 }