dsh-email 0.10.0 → 0.10.2

package/README.en.md

@@ -42,7 +42,7 @@ Example:
 
 ## Compatibility
 
-Verified against `@deepseek-ai/dsh@0.1.2-alpha.3` on 2026-09-01 (settings page / asset route / email_watch fully regression-tested). Built for the cordis patch-bundle plugin model (`cordis.patch.yml` + `dsh.bundle.patch`). No runtime imports of `@deepseek-ai/*` internals.
+Verified against source-run `@deepseek-ai/dsh@0.1.2-alpha.4` on 2026-09-02 (69 tests plus a Web-profile startup smoke test). Built for the cordis patch-bundle plugin model (`cordis.patch.yml` + `dsh.bundle.patch`). No runtime imports of `@deepseek-ai/*` internals.
 
 ## Installation
 

package/README.md

@@ -30,6 +30,7 @@ Email tools for DeepSeek Harness: list, read, search and send mail through stand
 | `email_attachment` | 按序号下载邮件附件（默认存到会话工作区，模型可直接读取；大小受 maxAttachmentBytes 限制） |
 | `email_watch` | 增量检查新邮件：首次调用建立基线，之后每次只报告比上次多出来的未读邮件，适合定时任务做新邮件提醒 |
 | `email_mark` | 修改邮件状态：标记已读/未读、加/取消星标，或移动到别的文件夹（归档、丢回收站），收发闭环的「收完之后」那一半 |
+| `email_reply` | 回复/回复全部/转发已有邮件：自动带上 In-Reply-To/References 线程头与原文引文，收件人自动排除自己，主题不重复叠 Re:/Fwd:；同样走发信审批门 |
 
 ### 新邮件提醒（Web 端）
 
@@ -43,7 +44,8 @@ Email tools for DeepSeek Harness: list, read, search and send mail through stand
 
 ### 版本记录
 
-- **0.10.0**：新增 `email_mark` 工具——标记已读/未读、加/取消星标、移动文件夹（归档/整理），补齐收发闭环；连接池按读/写模式分别管理邮箱打开状态。
+- **0.10.1**：补发制品——已发布的 0.10.0 打包时只含 `email_mark`，本版同时包含 `email_mark` 与 `email_reply`，代码与 0.10.0 的 main 一致。
+- **0.10.0**：新增 `email_mark`（已读/未读/星标/移动文件夹，补齐收发闭环的整理侧）与 `email_reply`（回复/回复全部/转发，自动线程头+引文，走发信审批门）；连接池按读/写模式分别管理邮箱打开状态。
 - **0.9.1**：修复设置页空主机遮蔽 provider 预设（#3/#6）；IMAP 连接超时不再杀死整个 DSH 进程（#4）；暗色模式输入控件可见（#2）；密码栏提示环境变量 `DSH_EMAIL_PASSWORD` 免明文方案（#5）。
 - **0.9.0**：新增 `email_watch` 增量新邮件检查工具（游标式，适合定时提醒）；Web 端新增「鲸鱼娘递信」新邮件弹窗（本地皮肤素材运行时读取 + 内置回退图）。
 - **0.8.2**：`since` / `until` 参数描述与其余参数统一为英文，方便多语言 agent 理解。
@@ -53,7 +55,7 @@ Email tools for DeepSeek Harness: list, read, search and send mail through stand
 
 ## 兼容性
 
-在 `@deepseek-ai/dsh@0.1.2-alpha.3` 上实测通过（2026-09-01，设置页/素材路由/email_watch 全回归）。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。
+在 `@deepseek-ai/dsh@0.1.2-alpha.4` 源码模式下实测通过（2026-09-02，69 项测试及 Web profile 启动冒烟）。遵循 cordis 组合包补丁模型（`cordis.patch.yml` + `dsh.bundle.patch`），运行时不 import 任何 `@deepseek-ai/*` 内部模块。
 
 ## 安装
 
@@ -192,4 +194,4 @@ MIT。这是一个社区插件，与 DeepSeek 官方无关；`@deepseek-ai/*`
 
 - [dsh-slack](https://github.com/STARDUSTLC666/dsh-slack) — Slack 通知/收件箱
 - [dsh-dingtalk](https://github.com/STARDUSTLC666/dsh-dingtalk) — 钉钉群通知（零依赖）
-- [dsh-email](https://github.com/STARDUSTLC666/dsh-email) — 邮件八件套 + Web 设置页 + 新邮件弹窗
+- [dsh-email](https://github.com/STARDUSTLC666/dsh-email) — 邮件八件套 + Web 设置页 + 新邮件弹窗

package/lib/index.d.ts

@@ -11,6 +11,6 @@ export declare function apply(ctx: any, config?: Config): void;
 export { PROVIDER_NAMES, EMAIL_PASSWORD_ENV } from './config.js';
 export { resolveEmailConfig, resolveEmailSettings, parseAccountsYaml, clampInt, defaultDownloadDir } from './config.js';
 export { stripHtml, truncateText, flattenAddresses, sanitizeFilename, parseRawMessage } from './parse.js';
-export { EmailPool, MailError, messageOf, validateAttachmentPaths, selectAttachmentPart, messageMatchesQuery } from './mail-client.js';
+export { EmailPool, MailError, messageOf, validateAttachmentPaths, selectAttachmentPart, messageMatchesQuery, buildReplyMessage, extractMessageIds } from './mail-client.js';
 export { SETTINGS_NAMESPACE, EmailSettingsSchema, toSettingsBase, toEmailConfig, validateSettingsValue } from './settings.js';
 export { SETTINGS_ROUTE, EmailSettingsBackend, installEmailSettingsWeb } from './web.js';

package/lib/index.js

@@ -152,6 +152,7 @@ const markSchema = {
     additionalProperties: true,
 };
 const MARK_ACTIONS = ['read', 'unread', 'star', 'unstar', 'move'];
+const REPLY_MODES = ['reply', 'reply-all', 'forward'];
 function oneText(text) {
     return [{ type: 'text', text }];
 }
@@ -226,6 +227,15 @@ function renderMark(value) {
     }
     return oneText(text);
 }
+const REPLY_LABELS = {
+    reply: '回复',
+    'reply-all': '回复全部',
+    forward: '转发',
+};
+function renderReply(value) {
+    const rejected = value.rejected.length > 0 ? '；被拒：' + value.rejected.join(', ') : '';
+    return oneText('账号 ' + value.account + ' 已' + REPLY_LABELS[value.mode] + ' uid=' + value.originalUid + ' 的邮件：收件人 ' + value.to.join(', ') + '，主题「' + value.subject + '」，messageId: ' + value.messageId + rejected);
+}
 function fingerprintSettings(settings) {
     return JSON.stringify({
         accounts: [...settings.accounts.entries()].map(([name, account]) => [name, account]),
@@ -403,6 +413,54 @@ export function apply(ctx, config = {}) {
             return await getPool().send(args.account, args.to.trim(), args.subject.trim(), typeof args.text === 'string' ? args.text : undefined, typeof args.cc === 'string' && args.cc.trim() !== '' ? args.cc.trim() : undefined, normalizeAttachmentPaths(args.attachments));
         },
     });
+    ctx.tools.register({
+        name: 'email_reply',
+        description: 'Reply to, reply-all to, or forward an existing message (mode: reply | reply-all | forward). Recipients come from the original message (your own address is excluded automatically), the subject gets a single Re:/Fwd: prefix, the original text is quoted underneath, and In-Reply-To/References headers keep mail clients threading correctly. mode=forward needs the to parameter. Like email_send, this asks the user for approval before sending. Never invent recipients or content without the user\'s instruction.',
+        parameters: compileParameters({
+            uid: { type: 'integer', required: true, description: 'Message uid to answer/forward, from email_list or email_search' },
+            text: { type: 'string', required: true, description: 'The new text to write; the original is quoted below it automatically' },
+            mode: { type: 'string', description: 'reply (default), reply-all, or forward' },
+            to: { type: 'string', description: 'Recipient(s) for mode=forward, comma-separated' },
+            cc: { type: 'string', description: 'Extra CC recipient(s), comma-separated (optional)' },
+            folder: { type: 'string', description: 'IMAP folder the uid belongs to; defaults to the account inboxFolder' },
+            account: { type: 'string', description: ACCOUNT_HINT },
+        }),
+        output: {
+            schema: {
+                type: 'object',
+                properties: {
+                    account: { type: 'string' },
+                    mode: { type: 'string' },
+                    originalUid: { type: 'integer' },
+                    messageId: { type: 'string' },
+                    accepted: strArray,
+                    rejected: strArray,
+                    response: { type: 'string' },
+                    to: strArray,
+                    subject: { type: 'string' },
+                },
+                additionalProperties: true,
+            },
+            render: (_args, value) => renderReply(value),
+        },
+        async execute(rawArgs) {
+            const args = rawArgs;
+            if (typeof args.uid !== 'number' || !Number.isInteger(args.uid) || args.uid <= 0) {
+                throw new Error('uid 必须是正整数（用 email_list 获取）');
+            }
+            if (typeof args.text !== 'string' || args.text.trim() === '')
+                throw new Error('text 不能为空');
+            const mode = ((typeof args.mode === 'string' && args.mode.trim() !== '' ? args.mode.trim().toLowerCase() : 'reply'));
+            if (!REPLY_MODES.includes(mode)) {
+                throw new Error('mode 必须是 ' + REPLY_MODES.join('、') + ' 之一');
+            }
+            if (mode === 'forward' && (typeof args.to !== 'string' || args.to.trim() === '')) {
+                throw new Error('mode=forward 时需要 to 参数指定转发收件人');
+            }
+            const cc = typeof args.cc === 'string' && args.cc.trim() !== '' ? args.cc.trim() : undefined;
+            return await getPool().reply(args.account, args.folder?.trim() || '', args.uid, mode, args.text, args.to?.trim() ?? '', cc);
+        },
+    });
     ctx.tools.register({
         name: 'email_folders',
         description: 'List the mailbox folders of an account (INBOX, Sent, Trash, custom folders, ...). Use the returned path values as the folder argument of the other email tools.',
@@ -548,11 +606,12 @@ export function apply(ctx, config = {}) {
             return await watchCore(args.account?.trim() || '', args.folder?.trim() || '', limit, 'tool');
         },
     });
-    // Approval gate: the user must confirm every send (recipient + subject).
-    // Runs before other listeners; degrades to the tool-time failure only
-    // when the account itself is not configured yet.
+    // Approval gate: the user must confirm every outgoing message
+    // (email_send: recipient + subject; email_reply: target + subject when
+    // known). Runs before other listeners; degrades to the tool-time failure
+    // only when the account itself is not configured yet.
     ctx.on('tools/pre-execute', async (exec, next) => {
-        if (exec?.name !== 'email_send')
+        if (exec?.name !== 'email_send' && exec?.name !== 'email_reply')
             return next();
         const descriptor = (ctx.settings.describe?.() ?? []).find((row) => row.ns === SETTINGS_NAMESPACE);
         const userSection = descriptor?.user;
@@ -565,9 +624,18 @@ export function apply(ctx, config = {}) {
         catch {
             return next(); // unconfigured: let the tool report the actionable hint
         }
-        const args = (exec.args ?? {});
-        const attachCount = Array.isArray(args.attachments) ? args.attachments.length : 0;
-        const reason = '发送邮件给 ' + args.to + '，主题「' + args.subject + '」' + (attachCount > 0 ? '，附件 ' + attachCount + ' 个' : '');
+        let reason;
+        if (exec.name === 'email_send') {
+            const args = (exec.arguments ?? {});
+            const attachCount = Array.isArray(args.attachments) ? args.attachments.length : 0;
+            reason = '发送邮件给 ' + args.to + '，主题「' + args.subject + '」' + (attachCount > 0 ? '，附件 ' + attachCount + ' 个' : '');
+        }
+        else {
+            const args = (exec.arguments ?? {});
+            const mode = typeof args.mode === 'string' && args.mode.trim() !== '' ? args.mode.trim().toLowerCase() : 'reply';
+            const modeLabel = mode === 'forward' ? '转发' : mode === 'reply-all' ? '回复全部' : '回复';
+            reason = modeLabel + '邮件（原邮件 uid=' + args.uid + '）' + (mode === 'forward' && typeof args.to === 'string' && args.to.trim() !== '' ? '，收件人 ' + args.to : '');
+        }
         // Gate-owned approval: we run the approval round-trip ourselves so the
         // denial reason is always honest and actionable — including the Full
         // Access case where the harness policy answers 'rejected' without ever
@@ -601,6 +669,6 @@ export function apply(ctx, config = {}) {
 export { PROVIDER_NAMES, EMAIL_PASSWORD_ENV } from './config.js';
 export { resolveEmailConfig, resolveEmailSettings, parseAccountsYaml, clampInt, defaultDownloadDir } from './config.js';
 export { stripHtml, truncateText, flattenAddresses, sanitizeFilename, parseRawMessage } from './parse.js';
-export { EmailPool, MailError, messageOf, validateAttachmentPaths, selectAttachmentPart, messageMatchesQuery } from './mail-client.js';
+export { EmailPool, MailError, messageOf, validateAttachmentPaths, selectAttachmentPart, messageMatchesQuery, buildReplyMessage, extractMessageIds } from './mail-client.js';
 export { SETTINGS_NAMESPACE, EmailSettingsSchema, toSettingsBase, toEmailConfig, validateSettingsValue } from './settings.js';
 export { SETTINGS_ROUTE, EmailSettingsBackend, installEmailSettingsWeb } from './web.js';

package/lib/mail-client.d.ts

@@ -1,6 +1,6 @@
 import { ImapFlow } from 'imapflow';
 import type { ResolvedEmailConfig, ResolvedEmailSettings } from './config.js';
-import type { EmailAttachmentMeta, EmailAttachmentResult, EmailFoldersResult, EmailListResult, EmailMarkAction, EmailMarkResult, EmailReadResult, EmailSearchResult, EmailSendResult } from './types.js';
+import type { AddressEntry, EmailAttachmentMeta, EmailAttachmentResult, EmailFoldersResult, EmailListResult, EmailMarkAction, EmailMarkResult, EmailReadResult, EmailReplyMode, EmailReplyResult, EmailSearchResult, EmailSendResult } from './types.js';
 export declare class MailError extends Error {
     constructor(message: string);
 }
@@ -20,6 +20,37 @@ interface AttachmentPart {
 export declare function selectAttachmentPart(readAttachments: EmailAttachmentMeta[], parts: AttachmentPart[], index: number): AttachmentPart | undefined;
 /** Case-insensitive match of a query against subject/from/body text. */
 export declare function messageMatchesQuery(subject: string, fromText: string, body: string, query: string): boolean;
+export interface OriginalDigest {
+    from: AddressEntry[];
+    to: AddressEntry[];
+    cc: AddressEntry[];
+    subject: string;
+    date: string;
+    text: string;
+    /** Bare id without angle brackets, '' when absent. */
+    messageId: string;
+    /** Space-joined bare ids from the References header, '' when absent. */
+    references: string;
+}
+export interface BuiltReply {
+    to: string;
+    cc?: string;
+    subject: string;
+    text: string;
+    inReplyTo?: string;
+    references?: string;
+}
+/** Pull Message-ID / References out of a raw RFC822 source (header section only). */
+export declare function extractMessageIds(source: Buffer): {
+    messageId: string;
+    references: string;
+};
+/**
+ * Compose the outgoing message for a reply/reply-all/forward. Pure so it can
+ * be tested without a connection: recipients exclude the sending account,
+ * subject prefixes never stack, the original text is quoted underneath.
+ */
+export declare function buildReplyMessage(original: OriginalDigest, mode: EmailReplyMode, selfAddress: string, text: string, forwardTo?: string): BuiltReply;
 /**
  * One mailbox pool for the whole plugin: pooled IMAP connections per
  * account plus pooled SMTP transporters, with idle sweep and error eviction.
@@ -54,6 +85,7 @@ export declare class EmailPool {
     folders(accountName: string | undefined, subscribedOnly: boolean): Promise<EmailFoldersResult>;
     downloadAttachment(accountName: string | undefined, folder: string, uid: number, index: number, workspaceHint?: string): Promise<EmailAttachmentResult>;
     send(accountName: string | undefined, to: string, subject: string, text: string | undefined, cc: string | undefined, attachmentPaths: string[] | undefined): Promise<EmailSendResult>;
+    reply(accountName: string | undefined, folder: string, uid: number, mode: EmailReplyMode, text: string, forwardTo: string, cc: string | undefined): Promise<EmailReplyResult>;
 }
 /** Stat every attachment path up front; total size must stay under the cap. */
 export declare function validateAttachmentPaths(paths: string[], maxBytes: number): Promise<Array<{

package/lib/mail-client.js

@@ -64,6 +64,92 @@ export function messageMatchesQuery(subject, fromText, body, query) {
         || fromText.toLowerCase().includes(q)
         || body.toLowerCase().includes(q);
 }
+/** Pull Message-ID / References out of a raw RFC822 source (header section only). */
+export function extractMessageIds(source) {
+    const headerEnd = source.indexOf('\r\n\r\n');
+    const head = source.slice(0, headerEnd === -1 ? Math.min(source.length, 32768) : headerEnd).toString('latin1');
+    const idMatch = head.match(/^message-id:\s*<([^>]+)>/im);
+    // References can fold across continuation lines; collect every <id> token up to the next header.
+    const refBlock = head.match(/^references:((?:[^\r\n]|\r?\n[ \t])*)/im);
+    const refs = refBlock === null ? [] : [...refBlock[1].matchAll(/<([^>]+)>/g)].map(m => m[1]);
+    return { messageId: idMatch === null ? '' : idMatch[1], references: refs.join(' ') };
+}
+function formatAddress(entry) {
+    if (entry.address === undefined)
+        return entry.name ?? '';
+    return entry.name !== undefined && entry.name !== '' ? entry.name + ' <' + entry.address + '>' : entry.address;
+}
+function dedupeAddresses(entries, exclude) {
+    const seen = new Set();
+    const out = [];
+    for (const entry of entries) {
+        const addr = (entry.address ?? '').toLowerCase();
+        if (addr === '' || addr === exclude || seen.has(addr))
+            continue;
+        seen.add(addr);
+        out.push(entry);
+    }
+    return out;
+}
+function stripReplyPrefix(subject, prefix) {
+    return subject.replace(new RegExp('^(?:' + prefix.source + '\\s*)+', 'i'), '').trim();
+}
+const QUOTE_MAX_CHARS = 2000;
+const FORWARD_MAX_CHARS = 4000;
+/**
+ * Compose the outgoing message for a reply/reply-all/forward. Pure so it can
+ * be tested without a connection: recipients exclude the sending account,
+ * subject prefixes never stack, the original text is quoted underneath.
+ */
+export function buildReplyMessage(original, mode, selfAddress, text, forwardTo = '') {
+    const fromText = original.from.map(a => a.name ?? a.address).filter(Boolean).join(', ') || '(未知发件人)';
+    const self = selfAddress.toLowerCase();
+    if (mode === 'forward') {
+        const to = forwardTo.trim();
+        if (to === '')
+            throw new MailError('forward 模式需要 to 参数指定转发收件人');
+        const fwdBody = original.text.length > FORWARD_MAX_CHARS
+            ? original.text.slice(0, FORWARD_MAX_CHARS) + '\n…[原文过长，已截断]'
+            : original.text;
+        const header = '---------- 转发的邮件 ----------\n发件人: ' + fromText
+            + (original.date !== '' ? '\n时间: ' + original.date : '')
+            + '\n主题: ' + (original.subject || '(无主题)')
+            + (original.to.length > 0 ? '\n收件人: ' + original.to.map(a => a.address).filter(Boolean).join(', ') : '');
+        return {
+            to,
+            subject: 'Fwd: ' + stripReplyPrefix(original.subject, /fwd:|fw:|re:/),
+            text: text + '\n\n' + header + '\n\n' + fwdBody,
+            ...(original.messageId !== '' ? { references: (original.references !== '' ? original.references + ' ' : '') + original.messageId } : {}),
+        };
+    }
+    let recipients;
+    if (mode === 'reply-all') {
+        recipients = dedupeAddresses([...original.from, ...original.to, ...original.cc], self);
+        if (recipients.length === 0)
+            recipients = dedupeAddresses(original.from, '');
+    }
+    else {
+        recipients = dedupeAddresses(original.from, '');
+    }
+    if (recipients.length === 0) {
+        throw new MailError('原邮件没有可用的发件人地址，无法回复；可用 email_send 手动发送');
+    }
+    const quoteText = original.text.length > QUOTE_MAX_CHARS
+        ? original.text.slice(0, QUOTE_MAX_CHARS) + '\n…[原文过长，已截断]'
+        : original.text;
+    const quote = '在 ' + (original.date || '未知时间') + '，' + fromText + ' 写道：\n'
+        + quoteText.split('\n').map(line => '> ' + line).join('\n');
+    const built = {
+        to: recipients.map(formatAddress).join(', '),
+        subject: 'Re: ' + stripReplyPrefix(original.subject, /re:/),
+        text: text + '\n\n' + quote,
+    };
+    if (original.messageId !== '') {
+        built.inReplyTo = original.messageId;
+        built.references = (original.references !== '' ? original.references + ' ' : '') + original.messageId;
+    }
+    return built;
+}
 function flattenAddressText(value) {
     return flattenAddresses(value)
         .map(a => (a.name ?? '') + ' ' + (a.address ?? ''))
@@ -483,6 +569,42 @@ export class EmailPool {
             response: info.response,
         };
     }
+    async reply(accountName, folder, uid, mode, text, forwardTo, cc) {
+        const name = this.resolveName(accountName);
+        const cfg = this.account(name);
+        const folderName = folder || cfg.inboxFolder;
+        // Read the original first (read-only), send second: a failed compose never
+        // leaves a half-written mailbox state behind.
+        const built = await this.withImap(name, folderName, async (client) => {
+            const message = await client.fetchOne(uid, { uid: true, source: true }, { uid: true });
+            if (message === false || message.source === undefined) {
+                throw new MailError('找不到 uid=' + uid + ' 的邮件（可能已被删除，或不在文件夹 "' + folderName + '"；可用 email_list 重新获取 uid）');
+            }
+            const ids = extractMessageIds(message.source);
+            const body = await parseRawMessage(message.source, this.settings.maxBodyChars);
+            return buildReplyMessage({ from: body.from, to: body.to, cc: body.cc, subject: body.subject, date: body.date, text: body.text, messageId: ids.messageId, references: ids.references }, mode, cfg.user, text, forwardTo);
+        });
+        const info = await this.transporter(name, cfg).sendMail({
+            from: cfg.user,
+            to: built.to,
+            cc,
+            subject: built.subject,
+            text: built.text,
+            ...(built.inReplyTo !== undefined ? { inReplyTo: '<' + built.inReplyTo + '>' } : {}),
+            ...(built.references !== undefined ? { references: built.references.split(' ').map(id => '<' + id + '>') } : {}),
+        });
+        return {
+            account: name,
+            mode,
+            originalUid: uid,
+            messageId: info.messageId,
+            accepted: info.accepted.map(String),
+            rejected: info.rejected.map(String),
+            response: info.response,
+            to: built.to.split(',').map(part => part.trim()).filter(part => part !== ''),
+            subject: built.subject,
+        };
+    }
 }
 /** Stat every attachment path up front; total size must stay under the cap. */
 export async function validateAttachmentPaths(paths, maxBytes) {

package/lib/types.d.ts

@@ -144,6 +144,29 @@ export interface EmailMarkResult {
     /** Set after a successful move: uid in the destination when the server reports it. */
     movedUid?: number;
 }
+export type EmailReplyMode = 'reply' | 'reply-all' | 'forward';
+export interface EmailReplyArgs extends AccountArg {
+    uid: number;
+    /** The new text to write; the original is quoted below it automatically. */
+    text: string;
+    mode?: EmailReplyMode;
+    /** Recipient(s) for mode=forward, comma-separated. */
+    to?: string;
+    cc?: string;
+    folder?: string;
+}
+export interface EmailReplyResult {
+    account: string;
+    mode: EmailReplyMode;
+    /** uid of the original message that was answered/forwarded. */
+    originalUid: number;
+    messageId: string;
+    accepted: string[];
+    rejected: string[];
+    response: string;
+    to: string[];
+    subject: string;
+}
 export interface EmailWatchResult {
     account: string;
     folder: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-email",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "description": "IMAP/SMTP email tools for DeepSeek Harness: list, read, search and send mail, with QQ/163/126/Sina/Aliyun/Gmail/Outlook/iCloud presets.",
   "type": "module",
   "main": "lib/index.js",