dsh-messager 0.2.0 → 0.3.0

package/README.en.md

@@ -24,14 +24,14 @@ Trigger semantics align with the Web UI status dots: **orange = needs interactio
 
 **One step for a formal install** (host + browser client both take effect; then just start with `dsh web` — **no** `--patch` needed):
 
-```sh
+``sh
 # Build inside the plugin repo
 pnpm install
 pnpm build
 
 dsh plugin --profile web add <plugin-path>
 dsh web   # or dsh --profile web
-```
+``
 
 > `pnpm install` and `pnpm build` run inside your plugin checkout; replace `<plugin-path>` with that directory (absolute or relative both work).
 
@@ -50,10 +50,10 @@ After installation, a **「通知&信使」** (Messenger) section appears in the
 - **Host side (quick)**: from the DSH repo root run
   `pnpm dsh web --patch <plugin-path>/cordis.yml` — loads the TS source directly (HMR works). In source mode the host runs via tsx, so no build is needed to load that path.
 - **Full dual-runtime**: the browser (client) side requires the plugin to enter the Loader as a package for clientModules to scan it into the Web bundle (`--patch` file-path entries are not scanned), so do a full install into the profile:
-  ```sh
+  ``sh
   dsh plugin --profile web add <plugin-path>   # source mode: pnpm dsh plugin ...
   pnpm dsh web   # run from the DSH source repo
-  ```
+  ``
   **Restart** `pnpm dsh web` after `plugin add` (clientModules scans at startup; a running instance does not hot-add new bundles). After changing client code, re-run `pnpm run build:client` in your own repo and refresh the page (the bundle carries a rev hash so it is re-fetched; the DSH repo's `dev:web` watcher only watches in-workspace client plugins, not external ones).
 
 Browser notifications require user permission: the plugin requests it once on load when the permission is `default`; if denied, the browser channel degrades silently (other channels are unaffected) — re-authorize in the browser's site settings.
@@ -130,16 +130,16 @@ Verbosity: `minimal` = title only; `normal` adds session title/tool name/end rea
 
 Add a third-party channel (DingTalk / WeCom / Telegram…) by implementing the `NotifyChannel` interface and registering it in `buildChannels()` in `src/index.ts`:
 
-```ts
+``ts
 export interface NotifyChannel {
   readonly id: string
   send(payload: NotificationPayload): Promise<void>
 }
-```
+``
 
 ## Project structure
 
-```
+``
 dsh-messager/
 ├── package.json          # dsh.bundle + dsh.client dual declarations; exports["./client"]
 ├── tsconfig.json         # host side (Node)
@@ -168,16 +168,23 @@ dsh-messager/
 │       ├── config.ts     # browser-notification config handle (via the config route)
 │       └── diff.ts       # session summary diff (pure functions)
 └── tests/                # vitest unit tests (126)
-```
+``
 
 ## Testing
 
-```sh
+``sh
 pnpm test       # 126 unit tests: signal extraction/templates/dispatch/channel payloads & signatures/config parsing/client diff/config route/fetch scope/locale consistency/form gating
 pnpm typecheck  # host side
 pnpm build      # host tsc + client declarations + client bundle (lib/)
-```
-
+``
+
+## Version compatibility (dsh-messager 0.3.0 / DSH 0.1.2-alpha.5)
+
+- **v0.3.0 supports only DSH `0.1.2-alpha.5`**; all `@deepseek-ai/dsh-*` peerDependencies are pinned to that version.
+- Compatibility notes:
+  - The removed `dsh-client-runtime` is no longer used. Client session lists use `dsh-api-session-controller`, interaction state uses `dsh-client-ui-session`, and slot services use `dsh-client-ui-renderer`.
+  - The `messager` settings namespace is registered from the Loader config and can also be read/written through the plugin's own `/dsh-messager/config` route, which is not subject to DSH's settings namespace allowlist.
+
 ## Known limitations
 
 - Browser notifications require site permission; with `onlyWhenHidden=false` they also pop while visible.

package/README.md

@@ -13,11 +13,11 @@ DeepSeek Harness（DSH）**任务状态通知插件**：会话需要交互、任
 
 | 需求 | 实现 |
 | --- | --- |
-| 触发时机 | 需要交互（审批 `approval/asked`、提问/计划待审 `ask_user_question`、客户端 pendingInteraction）、任务完成（`agent/status` running→idle 且仅根会话 + `turn/end` 原因）、任务出错（`agent/error`） |
+| 触发时机 | 需要交互（审批 `approval/asked`、提问/计划待审 `ask_user_question`、客户端 `uiSession.pendingInteractions`）、任务完成（`agent/status` running→idle 且仅根会话 + `turn/end` 原因）、任务出错（`agent/error`） |
 | 推送路径 | 系统通知（node-notifier toast）、浏览器通知（Notification API）、飞书（interactive 卡片 + HMAC-SHA256 签名）、企业微信（markdown + 可选加签）、Discord（embed 卡片）、钉钉（actionCard + 可选加签）、Telegram（Bot API HTML 消息）；`NotifyChannel` 接口可扩展 |
 | 可配置 | 触发开关、各通道启停/verbosity/icon、去重冷却、标题前缀等，见[配置](#配置) |
 
-触发语义与 Web UI 状态圆点完全对齐：**橙点 = 需要交互**（`pendingInteraction`），**绿点 = 任务完成**
+触发语义与 Web UI 状态圆点完全对齐：**橙点 = 需要交互**（`uiSession.pendingInteractions`），**绿点 = 任务完成**
 （`running→idle` 且非当前会话），**蓝点 = 运行中**（不通知）。
 
 ## 安装
@@ -151,8 +151,8 @@ host 端把 Loader config 注册为 settings 命名空间 `messager` 的 base
 
 | 触发 | host 端（system/feishu/wecom/discord/dingtalk/telegram） | client 端（browser） |
 | --- | --- | --- |
-| 审批 | `session/event` `approval/asked` | 摘要 `pendingInteraction==='approval'` 出现 |
-| 提问/计划待审 | `session/event` `tool/call`（`ask_user_question`） | `pendingInteraction==='question'/'plan-review'` 出现 |
+| 审批 | `session/event` `approval/asked` | `ctx.uiSession.pendingInteractions` 中 `kind==='approval'` 从无到有 |
+| 提问/计划待审 | `session/event` `tool/call`（`ask_user_question`） | `ctx.uiSession.pendingInteractions` 中 `kind==='question'/'plan-review'` 从无到有 |
 | 任务完成 | `agent/status` running→idle（仅根会话）＋`turn/end` 原因 | 摘要 `running:true→false` 且非当前会话 |
 | 任务出错 | `agent/error` | -（host 端覆盖） |
 
@@ -179,6 +179,7 @@ dsh-messager/
 ├── cordis.yml            # 本地开发覆盖层（host 端）
 ├── cordis.patch.yml      # 分发包配置层（安装后生效）
 ├── assets/icon.png       # 默认通知图标
+├── doc/plan/             # 规划存档（01 起编号）
 ├── src/
 │   ├── index.ts          # host apply：事件接线 + settings 注册 + 通道构建 + 路由挂载
 │   ├── config.ts         # Config schema（Loader config 与 settings 共用）
@@ -197,18 +198,30 @@ dsh-messager/
 │       ├── fetch-scope.ts     # ScopeLike 的 fetch 适配层（配置路由）
 │       ├── locales.ts    # zh/en 字典（ctx.locale 注册）
 │       ├── config.ts     # 浏览器通知的配置句柄（走配置路由）
-│       └── diff.ts       # 会话摘要 diff（纯函数）
-└── tests/                # vitest 单元测试（126 个）
+│       └── diff.ts       # 完成摘要 / 待交互状态 diff（纯函数）
+└── tests/                # vitest 单元测试（129 个）
 ```
 
 ## 测试
 
 ```sh
-pnpm test       # 126 个单元测试：信号提取/模板/调度/各通道签名与载荷/配置解析/client diff/配置路由/fetch scope/字典一致性/表单门控
+pnpm test       # 129 个单元测试：信号提取/模板/调度/各通道签名与载荷/配置解析/client diff/配置路由/fetch scope/字典一致性/表单门控
 pnpm typecheck  # host 端
 pnpm build      # host tsc + client 声明 + client bundle（lib/）
 ```
 
+## 版本兼容（dsh-messager 0.3.0 / DSH 0.1.2-alpha.5）
+
+- **v0.3.0 仅支持 DSH `0.1.2-alpha.5`**；所有 `@deepseek-ai/dsh-*` peerDependencies
+  统一锁定该版本，不再兼容旧 RC 接口。
+- client 端适配新版拆分：会话列表来自 `dsh-api-session-controller`，交互状态来自
+  `dsh-client-ui-session` 的 `ctx.uiSession.pendingInteractions`，`ctx.slots` 由
+  `dsh-client-ui-renderer` 提供；不再依赖已移除的 `dsh-client-runtime`。
+- 完成通知仍按会话摘要 `running: true → false` 且非当前会话触发；交互通知仅在
+  `approval` / `question` / `plan-review` 从无到有时触发，首次订阅只建立基线。
+- host 设置使用字符串命名空间 `messager`；配置读写继续走插件自有 webServer 路由
+  `/dsh-messager/config`，现有 schema、settings 数据和第三方通道配置无需迁移或重置。
+
 ## 已知边界
 
 - 浏览器通知需站点权限；`onlyWhenHidden=false` 时页面可见也会弹。
@@ -238,3 +251,5 @@ pnpm build      # host tsc + client 声明 + client bundle（lib/）
 - 第三方通道扩展：邮件
 - 触发扩展：后台 job 完成、goal 轮次完成
 - 通知历史、按会话静音、勿扰时段
+
+规划存档见 `doc/plan/01-通知插件实施规划.md`。

package/lib/client.js

@@ -5,7 +5,7 @@ window.__ModuleLoader__.load({
 		var exports = module.exports;
 		Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 		let react_jsx_runtime = require("react/jsx-runtime");
-		//#region node_modules/.pnpm/@deepseek-ai+cosmokit@1.8.2/node_modules/@deepseek-ai/cosmokit/lib/index.js
+		//#region node_modules/.pnpm/@deepseek-ai+cosmokit@1.8.3/node_modules/@deepseek-ai/cosmokit/lib/index.js
 		/** Return true when a value is `null` or `undefined`. */
 		function isNullable(value) {
 			return value === null || value === void 0;
@@ -201,7 +201,7 @@ window.__ModuleLoader__.load({
 			Time.template = template;
 		})(Time || (Time = {}));
 		//#endregion
-		//#region node_modules/.pnpm/@deepseek-ai+schemastery@3.18.1/node_modules/@deepseek-ai/schemastery/lib/index.mjs
+		//#region node_modules/.pnpm/@deepseek-ai+schemastery@3.18.2/node_modules/@deepseek-ai/schemastery/lib/index.mjs
 		const kSchema = Symbol.for("schemastery");
 		const kValidationError = Symbol.for("ValidationError");
 		globalThis.__schemastery_index__ ??= 0;
@@ -935,12 +935,6 @@ window.__ModuleLoader__.load({
 				if (summary === void 0) continue;
 				const before = previous[id];
 				if (before === void 0) continue;
-				if (summary.pendingInteraction !== void 0 && before.pendingInteraction === void 0) notices.push({
-					kind: "interaction",
-					sessionId: id,
-					interaction: summary.pendingInteraction,
-					title: summary.displayTitle
-				});
 				if (before.running && !summary.running && id !== current) notices.push({
 					kind: "completed",
 					sessionId: id,
@@ -949,6 +943,35 @@ window.__ModuleLoader__.load({
 			}
 			return notices;
 		}
+		/** 仅把 DSH Web UI 有专用展示语义的待交互 kind 映射为通知类型。 */
+		function clientInteractionKindOf(kind) {
+			switch (kind) {
+				case "approval":
+				case "plan-review":
+				case "question": return kind;
+				default: return;
+			}
+		}
+		/**
+		* 对比两次 uiSession 待交互快照。
+		* 仅从无到有时通知；首次订阅由调用方把当前快照设为 previous，因此不会补发历史通知。
+		*/
+		function diffPendingInteractions(previous, next, summaries) {
+			const notices = [];
+			for (const [sessionId, pending] of next) {
+				if (previous.has(sessionId)) continue;
+				const interaction = clientInteractionKindOf(pending.kind);
+				if (interaction === void 0) continue;
+				const title = summaries[sessionId]?.displayTitle;
+				notices.push({
+					kind: "interaction",
+					sessionId,
+					interaction,
+					...title === void 0 ? {} : { title }
+				});
+			}
+			return notices;
+		}
 		//#endregion
 		//#region src/client/card-controller.ts
 		/** 字段键：`group.field`。 */
@@ -2182,6 +2205,7 @@ window.__ModuleLoader__.load({
 		/** 依赖的客户端服务：会话列表、远程事件（document-updated）、槽位、locale。 */
 		const inject = [
 			"sessions",
+			"uiSession",
 			"remote",
 			"slots",
 			"locale"
@@ -2201,12 +2225,18 @@ window.__ModuleLoader__.load({
 			}
 			/** 列表快照变化 → 通知。 */
 			onListChange(previous, next) {
+				this.onNotices(diffSessionSummaries(previous.byId, next.byId, next.current));
+			}
+			/** 待交互快照变化 → 通知。 */
+			onPendingChange(previous, next, sessions) {
+				this.onNotices(diffPendingInteractions(previous, next, sessions.byId));
+			}
+			onNotices(notices) {
 				const config = this.config.get();
 				if (!config.browser.enabled) return;
 				if (typeof Notification === "undefined") return;
 				if (Notification.permission !== "granted") return;
 				if (config.browser.onlyWhenHidden && document.visibilityState !== "hidden") return;
-				const notices = diffSessionSummaries(previous.byId, next.byId, next.current);
 				for (const notice of notices) {
 					if (!this.allow(notice, config)) continue;
 					this.show(notice, config);
@@ -2299,6 +2329,13 @@ window.__ModuleLoader__.load({
 				previous = next;
 			});
 			ctx.effect(() => () => offList(), "dsh-messager: sessions subscription");
+			let previousPending = ctx.uiSession.pendingInteractions.getSnapshot();
+			const offPending = ctx.uiSession.pendingInteractions.subscribe(() => {
+				const next = ctx.uiSession.pendingInteractions.getSnapshot();
+				notifier.onPendingChange(previousPending, next, ctx.sessions.list.getSnapshot());
+				previousPending = next;
+			});
+			ctx.effect(() => () => offPending(), "dsh-messager: pending interactions subscription");
 			const controller = new MessagerCardController(fetchScope.scope, CARD_FIELDS);
 			ctx.effect(() => ctx.locale.register(LOCALE_NS, {
 				zh,