@dsh-plus/notify-email 0.1.8 → 0.1.10

package/lib/index.js

@@ -292,12 +292,19 @@ function createTurnEndTrigger(resolveConfig) {
 //#endregion
 //#region src/watchers/decision.ts
 function installDecisionWatcher(ctx, service) {
-	const seen = /* @__PURE__ */ new Set();
+	const seen = /* @__PURE__ */ new Map();
+	const UNKNOWN_BUCKET_CAP = 1e3;
 	const logger = ctx.logger("notify-email");
 	ctx.on("tools/pre-execute", (exec, next) => {
-		if (seen.has(exec.callId)) return next();
-		seen.add(exec.callId);
 		const sessionId = exec.agent?.id ?? "unknown";
+		let bucket = seen.get(sessionId);
+		if (bucket === void 0) {
+			bucket = /* @__PURE__ */ new Set();
+			seen.set(sessionId, bucket);
+		}
+		if (bucket.has(exec.callId)) return next();
+		if (sessionId === "unknown" && bucket.size >= UNKNOWN_BUCKET_CAP) bucket.clear();
+		bucket.add(exec.callId);
 		service.dispatchDecision({
 			callId: exec.callId,
 			sessionId,
@@ -308,6 +315,9 @@ function installDecisionWatcher(ctx, service) {
 		});
 		return next();
 	});
+	ctx.on("session/disposed", (session) => {
+		seen.delete(session.id);
+	});
 }
 //#endregion
 //#region src/watchers/turn-end.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/notify-email",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "dsh-plus service+ui plugin: 任务结束/等待决策/出错时向指定邮箱发送邮件通知",
   "type": "module",
   "main": "lib/index.js",
@@ -32,7 +32,8 @@
     }
   },
   "dependencies": {
-    "nodemailer": "9.0.5"
+    "nodemailer": "9.0.5",
+    "@dsh-plus/shared": "0.1.3"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",

package/src/client/card.tsx

@@ -1,18 +1,26 @@
 /**
  * 「邮件通知」配置卡片：注册进 settings.plugin.item 插槽（官方插件配置页）。
- * 交互对齐官方卡片：折叠/展开、staged draft、未保存标记、保存/放弃；
- * 另加「发送测试邮件」（唯一保留的自定义端点）。
- * 配置读写走官方 settingsScope 传输（scope.ts）：value 为 schema 解析后的
- * 脱敏视图（smtp.pass 不出现，passConfigured 由 describe 的 secrets 探测），
+ * 外壳与基础控件走 @dsh-plus/shared/client 套件（CardChrome/TextField/CheckRow），
+ * 本文件只保留业务字段与保存/测试逻辑。交互对齐官方卡片：折叠/展开、
+ * staged draft、未保存标记、保存/放弃；另加「发送测试邮件」。
+ * 配置读写走官方 settingsScope 传输：value 为 schema 解析后的脱敏视图
+ * （smtp.pass 不出现，passConfigured 由 describe 的 secrets 探测），
  * 保存经 settings.update 深合并（空 pass 剔除 = 保持不变）。
  * @module notify-email/client/card
  */
-import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
 
+import {
+  CardChrome,
+  type CardStatusState,
+  CheckRow,
+  IDLE_STATUS,
+  type Scope,
+  type SettingsApi,
+  TextField,
+} from '@dsh-plus/shared/client'
+import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
 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
@@ -58,13 +66,6 @@ interface Draft {
   dryRun: boolean
 }
 
-interface Status {
-  kind: 'idle' | 'ok' | 'error'
-  text: string
-}
-
-const IDLE_STATUS: Status = { kind: 'idle', text: '' }
-
 function draftFromValue(value: ConfigValue): Draft {
   return {
     enabled: value.enabled,
@@ -122,7 +123,7 @@ export function NotifyEmailCard(props: CardProps): ReactElement | null {
   const [passConfigured, setPassConfigured] = useState(false)
   const [saving, setSaving] = useState(false)
   const [testing, setTesting] = useState(false)
-  const [status, setStatus] = useState<Status>(IDLE_STATUS)
+  const [status, setStatus] = useState<CardStatusState>(IDLE_STATUS)
 
   // 首次拿到解析值后播种草稿；后续 Host 更新不覆盖在途编辑（与官方 staged 表单一致）。
   useEffect(() => {
@@ -234,177 +235,164 @@ export function NotifyEmailCard(props: CardProps): ReactElement | null {
 
   const disabled = !snapshot.writable
   return (
-    <li className={`dne-card${open ? ' dne-cardOpen' : ''}`}>
-      <button
-        type="button"
-        className="dne-header"
-        aria-expanded={open}
-        aria-label={`${t(open ? 'collapse' : 'expand')}: ${t('title')}`}
-        onClick={() => setOpen(!open)}
-      >
-        <span className="dne-headText">
-          <span className="dne-name">{t('title')}</span>
-          <span className="dne-description">{t('description')}</span>
-        </span>
-        {dirty ? <span className="dne-pending">{t('unsaved')}</span> : null}
-        <span className={`dne-chevron${open ? ' dne-chevronOpen' : ''}`}>▾</span>
-      </button>
-      {open ? (
-        <div className="dne-body">
-          {disabled ? (
-            <p className="dne-readOnly" role="status">
-              {t('readOnly')}
-            </p>
-          ) : null}
-          <CheckRow
-            id="dne-enabled"
-            label={t('enabled')}
-            checked={draft.enabled}
-            disabled={disabled}
-            onEdit={(v) => edit('enabled', v)}
-          />
-          <TextField
-            id="dne-host"
-            label={t('host')}
-            hint={t('hostHint')}
-            value={draft.host}
-            disabled={disabled}
-            onEdit={(v) => edit('host', v)}
-          />
-          <TextField
-            id="dne-port"
-            label={t('port')}
-            hint={t('portHint')}
-            value={draft.port}
-            numeric
-            disabled={disabled}
-            invalid={!isPositiveInt(draft.port)}
-            invalidLabel={t('invalidNumber')}
-            onEdit={(v) => edit('port', v)}
-          />
-          <CheckRow
-            id="dne-secure"
-            label={t('secure')}
-            checked={draft.secure}
-            disabled={disabled}
-            onEdit={(v) => edit('secure', v)}
-          />
-          <TextField
-            id="dne-user"
-            label={t('user')}
-            hint={t('userHint')}
-            value={draft.user}
-            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: 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)}
-          />
-          <TextField
-            id="dne-to"
-            label={t('to')}
-            hint={t('toHint')}
-            value={draft.toText}
-            disabled={disabled}
-            onEdit={(v) => edit('toText', v)}
-          />
-          <p className="dne-groupLabel">{t('triggerGroup')}</p>
-          {TRIGGER_KEYS.map((key) => (
-            <CheckRow
-              key={key}
-              id={`dne-${key}`}
-              label={t(key)}
-              checked={draft.triggers[key]}
-              disabled={disabled}
-              onEdit={(v) => editTrigger(key, v)}
-            />
-          ))}
-          <TextField
-            id="dne-debounce"
-            label={t('idleDebounceMs')}
-            hint={t('idleDebounceMsHint')}
-            value={draft.idleDebounceMs}
-            numeric
-            disabled={disabled}
-            invalid={!isPositiveInt(draft.idleDebounceMs)}
-            invalidLabel={t('invalidNumber')}
-            onEdit={(v) => edit('idleDebounceMs', v)}
-          />
-          <TextField
-            id="dne-maxchars"
-            label={t('maxBodyChars')}
-            hint={t('maxBodyCharsHint')}
-            value={draft.maxBodyChars}
-            numeric
-            disabled={disabled}
-            invalid={!isPositiveInt(draft.maxBodyChars) || Number(draft.maxBodyChars) < 200}
-            invalidLabel={t('invalidNumber')}
-            onEdit={(v) => edit('maxBodyChars', v)}
-          />
-          <CheckRow
-            id="dne-dryrun"
-            label={t('dryRun')}
-            checked={draft.dryRun}
-            disabled={disabled}
-            onEdit={(v) => edit('dryRun', v)}
-          />
-          <div className="dne-footer">
-            {status.kind !== 'idle' ? (
-              <p
-                className={`dne-status${status.kind === 'error' ? ' dne-statusError' : ''}`}
-                role="status"
-              >
-                {status.text}
-              </p>
-            ) : null}
-            <button
-              type="button"
-              className="dne-btn dne-btnGhost"
-              disabled={testing}
-              onClick={onTest}
-            >
-              {t(testing ? 'testing' : 'test')}
-            </button>
-            <button
-              type="button"
-              className="dne-btn dne-btnGhost"
-              disabled={!dirty || saving}
-              onClick={() => {
-                setDraft(draftFromValue(value))
-                setStatus(IDLE_STATUS)
-              }}
-            >
-              {t('discard')}
-            </button>
-            <button
-              type="button"
-              className="dne-btn dne-btnPrimary"
-              disabled={!dirty || invalid || saving || disabled}
-              onClick={onSave}
-            >
-              {t(saving ? 'saving' : 'save')}
-            </button>
-          </div>
-        </div>
-      ) : null}
-    </li>
+    <CardChrome
+      prefix="dne"
+      title={t('title')}
+      description={t('description')}
+      open={open}
+      onToggle={setOpen}
+      statusBadge={{ text: t(draft.enabled ? 'enabledOn' : 'enabledOff'), on: draft.enabled }}
+      dirty={dirty}
+      dirtyLabel={t('unsaved')}
+      readOnlyNotice={disabled ? t('readOnly') : undefined}
+      status={status}
+      actions={[
+        {
+          key: 'test',
+          label: t(testing ? 'testing' : 'test'),
+          disabled: testing,
+          onClick: onTest,
+        },
+        {
+          key: 'discard',
+          label: t('discard'),
+          disabled: !dirty || saving,
+          onClick: () => {
+            setDraft(draftFromValue(value))
+            setStatus(IDLE_STATUS)
+          },
+        },
+        {
+          key: 'save',
+          label: t(saving ? 'saving' : 'save'),
+          variant: 'primary',
+          disabled: !dirty || invalid || saving || disabled,
+          onClick: onSave,
+        },
+      ]}
+    >
+      <CheckRow
+        prefix="dne"
+        id="dne-enabled"
+        label={t('enabled')}
+        checked={draft.enabled}
+        disabled={disabled}
+        onEdit={(v) => edit('enabled', v)}
+      />
+      <TextField
+        prefix="dne"
+        id="dne-host"
+        label={t('host')}
+        hint={t('hostHint')}
+        value={draft.host}
+        disabled={disabled}
+        onEdit={(v) => edit('host', v)}
+      />
+      <TextField
+        prefix="dne"
+        id="dne-port"
+        label={t('port')}
+        hint={t('portHint')}
+        value={draft.port}
+        numeric
+        disabled={disabled}
+        invalid={!isPositiveInt(draft.port)}
+        invalidLabel={t('invalidNumber')}
+        onEdit={(v) => edit('port', v)}
+      />
+      <CheckRow
+        prefix="dne"
+        id="dne-secure"
+        label={t('secure')}
+        checked={draft.secure}
+        disabled={disabled}
+        onEdit={(v) => edit('secure', v)}
+      />
+      <TextField
+        prefix="dne"
+        id="dne-user"
+        label={t('user')}
+        hint={t('userHint')}
+        value={draft.user}
+        disabled={disabled}
+        onEdit={(v) => edit('user', v)}
+      />
+      <TextField
+        prefix="dne"
+        id="dne-pass"
+        label={t('pass')}
+        hint={t('passHint')}
+        value={draft.pass}
+        password
+        disabled={disabled}
+        badge={{
+          text: passConfigured ? t('passSet') : t('passUnset'),
+          set: passConfigured,
+        }}
+        onEdit={(v) => edit('pass', v)}
+      />
+      <TextField
+        prefix="dne"
+        id="dne-from"
+        label={t('from')}
+        hint={t('fromHint')}
+        value={draft.from}
+        disabled={disabled}
+        onEdit={(v) => edit('from', v)}
+      />
+      <TextField
+        prefix="dne"
+        id="dne-to"
+        label={t('to')}
+        hint={t('toHint')}
+        value={draft.toText}
+        disabled={disabled}
+        onEdit={(v) => edit('toText', v)}
+      />
+      <p className="dne-groupLabel">{t('triggerGroup')}</p>
+      {TRIGGER_KEYS.map((key) => (
+        <CheckRow
+          prefix="dne"
+          key={key}
+          id={`dne-${key}`}
+          label={t(key)}
+          checked={draft.triggers[key]}
+          disabled={disabled}
+          onEdit={(v) => editTrigger(key, v)}
+        />
+      ))}
+      <TextField
+        prefix="dne"
+        id="dne-debounce"
+        label={t('idleDebounceMs')}
+        hint={t('idleDebounceMsHint')}
+        value={draft.idleDebounceMs}
+        numeric
+        disabled={disabled}
+        invalid={!isPositiveInt(draft.idleDebounceMs)}
+        invalidLabel={t('invalidNumber')}
+        onEdit={(v) => edit('idleDebounceMs', v)}
+      />
+      <TextField
+        prefix="dne"
+        id="dne-maxchars"
+        label={t('maxBodyChars')}
+        hint={t('maxBodyCharsHint')}
+        value={draft.maxBodyChars}
+        numeric
+        disabled={disabled}
+        invalid={!isPositiveInt(draft.maxBodyChars) || Number(draft.maxBodyChars) < 200}
+        invalidLabel={t('invalidNumber')}
+        onEdit={(v) => edit('maxBodyChars', v)}
+      />
+      <CheckRow
+        prefix="dne"
+        id="dne-dryrun"
+        label={t('dryRun')}
+        checked={draft.dryRun}
+        disabled={disabled}
+        onEdit={(v) => edit('dryRun', v)}
+      />
+    </CardChrome>
   )
 }

package/src/client/client.ts

@@ -4,24 +4,20 @@
  * （包装见 tsdown.config.ts）；样式沿用官方 data-plugin-css 约定，HMR 据此卸载。
  *
  * 类型说明：浏览器半只用到 slots/locale/connection/remote 的很窄一面，
- * 此处以最小本地接口声明（见 ./scope.ts），避免为构建期类型引入整条官方
- * client 依赖树；运行时契约以官方 dsh-client-ui-settings-plugins 的
- * settings.plugin.item 插槽与 dsh-client-connection 的 settings RPC 面为准。
+ * scope 与基础控件走 @dsh-plus/shared/client 套件（收编自本插件原实现）。
  * rc7 起该插槽为 keyed 槽位：key 必须是卡片编辑的 settings 命名空间
  * （即服务端 settingsNamespace() 注册的同一字面量，见 ../ns.ts），
  * 官方配置页按此 key 与 Host 已注册命名空间配对分发。
  * 配置读写经官方 settings RPC 直连（rc7 起第三方命名空间全量开放；
- * 不复用 settingsScope 服务——非 loopback 页面下它无数据，见 scope.ts）；
+ * 不复用 settingsScope 服务——非 loopback 页面下它无数据）；
  * 自定义端点仅剩「发送测试邮件」（api.ts）。
  * @module @dsh-plus/notify-email/client
  */
 import type { Context } from '@deepseek-ai/cordis'
-
+import { cardCss, createApiScope, injectCardStyle } from '@dsh-plus/shared/client'
 import { SETTINGS_NS } from '../ns.ts'
 import { NotifyEmailCard } from './card.tsx'
 import { en, NS, zh } from './i18n.ts'
-import type { Scope, ScopeSnapshot, SettingsApi } from './scope.ts'
-import { injectStyle } from './styles.ts'
 
 export const name = 'dsh-plus-notify-email'
 
@@ -43,7 +39,7 @@ interface RemoteLike {
 }
 
 interface ConnectionLike {
-  api: { settings: SettingsApi }
+  api: { settings: Parameters<typeof createApiScope>[0] }
 }
 
 interface ClientContext {
@@ -55,85 +51,9 @@ interface ClientContext {
   effect(execute: () => () => void, label?: string): unknown
 }
 
-/**
- * api 直连实现的命名空间 scope（官方配置页 tab 同款模式）。
- * 读：describe 取命名空间视图（脱敏 value/revision + 顶层 writable）；
- * 刷新：remote `settings/document-updated`（按命名空间过滤）与
- * `connection/reset`；generation 防旧读覆盖新发布。任何页面 origin
- * （loopback 或 tailnet 信任域名）下行为一致。
- */
-function createApiScope(api: SettingsApi, ns: string, c: ClientContext): Scope {
-  let state: ScopeSnapshot = {
-    status: 'loading',
-    value: undefined,
-    revision: undefined,
-    writable: false,
-  }
-  const listeners = new Set<() => void>()
-  let generation = 0
-  const publish = (next: ScopeSnapshot): void => {
-    state = next
-    for (const listener of [...listeners]) listener()
-  }
-  const load = async (): Promise<void> => {
-    const gen = ++generation
-    let response: Awaited<ReturnType<SettingsApi['describe']>>
-    try {
-      response = await api.describe({})
-    } catch {
-      return
-    }
-    if (gen !== generation || !response.result.ok) return
-    const writable = response.result.value?.writable ?? false
-    const view = response.result.value?.namespaces.find((candidate) => candidate.ns === ns)
-    if (view === undefined) {
-      publish({
-        status: 'unavailable',
-        value: undefined,
-        revision: undefined,
-        writable,
-      })
-      return
-    }
-    publish({
-      status: 'ready',
-      value: view.value,
-      revision: view.revision,
-      writable,
-    })
-  }
-  const refresh = (namespace?: unknown): void => {
-    if (namespace !== undefined && namespace !== ns) return
-    void load()
-  }
-  const disposers = [
-    c.get('remote').$on('settings/document-updated', refresh),
-    c.on('connection/reset', () => {
-      void load()
-    }),
-  ]
-  c.effect(
-    () => () => {
-      for (const dispose of disposers) dispose()
-    },
-    'notify-email: settings scope',
-  )
-  void load()
-  return {
-    getSnapshot: () => state,
-    subscribe: (listener: () => void) => {
-      listeners.add(listener)
-      return () => {
-        listeners.delete(listener)
-      }
-    },
-    load,
-  }
-}
-
 export function apply(ctx: Context): void {
   const c = ctx as unknown as ClientContext
-  const tag = injectStyle()
+  const tag = injectCardStyle('@dsh-plus/notify-email', cardCss('dne'))
   c.effect(
     () => () => {
       tag?.remove()
@@ -142,7 +62,7 @@ export function apply(ctx: Context): void {
   )
   c.effect(() => c.locale.register(NS, { zh, en }), 'notify-email: locale')
   const api = c.get('connection').api.settings
-  const scope = createApiScope(api, SETTINGS_NS, c)
+  const scope = createApiScope(api, SETTINGS_NS, c, 'notify-email: settings scope')
   c.slots.inject('settings.plugin.item', () =>
     c.slots.register(
       {

package/src/client/i18n.ts

@@ -1,11 +1,13 @@
 /**
  * 配置卡片文案（zh/en）。经 ctx.locale.register 注册、bind 取用，与官方卡片同机制。
+ * 公共键（save/discard/unsaved 等）来自 shared 的 common 字典，本文件只维护业务键。
  * @module notify-email/client/i18n
  */
+import { commonEn, commonZh, mergeDict } from '@dsh-plus/shared/client'
 
 export const NS = 'dsh-plus-notify-email'
 
-export const zh: Record<string, string> = {
+const ownZh = {
   title: '邮件通知',
   description: '任务结束、等待决策或出错时向指定邮箱发送邮件。',
   enabled: '启用通知',
@@ -35,26 +37,15 @@ export const zh: Record<string, string> = {
   maxBodyChars: '正文截断长度',
   maxBodyCharsHint: '邮件正文内容超过该长度时截断。',
   dryRun: '仅记录日志（不真实发送）',
-  save: '保存',
-  saving: '保存中…',
-  discard: '放弃',
-  unsaved: '未保存',
   test: '发送测试邮件',
   testing: '发送中…',
   testOk: '测试邮件已发送。',
   testDryRun: '已按 dry-run 记录日志（未真实发送）。',
   testFailed: '测试发送失败：',
-  saveFailed: '保存失败，请检查填写内容。',
-  loading: '加载中…',
-  unavailable: '配置服务不可用。',
-  readOnly: '当前部署无 settings provider，配置为只读；请编辑 settings.yaml。',
-  expand: '展开',
-  collapse: '收起',
-  invalidNumber: '请输入有效数字',
   incomplete: 'SMTP 配置不完整（服务器/发件地址/收件人必填）。',
 }
 
-export const en: Record<string, string> = {
+const ownEn = {
   title: 'Email notifications',
   description: 'Email a mailbox when a task finishes, awaits a decision, or fails.',
   enabled: 'Enable notifications',
@@ -77,28 +68,20 @@ export const en: Record<string, string> = {
   onComplete: 'Task completed',
   onError: 'Task failed',
   onAborted: 'Cancelled by user',
-  onQuestion: 'Waiting for an answer',
-  onPlanReview: 'Plan pending approval',
-  idleDebounceMs: 'Idle confirmation (ms)',
-  idleDebounceMsHint: 'Wait this long after completion to confirm no follow-up work.',
-  maxBodyChars: 'Body truncation',
-  maxBodyCharsHint: 'Truncate mail body content beyond this length.',
-  dryRun: 'Log only (do not send)',
-  save: 'Save',
-  saving: 'Saving…',
-  discard: 'Discard',
-  unsaved: 'Unsaved',
+  onQuestion: 'Question awaiting answer',
+  onPlanReview: 'Plan awaiting review',
+  idleDebounceMs: 'Idle debounce (ms)',
+  idleDebounceMsHint: 'After completion, wait this long to confirm no follow-up before sending.',
+  maxBodyChars: 'Body truncation length',
+  maxBodyCharsHint: 'Truncate the email body beyond this length.',
+  dryRun: 'Log only (do not actually send)',
   test: 'Send test email',
   testing: 'Sending…',
   testOk: 'Test email sent.',
-  testDryRun: 'Recorded as dry-run (not actually sent).',
-  testFailed: 'Test failed: ',
-  saveFailed: 'Save failed; please check the fields.',
-  loading: 'Loading…',
-  unavailable: 'Configuration service unavailable.',
-  readOnly: 'No settings provider in this deployment; edit settings.yaml instead.',
-  expand: 'Expand',
-  collapse: 'Collapse',
-  invalidNumber: 'Enter a valid number',
+  testDryRun: 'Logged in dry-run mode (not sent).',
+  testFailed: 'Test send failed: ',
   incomplete: 'SMTP config incomplete (host/from/recipients required).',
 }
+
+export const zh: Record<string, string> = mergeDict(commonZh, ownZh)
+export const en: Record<string, string> = mergeDict(commonEn, ownEn)