dsh-email 0.14.0 → 0.14.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.14.1（2026-09-27）
+
+- 未补全的账号和服务器预设会显示未保存提示；避免草稿丢失和错误的“已保存”状态。测试连接只校验所选账号，错误直接指向设置页中的对应字段。
+
 > 完整历史（含详细改动说明）。README 只保留最近几个版本的一句话摘要。
 
 ## 中文版

package/README.en.md

@@ -1,5 +1,11 @@
 # dsh-email
 
+## 0.14.1 update (2026-09-27)
+
+Incomplete account and server-preset drafts display an unsaved status and are protected against accidental navigation. Connection tests validate the selected account independently and identify the relevant settings field.
+
+Validation host: Harness 0.1.7-rc.2 built from official sources, retaining the local tool-scheduler fix. Build and automated checks pass; interactive coverage and external-service limits are recorded in this release round.
+
 ![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)
 
 [![Awesome DSH Plugin](https://awesome-dsh-plugin.com/badge.svg)](https://awesome-dsh-plugin.com)

package/README.md

@@ -2,6 +2,12 @@
 
 # dsh-email
 
+## 0.14.1 更新（2026-09-27）
+
+未补全的账号和服务器预设会显示未保存提示；避免草稿丢失和错误的“已保存”状态。测试连接只校验所选账号，错误直接指向设置页中的对应字段。
+
+验证宿主：官方源码构建的 Harness 0.1.7-rc.2（保留本地工具调度器修复）。构建与自动测试通过；实际操作和外部服务限制见本轮验收记录。
+
 > **让 agent 协助处理邮件**：收发、搜索、回复转发、附件、邮件整理与新邮件提醒，支持八种常见邮箱服务预设。
 
 ![npm version](https://img.shields.io/npm/v/dsh-email?label=npm&color=blue) ![npm downloads](https://img.shields.io/npm/dm/dsh-email) ![license](https://img.shields.io/npm/l/dsh-email) ![stars](https://img.shields.io/github/stars/STARDUSTLC666/dsh-email?style=social)

package/lib/client.js

@@ -208,6 +208,7 @@ const CSS = [
   ".dshe-auto-status{font-size:12px;font-weight:600;align-self:center;color:var(--dsw-alias-label-tertiary,#77736d)}",
   ".dshe-auto-status.is-saved{color:var(--dsw-alias-state-success-primary,#267d52)}",
   ".dshe-auto-status.is-error{color:var(--dsw-alias-state-error-primary,#aa3939)}",
+  ".dshe-auto-status.is-draft{color:var(--dsw-alias-state-warning-primary,#986000)}",
   ".dshe-acc-badge.is-oauth{border-color:transparent;background:color-mix(in srgb,var(--dsw-alias-state-success-primary,#267d52) 12%,transparent);color:var(--dsw-alias-state-success-primary,#267d52)}",
   ".dshe-oauth{display:grid;gap:8px;padding:10px 11px;border:1px dashed var(--dsw-alias-border-l2,#dedbd5);border-radius:10px;background:var(--dsw-alias-bg-layer-1,#fff)}",
   ".dshe-oauth.is-logged-in{border-style:solid;border-color:color-mix(in srgb,var(--dsw-alias-state-success-primary,#267d52) 34%,transparent);background:color-mix(in srgb,var(--dsw-alias-state-success-primary,#267d52) 8%,transparent)}",
@@ -260,7 +261,7 @@ var UI = {
     "provider.outlook": "Outlook",
     "provider.icloud": "iCloud",
     "provider.custom": "自定义",
-    "provider.noneInYaml": "（YAML 未指定服务商）",
+    "provider.noneInYaml": "请选择邮箱服务商",
     "provider.undefinedPresetSuffix": "（未定义预设）",
 
     // 全局设置
@@ -272,6 +273,7 @@ var UI = {
     // 自动保存状态条
     "status.saved": "已保存",
     "status.saving": "保存中…",
+    "status.draft": "还有未保存的内容，请补全下方标记的字段。",
     "status.saveFailed": "保存失败：{message}（点击重试）",
 
     // 账号卡片
@@ -314,7 +316,7 @@ var UI = {
     "card.passwordLabel": "授权码 / 应用专用密码",
     "card.passwordPlaceholder": "留空保持不变",
     "card.passwordSaved": "已存有授权码：留空保持不变，清空后填内容即覆盖。",
-    "card.passwordHint": "留空即不写入 password 键。",
+    "card.passwordHint": "请填写邮箱服务商提供的授权码或应用专用密码，然后点击「测试连接」。",
   "card.senderNameLabel": "发件显示名（可选）",
   "card.senderNamePlaceholder": "只影响收件人看到的名称",
   "card.senderNameHint": "只改收件人看到的显示名，发件地址仍是上面的邮箱地址。",
@@ -439,7 +441,7 @@ var UI = {
     "provider.outlook": "Outlook",
     "provider.icloud": "iCloud",
     "provider.custom": "Custom",
-    "provider.noneInYaml": "(no provider in YAML)",
+    "provider.noneInYaml": "Choose your email provider",
     "provider.undefinedPresetSuffix": "(undefined preset)",
 
     // 全局设置
@@ -451,6 +453,7 @@ var UI = {
     // 自动保存状态条
     "status.saved": "Saved",
     "status.saving": "Saving…",
+    "status.draft": "Some edits are not saved yet. Complete the highlighted fields below.",
     "status.saveFailed": "Save failed: {message} (click to retry)",
 
     // 账号卡片
@@ -493,7 +496,7 @@ var UI = {
     "card.passwordLabel": "Authorization code / app password",
     "card.passwordPlaceholder": "Leave empty to keep it",
     "card.passwordSaved": "A password is already stored: leave empty to keep it, or clear the field and type to overwrite.",
-    "card.passwordHint": "Leave it empty and the password key is not written.",
+    "card.passwordHint": "Enter the authorization code or app password from your email provider, then click “Test connection”.",
   "card.senderNameLabel": "Sender display name (optional)",
   "card.senderNamePlaceholder": "Only the name recipients see",
   "card.senderNameHint": "Changes only the name recipients see; the address stays the one above.",
@@ -1350,33 +1353,38 @@ function AccountCardsEditor(props) {
    */
   const autoSave = (draftsNow, orderNow, defaultNow, immediate) => {
     if (typeof props.onAutoSave !== "function") return null;
+    const incomplete = (text) => {
+      setNotice({ kind: "error", text });
+      if (typeof props.onDraftStatus === "function") props.onDraftStatus(true);
+    };
     const names = orderNow.map((row) => row.key).filter((name) => Object.prototype.hasOwnProperty.call(draftsNow, name));
     let built;
     try {
       built = names.map((name) => draftToInput(draftsNow[name]));
     } catch (e) {
-      console.error("[dsh-email] 卡片快照组装失败", e, names, draftsNow);
+      incomplete(e && e.message ? e.message : String(e));
       return null;
     }
     if (built.some((card) => String(card.name || "").trim() === "")) {
-      setNotice({ kind: "error", text: t("card.errNoName") });
+      incomplete(t("card.errNoName"));
       return null;
     }
     if (names.some((name) => !draftsNow[name].provider && !(draftsNow[name].imap?.host && draftsNow[name].smtp?.host))) {
       // 服务商就是账号的连接身份：没有它，后端写回时会把 provider 键删掉，这个账号
       // 永远连不上。名字和它都属于「这还是一张半填的卡」，一起拦在这里。
-      setNotice({ kind: "error", text: t("card.errNoProvider") });
+      incomplete(t("card.errNoProvider"));
       return null;
     }
     if (built.some((card) => card.name === "defaultAccount")) {
-      setNotice({ kind: "error", text: t("card.errReservedName") });
+      incomplete(t("card.errReservedName"));
       return null;
     }
     if (built.length > 1 && String(defaultNow || "") === "") {
-      setNotice({ kind: "error", text: t("card.errNoDefault") });
+      incomplete(t("card.errNoDefault"));
       return null;
     }
     setNotice(null);
+    if (typeof props.onDraftStatus === "function") props.onDraftStatus(false);
     // 返回值只给 OAuth 登录用：它必须等这份配置真的落盘（后端按账号名去读 provider
     // 和端点）。其余调用方照旧忽略返回值。
     return props.onAutoSave(built, String(defaultNow || ""), immediate === true);
@@ -1889,9 +1897,11 @@ function ServerPresetsEditor(props) {
     const result = serializePresetDrafts(nextOrder.map((row) => row.key), nextDrafts);
     if (result.error !== undefined) {
       setNotice({ kind: "error", text: result.error });
+      if (typeof props.onDraftStatus === "function") props.onDraftStatus(true);
       return;
     }
     setNotice(null);
+    if (typeof props.onDraftStatus === "function") props.onDraftStatus(false);
     props.onAutoSave(result.text);
   };
 
@@ -2109,6 +2119,8 @@ function EmailSettingsSection() {
   const [error, setError] = useState("");
   /** 自动保存的可见状态：null 视同「已保存」（刚加载完、什么都没改）。 */
   const [saveState, setSaveState] = useState(null);
+  const [incompleteDrafts, setIncompleteDrafts] = useState({ accounts: false, presets: false });
+  const hasIncompleteDraft = incompleteDrafts.accounts || incompleteDrafts.presets;
   /** 卡片级提示（注释丢失、序列化失败…）：走卡片自己的 notice 位，不打断顶部状态。 */
   const [cardsNotice, setCardsNotice] = useState(null);
   /**
@@ -2163,6 +2175,7 @@ function EmailSettingsSection() {
       accountsYamlRef.current = next.accountsYaml || "";
       savedSignatureRef.current = signatureOf(next, next.accountsYaml || "");
       setSaveState(null);
+      setIncompleteDrafts({ accounts: false, presets: false });
       setCardsNotice(null);
       setCustomNames(presetNamesOf(next.serverPresets));
       setCardsDetail(snap.accountsDetail);
@@ -2184,6 +2197,7 @@ function EmailSettingsSection() {
    * 防抖那条路交不出 promise（定时器还没到点），返回 null。
    */
   const scheduleSave = (immediate) => {
+    setSaveState({ kind: "busy" });
     // 用户又改了：还在飞的那次保存结果就作废，别拿旧结果盖住新状态。
     seqRef.current += 1;
     if (saveTimerRef.current) clearTimeout(saveTimerRef.current);
@@ -2270,14 +2284,14 @@ function EmailSettingsSection() {
   // 有没落盘的内容（保存中或保存失败）才拦离开：这正是「编辑即保存」剩下的窗口。
   useEffect(() => {
     const guard = (e) => {
-      if (saveState === null || saveState.kind === "saved") return undefined;
+      if (!hasIncompleteDraft && (saveState === null || saveState.kind === "saved")) return undefined;
       e.preventDefault();
       e.returnValue = "";
       return "";
     };
     window.addEventListener("beforeunload", guard);
     return () => window.removeEventListener("beforeunload", guard);
-  }, [saveState]);
+  }, [saveState, hasIncompleteDraft]);
 
   /** 卡片序列化的往返序号：打字快时多个 serializeAccounts 会并发，只认最后一个。 */
   const cardsSeqRef = useRef(0);
@@ -2312,6 +2326,7 @@ function EmailSettingsSection() {
    */
   const onCardsAutoSave = async (cards, defaultAccount, immediate) => {
     const seq = ++cardsSeqRef.current;
+    setSaveState({ kind: "busy" });
     try {
       const result = await serializeCards(cards, defaultAccount);
       if (seq !== cardsSeqRef.current) return { ok: false, reason: "superseded" }; // 更晚的一次已经在路上，别用旧结果盖新状态
@@ -2333,8 +2348,10 @@ function EmailSettingsSection() {
       if (flushed && typeof flushed.then === "function") await flushed;
       return { ok: true };
     } catch (e) {
+      if (seq !== cardsSeqRef.current) return { ok: false, reason: "superseded" };
       const message = e && e.message ? e.message : String(e);
       setCardsNotice({ kind: "error", text: t("notice.cardsNotWritten", { message }) });
+      setSaveState({ kind: "error", text: message });
       return { ok: false, reason: message };
     }
   };
@@ -2360,7 +2377,7 @@ function EmailSettingsSection() {
 
   const accounts = snapshot && snapshot.accounts ? snapshot.accounts : [];
   const presetsMerged = presetsWithNames((snapshot && snapshot.presets) || undefined, customNames);
-  const statusText = saveState === null
+  const statusText = hasIncompleteDraft ? t("status.draft") : saveState === null
     ? t("status.saved")
     : saveState.kind === "busy"
       ? t("status.saving")
@@ -2368,9 +2385,11 @@ function EmailSettingsSection() {
         ? t("status.saved")
         : t("status.saveFailed", { message: saveState.text });
   const status = h("span", {
-    className: "dshe-auto-status" + (saveState === null ? "" : " is-" + saveState.kind),
-    onClick: saveState !== null && saveState.kind === "error" ? () => flushSave() : undefined,
-    style: saveState !== null && saveState.kind === "error" ? { cursor: "pointer" } : undefined,
+    role: "status",
+    "aria-live": "polite",
+    className: "dshe-auto-status" + (hasIncompleteDraft ? " is-draft" : saveState === null ? "" : " is-" + saveState.kind),
+    onClick: !hasIncompleteDraft && saveState !== null && saveState.kind === "error" ? () => flushSave() : undefined,
+    style: !hasIncompleteDraft && saveState !== null && saveState.kind === "error" ? { cursor: "pointer" } : undefined,
   }, statusText);
 
   return h("div", { className: "dshe-settings" }, [
@@ -2403,6 +2422,7 @@ function EmailSettingsSection() {
         presets: presetsMerged,
         extraNotice: cardsNotice,
         onAutoSave: onCardsAutoSave,
+        onDraftStatus: (blocked) => setIncompleteDrafts((current) => ({ ...current, accounts: blocked })),
         onTest: onCardTest,
         // OAuth2 登录成功后重拉整份快照：卡片的 authKind/oauthState/oauthUser 是
         // 服务端算出来的，只有新快照才拿得到（和加载走同一条路径）。
@@ -2413,6 +2433,7 @@ function EmailSettingsSection() {
         h(ServerPresetsEditor, {
           presets: presetsAtLoad,
           onAutoSave: (text) => update({ serverPresets: typeof text === "string" ? text : "" }),
+          onDraftStatus: (blocked) => setIncompleteDrafts((current) => ({ ...current, presets: blocked })),
         }),
       ]),
       snapshot && snapshot.writable === false

package/lib/config.d.ts

@@ -256,8 +256,10 @@ export declare function serializeAccountsYaml(raw: unknown, defaultAccount?: str
  * Resolve and validate the raw row config. Throws with an actionable message
  * (in Chinese, since it is what the user and the model both read) when the
  * account is not fully specified.
+ * An explicit account resolves only that card for connection tests, without
+ * making named accounts eligible for the single-account environment password.
  */
-export declare function resolveEmailSettings(config: EmailConfig | undefined): ResolvedEmailSettings;
+export declare function resolveEmailSettings(config: EmailConfig | undefined, onlyAccount?: string): ResolvedEmailSettings;
 /** Every name a `provider:` may legally use, built-ins first. */
 export declare function providerNames(custom?: Record<string, ServerPreset>): string[];
 /**

package/lib/config.js

@@ -201,8 +201,10 @@ function normalizeAccountForYaml(value) {
  * Resolve and validate the raw row config. Throws with an actionable message
  * (in Chinese, since it is what the user and the model both read) when the
  * account is not fully specified.
+ * An explicit account resolves only that card for connection tests, without
+ * making named accounts eligible for the single-account environment password.
  */
-export function resolveEmailSettings(config) {
+export function resolveEmailSettings(config, onlyAccount) {
     const raw = config ?? {};
     const common = {
         provider: raw.provider,
@@ -218,6 +220,10 @@ export function resolveEmailSettings(config) {
     const entries = parsedYaml !== undefined
         ? parsedYaml.map
         : (raw.accounts === undefined || Object.keys(raw.accounts).length === 0 ? undefined : raw.accounts);
+    const available = entries === undefined ? ['default'] : Object.keys(entries);
+    if (onlyAccount !== undefined && !available.includes(onlyAccount)) {
+        throw new Error(`未知账号 "${onlyAccount}"，可用：${available.join('、')}`);
+    }
     // The custom preset table is read once, here, and never stored on the result:
     // it is a lookup source for provider names, not part of the resolved config.
     // A broken preset text degrades to "no custom presets" — the account-level
@@ -237,11 +243,16 @@ export function resolveEmailSettings(config) {
     }
     else {
         for (const [name, acc] of Object.entries(entries)) {
+            if (onlyAccount !== undefined && name !== onlyAccount)
+                continue;
             accounts.set(name, resolveAccount(name, common, acc ?? {}, false, providers, known));
         }
     }
     let defaultName;
-    if (raw.defaultAccount !== undefined && raw.defaultAccount !== '') {
+    if (onlyAccount !== undefined) {
+        defaultName = onlyAccount;
+    }
+    else if (raw.defaultAccount !== undefined && raw.defaultAccount !== '') {
         if (!accounts.has(raw.defaultAccount)) {
             throw new Error(`dsh-email：defaultAccount "${raw.defaultAccount}" 不存在，可用账号：${[...accounts.keys()].join('、')}`);
         }
@@ -343,7 +354,7 @@ function resolveAccount(name, common, acc, allowEnvPassword, providers, known) {
     };
     const problems = [];
     if (user === '')
-        problems.push(`账号 "${name}" 的 user（邮箱地址）未填写`);
+        problems.push(`账号 "${name}" 的邮箱地址未填写`);
     // An explicit `authKind` outranks the derivation: a tenant that still accepts
     // an app password for Exchange Online, or a mailbox that worked before the
     // derivation existed, keeps working instead of being told「尚未登录」.
@@ -358,14 +369,14 @@ function resolveAccount(name, common, acc, allowEnvPassword, providers, known) {
     // in the OAuth2 store, and requiring a password would demand a secret
     // Microsoft no longer accepts for Exchange Online.
     if (!oauth2 && authPassword === '') {
-        problems.push(`账号 "${name}" 的 ${authUser === user ? 'password' : 'authPassword'} 未填写（单账号可用环境变量 ${EMAIL_PASSWORD_ENV}）`);
+        problems.push(`账号 "${name}" 的${authUser === user ? '授权码 / 应用专用密码' : '登录账号的密码'}未填写`);
     }
     if (imap.host === undefined || imap.host === '')
         problems.push(`账号 "${name}" 的 imap.host 未填写（可填 provider 预设：${known.join('/')}）`);
     if (smtp.host === undefined || smtp.host === '')
         problems.push(`账号 "${name}" 的 smtp.host 未填写（同上）`);
     if (problems.length > 0) {
-        throw new Error(`dsh-email 未配置：${problems.join('；')}。请在 profile 的 cordis.patch.yml 中覆盖 tool-email 行并重启（见插件 README）`);
+        throw new Error(`邮件账号配置不完整：${problems.join('；')}。请在「设置 → 邮件」补全对应账号，再点击「测试连接」。修改会自动保存并立即生效。`);
     }
     const clientId = (acc.clientId ?? common.clientId ?? '').trim();
     return {

package/lib/web.js

@@ -855,12 +855,12 @@ export class EmailSettingsBackend {
         // does for the stored settings (it never enters the resolved fingerprint).
         const draft = toEmailConfig(value, null);
         const presets = value?.serverPresets ?? this.scope.get()?.serverPresets;
+        const requested = typeof accountName === 'string' && accountName.trim() !== '' ? accountName.trim() : '';
         const settings = resolveEmailSettings({
             ...this.currentConfig,
             ...draft,
             ...(typeof presets === 'string' ? { serverPresets: presets } : {}),
-        });
-        const requested = typeof accountName === 'string' && accountName.trim() !== '' ? accountName.trim() : '';
+        }, requested || undefined);
         const available = [...settings.accounts.keys()];
         const name = requested !== '' ? requested : settings.defaultAccount;
         const cfg = settings.accounts.get(name);

package/package.json

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