@dsh-plus/notify-email 0.1.21 → 0.1.23

package/lib/client.js

@@ -168,7 +168,10 @@ window.__ModuleLoader__.load({
 			confirm: "Confirm",
 			cancel: "Cancel"
 		};
-		/** own 覆盖同键合并（返回新对象，入参不可变）。 */
+		/**
+		* own 覆盖同键合并（返回新对象，入参不可变）。
+		* 返回类型保留两侧键集合，调用方据此派生 DictKey。
+		*/
 		function mergeDict(base, own) {
 			return {
 				...base,

package/lib/index.d.ts

@@ -148,7 +148,7 @@ declare class NotifyEmailService extends Service {
 //#endregion
 //#region src/index.d.ts
 declare const name = "dsh-plus-notify-email";
-declare const inject: readonly ["agents", "tools", "credentials"];
+declare const inject: readonly ['agents', 'tools', 'credentials'];
 declare function apply(ctx: Context, config: NotifyEmailConfig): void;
 //#endregion
 export { Config, type DecisionCall, type EmailNotice, NotifyEmailService, type NotifyTrigger, type TurnEndInfo, apply, inject, name };

package/lib/index.js

@@ -355,6 +355,17 @@ function extractErrorMessage(reason) {
 	const message = error.message;
 	return typeof message === "string" ? message : void 0;
 }
+/**
+* agent 是否仍留有已接收但未认领的工作。
+* `hasPending` 未进 Inbox 契约面——它只是 dsh-agent-loop 的 ReactLoopInbox
+* 实现 getter（官方唯一的 `agent.inbox` 赋值点），故按「实现面存在才读」
+* 收窄：实现缺席即视为无待处理工作；存在时读到的正是该 getter，取值与
+* 契约面的 nextTurn/nextStep 非空判定一致。
+*/
+function hasPendingWork(inbox) {
+	if (!("hasPending" in inbox)) return false;
+	return inbox.hasPending === true;
+}
 function installTurnEndWatcher(ctx, service, resolveConfig) {
 	const watches = /* @__PURE__ */ new Map();
 	const logger = ctx.logger("notify-email");
@@ -369,7 +380,7 @@ function installTurnEndWatcher(ctx, service, resolveConfig) {
 	const fire = (session, turn, kind, errorMessage) => {
 		const agent = ctx.agents.get(session.id);
 		if (agent === void 0) return;
-		if (agent.status !== "idle" || agent.inbox.hasPending) return;
+		if (agent.status !== "idle" || hasPendingWork(agent.inbox)) return;
 		if (!ctx.agents.roots().includes(agent)) return;
 		const watch = watchOf(session.id);
 		const key = `${turn}:${kind}`;

package/package.json

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

package/src/client/card.tsx

@@ -22,9 +22,10 @@ import {
 import { type ReactElement, useEffect, useMemo, useState, useSyncExternalStore } from 'react'
 import { SETTINGS_NS } from '../ns.ts'
 import { sendTest } from './api.ts'
+import type { Translate } from './i18n.ts'
 
 export interface CardProps {
-  t(key: string): string
+  t: Translate
   scope: Scope
   api: NamespaceSettingsApi
 }

package/src/client/client.ts

@@ -19,39 +19,19 @@ import {
   createNamespaceApi,
   createSettingsScope,
   injectCardStyle,
-  type SettingsRemoteFace,
+  type PluginClientContext,
 } 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 DictKey, en, NS, zh } from './i18n.ts'
 
 export const name = 'dsh-plus-notify-email'
 
 /** 浏览器半需要的 cordis 服务 key（loader 据此注入；package.json 的 dsh.client.inject 管包加载顺序）。 */
 export const inject = ['slots', 'locale', 'remote', 'remote.settings'] as const
 
-interface SlotsLike {
-  inject(key: string, callback: () => unknown): unknown
-  register(options: Record<string, unknown>, component: unknown): () => void
-}
-
-interface LocaleLike {
-  register(ns: string, dict: { zh: Record<string, string>; en: Record<string, string> }): () => void
-  bind(ns: string): (key: string) => string
-}
-
-interface RemoteLike {
-  settings: SettingsRemoteFace
-  $on(event: string, listener: (payload?: unknown) => void): () => void
-}
-
-interface ClientContext {
-  slots: SlotsLike
-  locale: LocaleLike
-  get(key: 'remote'): RemoteLike
-  on(event: string, listener: () => void): () => void
-  effect(execute: () => () => void, label?: string): unknown
-}
+/** 宿主窄面收编在 @dsh-plus/shared/client；TKey 传入本包 DictKey 使键名受检。 */
+type ClientContext = PluginClientContext<DictKey>
 
 export function apply(ctx: Context): void {
   const c = ctx as unknown as ClientContext

package/src/client/i18n.ts

@@ -43,7 +43,7 @@ const ownZh = {
   testDryRun: '已按 dry-run 记录日志（未真实发送）。',
   testFailed: '测试发送失败：',
   incomplete: 'SMTP 配置不完整（服务器/发件地址/收件人必填）。',
-}
+} as const
 
 const ownEn = {
   title: 'Email notifications',
@@ -81,7 +81,13 @@ const ownEn = {
   testDryRun: 'Logged in dry-run mode (not sent).',
   testFailed: 'Test send failed: ',
   incomplete: 'SMTP config incomplete (host/from/recipients required).',
-}
+} as const
 
-export const zh: Record<string, string> = mergeDict(commonZh, ownZh)
-export const en: Record<string, string> = mergeDict(commonEn, ownEn)
+export type DictKey = keyof typeof commonZh | keyof typeof ownZh
+
+/** 卡片/面板共用的翻译函数类型（slot 注入的 bind 结果按此消费）。 */
+export type Translate = (key: DictKey) => string
+
+// 标注为 Record<DictKey, string>：en 缺任一键即编译期报错（中英强制对齐）。
+export const zh: Record<DictKey, string> = mergeDict(commonZh, ownZh)
+export const en: Record<DictKey, string> = mergeDict(commonEn, ownEn)

package/src/config-api.ts

@@ -7,6 +7,8 @@
 import type { IncomingMessage, ServerResponse } from 'node:http'
 
 import type { Context } from '@deepseek-ai/cordis'
+// 平台声明导入（无值消费）：把 webServer 服务面合进 program，ctx.webServer 方可解析。
+import type {} from '@deepseek-ai/dsh-host-webserver'
 
 import type { NotifyEmailService } from './service.ts'
 

package/src/mailer.ts

@@ -83,8 +83,10 @@ export class Mailer {
   private readonly resolveConfig: () => NotifyEmailConfig
   private readonly logger: MailLogger
   private readonly transport: Transport
-  private readonly audit?: AuditSink
-  private readonly credentials?: CredentialsSeamLike
+  // 构造期无条件赋值，故为「必需但可为 undefined」：exactOptionalPropertyTypes
+  // 下可选属性不允许显式赋 undefined。
+  private readonly audit: AuditSink | undefined
+  private readonly credentials: CredentialsSeamLike | undefined
 
   constructor(
     resolveConfig: () => NotifyEmailConfig,

package/src/watchers/decision.ts

@@ -5,6 +5,9 @@
  * @module notify-email/watchers/decision
  */
 import type { Context } from '@deepseek-ai/cordis'
+// 平台声明导入（无值消费）：把 dsh-tools 的 'tools/pre-execute' 事件与
+// ToolExecution 参数/next 签名合进 program（事件名真名即此，非拼写错误）。
+import type {} from '@deepseek-ai/dsh-tools'
 
 import type { NotifyEmailService } from '../service.ts'
 

package/src/watchers/turn-end.ts

@@ -7,6 +7,8 @@
  * @module notify-email/watchers/turn-end
  */
 import type { Context } from '@deepseek-ai/cordis'
+// 平台声明导入：把 agent 服务面（ctx.agents）与 Inbox 契约合进 program。
+import type { Inbox } from '@deepseek-ai/dsh-agent'
 import type { Session, TurnEndReason } from '@deepseek-ai/dsh-session'
 
 import type { NotifyEmailConfig } from '../config.ts'
@@ -16,8 +18,11 @@ import type { NotifyEmailService } from '../service.ts'
 const NOTIFY_KINDS = new Set(['completed', 'error', 'aborted'])
 
 interface SessionWatch {
-  lastDelivery?: string
-  timer?: ReturnType<typeof setTimeout>
+  // 显式并上 undefined：这些字段会被反复赋 undefined 以清空状态
+  // （如 `watch.timer = undefined` 取消定时器），exactOptionalPropertyTypes
+  // 下可选属性不允许该写法。
+  lastDelivery?: string | undefined
+  timer?: ReturnType<typeof setTimeout> | undefined
   readonly notified: Set<string>
 }
 
@@ -44,6 +49,18 @@ function extractErrorMessage(reason: unknown): string | undefined {
   return typeof message === 'string' ? message : undefined
 }
 
+/**
+ * agent 是否仍留有已接收但未认领的工作。
+ * `hasPending` 未进 Inbox 契约面——它只是 dsh-agent-loop 的 ReactLoopInbox
+ * 实现 getter（官方唯一的 `agent.inbox` 赋值点），故按「实现面存在才读」
+ * 收窄：实现缺席即视为无待处理工作；存在时读到的正是该 getter，取值与
+ * 契约面的 nextTurn/nextStep 非空判定一致。
+ */
+function hasPendingWork(inbox: Inbox): boolean {
+  if (!('hasPending' in inbox)) return false
+  return inbox.hasPending === true
+}
+
 export function installTurnEndWatcher(
   ctx: Context,
   service: NotifyEmailService,
@@ -64,7 +81,7 @@ export function installTurnEndWatcher(
   const fire = (session: Session, turn: number, kind: string, errorMessage?: string): void => {
     const agent = ctx.agents.get(session.id)
     if (agent === undefined) return
-    if (agent.status !== 'idle' || agent.inbox.hasPending) return
+    if (agent.status !== 'idle' || hasPendingWork(agent.inbox)) return
     if (!ctx.agents.roots().includes(agent)) return
     const watch = watchOf(session.id)
     const key = `${turn}:${kind}`