dsh-email 0.14.3 → 0.14.5

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.14.5（2026-10-01）
+
+- 修复 [#20](https://github.com/STARDUSTLC666/dsh-email/issues/20)：具名账号的服务商预设不再被顶层共享服务器遮蔽；Gmail 不再因继承 Outlook 端点被误判为 OAuth2。保留账号显式端点、传输超时和旧单账号继承规则。
+- 账号映射转换为卡片时沿用相同端点规则；新版设置服务保存卡片时排除表单派生的共享 imap/smtp，避免修改 Outlook 后改变其他账号的连接。
+- 连接失败显示账号、实际 IMAP 主机与端口；密码赋值及服务端回显的已知密码会脱敏，短密码不会破坏普通错误文字。
+- 修复顶层 senderName / authUser / authPassword 未传入单账号解析的问题。
+- 空地址卡片点击测试时先提示填写邮箱地址，不再测试隐藏表单中的旧凭据；保存后及时更新 Outlook 内置应用 ID 和独立登录密码的提示。
+- Windows 下新增十项行为回归，整套邮件 295 项通过；官方 Harness 0.2.0-rc.2 源码构建及 18 插件同载检查通过。原生桌面已实测新增卡片、服务商切换、自动保存与删除；最后的字段提示修正有组件行为回归，尚未再次实机操作。未验证真实邮箱登录、OAuth2 授权或发信成功。
+
+## 0.14.4（2026-09-29）
+
+- 修复：SMTP 发送改为**每次发送独占连接**，取消（AbortSignal）时只销毁本次连接的 socket 并立即拒绝，不再影响同账号的其它发送，也不会在取消后仍把邮件发出去。
+- 修复：OAuth2 令牌刷新与取消的竞态——取消后即使令牌刷新成功也不再继续发送。
+- 测试：修正 TLS fixture 的两处握手缺陷（STARTTLS 明文阶段未发送 220；取消用例把 greeting 压住导致走不到 TLS 升级），TLS 与取消回归现可稳定通过（285 项）。
 ## 0.14.3（2026-09-28）
 
 - 兼容验证更新到 Harness 0.2.0-rc.1：282 项邮件测试与 18 插件共同加载检查通过。

package/README.en.md

@@ -1,10 +1,12 @@
 # dsh-email
 
-## 0.14.2 update (2026-09-28)
+## 0.14.5 update (2026-10-01)
 
-Fixes saved blank-host defaults overriding Outlook's 587/STARTTLS preset, including legacy settings migrated to Harness 0.1.7. Explicit custom hosts, ports and TLS choices remain effective. Thanks to [SenkjM for the reproduction and proposed fix in #17 / #18](https://github.com/STARDUSTLC666/dsh-email/pull/18).
+Fixes [#20](https://github.com/STARDUSTLC666/dsh-email/issues/20): a named account's provider selects its own servers, so Gmail no longer inherits shared Outlook endpoints or becomes an OAuth2 account. Card saves exclude form-derived shared endpoints. Explicit account endpoints and legacy single-account configuration remain supported; top-level sender aliases and login credentials now take effect. Connection failures identify the selected account and actual IMAP host and port, with echoed credentials redacted.
 
-Validation host: Harness `0.2.0-rc.1` built from official sources (commit `407e65c8`) with Node `24.16.0` on 2026-09-28. All 282 plugin tests pass in an isolated environment; all 18 plugins mount together in one host registering 10 tools, with tool schemas and health-check contracts passing. No live ports or external services were exercised in this round.
+An empty card asks for its email address before testing. Outlook's built-in application ID updates from the saved snapshot, avoiding a false missing-ID warning. Stored separate login passwords are acknowledged without exposing their values.
+
+Validation host: Harness `0.2.0-rc.2` built from the official release tag (commit `639ed01539`), Windows and Node `24.16.0`. All 295 email tests pass; all 18 plugins mount together, with 10 email tools. Native Desktop checks covered adding a card, switching Outlook/Gmail, automatic saving and deletion. The final field-hint fixes have component behavior regressions but have not been retested in the native UI. Successful real-mailbox login, OAuth2 authorization and sending remain unverified.
 
 ![npm](https://img.shields.io/npm/v/dsh-email) ![downloads](https://img.shields.io/npm/dm/dsh-email) ![license](https://img.shields.io/github/license/STARDUSTLC666/dsh-email) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-email?style=social)
 
@@ -53,11 +55,7 @@ Example:
 - **0.10.8 and earlier**: see [CHANGELOG.md](CHANGELOG.md).
 ## Compatibility
 
-The current baseline is official-source Harness **0.2.0-rc.1** (2026-09-28, with a local `Symbol.for` tool-scheduler fix). All 18 plugins load together. Settings coverage includes legacy migration, real Web UI editing and automatic saving, refresh, revision conflicts and restart persistence with isolated fixture accounts. No live mailbox connection or sending was exercised in this round.
-
-2026-09-21: the current release package was installed through the official CLI in an isolated profile and co-loaded with the other two most-downloaded plugins on source-built Harness `0.1.6-alpha.2`. All 18 plugin tools registered; calendar/email configuration checks, PPT theme listing and 17-row table generation passed. The host is based on the official alpha.2 release plus the tool-scheduler `Symbol.for` fix (`93badd88`). This run did not connect to live mail or calendar services.
-
-Co-load verification was performed on 2026-09-16 with official source builds of Harness `0.1.5-rc.2` and `0.1.6-alpha.1`: all 18 components load alongside ModLens, with passing tool schemas, skill registration and offline read-only calls.
+The current baseline is Harness **0.2.0-rc.2** built from its official release tag on 2026-09-30. All 18 plugins mount together with 99 tools and 35 skills; registration and output checks pass. New email regressions cover provider isolation, card saves, endpoint diagnostics, sender aliases and editor hints. The native UI scope and remaining live-service checks are described above.
 
 **0.11.0 co-load verification (2026-09-18, locally built Harness `0.1.5-rc.2`, `web` profile)**: the plugin mounted without errors; the settings route answered GET with 200 and no `raw` field in the response; a `text/plain` POST was refused with **415**, proving the same-origin guard holds in the real host; under a `application/json` POST the card projection was correct, and an account pinning `authKind: password` reported both `authKindDeclared` and `authKind` as `password`; the panel actually rendered account cards, the eight provider presets with localized labels, the three-way authentication selector, the application (client) ID field with its hint, the missing-ID warning banner (so `--dsw-alias-state-warn-primary` is genuinely defined in the real host) and the Sign in with Microsoft button; the browser console was clean; save worked end to end, and afterwards `accountsYaml` was restored to empty with the original account intact. Offline tests: 231 green. **Still not done**: an end-to-end OAuth2 run against a real Outlook tenant (the device-code flow needs a human to authorize in a browser) and real sending; the `clientId` paths are covered only against a fake authority. Uses the `cordis.patch.yml` + `dsh.bundle.patch` bundle model. Node requirements are 22.19 or later within 22.x, or 24 or later. Live external-service workflows require separate configuration and validation.
 

package/README.md

@@ -2,11 +2,13 @@
 
 # dsh-email
 
-## 0.14.2 更新（2026-09-28）
+## 0.14.5 更新（2026-10-01）
 
-修复保存过的空服务器默认值覆盖 Outlook 预设的问题：恢复 `587 / STARTTLS`，并覆盖 Harness 0.1.7 的旧配置迁移路径。明确设置的自定义主机、端口和 TLS 仍然生效。感谢 [SenkjM 在 #17 / #18 提供复现和修复方向](https://github.com/STARDUSTLC666/dsh-email/pull/18)。
+修复 [#20](https://github.com/STARDUSTLC666/dsh-email/issues/20)：具名账号选择自己的服务商后，使用该服务商的服务器；Gmail 不再继承共享 Outlook 端点并被误判为 OAuth2。账号卡片保存不再把默认账号端点写回共享配置。保留显式账号端点与旧单账号配置，同时修复顶层发送别名和登录凭据未生效的问题。连接失败显示所选账号及实际 IMAP 主机、端口，服务端回显的密码继续脱敏。
 
-验证宿主：官方源码构建的 Harness `0.2.0-rc.1`（commit `407e65c8`）+ Node `24.16.0`（2026-09-28）。282 项插件测试在隔离环境全部通过；同一个宿主里 18 个插件共同加载，注册 10 个工具，工具 schema 与健康检查契约通过。本轮未启用真实端口与外部服务。
+空地址卡片点击测试时先提示填写邮箱地址；切换到 Outlook 后，内置应用 ID 提示随保存结果更新，不再误报缺失。独立登录密码只显示是否已保存，仍不回填明文。
+
+验证宿主：官方源码构建的 Harness `0.2.0-rc.2`（commit `639ed01539`）+ Windows / Node `24.16.0`。295 项邮件测试通过；18 个插件共同加载，邮件注册 10 个工具。原生桌面已实测新增卡片、Outlook/Gmail 切换、自动保存和删除。最后的字段提示修正通过组件行为回归，尚未再次实机操作；未验证真实邮箱登录、OAuth2 授权或发信成功。
 
 > **让 agent 协助处理邮件**：收发、搜索、回复转发、附件、邮件整理与新邮件提醒，支持八种常见邮箱服务预设。
 
@@ -61,16 +63,10 @@ IMAP/SMTP email tools for DeepSeek Harness, with replies, forwarding, mailbox or
 - **0.10.8 及更早**：见 [CHANGELOG.md](CHANGELOG.md)。
 ## 兼容性
 
-当前验证基线为官方源码构建的 Harness **0.2.0-rc.1**（2026-09-28，含本地工具调度器 `Symbol.for` 修复）。18 个插件共同加载；邮件设置覆盖旧配置迁移、真实网页编辑与自动保存、刷新恢复、修订冲突和重启持久化检查。本轮使用隔离测试账号，未连接真实邮箱或发送邮件。
-
-2026-09-21：当前发布包经官方 CLI 安装到隔离 profile，在源码构建的 Harness `0.1.6-alpha.2` 上与另外两个下载量前三插件共同加载，18 个插件工具注册正常；日历/邮件配置自检、PPT 主题查询和 17 行表格生成通过。测试本体基于官方 alpha.2 发布提交，另含工具调度器 `Symbol.for` 修复（`93badd88`）。本轮未连接真实邮箱或日历服务。
-
-2026-09-16 曾在官方源码构建的 Harness `0.1.5-rc.2` 和 `0.1.6-alpha.1` 上完成同载验证：18 个组件与 ModLens 同载，工具 schema、技能注册及离线只读调用检查通过。
+当前验证基线为官方发布标签源码构建的 Harness **0.2.0-rc.2**（2026-09-30）。18 个插件共同加载，99 个工具与 35 个技能的注册及输出检查通过；邮件新增多服务商隔离、卡片保存、端点错误提示、发送别名与编辑提示回归。桌面操作范围与尚未完成的真实服务验证见上文。
 
 **0.11.0 的同载验证（2026-09-18，本地构建的 Harness `0.1.5-rc.2`，`web` profile）**：插件挂载无报错；设置路由 GET 返回 200 且响应中已无 `raw` 字段；用 `text/plain` 发 POST 被 **415** 拒绝（同源守卫在真实宿主下生效）；`application/json` 的 POST 下卡片投影正确，账号钉住 `authKind: password` 后 `authKindDeclared` 与 `authKind` 均为 `password`；设置面板实际渲染出账号卡片、8 个服务商预设的中文下拉、「认证方式」三态选择器、「应用（客户端）ID」输入格与提示、未填 ID 时的警示条（说明 `--dsw-alias-state-warn-primary` 在真实宿主下确有定义）与「登录 Microsoft 账号」按钮；浏览器控制台无报错；save 全链路可用，验证结束后已把 `accountsYaml` 还原为空、原有账号恢复。离线测试 231 项全绿。**仍未做**：真实 Outlook 租户的 OAuth2 端到端（设备码流程要真人在浏览器完成授权）与真实发信未测，`clientId` 相关路径目前只有假 authority 的用例覆盖。采用 `cordis.patch.yml` + `dsh.bundle.patch` 组合包模型。Node 要求为 22.19 及以上的 22.x，或 24 及以上。外部服务的实际业务操作需按各组件配置单独验证。
 
-2026-09-10，npm `dsh-email@0.10.6` 曾通过真实 QQ 邮箱目录、列表、读取和搜索，以及设置页“测试连接”“保存并应用”检查；授权码留空时能继续使用 `DSH_EMAIL_PASSWORD`。独立 SMTP 登录认证也已通过。此次复验未连接真实邮箱，未发送、修改或删除邮件。
-
 遵循官方[插件打包与安装要求](https://github.com/deepseek-ai/deepseek-harness/blob/master/docs/user/develop/basic/publish.md)：ESM 入口、预构建 `lib/`、`dsh.bundle.patch` 和 `cordis.patch.yml` 配置层；显式注入所需服务，提供 JSON Schema 参数、规范化输出和渲染函数，运行时不导入宿主内部服务；配置声明使用官方 `@deepseek-ai/schemastery` 公共包。使用 Node 22.19 及以上的 22.x 或 Node 24 及以上版本；Harness 仍在快速迭代，上述版本是实测基线。
 
 ## 安装
@@ -139,7 +135,7 @@ dsh plugin --profile web remove dsh-email
     downloadDir: E:/attachments # 可选，默认 $DSH_HOME/email-downloads
 ```
 
-顶层的 `provider`/`user`/`password`/`imap`/`smtp`/`inboxFolder` 仍然可用，作为各账号的共享默认值（v0.1 单账号写法完全兼容）。
+顶层的 `provider`/`user`/`password`/`imap`/`smtp`/`inboxFolder` 仍兼容旧单账号写法。具名账号声明自己的 `provider` 时，服务器取该预设，账号自己的 `imap`/`smtp` 显式覆盖优先；未声明服务商的账号继续继承顶层服务器。共享连接超时仍可生效。
 
 想在多个账号之间复用同一套连接端点，可以用 `serverPresets` 自定义服务商预设（YAML 映射，键 = 预设名，值含可选的 `label` 与 `imap`/`smtp`）：
 

package/lib/client.js

@@ -295,6 +295,7 @@ var UI = {
     "card.testing": "测试中…",
     "card.testOk": "连接成功（{ms} ms）· {host}:{port}",
     "card.testFailed": "连接失败：{message}",
+    "card.testMissingAddress": "请先填写这个账号的邮箱地址，再测试连接。",
     "card.pickDefault": "配置了多个账号，请设置默认账号：",
     "card.errNoName": "有账号还没填账号名，这份改动先不保存。",
     "card.errNoProvider": "有账号还没选服务商，这份改动先不保存。",
@@ -475,6 +476,7 @@ var UI = {
     "card.testing": "Testing…",
     "card.testOk": "Connected ({ms} ms) · {host}:{port}",
     "card.testFailed": "Connection failed: {message}",
+    "card.testMissingAddress": "Enter this account's email address before testing the connection.",
     "card.pickDefault": "Several accounts are configured; choose the default account:",
     "card.errNoName": "An account has no name yet; this change will not be saved.",
     "card.errNoProvider": "An account has no provider selected; this change will not be saved.",
@@ -1154,6 +1156,9 @@ function oauthViewOf(draft, cards) {
     oauthState: sameProvider && liveState !== "" ? liveState : draftState,
     oauthUser: sameProvider && live && typeof live.oauthUser === "string" ? live.oauthUser : String(draft.oauthUser || ""),
     hasPassword: live !== null && live.hasPassword === true,
+    hasAuthPassword: live !== null && live.hasAuthPassword === true,
+    defaultClientId: sameProvider && typeof live.oauthDefaultClientId === "string"
+      ? live.oauthDefaultClientId : String(draft.defaultClientId || ""),
   };
 }
 
@@ -1195,7 +1200,7 @@ function OauthLoginPanel(props) {
   // （公共客户端 ID 每次都随请求发出），因此可以直接回填、直接编辑。留空不是
   // 「没配置」：插件自带一份社区注册，所以这里必须说清生效的到底是哪个应用 ——
   // 同意屏上写的名字不是账号主人自己的，这件事不该等点了登录才发现。
-  const builtInClientId = String(draft.defaultClientId || "").trim();
+  const builtInClientId = String(view.defaultClientId ?? draft.defaultClientId ?? "").trim();
   const clientIdField = () => h("div", { className: "dshe-field dshe-oauth-client" }, [
     h("label", null, t("oauth.clientIdLabel")),
     h("input", {
@@ -1595,6 +1600,13 @@ function AccountCardsEditor(props) {
 
   /** 传的是卡片上的「当前账号名」（可能刚改过名），行内提示按它归类。 */
   const testCard = async (draftName) => {
+    // An empty card must not fall back to credentials in the hidden legacy form.
+    if (String(draftsRef.current[draftName]?.user || "").trim() === "") {
+      setRowStatus((cur) => Object.assign({}, cur, {
+        [draftName]: { kind: "error", text: t("card.testMissingAddress") },
+      }));
+      return;
+    }
     setBusy(draftName);
     setRowStatus((cur) => Object.assign({}, cur, { [draftName]: { kind: "busy", text: t("card.testing") } }));
     try {

package/lib/config.d.ts

@@ -280,6 +280,8 @@ export declare function providerNames(custom?: Record<string, ServerPreset>): st
  * this provider name be written?", where a broken table can only mean "no".
  */
 export declare function presetNamesIn(text: string | undefined): string[];
+/** Materialize shared account defaults without replacing a named provider's servers. */
+export declare function mergeAccountDefaults(common: AccountConfig, account?: AccountConfig): AccountConfig;
 /** v0.1-compatible wrapper: resolve the single (or default) account. */
 export declare function resolveEmailConfig(config: EmailConfig | undefined): ResolvedEmailConfig;
 export declare function clampInt(value: unknown, fallback: number, min: number, max: number): number;

package/lib/config.js

@@ -228,6 +228,9 @@ export function resolveEmailSettings(config, onlyAccount) {
         provider: raw.provider,
         user: raw.user,
         password: raw.password,
+        senderName: raw.senderName,
+        authUser: raw.authUser,
+        authPassword: raw.authPassword,
         clientId: raw.clientId,
         authKind: raw.authKind,
         imap: raw.imap,
@@ -341,7 +344,24 @@ export function presetNamesIn(text) {
         return [];
     }
 }
-/** Merge one account over the shared shorthand and validate it. */
+/** Materialize shared account defaults without replacing a named provider's servers. */
+export function mergeAccountDefaults(common, account = {}) {
+    const acc = account ?? {};
+    const ownProvider = acc.provider !== undefined && acc.provider !== '';
+    // A named provider selects its own servers; shared connection budgets still apply.
+    const sharedImap = ownProvider ? {
+        ...(common.imap?.connectionTimeoutMs !== undefined ? { connectionTimeoutMs: common.imap.connectionTimeoutMs } : {}),
+        ...(common.imap?.socketTimeoutMs !== undefined ? { socketTimeoutMs: common.imap.socketTimeoutMs } : {}),
+    } : common.imap && normalizeSettingsEndpoint(common.imap, 'imap');
+    const sharedSmtp = !ownProvider && common.smtp ? normalizeSettingsEndpoint(common.smtp, 'smtp') : undefined;
+    const imap = { ...sharedImap, ...(acc.imap && normalizeSettingsEndpoint(acc.imap, 'imap')) };
+    const smtp = { ...sharedSmtp, ...(acc.smtp && normalizeSettingsEndpoint(acc.smtp, 'smtp')) };
+    return { ...common, ...acc,
+        imap: Object.keys(imap).length > 0 ? imap : undefined,
+        smtp: Object.keys(smtp).length > 0 ? smtp : undefined,
+    };
+}
+/** Merge one account over shared defaults and its selected provider, then validate it. */
 function resolveAccount(name, common, acc, allowEnvPassword, providers, known) {
     const requested = acc.provider ?? common.provider;
     const preset = requested === undefined ? undefined : providers[requested];
@@ -358,21 +378,20 @@ function resolveAccount(name, common, acc, allowEnvPassword, providers, known) {
     const authUser = (acc.authUser ?? common.authUser ?? '').trim() || user;
     const authPassword = (acc.authPassword ?? common.authPassword) || password;
     const senderName = (acc.senderName ?? common.senderName ?? '').trim();
-    const accountImap = acc.imap && normalizeSettingsEndpoint(acc.imap, 'imap');
-    const sharedImap = common.imap && normalizeSettingsEndpoint(common.imap, 'imap');
-    const accountSmtp = acc.smtp && normalizeSettingsEndpoint(acc.smtp, 'smtp');
-    const sharedSmtp = common.smtp && normalizeSettingsEndpoint(common.smtp, 'smtp');
+    const merged = mergeAccountDefaults(common, acc);
+    const accountImap = merged.imap && normalizeSettingsEndpoint(merged.imap, 'imap');
+    const accountSmtp = merged.smtp && normalizeSettingsEndpoint(merged.smtp, 'smtp');
     const imap = {
-        host: accountImap?.host ?? sharedImap?.host ?? preset?.imap.host,
-        port: accountImap?.port ?? sharedImap?.port ?? preset?.imap.port,
-        secure: accountImap?.secure ?? sharedImap?.secure ?? preset?.imap.secure,
-        connectionTimeoutMs: accountImap?.connectionTimeoutMs ?? sharedImap?.connectionTimeoutMs,
-        socketTimeoutMs: accountImap?.socketTimeoutMs ?? sharedImap?.socketTimeoutMs,
+        host: accountImap?.host ?? preset?.imap.host,
+        port: accountImap?.port ?? preset?.imap.port,
+        secure: accountImap?.secure ?? preset?.imap.secure,
+        connectionTimeoutMs: accountImap?.connectionTimeoutMs,
+        socketTimeoutMs: accountImap?.socketTimeoutMs,
     };
     const smtp = {
-        host: accountSmtp?.host ?? sharedSmtp?.host ?? preset?.smtp.host,
-        port: accountSmtp?.port ?? sharedSmtp?.port ?? preset?.smtp.port,
-        secure: accountSmtp?.secure ?? sharedSmtp?.secure ?? preset?.smtp.secure,
+        host: accountSmtp?.host ?? preset?.smtp.host,
+        port: accountSmtp?.port ?? preset?.smtp.port,
+        secure: accountSmtp?.secure ?? preset?.smtp.secure,
     };
     const problems = [];
     if (user === '')

package/lib/mail-client.d.ts

@@ -15,10 +15,8 @@ export declare function messageOf(error: unknown, fallback: string): string;
  * messages are rendered in the settings panel, returned by the mail tools, and
  * pasted into bug reports.
  *
- * Two shapes are masked: a JWT (three base64url segments, which is what every
- * OAuth2 access token looks like) and a long base64 run (the quoted XOAUTH2
- * blob). The replacement keeps the length so a report still says how big the
- * thing was, without saying what it was.
+ * Mask JWTs, long base64 authentication blobs and credential assignments.
+ * Token replacements retain their length for diagnostics.
  */
 export declare function redactCredentials(text: string): string;
 /** The IMAP auth shape imapflow accepts: a password, or an OAuth2 access token. */
@@ -108,8 +106,7 @@ export declare function extractMessageIds(source: Buffer): {
  */
 export declare function buildReplyMessage(original: OriginalDigest, mode: EmailReplyMode, selfAddress: string | readonly 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.
+ * One mailbox pool for the whole plugin: pooled IMAP connections per account.
  */
 export declare class EmailPool {
     private readonly settings;
@@ -155,14 +152,13 @@ export declare class EmailPool {
     startIdleSweep(): void;
     dispose(): void;
     /**
-     * A pooled transporter for one account. The token is captured when the
-     * transporter is built; an OAuth2 token that turns out to be stale is
-     * re-minted in sendMail, which rebuilds the transporter.
+     * Create an unpooled sender with its own socket. The socket callback exposes
+     * only the public SMTP transport hook to the cancellation owner.
      */
     private transporter;
-    private dropTransporter;
     /**
-     * Send through the pooled transporter while making cancellation close it.
+     * Give each send its own SMTP connection so cancellation can close that
+     * operation without closing another send for the same account.
      *
      * An OAuth2 transporter carries a token that was minted when it was built,
      * so a rejection is retried once against a freshly built one (and a fresh

package/lib/mail-client.js

@@ -1,5 +1,6 @@
 import { ImapFlow } from 'imapflow';
 import nodemailer from 'nodemailer';
+import { createConnection } from 'node:net';
 import { mkdir, stat, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { getFreshAccessToken, OAuth2Error } from './oauth2.js';
@@ -23,13 +24,12 @@ export function messageOf(error, fallback) {
  * messages are rendered in the settings panel, returned by the mail tools, and
  * pasted into bug reports.
  *
- * Two shapes are masked: a JWT (three base64url segments, which is what every
- * OAuth2 access token looks like) and a long base64 run (the quoted XOAUTH2
- * blob). The replacement keeps the length so a report still says how big the
- * thing was, without saying what it was.
+ * Mask JWTs, long base64 authentication blobs and credential assignments.
+ * Token replacements retain their length for diagnostics.
  */
 export function redactCredentials(text) {
     return text
+        .replace(/(["']?(?:password|passwd|authPassword|secret|api[_-]?key)["']?)(\s*[:=]\s*)(?:"[^"]*"|'[^']*'|[^\s;,)]+)/gi, '$1$2<已隐去的凭据>')
         .replace(/[A-Za-z0-9_-]{12,}\.[A-Za-z0-9_-]{12,}\.[A-Za-z0-9_-]{8,}/g, match => `<已隐去 ${match.length} 字符的令牌>`)
         .replace(/[A-Za-z0-9+/]{40,}={0,2}/g, match => `<已隐去 ${match.length} 字符的凭据>`);
 }
@@ -293,8 +293,7 @@ const READ_CACHE_TTL_MS = 10 * 60 * 1000;
 /** Folder names change rarely; a short TTL keeps email_folders off the wire. */
 const FOLDER_CACHE_TTL_MS = 60 * 1000;
 /**
- * One mailbox pool for the whole plugin: pooled IMAP connections per
- * account plus pooled SMTP transporters, with idle sweep and error eviction.
+ * One mailbox pool for the whole plugin: pooled IMAP connections per account.
  */
 export class EmailPool {
     settings;
@@ -566,41 +565,64 @@ export class EmailPool {
         this.idleTimer = undefined;
         for (const name of [...this.imaps.keys()])
             void this.evictImap(name);
-        for (const transporter of this.smtps.values())
+        for (const [transporter, socket] of this.smtps) {
+            socket?.destroy();
             transporter.close();
+        }
         this.smtps.clear();
     }
     /**
-     * A pooled transporter for one account. The token is captured when the
-     * transporter is built; an OAuth2 token that turns out to be stale is
-     * re-minted in sendMail, which rebuilds the transporter.
+     * Create an unpooled sender with its own socket. The socket callback exposes
+     * only the public SMTP transport hook to the cancellation owner.
      */
-    transporter(name, cfg, accessToken) {
-        let t = this.smtps.get(name);
-        if (t === undefined) {
-            t = nodemailer.createTransport({
-                pool: true,
-                host: cfg.smtp.host,
-                port: cfg.smtp.port,
-                secure: cfg.smtp.secure,
-                auth: smtpAuthOf(cfg, accessToken),
-                connectionTimeout: 30000,
-                greetingTimeout: 10000,
-                socketTimeout: 60000,
-                maxConnections: 2,
-                maxMessages: 50,
-            });
-            this.smtps.set(name, t);
-        }
-        return t;
-    }
-    dropTransporter(name, transporter) {
-        if (this.smtps.get(name) === transporter)
-            this.smtps.delete(name);
-        transporter.close();
+    transporter(name, cfg, accessToken, signal, onSocket) {
+        const transporter = nodemailer.createTransport({
+            host: cfg.smtp.host,
+            port: cfg.smtp.port,
+            secure: cfg.smtp.secure,
+            auth: smtpAuthOf(cfg, accessToken),
+            connectionTimeout: 30000,
+            greetingTimeout: 10000,
+            socketTimeout: 60000,
+            getSocket: (options, callback) => {
+                const socket = createConnection({ host: options.host ?? cfg.smtp.host, port: options.port ?? cfg.smtp.port });
+                onSocket(socket);
+                let settled = false;
+                const finish = (error, socketOptions) => {
+                    if (settled)
+                        return;
+                    settled = true;
+                    clearTimeout(timer);
+                    socket.removeListener('connect', onConnect);
+                    socket.removeListener('error', onError);
+                    signal?.removeEventListener('abort', onAbort);
+                    if (error !== null)
+                        socket.destroy();
+                    callback(error, socketOptions);
+                };
+                const onConnect = () => {
+                    if (signal?.aborted === true) {
+                        finish(signal.reason instanceof Error ? signal.reason : new Error('SMTP connection aborted'));
+                    }
+                    else
+                        finish(null, { connection: socket });
+                };
+                const onError = (error) => finish(error);
+                const onAbort = () => finish(signal?.reason instanceof Error ? signal.reason : new Error('SMTP connection aborted'));
+                const timer = setTimeout(() => finish(new Error('SMTP connection timeout')), 30000);
+                socket.once('connect', onConnect);
+                socket.once('error', onError);
+                signal?.addEventListener('abort', onAbort, { once: true });
+                if (signal?.aborted === true)
+                    onAbort();
+            },
+        });
+        this.smtps.set(transporter, undefined);
+        return transporter;
     }
     /**
-     * Send through the pooled transporter while making cancellation close it.
+     * Give each send its own SMTP connection so cancellation can close that
+     * operation without closing another send for the same account.
      *
      * An OAuth2 transporter carries a token that was minted when it was built,
      * so a rejection is retried once against a freshly built one (and a fresh
@@ -610,44 +632,78 @@ export class EmailPool {
     async sendMail(name, cfg, message, signal) {
         signal?.throwIfAborted();
         const attempt = async (forceToken) => {
-            const token = cfg.authKind === 'oauth2' ? await getFreshAccessToken(name, cfg, { force: forceToken }) : undefined;
-            const transporter = this.transporter(name, cfg, token);
-            const onAbort = () => {
-                this.dropTransporter(name, transporter);
-            };
-            signal?.addEventListener('abort', onAbort, { once: true });
+            let token;
+            if (cfg.authKind === 'oauth2') {
+                const refreshing = getFreshAccessToken(name, cfg, { force: forceToken });
+                if (signal === undefined)
+                    token = await refreshing;
+                else {
+                    let onAbort;
+                    const aborted = new Promise((_resolve, reject) => {
+                        onAbort = () => reject(signal.reason ?? new DOMException('The operation was aborted', 'AbortError'));
+                        signal.addEventListener('abort', onAbort, { once: true });
+                        if (signal.aborted)
+                            onAbort();
+                    });
+                    try {
+                        token = await Promise.race([refreshing, aborted]);
+                    }
+                    finally {
+                        if (onAbort !== undefined)
+                            signal.removeEventListener('abort', onAbort);
+                    }
+                }
+            }
+            signal?.throwIfAborted();
+            let smtpSocket;
+            const transporter = this.transporter(name, cfg, token, signal, socket => {
+                smtpSocket = socket;
+                this.smtps.set(transporter, socket);
+            });
+            let onAbort;
+            const aborted = signal === undefined ? undefined : new Promise((_resolve, reject) => {
+                onAbort = () => {
+                    smtpSocket?.destroy();
+                    transporter.close();
+                    reject(new MailError('SMTP发送已取消；服务器是否已接收邮件无法确认，请先检查邮箱再决定是否重发'));
+                };
+                signal.addEventListener('abort', onAbort, { once: true });
+            });
             try {
-                const info = await transporter.sendMail(message);
-                signal?.throwIfAborted();
+                const sending = transporter.sendMail(message);
+                const info = aborted === undefined ? await sending : await Promise.race([sending, aborted]);
                 return info;
             }
             finally {
-                signal?.removeEventListener('abort', onAbort);
+                if (onAbort !== undefined)
+                    signal?.removeEventListener('abort', onAbort);
+                smtpSocket?.destroy();
+                transporter.close();
+                this.smtps.delete(transporter);
             }
         };
         try {
             return await attempt(false);
         }
         catch (error) {
-            signal?.throwIfAborted();
+            if (signal?.aborted === true)
+                throw error;
             if (cfg.authKind !== 'oauth2')
                 throw error;
-            // A pooled connection that already authenticated can fail for reasons no
+            // A connection that already authenticated can fail for reasons no
             // token can fix (a rejected recipient, a full mailbox). Only a credential
             // rejection is worth a second, freshly-tokened attempt — and a token
             // store that refused outright is reported as itself.
             if (!looksLikeAuthFailure(error))
                 throw this.oauth2ErrorOf(error);
-            // The cached transporter holds the old token: it has to go, or the retry
-            // would reuse the very credential that was just refused.
-            const stale = this.smtps.get(name);
-            if (stale !== undefined)
-                this.dropTransporter(name, stale);
+            // A fresh transporter is created for the retry so it cannot reuse the
+            // credential that was just refused.
             try {
                 return await attempt(true);
             }
             catch (retryError) {
-                signal?.throwIfAborted();
+                if (signal !== undefined && Boolean(signal.aborted))
+                    throw retryError;
                 throw this.oauth2ErrorOf(retryError);
             }
         }

package/lib/runtime.js

@@ -1,5 +1,5 @@
 /** Live settings, account-pool ownership, and independent tool/web watch cursors. */
-import { clampInt, presetNamesIn, resolveEmailSettings, serializeAccountsYaml } from './config.js';
+import { clampInt, mergeAccountDefaults, presetNamesIn, resolveEmailSettings, serializeAccountsYaml } from './config.js';
 import { EmailPool, messageOf } from './mail-client.js';
 import { EmailSettingsSchema, SETTINGS_NAMESPACE, toEmailConfig, toSettingsBase, validateSettingsValue } from './settings.js';
 import { liveConfig } from './host-config.js';
@@ -43,7 +43,7 @@ export function createEmailRuntime(ctx, config, createPool = settings => new Ema
             const shared = Object.fromEntries(['provider', 'user', 'password', 'senderName', 'authUser', 'authPassword', 'clientId', 'authKind', 'imap', 'smtp', 'inboxFolder']
                 .filter(key => config[key] !== undefined).map(key => [key, config[key]]));
             const cards = config.accounts && Object.keys(config.accounts).length > 0
-                ? Object.fromEntries(Object.entries(config.accounts).map(([key, account]) => [key, { ...shared, ...account }]))
+                ? Object.fromEntries(Object.entries(config.accounts).map(([key, account]) => [key, mergeAccountDefaults(shared, account)]))
                 : typeof config.user === 'string' && config.user !== '' ? { default: shared } : {};
             return EmailSettingsSchema({ ...toSettingsBase(config), ...endpointDefaults,
                 accountsYaml: config.accountsYaml ?? serializeAccountsYaml(cards, config.defaultAccount),

package/lib/web.js

@@ -823,7 +823,12 @@ export class EmailSettingsBackend {
             // resurrect a hidden old account on the next read.
             const section = Object.hasOwn(value, 'accountsYaml')
                 ? { ...value, accounts: {}, user: '', password: '', authUser: '', authPassword: '' }
-                : value;
+                : { ...value };
+            if (Object.hasOwn(value, 'accountsYaml')) {
+                // The form displays the default card's resolved endpoints; those are not shared edits.
+                delete section.imap;
+                delete section.smtp;
+            }
             await this.ctx.settings.update(this.namespace, section, expectedRevision);
         }
         else
@@ -868,6 +873,7 @@ export class EmailSettingsBackend {
             throw new Error(`未知账号 "${name}"，可用：${available.join('、')}`);
         }
         const target = { account: name, imapHost: cfg.imap.host, imapPort: cfg.imap.port };
+        const targetDescription = '账号 "' + name + '" · IMAP ' + cfg.imap.host + ':' + cfg.imap.port;
         // An OAuth2 account has no password to check: without a token there is
         // nothing to dial with, and a failed dial would only say so less clearly.
         if (cfg.authKind === 'oauth2') {
@@ -875,7 +881,7 @@ export class EmailSettingsBackend {
                 await getFreshAccessToken(name, cfg);
             }
             catch (error) {
-                throw new Error(messageOf(error, '尚未登录：请先在设置页完成设备码登录'));
+                throw new Error(targetDescription + '（OAuth2）：' + redactCredentials(messageOf(error, '尚未登录：请先在设置页完成设备码登录')));
             }
         }
         const pool = new EmailPool(settings);
@@ -889,14 +895,18 @@ export class EmailSettingsBackend {
             // actionable hint instead of the opaque message. The server's own text is
             // redacted first: a refused authentication string is echoed verbatim by
             // many servers, and for XOAUTH2 that blob carries the access token.
-            const raw = redactCredentials(messageOf(error, 'unknown error'));
+            let raw = redactCredentials(messageOf(error, 'unknown error'));
+            for (const secret of [cfg.password, cfg.authPassword]) {
+                if (secret && secret.length >= 4)
+                    raw = raw.split(secret).join('[redacted]');
+            }
             const lower = raw.toLowerCase();
             if (lower.includes('command failed') || lower.includes('authentication') || lower.includes('login')) {
                 throw new Error(cfg.authKind === 'oauth2'
-                    ? '邮箱登录失败：请在设置页重新完成设备码登录（' + raw + '）'
-                    : '邮箱登录失败：请检查邮箱地址与授权码（' + raw + '）');
+                    ? targetDescription + '（OAuth2）：邮箱登录失败：请在设置页重新完成设备码登录（' + raw + '）'
+                    : targetDescription + '：邮箱登录失败：请检查邮箱地址与授权码（' + raw + '）');
             }
-            throw error;
+            throw new Error(targetDescription + '：' + raw);
         }
         finally {
             pool.dispose();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-email",
-  "version": "0.14.3",
+  "version": "0.14.5",
   "description": "DSH 邮件插件：IMAP/SMTP 收发搜索、回复转发、附件与整理，多账号卡片设置页、Outlook OAuth2 登录与发信审批。",
   "type": "module",
   "main": "lib/index.js",