dsh-email 0.14.7 → 0.15.0

package/lib/settings.js

@@ -1,5 +1,6 @@
 import z from 'schemastery';
 import { ENDPOINT_DEFAULTS, normalizeSettingsEndpoint, PROVIDER_NAMES } from './config.js';
+import { parseRecipientPolicies } from './recipient-policy.js';
 /** Settings-document namespace this plugin owns (editable from the Web settings page). */
 export const SETTINGS_NAMESPACE = 'dsh-email';
 /**
@@ -13,6 +14,7 @@ export const EmailSettingsSchema = z.object({
     password: z.string().role('secret').default(''),
     inboxFolder: z.string().default('INBOX'),
     sendApproval: z.boolean().default(true),
+    trustedRecipientsYaml: z.string().default(''),
     maxBodyChars: z.number().default(20000),
     downloadDir: z.string().default(''),
     accountsYaml: z.string().role('secret').default(''),
@@ -39,6 +41,7 @@ export function toSettingsBase(config) {
         ...(config.password !== undefined && config.password !== '' ? { password: config.password } : {}),
         ...(config.inboxFolder !== undefined && config.inboxFolder !== '' ? { inboxFolder: config.inboxFolder } : {}),
         ...(config.sendApproval !== undefined ? { sendApproval: config.sendApproval } : {}),
+        ...(config.trustedRecipientsYaml !== undefined ? { trustedRecipientsYaml: config.trustedRecipientsYaml } : {}),
         ...(config.maxBodyChars !== undefined ? { maxBodyChars: config.maxBodyChars } : {}),
         ...(config.downloadDir !== undefined && config.downloadDir !== '' ? { downloadDir: config.downloadDir } : {}),
         ...(config.serverPresets !== undefined && config.serverPresets !== '' ? { serverPresets: config.serverPresets } : {}),
@@ -122,6 +125,8 @@ export function toEmailConfig(value, user) {
         set('inboxFolder', draft.inboxFolder);
     if (has('sendApproval'))
         set('sendApproval', draft.sendApproval);
+    if (has('trustedRecipientsYaml'))
+        set('trustedRecipientsYaml', draft.trustedRecipientsYaml);
     if (has('maxBodyChars'))
         set('maxBodyChars', draft.maxBodyChars);
     if (has('downloadDir'))
@@ -198,6 +203,11 @@ function describeValue(value) {
  */
 export function validateSettingsValue(value, extraProviders = []) {
     const draft = (value ?? {});
+    if (draft.trustedRecipientsYaml !== undefined) {
+        if (typeof draft.trustedRecipientsYaml !== 'string')
+            throw new Error('可信收件人规则必须为文本');
+        parseRecipientPolicies(draft.trustedRecipientsYaml);
+    }
     const provider = draft.provider;
     if (isSet(provider) && provider !== '' && !PROVIDER_NAMES.includes(provider) && !extraProviders.includes(provider)) {
         const names = [...PROVIDER_NAMES, ...extraProviders];

package/lib/tools.d.ts

@@ -1,4 +1,5 @@
 import type { EmailRuntime } from './runtime.js';
+import type { EmailDraftBackend } from './draft-web.js';
 import { type TextBlock } from './tool-contract.js';
 export interface EmailToolDefinition {
     name: string;
@@ -11,4 +12,4 @@ export interface EmailToolDefinition {
     execute(args: unknown, exec?: unknown): Promise<unknown>;
     timeoutMs?: number;
 }
-export declare function buildEmailTools(runtime: Pick<EmailRuntime, 'getPool' | 'getEffectiveSettings' | 'watch'>): EmailToolDefinition[];
+export declare function buildEmailTools(runtime: Pick<EmailRuntime, 'getPool' | 'getEffectiveSettings' | 'watch'>, drafts?: Pick<EmailDraftBackend, 'create'>): EmailToolDefinition[];

package/lib/tools.js

@@ -5,9 +5,17 @@ import { descriptions, parameters, MAX_LIMIT, MARK_ACTIONS, REPLY_MODES, executi
 /** 单次工具调用的 deadline：普通查询 60s，正文扫描/watch 这类整批操作 120s。 */
 const QUERY_TIMEOUT_MS = 60000;
 const BATCH_TIMEOUT_MS = 120000;
-export function buildEmailTools(runtime) {
+export function buildEmailTools(runtime, drafts) {
     const { getPool, getEffectiveSettings, watch: watchCore } = runtime;
     return [
+        ...(drafts ? [{
+                name: 'email_draft',
+                description: '准备可编辑的本地邮件草稿，不投递邮件。用户在设置 → 邮件 → 草稿中编辑、检查附件预览并明确确认后才发送。可在邮箱尚未配置时准备文字草稿；不用于回复原邮件线程。',
+                parameters: { type: 'object', properties: { account: { type: 'string', description: '发件账号名，省略时使用默认账号' }, to: { type: 'string', description: 'To 地址，支持显示名和地址组' }, cc: { type: 'string' }, subject: { type: 'string' }, text: { type: 'string', description: '纯文本正文' }, attachments: { type: 'array', items: { type: 'string' }, maxItems: 10, description: '本地附件路径，用户在预览中检查后才提交' } }, required: ['to', 'subject', 'text'], additionalProperties: false },
+                output: { schema: { type: 'object', properties: { id: { type: 'string' }, state: { type: 'string' }, subject: { type: 'string' } }, required: ['id', 'state', 'subject'] }, render: (_args, value) => [{ type: 'text', text: '本地草稿已保存，邮件未发送。请在设置 → 邮件 → 草稿中打开并检查。\n草稿编号：' + value.id + '\n主题：' + value.subject }] },
+                timeoutMs: QUERY_TIMEOUT_MS,
+                async execute(args, exec) { const draft = await drafts.create(args, executionSignal(exec)); return { id: draft.id, state: draft.state, subject: draft.subject }; },
+            }] : []),
         {
             name: 'email_list',
             description: descriptions.email_list,

package/lib/web.d.ts

@@ -232,6 +232,30 @@ export declare class EmailSettingsBackend {
             credit: string;
         };
     }>;
+    saveRecipientRules(text: string, expectedRevision: number): Promise<{
+        settings: {
+            value: EmailSettingsValue;
+            revision: any;
+            applies: any;
+        };
+        writable: boolean;
+        accounts: string[];
+        accountsDetail: {
+            error?: string | undefined;
+            list: AccountCardData[];
+            defaultAccount?: string | undefined;
+        };
+        presets: {
+            custom: Record<string, ServerPreset>;
+            error?: string;
+            builtin: Record<string, ProviderPreset>;
+        };
+        whale: {
+            url: string;
+            skin: boolean;
+            credit: string;
+        };
+    }>;
     /**
      * Test one account (by name, defaulting to the draft's default account) over
      * a live IMAP login. Returns the endpoint it dialled so the panel can show

package/lib/web.js

@@ -810,6 +810,9 @@ export class EmailSettingsBackend {
         }
     }
     async save(value, expectedRevision) {
+        // Rules have an explicit, separate save action. A stale account autosave
+        // must never restore an older trust policy after another tab changed it.
+        value = { ...value, trustedRecipientsYaml: this.scope.get().trustedRecipientsYaml ?? '' };
         if (this.ctx.settings.writable === false)
             throw new Error('settings provider is read-only');
         // The provider dropdown offers the custom preset names, so a value naming
@@ -847,6 +850,18 @@ export class EmailSettingsBackend {
         }
         return this.snapshot();
     }
+    async saveRecipientRules(text, expectedRevision) {
+        if (this.ctx.settings.writable === false)
+            throw new Error('settings provider is read-only');
+        if (!Number.isSafeInteger(expectedRevision) || expectedRevision < 0)
+            throw new Error('请重新加载规则后保存');
+        validateSettingsValue({ trustedRecipientsYaml: text });
+        if (this.scope.config)
+            await this.ctx.settings.update(this.namespace, { trustedRecipientsYaml: text }, expectedRevision);
+        else
+            await this.ctx.settings.replace(this.namespace, { ...this.scope.get(), trustedRecipientsYaml: text }, expectedRevision);
+        return this.snapshot();
+    }
     /**
      * Test one account (by name, defaulting to the draft's default account) over
      * a live IMAP login. Returns the endpoint it dialled so the panel can show

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-email",
-  "version": "0.14.7",
-  "description": "DSH 邮件插件：IMAP/SMTP 收发搜索、回复转发、附件与整理，多账号卡片设置页、Outlook OAuth2 登录与发信审批。",
+  "version": "0.15.0",
+  "description": "在 DSH 中收发、搜索和整理邮件，支持多个邮箱账号。",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -20,7 +20,8 @@
     "cordis.patch.yml",
     "README.md",
     "README.en.md",
-    "CHANGELOG.md"
+    "CHANGELOG.md",
+    "docs"
   ],
   "scripts": {
     "build": "tsc",
@@ -61,15 +62,17 @@
     }
   },
   "dependencies": {
+    "@deepseek-ai/schemastery": "^3.18.3",
     "imapflow": "^2.2.1",
     "mailparser": "^3.9.33",
     "nodemailer": "^10.0.13",
+    "proper-lockfile": "4.1.2",
     "schemastery": "^3.18.0",
-    "yaml": "^2.9.0",
-    "@deepseek-ai/schemastery": "^3.18.3"
+    "yaml": "^2.9.0"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",
+    "@types/proper-lockfile": "4.1.4",
     "typescript": "^5.7.3"
   }
 }