dsh-mail-sender 0.1.2 → 0.1.4

package/cordis.patch.yml

@@ -1,16 +1,3 @@
-plugins:
-  - name: dsh-mail-sender
-    config:
-      imap:
-        host: imap.example.com
-        port: 993
-        secure: true
-        user: ""
-        password: ""
-      smtp:
-        host: smtp.example.com
-        port: 465
-        secure: true
-        user: ""
-        password: ""
-      allowedAddresses: []
+- insert:
+    - id: dsh-mail-sender
+      name: dsh-mail-sender

package/lib/index.d.ts

@@ -2,23 +2,36 @@ import type { Context } from '@deepseek-ai/cordis';
 import Schema from '@deepseek-ai/schemastery';
 export declare const name = "dsh-mail-sender";
 export declare const inject: string[];
+/** schemastery `.volatile()` 字段解析后的稳定引用 */
+interface Ref<T> {
+    get(): T;
+}
 export interface Config {
-    imap: {
-        host: string;
-        port: number;
-        secure: boolean;
-        user: string;
-        password: string;
-    };
-    smtp: {
-        host: string;
-        port: number;
-        secure: boolean;
-        user: string;
-        password: string;
-    };
-    /** 入站+出站合并白名单：只有名单内的地址可以给 agent 发信，agent 也只能回复这些地址 */
-    allowedAddresses: string[];
+    /** 机器人邮箱，同时用于 IMAP/SMTP 登录与回信 From */
+    email: Ref<string>;
+    /** 邮箱密码或授权码 */
+    password: Ref<string>;
+    imapHost: Ref<string>;
+    smtpHost: Ref<string>;
+    /** SMTP 端口，465 走 SSL，其余走 STARTTLS */
+    smtpPort: Ref<number>;
+    /** 入站+出站白名单 */
+    allowedAddresses: Ref<string[]>;
 }
-export declare const Config: Schema<Config>;
+export declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
+    email: Schema<string, string, "volatile-defined">;
+    password: Schema<string, string, "volatile-defined">;
+    imapHost: Schema<string, string, "volatile-defined">;
+    smtpHost: Schema<string, string, "volatile-defined">;
+    smtpPort: Schema<number, number, "volatile-defined">;
+    allowedAddresses: Schema<NoInfer<string[]>, NoInfer<string[]>, "volatile-defined">;
+}>>, Schemastery.ObjectT<NoInfer<{
+    email: Schema<string, string, "volatile-defined">;
+    password: Schema<string, string, "volatile-defined">;
+    imapHost: Schema<string, string, "volatile-defined">;
+    smtpHost: Schema<string, string, "volatile-defined">;
+    smtpPort: Schema<number, number, "volatile-defined">;
+    allowedAddresses: Schema<NoInfer<string[]>, NoInfer<string[]>, "volatile-defined">;
+}>>, "plain">;
 export declare function apply(ctx: Context, config: Config): void;
+export {};

package/lib/index.js

@@ -6,57 +6,77 @@ import Schema from '@deepseek-ai/schemastery';
 export const name = 'dsh-mail-sender';
 export const inject = ['agents'];
 export const Config = Schema.object({
-    imap: Schema.object({
-        host: Schema.string().required().description('IMAP 服务器地址'),
-        port: Schema.number().default(993),
-        secure: Schema.boolean().default(true),
-        user: Schema.string().required().description('IMAP 登录账号'),
-        password: Schema.string().required().description('IMAP 密码/授权码'),
-    }),
-    smtp: Schema.object({
-        host: Schema.string().required().description('SMTP 服务器地址'),
-        port: Schema.number().default(465),
-        secure: Schema.boolean().default(true),
-        user: Schema.string().required().description('SMTP 登录账号'),
-        password: Schema.string().required().description('SMTP 密码/授权码'),
-    }),
+    email: Schema.string().volatile().default('').description('机器人邮箱，如 agent@qq.com'),
+    password: Schema.string().volatile().default('').description('邮箱密码或授权码'),
+    imapHost: Schema.string().volatile().default('').description('IMAP 服务器，如 imap.qq.com'),
+    smtpHost: Schema.string().volatile().default('').description('SMTP 服务器，如 smtp.qq.com'),
+    smtpPort: Schema.number().volatile().default(465).description('SMTP 端口，465 走 SSL，587 走 STARTTLS'),
     allowedAddresses: Schema.array(Schema.string())
+        .volatile()
         .default([])
         .description('允许与 agent 通信的邮箱地址'),
 });
+function resolveServers(config) {
+    const smtpPort = config.smtpPort.get();
+    return {
+        email: config.email.get().trim(),
+        password: config.password.get(),
+        imapHost: config.imapHost.get().trim(),
+        imapPort: 993,
+        smtpHost: config.smtpHost.get().trim(),
+        smtpPort,
+        smtpSecure: smtpPort === 465,
+    };
+}
 export function apply(ctx, config) {
-    const allowed = new Set(config.allowedAddresses.map(a => a.toLowerCase().trim()));
-    const smtp = nodemailer.createTransport({
-        host: config.smtp.host,
-        port: config.smtp.port,
-        secure: config.smtp.secure,
-        auth: { user: config.smtp.user, pass: config.smtp.password },
-    });
-    const imap = new ImapFlow({
-        host: config.imap.host,
-        port: config.imap.port,
-        secure: config.imap.secure,
-        auth: { user: config.imap.user, pass: config.imap.password },
-        logger: false,
-    });
     // sessionId -> agent handle
     const handles = new Map();
-    // sessionId -> 最近一封来信的信息（用于回复）
+    // sessionId -> 最近一封来信（用于回复）
     const lastMail = new Map();
     // `${sessionId}:${turn}` -> 该 turn 内累积的 assistant 文本
     const turnBuffers = new Map();
-    ctx.effect(async () => {
-        await imap.connect();
-        const lock = await imap.getMailboxLock('INBOX');
-        imap.on('exists', async () => {
+    let client;
+    let lock;
+    let startedKey = '';
+    let smtp;
+    let smtpKey = '';
+    const stopImap = async () => {
+        startedKey = '';
+        try {
+            lock?.release();
+        }
+        catch { }
+        lock = undefined;
+        const current = client;
+        client = undefined;
+        if (current)
+            await current.logout().catch(() => { });
+    };
+    const ensureStarted = async () => {
+        const servers = resolveServers(config);
+        const key = JSON.stringify(servers);
+        if (key === startedKey)
+            return;
+        await stopImap();
+        if (!servers.email || !servers.password || !servers.imapHost || !servers.smtpHost) {
+            console.warn('[mail-bot] 请在 设置 → 插件 → dsh-mail-sender 填写邮箱、密码与 IMAP/SMTP 服务器');
+            return;
+        }
+        const next = new ImapFlow({
+            host: servers.imapHost,
+            port: servers.imapPort,
+            secure: true,
+            auth: { user: servers.email, pass: servers.password },
+            logger: false,
+        });
+        client = next;
+        startedKey = key;
+        next.on('exists', async () => {
             try {
-                const mb = imap.mailbox;
+                const mb = next.mailbox;
                 if (mb === false)
                     return;
-                const seq = mb.exists;
-                if (!seq)
-                    return;
-                const fetched = await imap.fetchOne(seq, { source: true });
+                const fetched = await next.fetchOne(mb.exists, { source: true });
                 if (fetched === false || !fetched.source)
                     return;
                 const parsed = await simpleParser(fetched.source);
@@ -64,38 +84,65 @@ export function apply(ctx, config) {
                 if (!from)
                     return;
                 // 白名单：不在名单内直接丢弃
+                const allowed = new Set(config.allowedAddresses.get().map(a => a.toLowerCase().trim()));
                 if (!allowed.has(from))
                     return;
                 const sessionId = `mail-${from}`;
-                const subject = parsed.subject || '(no subject)';
-                const body = parsed.text || '';
-                lastMail.set(sessionId, { from, subject, messageId: parsed.messageId });
-                // 获取或创建 agent（同一发件人同一会话）
+                lastMail.set(sessionId, {
+                    from,
+                    subject: parsed.subject || '(no subject)',
+                    messageId: parsed.messageId,
+                });
+                // 同一发件人同一会话
                 let handle = handles.get(sessionId);
                 if (!handle) {
                     handle = await getOrCreateAgent(ctx, sessionId);
                     handles.set(sessionId, handle);
-                    ctx.on('session/event', (session, event) => {
-                        if (session?.header?.id !== sessionId)
-                            return;
-                        handleSessionEvent(sessionId, event);
-                    });
                 }
-                const msg = createUserMessage({
-                    content: [{ type: 'text', text: body }],
+                handle.agent.followup(createUserMessage({
+                    content: [{ type: 'text', text: parsed.text || '' }],
                     source: { kind: 'plugin', plugin: name },
-                });
-                handle.agent.followup(msg);
+                }));
             }
             catch (err) {
-                ctx.logger?.error('[mail-bot] fetch/parse failed', err);
+                console.error('[mail-bot] 收信失败', err);
             }
         });
-        return async () => {
-            try {
-                lock.release();
-            }
-            catch { }
+        try {
+            await next.connect();
+            if (client !== next)
+                return void next.logout().catch(() => { });
+            lock = await next.getMailboxLock('INBOX');
+        }
+        catch (err) {
+            console.error('[mail-bot] IMAP 连接失败', err);
+            if (client === next)
+                await stopImap();
+        }
+    };
+    const getSmtp = (servers) => {
+        const key = `${servers.smtpHost}:${servers.smtpPort}:${servers.smtpSecure}:${servers.email}`;
+        if (smtpKey !== key) {
+            smtp = nodemailer.createTransport({
+                host: servers.smtpHost,
+                port: servers.smtpPort,
+                secure: servers.smtpSecure,
+                requireTLS: !servers.smtpSecure,
+                auth: { user: servers.email, pass: servers.password },
+            });
+            smtpKey = key;
+        }
+        return smtp;
+    };
+    ctx.on('loader/volatile-update', () => { void ensureStarted(); });
+    ctx.on('session/event', (session, event) => {
+        const id = session?.header?.id;
+        if (typeof id === 'string' && handles.has(id))
+            handleSessionEvent(id, event);
+    });
+    ctx.effect(() => {
+        void ensureStarted();
+        return () => {
             for (const h of handles.values()) {
                 try {
                     h.dispose();
@@ -105,12 +152,13 @@ export function apply(ctx, config) {
             handles.clear();
             turnBuffers.clear();
             lastMail.clear();
-            await imap.logout();
+            void stopImap();
         };
     });
     function handleSessionEvent(sessionId, event) {
         const data = event?.data ?? {};
         const turn = data.turn;
+        const key = `${sessionId}:${turn}`;
         if (event.type === 'assistant/message') {
             const text = (data.message?.content ?? [])
                 .filter((b) => b.type === 'text')
@@ -118,31 +166,28 @@ export function apply(ctx, config) {
                 .join('');
             if (!text)
                 return;
-            const key = `${sessionId}:${turn}`;
-            const buf = turnBuffers.get(key) ?? [];
-            buf.push(text);
-            turnBuffers.set(key, buf);
+            turnBuffers.set(key, [...(turnBuffers.get(key) ?? []), text]);
             return;
         }
+        // 一轮完整结束后才回信；一个 turn 可能含多个 step
         if (event.type === 'turn/end' && data.reason?.kind === 'completed') {
-            const key = `${sessionId}:${turn}`;
-            const parts = turnBuffers.get(key) ?? [];
+            const replyText = (turnBuffers.get(key) ?? []).join('\n\n').trim();
             turnBuffers.delete(key);
-            const replyText = parts.join('\n\n').trim();
             if (!replyText)
                 return;
             const mail = lastMail.get(sessionId);
             if (!mail)
                 return;
+            const servers = resolveServers(config);
             const subject = mail.subject.startsWith('Re:') ? mail.subject : `Re: ${mail.subject}`;
-            smtp.sendMail({
-                from: config.smtp.user,
+            getSmtp(servers).sendMail({
+                from: servers.email,
                 to: mail.from,
                 subject,
                 text: replyText,
                 inReplyTo: mail.messageId,
                 references: mail.messageId,
-            }).catch(err => ctx.logger?.error('[mail-bot] send reply failed', err));
+            }).catch(err => console.error('[mail-bot] 回信失败', err));
         }
     }
 }

package/package.json

@@ -1,16 +1,21 @@
 {
   "name": "dsh-mail-sender",
-  "version": "0.1.2",
+  "version": "0.1.4",
+  "description": "inbound IMAP mail is delivered to an agent, whose reply is sent back over SMTP.",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": ["lib", "cordis.patch.yml"],
+  "keywords": ["dsh-plugin", "deepseek-harness", "mail", "imap", "smtp"],
   "dsh": {
-    "bundle": { "patch": "./cordis.patch.yml" },
-    "client": {
-      "inject": ["mail"],
-      "platform": "web"
-    }
+    "bundle": { "patch": "./cordis.patch.yml" }
   },
   "engines": {
     "dsh": ">=0.2.1-rc.2 <0.3.0-0"
@@ -37,4 +42,4 @@
     "@types/nodemailer": "^6.4.17",
     "typescript": "^5.6.0"
   }
-}
+}

package/readme.md

@@ -1,11 +1,12 @@
 # dsh-mail-sender
 
-一个 DeepSeek Harness (DSH) 邮件通道插件：用户发邮件 → DSH 接收并交给 agent → agent 的回复自动用邮件发回去。
+DeepSeek Harness (DSH) 邮件通道插件：用户发邮件 → DSH 接收并交给 agent → agent 的回复自动用邮件发回去。
 
 - **入站**：IMAP IDLE 实时监听收件箱
 - **会话**：同一发件人 → 同一个 agent 会话（`sessionId = mail-<地址>`）
-- **出站**：订阅 `session/event`，一轮 turn 结束后自动 SMTP 回复（`Re:` 主题 + `In-Reply-To`）
-- **白名单**：`allowedAddresses` 同时控制入站和出站
+- **出站**：订阅 `session/event`，一轮 turn 正常结束后自动 SMTP 回信（`Re:` 主题 + `In-Reply-To`）
+- **白名单**：`allowedAddresses` 同时控制入站与出站
+- **配置界面**：Host 从导出的 `Config` schema 自动渲染，无需自写前端
 
 ## 工作原理
 
@@ -24,4 +25,54 @@ ctx.agents.create / resume (sessionId = `mail-${from}`)
    │  turn/end (reason.kind === 'completed') → 取出本轮文本
    ▼
 SMTP 回复 (Re: 原主题, In-Reply-To: 原 Message-ID)
+```
+
+## 安装
+
+```bash
+dsh plugin --profile web add dsh-mail-sender
+```
+
+安装后重启 `dsh web`，用 `dsh --profile web --dump-config` 确认插件行已进入配置树。
+
+## 在设置页填写配置
+
+打开 **Settings（设置）→ Plugins（插件）→ dsh-mail-sender**，表单由 Host 根据插件导出的 `Config` schema 自动生成。
+
+> 该表单依赖两点，本插件已满足：
+> 1. patch 行 `id` 与包名一致（`dsh-mail-sender`），设置表单按行 id 定位；
+> 2. 每个可编辑字段声明为 `.volatile()`，DSH 才会把它投影成可编辑项并把改动写回 profile 的 `cordis.patch.yml`。
+
+| 字段 | 说明 |
+|---|---|
+| `email` | 机器人邮箱，如 `agent@qq.com`（同时用于 IMAP/SMTP 登录与回信 From） |
+| `password` | 邮箱密码或授权码 |
+| `imapHost` | IMAP 服务器，如 `imap.qq.com`（固定 993 + SSL） |
+| `smtpHost` | SMTP 服务器，如 `smtp.qq.com` |
+| `smtpPort` | 默认 `465`（SSL）；填 `587` 时自动走 STARTTLS |
+| `allowedAddresses` | 允许与 agent 通信的邮箱地址列表 |
+
+服务器地址按你的邮箱服务商填写，插件不做猜测。
+
+白名单同时控制两个方向：非名单内发件人的来信直接丢弃；agent 的回复目标就是来信人，因此也天然限定在名单内。
+
+所有字段都是 `.volatile()`：保存后即时生效，IMAP 会按新配置自动重连，无需重启 host。
+
+## 包结构
+
+```
+.
+├── package.json        # dsh.bundle 声明（无 dsh.client，纯 Host 插件）
+├── cordis.patch.yml    # 顶层 YAML 数组：插入插件行
+├── src/index.ts
+├── tsconfig.json
+└── .npmrc              # legacy-peer-deps=true（本地开发）
+```
+
+`cordis.patch.yml` 必须是**顶层数组**的 loader patch 条目：
+
+```yaml
+- insert:
+    - id: dsh-mail-sender
+      name: dsh-mail-sender
 ```