dsh-email 0.15.1 → 0.15.2

package/CHANGELOG.md

@@ -4,6 +4,11 @@
 
 [历史英文记录](docs/CHANGELOG.en.md)
 
+## 0.15.2 (2026-10-03)
+
+- 修复语言切换后设置菜单滞后一轮；英文草稿、账号、发送失败引导不再回退中文，保留结果不明时禁止盲目重发的提示。
+- 验收范围见 [中英文界面检查](docs/validation-language-2026-10-03.md)。
+
 ## 0.15.1 (2026-10-03)
 
 - 修复 email_draft 使用宿主不支持的 JSON Schema maxItems，导致邮件工具注册失败的问题。附件最多 10 个的限制仍在执行前校验，并在工具说明中显示。

package/docs/VALIDATION.md

@@ -1,5 +1,7 @@
 # dsh-email 验证记录
 
+[0.15.2 中英文界面验收](validation-language-2026-10-03.md)。
+
 ## 0.15.1（2026-10-03）
 
 Windows / Node 24.16.0 下 330 项测试全部通过，无跳过。新回归在修复前定位到 email_draft 的 maxItems 参数声明，修复后通过；11 个附件仍在读取文件、保存草稿或发送之前被拒绝。

package/docs/validation-language-2026-10-03.md

@@ -0,0 +1,16 @@
+# 0.15.2：中英文界面验收
+
+2026-10-03，Windows / Node 24.16.0。采用 E 盘独立 DSH_HOME、合成资料与无密钥 profile；用户资料、账号、密钥、桌面窗口与 VPN 保持原状。
+
+- 自动测试：331 项全部通过。
+- 可见 Web 操作：英文界面新建并保存中文草稿，未配置账号时的预览引导为英文；中文界面读取同一份草稿，标题和正文保留。语言菜单回调顺序及发送结果不明的防重发提示有回归覆盖。
+- 宿主：官方 DSH 0.2.1-alpha.1 Web；官方 RC2 与 alpha SDK 同载 18 组件，110 工具、35 插件技能、19 输出样例注册与 schema 检查通过。无账号的健康结果不代表真实连接。
+- 边界：没有发送真实邮件。收件人配置与发件账号配置分别给出恢复引导。
+
+中英文共用同一份资料；界面翻译不会改写标题、正文、路径、引用或项目文件。系统文件选择控件和文件对话框跟随 Windows / 浏览器语言。未知技术诊断与原始引擎日志保留原文；英文界面提供操作恢复引导。
+
+此记录不代表原生桌面窗口内的新功能已逐项操作通过。发布包完整性、GitHub CI 与公开 npm 全新安装在发布时另行核对。
+
+## English scope
+
+The Chinese and English UI share the same data. UI translation preserves original content, paths and project files. Visible interactions were performed in an isolated official alpha Web profile; both RC2 and alpha SDK registration/schema checks passed. Native file controls use the OS/browser language, and original diagnostic logs are retained. Browser results do not certify native desktop interaction or real-service delivery.

package/lib/client.js

@@ -12,6 +12,23 @@ const h = React.createElement;
 
 // Harness supplies document.baseURI for reverse-proxy mounts and in-page navigation.
 const ROUTE = "_dsh/dsh-email/settings";
+
+function emailError(error) {
+  const message = typeof error === 'string' ? error : error?.message || String(error || '');
+  if (UI_LANG !== 'en') return message;
+  if (error?.status === 401) return 'Your DSH session expired. Reopen DSH and try again.';
+  if (!/[\u3400-\u9fff]/.test(message)) return message;
+  if (/结果.*未|不要.*重发|不要.*发送|本地保存失败|回执未能保存/.test(message)) return 'The send outcome is uncertain or its receipt could not be saved. Check the mailbox before sending again to avoid duplicate delivery.';
+  if (/已提交|不能再次发送/.test(message)) return 'This draft was submitted or its outcome is uncertain. Check the mailbox before copying it to a new draft.';
+  if (/预览已过期|draft-preview-expired/.test(message + ' ' + (error?.code || ''))) return 'The send review expired or was already used. Review the current draft again.';
+  if (/改变|已更新|冲突|重新加载/.test(message)) return 'The draft, account or rules changed. Reload the latest version and review your input before retrying.';
+  if (/请先填写并保存邮件主题/.test(message)) return 'Fill in and save the email subject first.';
+  if (/附件/.test(message)) return 'Check the attachments. Save the draft first; use up to 10 readable files and 20 MiB total. Remove invalid files and add them again.';
+  if (/账号|配置不完整|尚未登录|OAuth|设备码/.test(message)) return 'Check the selected email account. Complete its credentials or OAuth sign-in in Account settings, then test the connection.';
+  if (/收件人|邮箱地址/.test(message)) return 'Check the recipient addresses and trusted-recipient rules before reviewing the draft again.';
+  return 'The email operation failed. Check the account settings and DSH logs, then retry. For a send operation, check the mailbox before retrying.';
+}
+
 /** 「编辑即保存」的防抖窗口：连续打字只落一次盘。 */
 const SAVE_DEBOUNCE_MS = 800;
 
@@ -32,6 +49,7 @@ async function api(action, payload) {
     // anything else is not, and the message alone cannot tell them apart.
     error.code = body && body.error ? body.error.code : undefined;
     error.status = res.status;
+    error.message = emailError(error);
     throw error;
   }
   return body.value;
@@ -41,8 +59,8 @@ async function api(action, payload) {
  * 登录失败的文案：平铺的 message 优先，退回 error.message，再退回调用方给的兜底。
  */
 function oauthErrorMessage(body, fallback) {
-  if (body && typeof body.message === "string" && body.message !== "") return body.message;
-  if (body && body.error && typeof body.error.message === "string" && body.error.message !== "") return body.error.message;
+  if (body && typeof body.message === "string" && body.message !== "") return emailError(body.message);
+  if (body && body.error && typeof body.error.message === "string" && body.error.message !== "") return emailError(body.error);
   return fallback;
 }
 
@@ -620,6 +638,7 @@ function localeToLang(active) {
  * 弹窗，所以这里是单槽而不是列表；弹窗销毁时它会把自己的钩子摘掉。
  */
 var relocalize = null;
+var activeLocaleService = null;
 
 /**
  * 取 locale 服务。两条路都试，因为「服务在不在」和「ctx 长什么样」是两件事：
@@ -650,6 +669,7 @@ function localeServiceOf(ctx) {
  */
 function subscribeLocale(ctx) {
   const service = localeServiceOf(ctx);
+  activeLocaleService = service;
   if (service === null) return () => {};
   const apply = () => {
     try {
@@ -1257,7 +1277,7 @@ function OauthLoginPanel(props) {
 
   if (state === "error") {
     return h("div", { className: "dshe-oauth" }, [
-      h("div", { className: "dshe-alert error" }, String(session.message || t("oauth.loginFailed"))),
+      h("div", { className: "dshe-alert error" }, emailError(session.message || t("oauth.loginFailed"))),
       clientIdField(),
       h("div", { className: "dshe-oauth-actions" }, [
         h("button", {
@@ -1379,7 +1399,7 @@ function AccountCardsEditor(props) {
     try {
       built = names.map((name) => draftToInput(draftsNow[name]));
     } catch (e) {
-      incomplete(e && e.message ? e.message : String(e));
+      incomplete(emailError(e));
       return null;
     }
     if (built.some((card) => String(card.name || "").trim() === "")) {
@@ -1486,7 +1506,7 @@ function AccountCardsEditor(props) {
     } catch (e) {
       if (seq !== oauthCurrent(name)) return;
       setRowStatus((cur) => { const next = Object.assign({}, cur); delete next[name]; return next; });
-      setOauthOf(name, { state: "error", message: e && e.message ? e.message : String(e) });
+      setOauthOf(name, { state: "error", message: emailError(e) });
     }
   };
 
@@ -1498,7 +1518,7 @@ function AccountCardsEditor(props) {
       body = await apiOauth("oauthPoll", { account: name });
     } catch (e) {
       if (seq !== oauthCurrent(name)) return;
-      setOauthOf(name, { state: "error", message: e && e.message ? e.message : String(e) });
+      setOauthOf(name, { state: "error", message: emailError(e) });
       return;
     }
     if (seq !== oauthCurrent(name)) return;
@@ -1635,7 +1655,7 @@ function AccountCardsEditor(props) {
       }));
     } catch (e) {
       setRowStatus((cur) => Object.assign({}, cur, {
-        [draftName]: { kind: "error", text: t("card.testFailed", { message: e && e.message ? e.message : String(e) }) },
+        [draftName]: { kind: "error", text: t("card.testFailed", { message: emailError(e) }) },
       }));
     } finally {
       setBusy("");
@@ -2148,7 +2168,7 @@ async function draftApi(action, payload, upload) {
     init.body = upload;
   } else init.body = JSON.stringify({ ...payload, action });
   const response = await fetch(upload ? DRAFT_ROUTE + "/upload" : DRAFT_ROUTE, init), result = await response.json();
-  if (!response.ok || !result.ok) { const error = new Error(result.error && result.error.message || dt("邮件操作失败", "Email action failed")); error.code = result.error && result.error.code; throw error; }
+  if (!response.ok || !result.ok) { const error = new Error(result.error && result.error.message || dt("邮件操作失败", "Email action failed")); error.code = result.error && result.error.code; error.status = response.status; error.message = emailError(error); throw error; }
   return result.value;
 }
 const draftForm = (draft) => ({ account: draft.account || "", to: draft.to || "", cc: draft.cc || "", subject: draft.subject || "", text: draft.text || "", attachments: draft.attachments.map(file => file.id) });
@@ -2347,7 +2367,7 @@ function EmailSettingsSection() {
       setCardsDetail(snap.accountsDetail);
       setPresetsAtLoad(snap.presets);
     } catch (e) {
-      setError(e && e.message ? e.message : String(e));
+      setError(emailError(e));
     } finally {
       setBusy(false);
     }
@@ -2425,7 +2445,7 @@ function EmailSettingsSection() {
       if (seq !== seqRef.current) return;
       // 失败时清掉「正在飞」的签名，否则同一个值再也不会被重排（点重试即可再存）。
       pendingSignatureRef.current = null;
-      setSaveState({ kind: "error", text: e && e.message ? e.message : String(e) });
+      setSaveState({ kind: "error", text: emailError(e) });
     }
   };
 
@@ -2515,7 +2535,7 @@ function EmailSettingsSection() {
       return { ok: true };
     } catch (e) {
       if (seq !== cardsSeqRef.current) return { ok: false, reason: "superseded" };
-      const message = e && e.message ? e.message : String(e);
+      const message = emailError(e);
       setCardsNotice({ kind: "error", text: t("notice.cardsNotWritten", { message }) });
       setSaveState({ kind: "error", text: message });
       return { ok: false, reason: message };
@@ -2776,7 +2796,11 @@ function apply(ctx) {
     name: "settings.section",
     id: "dsh-email",
     order: 45,
-    label: () => t("nav.title"),
+    label: () => {
+      let lang = UI_LANG;
+      try { if (activeLocaleService?.getSnapshot) lang = localeToLang(activeLocaleService.getSnapshot().active); } catch {}
+      return UI[lang]["nav.title"];
+    },
     inject: () => ({}),
   }, EmailSettingsSection));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-email",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "在 DSH 中收发、搜索和整理邮件，支持多个邮箱账号。",
   "type": "module",
   "main": "lib/index.js",