@dsh-plus/notify-email 0.1.7 → 0.1.9

package/lib/index.d.ts

@@ -1,9 +1,6 @@
-import "@deepseek-ai/dsh-settings";
 import z from "@deepseek-ai/schemastery";
 import { Context, Service } from "@deepseek-ai/cordis";
-
 //#region src/config.d.ts
-
 declare const Config: z<Schemastery.ObjectS<{
   enabled: z<boolean, boolean>;
   smtp: z<Schemastery.ObjectS<{

package/lib/index.js

@@ -5,22 +5,16 @@ import { dshHomePath } from "@deepseek-ai/dsh-home-paths";
 import { appendFile, mkdir } from "node:fs/promises";
 import { dirname } from "node:path";
 import nodemailer from "nodemailer";
-
-//#region src/ns.ts
-/**
-* settings 命名空间字面量（纯常量，零依赖，浏览器半可安全引入）。
-* 服务端经 settingsNamespace() 品牌化后使用（config.ts），浏览器半将其作为
-* settings.plugin.item keyed 槽位的 key —— 同一字面量两处共用，防止漂移。
-* 契约：dsh rc7 起该槽位按「卡片编辑的 settings 命名空间」作 key 分发，
-* 官方配置页只渲染 key 命中 Host 已注册命名空间的卡片。
-* @module notify-email/ns
-*/
-const SETTINGS_NS$1 = "dsh-plus-notify-email";
-
 //#endregion
 //#region src/config.ts
+/**
+* 配置单一事实源：cordis 行级 Config（组合默认值，dev/prod patch 层可覆盖）
+* 与 settings namespace（用户层，经 dsh-settings-file 持久化到 $DSH_HOME/settings.yaml）
+* 共用同一 schemastery schema。SMTP 密码标记 secret 角色，任何读取通道不得回传。
+* @module notify-email/config
+*/
 /** settings 命名空间；webui 配置卡片与插件运行期读取同一份（字面量见 ./ns.ts）。 */
-const SETTINGS_NS = settingsNamespace(SETTINGS_NS$1);
+const SETTINGS_NS = settingsNamespace("dsh-plus-notify-email");
 const SmtpSchema = z.object({
 	host: z.string().description("SMTP 服务器主机名").default(""),
 	port: z.natural().max(65535).description("SMTP 端口").default(465),
@@ -58,9 +52,14 @@ const Config = z.object({
 	maxBodyChars: z.natural().min(200).description("邮件正文内容截断长度").default(4e3),
 	dryRun: z.boolean().description("仅记录日志不真实发送（开发调试用）").default(false)
 });
-
 //#endregion
 //#region src/audit.ts
+/**
+* 通知投递审计：每次发送尝试追加一行 JSONL 到 $DSH_HOME/logs/notify-email.jsonl。
+* 让 dry-run 可观测（dev 实例 logger 不落盘），也为生产排查「为什么没收到邮件」留痕。
+* 记录正文截断 2000 字符；永远不含 SMTP 凭据。写失败只告警不阻断。
+* @module notify-email/audit
+*/
 const BODY_EXCERPT_CHARS = 2e3;
 function buildAuditRecord(subject, text, to, result) {
 	return {
@@ -80,7 +79,6 @@ function createJsonlAuditSink(path, onError) {
 		});
 	};
 }
-
 //#endregion
 //#region src/config-api.ts
 const ROUTE_TEST = "/dsh-plus/notify-email/test";
@@ -119,9 +117,13 @@ function registerTestApi(ctx, service) {
 		})
 	});
 }
-
 //#endregion
 //#region src/mailer.ts
+/**
+* 邮件发送：nodemailer 封装 + dry-run 兜底。
+* Transport 抽象为函数注入，单元测试以假 transport 断言参数，零网络。
+* @module notify-email/mailer
+*/
 /**  nodemailer 连接/问候/套接字超时（毫秒），防 SMTP 不可达时挂住通知链路。 */
 const CONNECTION_TIMEOUT_MS = 1e4;
 const GREETING_TIMEOUT_MS = 1e4;
@@ -199,7 +201,6 @@ var Mailer = class {
 		return result;
 	}
 };
-
 //#endregion
 //#region src/triggers/render.ts
 function truncate(text, maxChars) {
@@ -264,7 +265,6 @@ function renderAbortedNotice(info) {
 		text: header("任务被用户取消", info)
 	};
 }
-
 //#endregion
 //#region src/triggers/builtin.ts
 /** 官方决策工具名 → 渲染函数 + 对应 toggle。 */
@@ -289,16 +289,22 @@ function createTurnEndTrigger(resolveConfig) {
 		}
 	};
 }
-
 //#endregion
 //#region src/watchers/decision.ts
 function installDecisionWatcher(ctx, service) {
-	const seen = /* @__PURE__ */ new Set();
+	const seen = /* @__PURE__ */ new Map();
+	const UNKNOWN_BUCKET_CAP = 1e3;
 	const logger = ctx.logger("notify-email");
 	ctx.on("tools/pre-execute", (exec, next) => {
-		if (seen.has(exec.callId)) return next();
-		seen.add(exec.callId);
 		const sessionId = exec.agent?.id ?? "unknown";
+		let bucket = seen.get(sessionId);
+		if (bucket === void 0) {
+			bucket = /* @__PURE__ */ new Set();
+			seen.set(sessionId, bucket);
+		}
+		if (bucket.has(exec.callId)) return next();
+		if (sessionId === "unknown" && bucket.size >= UNKNOWN_BUCKET_CAP) bucket.clear();
+		bucket.add(exec.callId);
 		service.dispatchDecision({
 			callId: exec.callId,
 			sessionId,
@@ -309,12 +315,14 @@ function installDecisionWatcher(ctx, service) {
 		});
 		return next();
 	});
+	ctx.on("session/disposed", (session) => {
+		seen.delete(session.id);
+	});
 }
-
 //#endregion
 //#region src/watchers/turn-end.ts
 /** 只有这三类 turn 结束对用户有可决策价值；blocked/max-tokens/interrupted 不通知。 */
-const NOTIFY_KINDS = new Set([
+const NOTIFY_KINDS = /* @__PURE__ */ new Set([
 	"completed",
 	"error",
 	"aborted"
@@ -397,9 +405,16 @@ function installTurnEndWatcher(ctx, service, resolveConfig) {
 		watches.clear();
 	}, "notify-email: turn-end timers");
 }
-
 //#endregion
 //#region src/service.ts
+/**
+* NotifyEmailService：通知编排中枢。
+* - 配置：installSettingsSection 接入 settings 用户层（$DSH_HOME/settings.yaml，热生效），
+*   无 settings provider 时退化为 cordis 行级 config。
+* - 触发器：registerTrigger 是第三方插件的扩展接口；内置官方适配器同路径注册。
+* - 投递：首个非空 EmailNotice 经 Mailer 发送；单个触发器抛错不影响其余。
+* @module @dsh-plus/notify-email
+*/
 var NotifyEmailService = class extends Service {
 	static [Context.inject] = ["agents", "tools"];
 	triggers = [];
@@ -415,7 +430,8 @@ var NotifyEmailService = class extends Service {
 			onChange: () => {}
 		});
 		const logger = ctx.logger("notify-email");
-		this.mailer = new Mailer(() => this.current(), logger, void 0, createJsonlAuditSink(dshHomePath("logs", "notify-email.jsonl"), (message) => logger.warn(`audit write failed: ${message}`)));
+		const audit = createJsonlAuditSink(dshHomePath("logs", "notify-email.jsonl"), (message) => logger.warn(`audit write failed: ${message}`));
+		this.mailer = new Mailer(() => this.current(), logger, void 0, audit);
 		this.registerTrigger(createDecisionTrigger(() => this.current()));
 		this.registerTrigger(createTurnEndTrigger(() => this.current()));
 		installDecisionWatcher(ctx, this);
@@ -472,7 +488,6 @@ var NotifyEmailService = class extends Service {
 		}
 	}
 };
-
 //#endregion
 //#region src/index.ts
 const name = "dsh-plus-notify-email";
@@ -480,6 +495,5 @@ const inject = ["agents", "tools"];
 function apply(ctx, config) {
 	ctx.plugin(NotifyEmailService, config);
 }
-
 //#endregion
-export { Config, NotifyEmailService, apply, inject, name };
+export { Config, NotifyEmailService, apply, inject, name };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/notify-email",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "dsh-plus service+ui plugin: 任务结束/等待决策/出错时向指定邮箱发送邮件通知",
   "type": "module",
   "main": "lib/index.js",
@@ -42,13 +42,13 @@
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "4.0.1",
-    "@deepseek-ai/dsh-agent": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-home-paths": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-host-webserver": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-session": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-tools": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-agent": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-host-webserver": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-session": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-settings": "0.1.1-rc.2",
+    "@deepseek-ai/dsh-tools": "0.1.1-rc.2",
     "@deepseek-ai/schemastery": "3.18.1",
     "@types/nodemailer": "8.0.1",
     "@types/react": "~18.3.1",

package/src/watchers/decision.ts

@@ -9,12 +9,22 @@ import type { Context } from '@deepseek-ai/cordis'
 import type { NotifyEmailService } from '../service.ts'
 
 export function installDecisionWatcher(ctx: Context, service: NotifyEmailService): void {
-  const seen = new Set<string>()
+  // 按 sessionId 分桶去重：callId 粒度的全局集合会随每个工具调用无限增长；
+  // 会话销毁即整桶释放。无 agent 归属的调用落到 unknown 桶（无生命周期可挂），
+  // 以有界环形覆盖兜底，保证任何路径都不产生无界内存。
+  const seen = new Map<string, Set<string>>()
+  const UNKNOWN_BUCKET_CAP = 1000
   const logger = ctx.logger('notify-email')
   ctx.on('tools/pre-execute', (exec, next) => {
-    if (seen.has(exec.callId)) return next()
-    seen.add(exec.callId)
     const sessionId = exec.agent?.id ?? 'unknown'
+    let bucket = seen.get(sessionId)
+    if (bucket === undefined) {
+      bucket = new Set()
+      seen.set(sessionId, bucket)
+    }
+    if (bucket.has(exec.callId)) return next()
+    if (sessionId === 'unknown' && bucket.size >= UNKNOWN_BUCKET_CAP) bucket.clear()
+    bucket.add(exec.callId)
     service
       .dispatchDecision({
         callId: exec.callId,
@@ -30,4 +40,7 @@ export function installDecisionWatcher(ctx: Context, service: NotifyEmailService
       })
     return next()
   })
+  ctx.on('session/disposed', (session) => {
+    seen.delete(session.id)
+  })
 }