@dsh-plus/notify-email 0.1.1 → 0.1.2

package/lib/client.js

@@ -45,24 +45,12 @@ const SETTINGS_NS = "dsh-plus-notify-email";
 
 //#endregion
 //#region src/client/api.ts
-const ROUTE_CONFIG = "/dsh-plus/notify-email/config";
 const ROUTE_TEST = "/dsh-plus/notify-email/test";
 async function parse(res) {
 	const body = await res.json();
 	if (!res.ok) throw new Error(body.error ?? `HTTP ${res.status}`);
 	return body;
 }
-async function fetchConfig() {
-	return parse(await fetch(ROUTE_CONFIG, { credentials: "same-origin" }));
-}
-async function saveConfig(patch) {
-	return parse(await fetch(ROUTE_CONFIG, {
-		method: "PUT",
-		credentials: "same-origin",
-		headers: { "content-type": "application/json" },
-		body: JSON.stringify(patch)
-	}));
-}
 async function sendTest() {
 	return parse(await fetch(ROUTE_TEST, {
 		method: "POST",
@@ -128,20 +116,20 @@ const IDLE_STATUS = {
 	kind: "idle",
 	text: ""
 };
-function draftFromWire(wire) {
+function draftFromValue(value) {
 	return {
-		enabled: wire.enabled,
-		host: wire.smtp.host,
-		port: String(wire.smtp.port),
-		secure: wire.smtp.secure,
-		user: wire.smtp.user,
+		enabled: value.enabled,
+		host: value.smtp.host,
+		port: String(value.smtp.port),
+		secure: value.smtp.secure,
+		user: value.smtp.user,
 		pass: "",
-		from: wire.smtp.from,
-		toText: wire.to.join(", "),
-		triggers: { ...wire.triggers },
-		idleDebounceMs: String(wire.idleDebounceMs),
-		maxBodyChars: String(wire.maxBodyChars),
-		dryRun: wire.dryRun
+		from: value.smtp.from,
+		toText: value.to.join(", "),
+		triggers: { ...value.triggers },
+		idleDebounceMs: String(value.idleDebounceMs),
+		maxBodyChars: String(value.maxBodyChars),
+		dryRun: value.dryRun
 	};
 }
 function isPositiveInt(text) {
@@ -173,41 +161,43 @@ const TRIGGER_KEYS = [
 	"onPlanReview"
 ];
 function NotifyEmailCard(props) {
-	const { t } = props;
+	const { t, scope, api } = props;
+	const snapshot = (0, react.useSyncExternalStore)((listener) => scope.subscribe(listener), () => scope.getSnapshot());
+	const value = snapshot.value;
 	const [open, setOpen] = (0, react.useState)(false);
-	const [wire, setWire] = (0, react.useState)(null);
 	const [draft, setDraft] = (0, react.useState)(null);
-	const [failed, setFailed] = (0, react.useState)(false);
+	const [passConfigured, setPassConfigured] = (0, react.useState)(false);
 	const [saving, setSaving] = (0, react.useState)(false);
 	const [testing, setTesting] = (0, react.useState)(false);
 	const [status, setStatus] = (0, react.useState)(IDLE_STATUS);
+	(0, react.useEffect)(() => {
+		if (value === void 0 || draft !== null) return;
+		setDraft(draftFromValue(value));
+	}, [value, draft]);
 	(0, react.useEffect)(() => {
 		let alive = true;
-		fetchConfig().then((loaded) => {
-			if (!alive) return;
-			setWire(loaded);
-			setDraft(draftFromWire(loaded));
-		}).catch(() => {
-			if (alive) setFailed(true);
-		});
+		api.describe().then((response) => {
+			if (!alive || !response.result.ok) return;
+			const view = response.result.value?.namespaces.find((ns) => ns.ns === SETTINGS_NS);
+			setPassConfigured(view?.secrets.some((secret) => secret.path.join(".") === "smtp.pass" && secret.set) ?? false);
+		}).catch(() => {});
 		return () => {
 			alive = false;
 		};
-	}, []);
-	const dirty = (0, react.useMemo)(() => wire !== null && draft !== null && JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFromWire(wire))), [wire, draft]);
+	}, [api, snapshot]);
+	const dirty = (0, react.useMemo)(() => value !== void 0 && draft !== null && JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFromValue(value))), [value, draft]);
 	const invalid = (0, react.useMemo)(() => draft !== null && (!isPositiveInt(draft.port) || !isPositiveInt(draft.idleDebounceMs) || !isPositiveInt(draft.maxBodyChars) || Number(draft.maxBodyChars) < 200), [draft]);
-	if (failed) return null;
-	if (wire === null || draft === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", {
+	if (value === void 0 || draft === null) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("li", {
 		className: "dne-card",
 		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
 			className: "dne-readOnly",
 			children: t("loading")
 		})
 	});
-	const edit = (key, value) => {
+	const edit = (key, editValue) => {
 		setDraft({
 			...draft,
-			[key]: value
+			[key]: editValue
 		});
 		setStatus(IDLE_STATUS);
 	};
@@ -219,14 +209,24 @@ function NotifyEmailCard(props) {
 	};
 	const onSave = () => {
 		setSaving(true);
-		saveConfig(toPatch(draft)).then((saved) => {
-			setWire(saved);
-			setDraft(draftFromWire(saved));
+		const patch = toPatch(draft);
+		if (patch["smtp"]["pass"] === "") delete patch["smtp"]["pass"];
+		const revision = scope.getSnapshot().revision;
+		api.update({
+			ns: SETTINGS_NS,
+			patch,
+			...revision !== void 0 ? { expectedRevision: revision } : {}
+		}).then(async (response) => {
+			if (!response.result.ok) throw new Error(response.result.error?.message ?? t("saveFailed"));
+			await scope.load();
+			const next = scope.getSnapshot().value;
+			if (next !== void 0) setDraft(draftFromValue(next));
 			setStatus(IDLE_STATUS);
 		}).catch((error) => {
+			const message = error instanceof Error ? error.message : String(error);
 			setStatus({
 				kind: "error",
-				text: `${t("saveFailed")} ${error instanceof Error ? error.message : ""}`
+				text: `${t("saveFailed")}${message}`
 			});
 		}).finally(() => setSaving(false));
 	};
@@ -251,7 +251,7 @@ function NotifyEmailCard(props) {
 			});
 		}).finally(() => setTesting(false));
 	};
-	const disabled = !wire.writable;
+	const disabled = !snapshot.writable;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("li", {
 		className: `dne-card${open ? " dne-cardOpen" : ""}`,
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
@@ -337,8 +337,8 @@ function NotifyEmailCard(props) {
 					password: true,
 					disabled,
 					badge: {
-						text: wire.smtp.passConfigured ? t("passSet") : t("passUnset"),
-						set: wire.smtp.passConfigured
+						text: passConfigured ? t("passSet") : t("passUnset"),
+						set: passConfigured
 					},
 					onEdit: (v) => edit("pass", v)
 				}),
@@ -418,7 +418,7 @@ function NotifyEmailCard(props) {
 							className: "dne-btn dne-btnGhost",
 							disabled: !dirty || saving,
 							onClick: () => {
-								setDraft(draftFromWire(wire));
+								setDraft(draftFromValue(value));
 								setStatus(IDLE_STATUS);
 							},
 							children: t("discard")
@@ -607,7 +607,12 @@ function injectStyle() {
 //#region src/client/client.ts
 const name = "dsh-plus-notify-email";
 /** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
-const inject = ["slots", "locale"];
+const inject = [
+	"slots",
+	"locale",
+	"settingsScope",
+	"connection"
+];
 function apply(ctx) {
 	const c = ctx;
 	const tag = injectStyle();
@@ -618,12 +623,17 @@ function apply(ctx) {
 		zh,
 		en
 	}), "notify-email: locale");
+	const scope = c.settingsScope.bind({ namespace: SETTINGS_NS });
+	const api = c.get("connection").api.settings;
 	c.slots.inject("settings.plugin.item", () => c.slots.register({
 		name: "settings.plugin.item",
 		key: SETTINGS_NS,
-		order: 100,
 		locale: NS,
-		inject: () => ({ t: c.locale.bind(NS) })
+		inject: () => ({
+			t: c.locale.bind(NS),
+			scope,
+			api
+		})
 	}, NotifyEmailCard));
 }
 

package/lib/index.js

@@ -58,64 +58,6 @@ const Config = z.object({
 	maxBodyChars: z.natural().min(200).description("邮件正文内容截断长度").default(4e3),
 	dryRun: z.boolean().description("仅记录日志不真实发送（开发调试用）").default(false)
 });
-function toWire(cfg, writable) {
-	return {
-		enabled: cfg.enabled,
-		smtp: {
-			host: cfg.smtp.host,
-			port: cfg.smtp.port,
-			secure: cfg.smtp.secure,
-			user: cfg.smtp.user,
-			from: cfg.smtp.from,
-			passConfigured: cfg.smtp.pass.length > 0
-		},
-		to: [...cfg.to],
-		triggers: { ...cfg.triggers },
-		idleDebounceMs: cfg.idleDebounceMs,
-		maxBodyChars: cfg.maxBodyChars,
-		dryRun: cfg.dryRun,
-		writable
-	};
-}
-/**
-* 配置卡片写回用的 patch schema：字段全部可选（无默认值），
-* 只携带用户真实编辑过的字段，交给 settings.update 深合并进用户层。
-*/
-const WirePatch = z.object({
-	enabled: z.boolean(),
-	smtp: z.object({
-		host: z.string(),
-		port: z.natural().max(65535),
-		secure: z.boolean(),
-		user: z.string(),
-		pass: z.string(),
-		from: z.string()
-	}),
-	to: z.array(z.string()),
-	triggers: z.object({
-		onComplete: z.boolean(),
-		onError: z.boolean(),
-		onAborted: z.boolean(),
-		onQuestion: z.boolean(),
-		onPlanReview: z.boolean()
-	}),
-	idleDebounceMs: z.natural(),
-	maxBodyChars: z.natural().min(200),
-	dryRun: z.boolean()
-});
-/**
-* 把卡片提交的 patch 规整为 settings.update 的用户层 patch。
-* smtp.pass 为空串表示「保持不变」，从 patch 中剔除，避免覆盖已存密码。
-*/
-function toUserPatch(input) {
-	const patch = { ...input };
-	if (input.smtp !== void 0 && input.smtp !== null) {
-		const smtp = { ...input.smtp };
-		if (smtp["pass"] === "") delete smtp["pass"];
-		patch["smtp"] = smtp;
-	}
-	return patch;
-}
 
 //#endregion
 //#region src/audit.ts
@@ -221,64 +163,17 @@ var Mailer = class {
 
 //#endregion
 //#region src/config-api.ts
-const ROUTE_CONFIG = "/dsh-plus/notify-email/config";
 const ROUTE_TEST = "/dsh-plus/notify-email/test";
-const MAX_BODY_BYTES = 64 * 1024;
 function sendJson(res, status, body) {
 	res.writeHead(status, { "content-type": "application/json; charset=utf-8" });
 	res.end(JSON.stringify(body));
 }
-function readBody(req) {
-	return new Promise((resolve, reject) => {
-		const chunks = [];
-		let size = 0;
-		req.on("data", (chunk) => {
-			size += chunk.length;
-			if (size > MAX_BODY_BYTES) {
-				reject(/* @__PURE__ */ new Error("request body too large"));
-				req.destroy();
-				return;
-			}
-			chunks.push(chunk);
-		});
-		req.on("end", () => resolve(Buffer.concat(chunks).toString("utf8")));
-		req.on("error", reject);
-	});
-}
-async function readPatch(req) {
-	const raw = await readBody(req);
-	let parsed;
-	try {
-		parsed = JSON.parse(raw);
-	} catch {
-		throw new Error("request body is not valid JSON");
-	}
-	return WirePatch(parsed);
-}
-async function handleConfig(ctx, service, req, res) {
-	const settings = ctx.get("settings");
-	if (req.method === "GET") {
-		sendJson(res, 200, toWire(service.currentConfig(), settings !== void 0));
-		return;
-	}
-	if (req.method !== "PUT") {
-		sendJson(res, 405, { error: "method not allowed" });
-		return;
-	}
-	if (settings === void 0) {
-		sendJson(res, 503, { error: "settings provider 不可用，无法在线保存；请编辑 settings.yaml" });
-		return;
-	}
-	const patch = toUserPatch(await readPatch(req));
-	await settings.update(SETTINGS_NS, patch);
-	sendJson(res, 200, toWire(service.currentConfig(), true));
-}
 async function handleTest(service, res) {
 	const result = await service.sendTest();
 	sendJson(res, result.ok ? 200 : 502, result);
 }
-/** 注册配置读写与测试发信路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
-function registerConfigApi(ctx, service) {
+/** 注册测试发信路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
+function registerTestApi(ctx, service) {
 	const logger = ctx.logger("notify-email");
 	const guard = (handler) => {
 		return async (req, res) => {
@@ -286,17 +181,12 @@ function registerConfigApi(ctx, service) {
 				await handler(req, res);
 			} catch (error) {
 				const message = error instanceof Error ? error.message : String(error);
-				logger.warn(`config api ${req.method ?? "?"} ${req.url ?? "?"} failed: ${message}`);
+				logger.warn(`test api ${req.method ?? "?"} ${req.url ?? "?"} failed: ${message}`);
 				if (!res.headersSent) sendJson(res, 400, { error: message });
 				else res.end();
 			}
 		};
 	};
-	ctx.webServer.register({
-		kind: "exact",
-		path: ROUTE_CONFIG,
-		handler: guard((req, res) => handleConfig(ctx, service, req, res))
-	});
 	ctx.webServer.register({
 		kind: "exact",
 		path: ROUTE_TEST,
@@ -531,7 +421,7 @@ var NotifyEmailService = class extends Service {
 		installDecisionWatcher(ctx, this);
 		installTurnEndWatcher(ctx, this, () => this.current());
 		ctx.inject(["webServer"], (webCtx) => {
-			registerConfigApi(webCtx, this);
+			registerTestApi(webCtx, this);
 		});
 	}
 	/** 注册触发器（第三方扩展接口）；返回注销函数，随调用方 fiber 释放。 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/notify-email",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "dsh-plus service+ui plugin: 任务结束/等待决策/出错时向指定邮箱发送邮件通知",
   "type": "module",
   "main": "lib/index.js",
@@ -24,7 +24,9 @@
     "client": {
       "inject": [
         "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-locale"
+        "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
     }

package/src/client/api.ts

@@ -1,60 +1,14 @@
 /**
- * 配置卡片数据通道：同源 fetch 调自建 webServer 路由。
- * （官方 settings.* RPC 白名单硬编码不含第三方 namespace，见 config-api.ts 注释。）
+ * 自定义端点通道：仅剩「发送测试邮件」（配置读写已迁移到官方 settingsScope
+ * 传输，见 scope.ts 与 card.tsx）。
  * @module notify-email/client/api
  */
 
-export interface WireSmtp {
-  host: string
-  port: number
-  secure: boolean
-  user: string
-  from: string
-  passConfigured: boolean
-}
-
-export interface WireTriggers {
-  onComplete: boolean
-  onError: boolean
-  onAborted: boolean
-  onQuestion: boolean
-  onPlanReview: boolean
-}
-
-export interface WireConfig {
-  enabled: boolean
-  smtp: WireSmtp
-  to: string[]
-  triggers: WireTriggers
-  idleDebounceMs: number
-  maxBodyChars: number
-  dryRun: boolean
-  writable: boolean
-}
-
-export interface WirePatch {
-  enabled: boolean
-  smtp: {
-    host: string
-    port: number
-    secure: boolean
-    user: string
-    pass: string
-    from: string
-  }
-  to: string[]
-  triggers: WireTriggers
-  idleDebounceMs: number
-  maxBodyChars: number
-  dryRun: boolean
-}
-
 export interface TestResult {
   ok: boolean
   detail: string
 }
 
-const ROUTE_CONFIG = '/dsh-plus/notify-email/config'
 const ROUTE_TEST = '/dsh-plus/notify-email/test'
 
 async function parse<T>(res: Response): Promise<T> {
@@ -63,21 +17,6 @@ async function parse<T>(res: Response): Promise<T> {
   return body
 }
 
-export async function fetchConfig(): Promise<WireConfig> {
-  return parse<WireConfig>(await fetch(ROUTE_CONFIG, { credentials: 'same-origin' }))
-}
-
-export async function saveConfig(patch: WirePatch): Promise<WireConfig> {
-  return parse<WireConfig>(
-    await fetch(ROUTE_CONFIG, {
-      method: 'PUT',
-      credentials: 'same-origin',
-      headers: { 'content-type': 'application/json' },
-      body: JSON.stringify(patch),
-    }),
-  )
-}
-
 export async function sendTest(): Promise<TestResult> {
   return parse<TestResult>(await fetch(ROUTE_TEST, { method: 'POST', credentials: 'same-origin' }))
 }

package/src/client/card.tsx

@@ -1,18 +1,46 @@
 /**
  * 「邮件通知」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
  * 交互对齐官方卡片：折叠/展开、staged draft、未保存标记、保存/放弃；
- * 另加「发送测试邮件」。数据走自建同源路由（api.ts）。
+ * 另加「发送测试邮件」（唯一保留的自定义端点）。
+ * 配置读写走官方 settingsScope 传输（scope.ts）：value 为 schema 解析后的
+ * 脱敏视图（smtp.pass 不出现，passConfigured 由 describe 的 secrets 探测），
+ * 保存经 settings.update 深合并（空 pass 剔除 = 保持不变）。
  * @module notify-email/client/card
  */
-import { useEffect, useMemo, useState, type ReactElement } from 'react'
+import { useEffect, useMemo, useSyncExternalStore, useState, type ReactElement } from 'react'
 
-import {
-  fetchConfig, saveConfig, sendTest, type WireConfig, type WirePatch, type WireTriggers,
-} from './api.ts'
+import { SETTINGS_NS } from '../ns.ts'
+import { sendTest } from './api.ts'
 import { CheckRow, TextField } from './fields.tsx'
+import type { Scope, SettingsApi } from './scope.ts'
 
 export interface CardProps {
   t(key: string): string
+  scope: Scope
+  api: SettingsApi
+}
+
+/** settings 命名空间的脱敏解析值（smtp.pass 被脱敏剥除）。 */
+export interface ConfigValue {
+  enabled: boolean
+  smtp: {
+    host: string
+    port: number
+    secure: boolean
+    user: string
+    from: string
+  }
+  to: string[]
+  triggers: {
+    onComplete: boolean
+    onError: boolean
+    onAborted: boolean
+    onQuestion: boolean
+    onPlanReview: boolean
+  }
+  idleDebounceMs: number
+  maxBodyChars: number
+  dryRun: boolean
 }
 
 interface Draft {
@@ -24,7 +52,7 @@ interface Draft {
   pass: string
   from: string
   toText: string
-  triggers: WireTriggers
+  triggers: ConfigValue['triggers']
   idleDebounceMs: string
   maxBodyChars: string
   dryRun: boolean
@@ -37,20 +65,20 @@ interface Status {
 
 const IDLE_STATUS: Status = { kind: 'idle', text: '' }
 
-function draftFromWire(wire: WireConfig): Draft {
+function draftFromValue(value: ConfigValue): Draft {
   return {
-    enabled: wire.enabled,
-    host: wire.smtp.host,
-    port: String(wire.smtp.port),
-    secure: wire.smtp.secure,
-    user: wire.smtp.user,
+    enabled: value.enabled,
+    host: value.smtp.host,
+    port: String(value.smtp.port),
+    secure: value.smtp.secure,
+    user: value.smtp.user,
     pass: '',
-    from: wire.smtp.from,
-    toText: wire.to.join(', '),
-    triggers: { ...wire.triggers },
-    idleDebounceMs: String(wire.idleDebounceMs),
-    maxBodyChars: String(wire.maxBodyChars),
-    dryRun: wire.dryRun,
+    from: value.smtp.from,
+    toText: value.to.join(', '),
+    triggers: { ...value.triggers },
+    idleDebounceMs: String(value.idleDebounceMs),
+    maxBodyChars: String(value.maxBodyChars),
+    dryRun: value.dryRun,
   }
 }
 
@@ -58,7 +86,7 @@ function isPositiveInt(text: string): boolean {
   return /^[0-9]+$/.test(text) && Number(text) > 0
 }
 
-function toPatch(draft: Draft): WirePatch {
+function toPatch(draft: Draft): Record<string, unknown> {
   return {
     enabled: draft.enabled,
     smtp: {
@@ -80,34 +108,47 @@ function toPatch(draft: Draft): WirePatch {
 const TRIGGER_KEYS = ['onComplete', 'onError', 'onAborted', 'onQuestion', 'onPlanReview'] as const
 
 export function NotifyEmailCard(props: CardProps): ReactElement | null {
-  const { t } = props
+  const { t, scope, api } = props
+  const snapshot = useSyncExternalStore(
+    (listener: () => void) => scope.subscribe(listener),
+    () => scope.getSnapshot(),
+  )
+  const value = snapshot.value as ConfigValue | undefined
   const [open, setOpen] = useState(false)
-  const [wire, setWire] = useState<WireConfig | null>(null)
   const [draft, setDraft] = useState<Draft | null>(null)
-  const [failed, setFailed] = useState(false)
+  const [passConfigured, setPassConfigured] = useState(false)
   const [saving, setSaving] = useState(false)
   const [testing, setTesting] = useState(false)
   const [status, setStatus] = useState<Status>(IDLE_STATUS)
 
+  // 首次拿到解析值后播种草稿；后续 Host 更新不覆盖在途编辑（与官方 staged 表单一致）。
+  useEffect(() => {
+    if (value === undefined || draft !== null) return
+    setDraft(draftFromValue(value))
+  }, [value, draft])
+
+  // passConfigured 探测：scope 快照不含 secrets，经 describe 的 secrets 列表判断。
   useEffect(() => {
     let alive = true
-    fetchConfig()
-      .then((loaded) => {
-        if (!alive) return
-        setWire(loaded)
-        setDraft(draftFromWire(loaded))
-      })
-      .catch(() => {
-        if (alive) setFailed(true)
+    api.describe()
+      .then((response) => {
+        if (!alive || !response.result.ok) return
+        const view = response.result.value?.namespaces.find((ns) => ns.ns === SETTINGS_NS)
+        setPassConfigured(
+          view?.secrets.some((secret) => secret.path.join('.') === 'smtp.pass' && secret.set) ?? false,
+        )
       })
+      .catch(() => {})
     return () => {
       alive = false
     }
-  }, [])
+  }, [api, snapshot])
 
   const dirty = useMemo(
-    () => wire !== null && draft !== null && JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFromWire(wire))),
-    [wire, draft],
+    () =>
+      value !== undefined && draft !== null &&
+      JSON.stringify(toPatch(draft)) !== JSON.stringify(toPatch(draftFromValue(value))),
+    [value, draft],
   )
   const invalid = useMemo(
     () =>
@@ -117,27 +158,40 @@ export function NotifyEmailCard(props: CardProps): ReactElement | null {
     [draft],
   )
 
-  if (failed) return null
-  if (wire === null || draft === null) {
+  if (value === undefined || draft === null) {
     return <li className="dne-card"><p className="dne-readOnly">{t('loading')}</p></li>
   }
-  const edit = <K extends keyof Draft>(key: K, value: Draft[K]): void => {
-    setDraft({ ...draft, [key]: value })
+  const edit = <K extends keyof Draft>(key: K, editValue: Draft[K]): void => {
+    setDraft({ ...draft, [key]: editValue })
     setStatus(IDLE_STATUS)
   }
-  const editTrigger = (key: keyof WireTriggers, checked: boolean): void => {
+  const editTrigger = (key: (typeof TRIGGER_KEYS)[number], checked: boolean): void => {
     edit('triggers', { ...draft.triggers, [key]: checked })
   }
   const onSave = (): void => {
     setSaving(true)
-    saveConfig(toPatch(draft))
-      .then((saved) => {
-        setWire(saved)
-        setDraft(draftFromWire(saved))
+    const patch = toPatch(draft)
+    if ((patch['smtp'] as Record<string, unknown>)['pass'] === '') {
+      delete (patch['smtp'] as Record<string, unknown>)['pass']
+    }
+    const revision = scope.getSnapshot().revision
+    api.update({
+      ns: SETTINGS_NS,
+      patch,
+      ...(revision !== undefined ? { expectedRevision: revision } : {}),
+    })
+      .then(async (response) => {
+        if (!response.result.ok) {
+          throw new Error(response.result.error?.message ?? t('saveFailed'))
+        }
+        await scope.load()
+        const next = scope.getSnapshot().value as ConfigValue | undefined
+        if (next !== undefined) setDraft(draftFromValue(next))
         setStatus(IDLE_STATUS)
       })
       .catch((error: unknown) => {
-        setStatus({ kind: 'error', text: `${t('saveFailed')} ${error instanceof Error ? error.message : ''}` })
+        const message = error instanceof Error ? error.message : String(error)
+        setStatus({ kind: 'error', text: `${t('saveFailed')}${message}` })
       })
       .finally(() => setSaving(false))
   }
@@ -158,7 +212,7 @@ export function NotifyEmailCard(props: CardProps): ReactElement | null {
       .finally(() => setTesting(false))
   }
 
-  const disabled = !wire.writable
+  const disabled = !snapshot.writable
   return (
     <li className={`dne-card${open ? ' dne-cardOpen' : ''}`}>
       <button
@@ -191,7 +245,7 @@ export function NotifyEmailCard(props: CardProps): ReactElement | null {
             disabled={disabled} onEdit={(v) => edit('user', v)} />
           <TextField id="dne-pass" label={t('pass')} hint={t('passHint')} value={draft.pass} password
             disabled={disabled}
-            badge={{ text: wire.smtp.passConfigured ? t('passSet') : t('passUnset'), set: wire.smtp.passConfigured }}
+            badge={{ text: passConfigured ? t('passSet') : t('passUnset'), set: passConfigured }}
             onEdit={(v) => edit('pass', v)} />
           <TextField id="dne-from" label={t('from')} hint={t('fromHint')} value={draft.from}
             disabled={disabled} onEdit={(v) => edit('from', v)} />
@@ -224,7 +278,7 @@ export function NotifyEmailCard(props: CardProps): ReactElement | null {
               {t(testing ? 'testing' : 'test')}
             </button>
             <button type="button" className="dne-btn dne-btnGhost" disabled={!dirty || saving}
-              onClick={() => { setDraft(draftFromWire(wire)); setStatus(IDLE_STATUS) }}>
+              onClick={() => { setDraft(draftFromValue(value)); setStatus(IDLE_STATUS) }}>
               {t('discard')}
             </button>
             <button type="button" className="dne-btn dne-btnPrimary" disabled={!dirty || invalid || saving || disabled}

package/src/client/client.ts

@@ -3,12 +3,15 @@
  * 构建产物为 window.__ModuleLoader__.load({id, factory}) 形式的 CJS factory
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
  *
- * 类型说明：浏览器半只用到 slots/locale 的很窄一面，此处以最小本地接口声明，
- * 避免为构建期类型引入整条官方 client 依赖树；运行时契约以官方
- * dsh-client-ui-settings-plugins 的 settings.plugin.item 插槽为准。
+ * 类型说明：浏览器半只用到 slots/locale/settingsScope/connection 的很窄一面，
+ * 此处以最小本地接口声明（见 ./scope.ts），避免为构建期类型引入整条官方
+ * client 依赖树；运行时契约以官方 dsh-client-ui-settings-plugins 的
+ * settings.plugin.item 插槽与 dsh-client-ui-settings 的 settingsScope 服务为准。
  * rc7 起该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
  * （即服务端 settingsNamespace() 注册的同一字面量，见 ../ns.ts），
  * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
+ * 配置读写经官方 settingsScope 传输（rc7 起第三方命名空间对 settings RPC
+ * 全量开放）；自定义端点仅剩「发送测试邮件」（api.ts）。
  * @module @dsh-plus/notify-email/client
  */
 import type { Context } from '@deepseek-ai/cordis'
@@ -16,12 +19,13 @@ import type { Context } from '@deepseek-ai/cordis'
 import { SETTINGS_NS } from '../ns.ts'
 import { NotifyEmailCard } from './card.tsx'
 import { en, NS, zh } from './i18n.ts'
+import type { Scope, SettingsApi } from './scope.ts'
 import { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-notify-email'
 
 /** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
-export const inject = ['slots', 'locale'] as const
+export const inject = ['slots', 'locale', 'settingsScope', 'connection'] as const
 
 interface SlotsLike {
   inject(key: string, callback: () => unknown): unknown
@@ -33,9 +37,19 @@ interface LocaleLike {
   bind(ns: string): (key: string) => string
 }
 
+interface SettingsScopeServiceLike {
+  bind(spec: { namespace: string }): Scope
+}
+
+interface ConnectionLike {
+  settings: SettingsApi
+}
+
 interface ClientContext {
   slots: SlotsLike
   locale: LocaleLike
+  settingsScope: SettingsScopeServiceLike
+  get(key: 'connection'): ConnectionLike
   effect(execute: () => () => void, label?: string): unknown
 }
 
@@ -52,14 +66,15 @@ export function apply(ctx: Context): void {
     () => c.locale.register(NS, { zh, en }),
     'notify-email: locale',
   )
+  const scope = c.settingsScope.bind({ namespace: SETTINGS_NS })
+  const api = c.get('connection').api.settings
   c.slots.inject('settings.plugin.item', () =>
     c.slots.register(
       {
         name: 'settings.plugin.item',
         key: SETTINGS_NS,
-        order: 100,
         locale: NS,
-        inject: () => ({ t: c.locale.bind(NS) }),
+        inject: () => ({ t: c.locale.bind(NS), scope, api }),
       },
       NotifyEmailCard,
     ),

package/src/client/scope.ts

@@ -0,0 +1,33 @@
+/**
+ * 浏览器半 settingsScope/connection 的最小本地接口声明。
+ * 只声明本插件用到的窄面，避免为构建期类型引入整条官方 client 依赖树；
+ * 运行时契约以官方 dsh-client-ui-settings 的 settingsScope 服务与
+ * dsh-client-connection 的 settings RPC 面为准（rc7：白名单已移除，
+ * 任何已注册命名空间均可 describe/update/replace）。
+ * @module notify-email/client/scope
+ */
+
+/** settings 命名空间 scope 的快照（官方 SettingsScopeSnapshot 的最小投影）。 */
+export interface ScopeSnapshot {
+  status: 'loading' | 'ready' | 'unavailable'
+  /** schema 解析后的配置值（secret 字段已脱敏剥除）。 */
+  value: unknown
+  /** 命名空间 revision，写操作 fencing 用；首次 Host 应答前为 undefined。 */
+  revision: number | undefined
+  /** Host 文档是否可写。 */
+  writable: boolean
+}
+
+/** settingsScope.bind({namespace}) 返回的控制器面。 */
+export interface Scope {
+  getSnapshot(): ScopeSnapshot
+  subscribe(listener: () => void): () => void
+  load(): Promise<void>
+}
+
+/** connection api.settings 的 RPC 面（本插件用到的三个方法）。 */
+export interface SettingsApi {
+  describe(): Promise<{ result: { ok: boolean; value?: { namespaces: Array<{ ns: string; secrets: Array<{ path: string[]; set: boolean }> }> }; error?: { message?: string } } }>
+  update(request: { ns: string; patch: Record<string, unknown>; expectedRevision?: number }): Promise<{ result: { ok: boolean; error?: { message?: string } } }>
+  replace(request: { ns: string; section: Record<string, unknown>; expectedRevision?: number }): Promise<{ result: { ok: boolean; error?: { message?: string } } }>
+}

package/src/config-api.ts

@@ -1,8 +1,6 @@
 /**
- * 配置 HTTP 通道：webui 插件配置卡片的后端。
- * 背景：官方 apiproxy 的 settings.* RPC 对 namespace 有硬编码白名单，第三方
- * namespace 一律 settings-not-exposed；故卡片数据走自建 webServer 路由，
- * 读写仍经 ctx.settings 用户层（持久化 $DSH_HOME/settings.yaml）。
+ * 自定义端点 HTTP 通道：配置读写已迁移到官方 settings RPC（rc7 起第三方
+ * 命名空间全量开放），这里只保留官方传输没有的「发送测试邮件」端点。
  * 仅监听 dsh web 同源（webserver 默认 127.0.0.1），与 GUI 其余面同等暴露面。
  * @module notify-email/config-api
  */
@@ -10,78 +8,22 @@ import type { IncomingMessage, ServerResponse } from 'node:http'
 
 import type { Context } from '@deepseek-ai/cordis'
 
-import { SETTINGS_NS, toUserPatch, toWire, WirePatch, type WirePatchInput } from './config.ts'
 import type { NotifyEmailService } from './service.ts'
 
-const ROUTE_CONFIG = '/dsh-plus/notify-email/config'
 const ROUTE_TEST = '/dsh-plus/notify-email/test'
-const MAX_BODY_BYTES = 64 * 1024
 
 function sendJson(res: ServerResponse, status: number, body: unknown): void {
   res.writeHead(status, { 'content-type': 'application/json; charset=utf-8' })
   res.end(JSON.stringify(body))
 }
 
-function readBody(req: IncomingMessage): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const chunks: Buffer[] = []
-    let size = 0
-    req.on('data', (chunk: Buffer) => {
-      size += chunk.length
-      if (size > MAX_BODY_BYTES) {
-        reject(new Error('request body too large'))
-        req.destroy()
-        return
-      }
-      chunks.push(chunk)
-    })
-    req.on('end', () => resolve(Buffer.concat(chunks).toString('utf8')))
-    req.on('error', reject)
-  })
-}
-
-async function readPatch(req: IncomingMessage): Promise<WirePatchInput> {
-  const raw = await readBody(req)
-  let parsed: unknown
-  try {
-    parsed = JSON.parse(raw)
-  } catch {
-    throw new Error('request body is not valid JSON')
-  }
-  return WirePatch(parsed) as WirePatchInput
-}
-
-async function handleConfig(
-  ctx: Context,
-  service: NotifyEmailService,
-  req: IncomingMessage,
-  res: ServerResponse,
-): Promise<void> {
-  const settings = ctx.get('settings')
-  if (req.method === 'GET') {
-    sendJson(res, 200, toWire(service.currentConfig(), settings !== undefined))
-    return
-  }
-  if (req.method !== 'PUT') {
-    sendJson(res, 405, { error: 'method not allowed' })
-    return
-  }
-  if (settings === undefined) {
-    sendJson(res, 503, { error: 'settings provider 不可用，无法在线保存；请编辑 settings.yaml' })
-    return
-  }
-  const patch = toUserPatch(await readPatch(req))
-  await settings.update(SETTINGS_NS, patch)
-  sendJson(res, 200, toWire(service.currentConfig(), true))
-}
-
 async function handleTest(service: NotifyEmailService, res: ServerResponse): Promise<void> {
   const result = await service.sendTest()
   sendJson(res, result.ok ? 200 : 502, result)
 }
 
-/** 注册配置读写与测试发信路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
-export function registerConfigApi(ctx: Context, service: NotifyEmailService): void {
+/** 注册测试发信路由；返回是否注册成功（webServer 缺失时由调用方保证不调用）。 */
+export function registerTestApi(ctx: Context, service: NotifyEmailService): void {
   const logger = ctx.logger('notify-email')
   const guard = (
     handler: (req: IncomingMessage, res: ServerResponse) => Promise<void>,
@@ -91,17 +33,12 @@ export function registerConfigApi(ctx: Context, service: NotifyEmailService): vo
         await handler(req, res)
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error)
-        logger.warn(`config api ${req.method ?? '?'} ${req.url ?? '?'} failed: ${message}`)
+        logger.warn(`test api ${req.method ?? '?'} ${req.url ?? '?'} failed: ${message}`)
         if (!res.headersSent) sendJson(res, 400, { error: message })
         else res.end()
       }
     }
   }
-  ctx.webServer.register({
-    kind: 'exact',
-    path: ROUTE_CONFIG,
-    handler: guard((req, res) => handleConfig(ctx, service, req, res)),
-  })
   ctx.webServer.register({
     kind: 'exact',
     path: ROUTE_TEST,

package/src/config.ts

@@ -44,90 +44,7 @@ export const Config = z.object({
 export type NotifyEmailConfig = Schemastery.TypeT<typeof Config>
 export type TriggerToggles = NotifyEmailConfig['triggers']
 
-/** 配置卡片读取用的传输对象：pass 永不回传，只报告是否已配置。 */
-export interface WireConfig {
-  enabled: boolean
-  smtp: {
-    host: string
-    port: number
-    secure: boolean
-    user: string
-    from: string
-    passConfigured: boolean
-  }
-  to: string[]
-  triggers: TriggerToggles
-  idleDebounceMs: number
-  maxBodyChars: number
-  dryRun: boolean
-  /** 是否存在可写的 settings provider（决定卡片是否允许编辑）。 */
-  writable: boolean
-}
-
-export function toWire(cfg: NotifyEmailConfig, writable: boolean): WireConfig {
-  return {
-    enabled: cfg.enabled,
-    smtp: {
-      host: cfg.smtp.host,
-      port: cfg.smtp.port,
-      secure: cfg.smtp.secure,
-      user: cfg.smtp.user,
-      from: cfg.smtp.from,
-      passConfigured: cfg.smtp.pass.length > 0,
-    },
-    to: [...cfg.to],
-    triggers: { ...cfg.triggers },
-    idleDebounceMs: cfg.idleDebounceMs,
-    maxBodyChars: cfg.maxBodyChars,
-    dryRun: cfg.dryRun,
-    writable,
-  }
-}
-
 /** 是否具备发信条件（enabled 之外的最小完整性）。 */
 export function isDeliverable(cfg: NotifyEmailConfig): boolean {
   return cfg.enabled && cfg.smtp.host.length > 0 && cfg.smtp.from.length > 0 && cfg.to.length > 0
 }
-
-/**
- * 配置卡片写回用的 patch schema：字段全部可选（无默认值），
- * 只携带用户真实编辑过的字段，交给 settings.update 深合并进用户层。
- */
-export const WirePatch = z.object({
-  enabled: z.boolean(),
-  smtp: z.object({
-    host: z.string(),
-    port: z.natural().max(65535),
-    secure: z.boolean(),
-    user: z.string(),
-    pass: z.string(),
-    from: z.string(),
-  }),
-  to: z.array(z.string()),
-  triggers: z.object({
-    onComplete: z.boolean(),
-    onError: z.boolean(),
-    onAborted: z.boolean(),
-    onQuestion: z.boolean(),
-    onPlanReview: z.boolean(),
-  }),
-  idleDebounceMs: z.natural(),
-  maxBodyChars: z.natural().min(200),
-  dryRun: z.boolean(),
-})
-
-export type WirePatchInput = Schemastery.TypeS<typeof WirePatch>
-
-/**
- * 把卡片提交的 patch 规整为 settings.update 的用户层 patch。
- * smtp.pass 为空串表示「保持不变」，从 patch 中剔除，避免覆盖已存密码。
- */
-export function toUserPatch(input: WirePatchInput): Record<string, unknown> {
-  const patch: Record<string, unknown> = { ...input }
-  if (input.smtp !== undefined && input.smtp !== null) {
-    const smtp: Record<string, unknown> = { ...input.smtp }
-    if (smtp['pass'] === '') delete smtp['pass']
-    patch['smtp'] = smtp
-  }
-  return patch
-}

package/src/service.ts

@@ -13,7 +13,7 @@ import { createJsonlAuditSink } from './audit.ts'
 import { Config, SETTINGS_NS, type NotifyEmailConfig } from './config.ts'
 import { Mailer } from './mailer.ts'
 import { installSettingsSection } from '@deepseek-ai/dsh-settings'
-import { registerConfigApi } from './config-api.ts'
+import { registerTestApi } from './config-api.ts'
 import { createDecisionTrigger, createTurnEndTrigger } from './triggers/builtin.ts'
 import type { DecisionCall, NotifyTrigger, TurnEndInfo } from './triggers/types.ts'
 import { installDecisionWatcher } from './watchers/decision.ts'
@@ -52,7 +52,7 @@ export class NotifyEmailService extends Service {
     installDecisionWatcher(ctx, this)
     installTurnEndWatcher(ctx, this, () => this.current())
     ctx.inject(['webServer'], (webCtx) => {
-      registerConfigApi(webCtx, this)
+      registerTestApi(webCtx, this)
     })
   }