@telosmaylx/dsh-session-notify 0.1.8 → 0.1.9

package/lib/index.js

@@ -36,7 +36,7 @@ import { appendFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { homedir } from 'node:os'
 import { createRequire } from 'node:module'
-import { createTurnTracker, buildNotice, isSubagentSession, officialCacheRate, officialTps } from './core.js?v=1' // v=1: 缓存破坏——HMR 重载按 URL 键控
+import { createTurnTracker, buildNotice, isSubagentSession, officialCacheRate, officialTps, renderTitle } from './core.js?v=1' // v=1: 缓存破坏——HMR 重载按 URL 键控
 
 /** Cordis loader 诊断用插件名。 */
 export const name = 'session-complete-notify'
@@ -73,7 +73,9 @@ const DEFAULT_OPTIONS = {
 const DEFAULT_SETTINGS = {
   language: 'zh',
   templates: { completed: '', error: '', aborted: '', blocked: '', 'max-tokens': '' },
-  titleTemplate: '任务已完成',
+  titleTemplate: '', // 空 = 未自定义全局标题，各原因使用语言默认标题（如「任务已完成」「任务出错」）
+  /** 按原因定制推送标题（空 = 用 titleTemplate 或语言默认标题）。 */
+  titleTemplates: { completed: '', error: '', aborted: '', blocked: '', 'max-tokens': '' },
   includeDuration: true,
   includeUsage: true,
   skipSubagents: true,
@@ -89,10 +91,16 @@ function sanitizeSettings(raw) {
   for (const key of Object.keys(templates)) {
     if (typeof templatesRaw[key] === 'string') templates[key] = templatesRaw[key]
   }
+  const titlesRaw = src.titleTemplates && typeof src.titleTemplates === 'object' ? src.titleTemplates : {}
+  const titleTemplates = { ...DEFAULT_SETTINGS.titleTemplates }
+  for (const key of Object.keys(titleTemplates)) {
+    if (typeof titlesRaw[key] === 'string') titleTemplates[key] = titlesRaw[key]
+  }
   return {
     language: ['zh', 'zh-tw', 'en', 'ja', 'ko'].includes(src.language) ? src.language : 'zh',
     templates,
     titleTemplate: typeof src.titleTemplate === 'string' ? src.titleTemplate : '',
+    titleTemplates,
     includeDuration: typeof src.includeDuration === 'boolean' ? src.includeDuration : true,
     includeUsage: typeof src.includeUsage === 'boolean' ? src.includeUsage : true,
     skipSubagents: typeof src.skipSubagents === 'boolean' ? src.skipSubagents : true,
@@ -129,7 +137,14 @@ export function apply(ctx, config = {}) {
         blocked: Schema.string().default(''),
         'max-tokens': Schema.string().default(''),
       }),
-      titleTemplate: Schema.string().default('任务已完成'),
+      titleTemplate: Schema.string().default(''),
+      titleTemplates: Schema.object({
+        completed: Schema.string().default(''),
+        error: Schema.string().default(''),
+        aborted: Schema.string().default(''),
+        blocked: Schema.string().default(''),
+        'max-tokens': Schema.string().default(''),
+      }),
       includeDuration: Schema.boolean().default(true),
       includeUsage: Schema.boolean().default(true),
       skipSubagents: Schema.boolean().default(true),
@@ -196,17 +211,23 @@ export function apply(ctx, config = {}) {
         try {
           rootRegistry.register({
             key: SETTINGS_NS,
-            schema: z.string(),
-            init: () => '',
+            // 投影值：{ kind: 结束原因, text: 系统消息全文, title: 该原因的推送标题（host 已渲染，含 {title} 替换）}
+            schema: z.object({ kind: z.string(), text: z.string(), title: z.string() }),
+            init: () => ({ kind: '', text: '', title: '' }),
             apply: (state, event) => {
               if (event.type !== 'user/message') return state
               const src = event.data?.source ?? {}
               if (src.kind !== 'plugin' || src.plugin !== PLUGIN_ID) return state
               const text = ((event.data?.content ?? []).map((b) => b?.text ?? '')).join('').trim()
-              return text || state
+              if (!text) return state
+              return {
+                kind: typeof src.reasonKind === 'string' ? src.reasonKind : state.kind,
+                text,
+                title: typeof src.titleText === 'string' && src.titleText ? src.titleText : state.title,
+              }
             },
             view: (state) => state,
-            stateVersion: 1,
+            stateVersion: 2, // 投影值从 string 升级为对象（kind/text/title）
           })
           fileLog('session-projections unit registered (key=session-complete-notify)')
         } catch (err) {
@@ -250,6 +271,12 @@ export function apply(ctx, config = {}) {
         } catch (projErr) {
           warn(ctx, `投影快照读取失败: ${projErr?.message ?? projErr}`)
         }
+        // 标题投影缺失时从会话自身兜底（header.title / title），确保默认文案能内嵌会话标题
+        if (!titleValue) {
+          const h = session?.header ?? {}
+          titleValue = (typeof h.title === 'string' && h.title.trim()) ? h.title
+            : (typeof session?.title === 'string' && session.title.trim()) ? session.title : ''
+        }
         const notice = buildNotice(kind, event.data.reason, {
           ...state,
           includeDuration: true, // 标签即开关：{duration} 插了才显示
@@ -258,6 +285,8 @@ export function apply(ctx, config = {}) {
           tpsValue,
           titleValue,
         }, { language: settings.language, templates: settings.templates })
+        // 推送标题按原因渲染：titleTemplates[kind] > titleTemplate > 语言默认（如「任务已完成」）
+        const title = renderTitle(kind, { language: settings.language, titleTemplate: settings.titleTemplate, titleTemplates: settings.titleTemplates }, titleValue)
         // 边界约束：session/event 观察者回调运行在 turn/end 那次 append 的
         // 发布边界之内（dsh-session 在 dispatch 前 set entry.appending，
         // finally 中复位），此时同步 append 会被拒绝：
@@ -265,7 +294,7 @@ export function apply(ctx, config = {}) {
         // 推迟到微任务——微任务队列在本次同步栈（含 finally 复位）之后才跑。
         queueMicrotask(() => {
           if (disposed) return // 卸载窗口内已调度的微任务：fiber 已拆除，跳过追加
-          appendNotice(ctx, session, notice)
+          appendNotice(ctx, session, notice, kind, title)
         })
         return
       }
@@ -290,7 +319,7 @@ export function apply(ctx, config = {}) {
 }
 
 /** 把系统消息追加进会话日志（失败只记日志，绝不抛出破坏 event 火线）。 */
-function appendNotice(ctx, session, notice) {
+function appendNotice(ctx, session, notice, kind, title) {
   try {
     session.append(
       'user/message',
@@ -298,7 +327,14 @@ function appendNotice(ctx, session, notice) {
         id: newId(),
         role: 'user',
         content: [{ type: 'text', text: notice.text }],
-        source: { kind: 'plugin', plugin: PLUGIN_ID, form: 'notice', summary: notice.summary },
+        source: {
+          kind: 'plugin',
+          plugin: PLUGIN_ID,
+          form: 'notice',
+          summary: notice.summary,
+          reasonKind: typeof kind === 'string' ? kind : '', // 投影 apply 取用
+          titleText: typeof title === 'string' ? title : '', // 投影 apply 取用（host 渲染好的推送标题）
+        },
       },
       { surfaceOp: 'append' },
     )

package/package.json

@@ -1,70 +1,70 @@
-{
-  "name": "@telosmaylx/dsh-session-notify",
-  "version": "0.1.8",
-  "description": "DSH session completion notifier: appends a plugin system message to the session log on turn/end and pushes browser notifications (Web Notification + toast), with a fully customizable official settings panel (presets, 5-language templates, cache-hit rate & tok/s from official projections).",
-  "private": false,
-  "type": "module",
-  "main": "./lib/index.js",
-  "exports": {
-    ".": {
-      "default": "./lib/index.js"
-    },
-    "./client": {
-      "default": "./lib/client.js"
-    },
-    "./core": {
-      "default": "./lib/core.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "files": [
-    "lib",
-    "scripts",
-    "cordis.patch.yml",
-    "README.md",
-    "LICENSE"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "keywords": [
-    "deepseek-harness",
-    "dsh",
-    "dsh-plugin",
-    "session-notify",
-    "notification",
-    "completion-reminder",
-    "agent"
-  ],
-  "author": "dsh-session-notify contributors",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/TelosmaYLX/dsh-session-notify.git"
-  },
-  "homepage": "https://github.com/TelosmaYLX/dsh-session-notify#readme",
-  "bugs": {
-    "url": "https://github.com/TelosmaYLX/dsh-session-notify/issues"
-  },
-  "peerDependencies": {
-    "cordis": ">=4.0.0-rc <5"
-  },
-  "engines": {
-    "node": ">=22"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime"
-      ],
-      "platform": "web"
-    }
-  },
-  "scripts": {
-    "build": "bash scripts/build.sh || node --check lib/index.js && node --check lib/core.js && node --check lib/client.js",
-    "prepublishOnly": "node --check lib/index.js && node --check lib/core.js && node --check lib/client.js"
-  }
-}
+{
+  "name": "@telosmaylx/dsh-session-notify",
+  "version": "0.1.9",
+  "description": "DSH session completion notifier: appends a plugin system message to the session log on turn/end and pushes browser notifications (Web Notification + toast), with a fully customizable official settings panel (presets, 5-language templates, cache-hit rate & tok/s from official projections).",
+  "private": false,
+  "type": "module",
+  "main": "./lib/index.js",
+  "exports": {
+    ".": {
+      "default": "./lib/index.js"
+    },
+    "./client": {
+      "default": "./lib/client.js"
+    },
+    "./core": {
+      "default": "./lib/core.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "scripts",
+    "cordis.patch.yml",
+    "README.md",
+    "LICENSE"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "deepseek-harness",
+    "dsh",
+    "dsh-plugin",
+    "session-notify",
+    "notification",
+    "completion-reminder",
+    "agent"
+  ],
+  "author": "dsh-session-notify contributors",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/TelosmaYLX/dsh-session-notify.git"
+  },
+  "homepage": "https://github.com/TelosmaYLX/dsh-session-notify#readme",
+  "bugs": {
+    "url": "https://github.com/TelosmaYLX/dsh-session-notify/issues"
+  },
+  "peerDependencies": {
+    "cordis": ">=4.0.0-rc <5"
+  },
+  "engines": {
+    "node": ">=22"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime"
+      ],
+      "platform": "web"
+    }
+  },
+  "scripts": {
+    "build": "bash scripts/build.sh || node --check lib/index.js && node --check lib/core.js && node --check lib/client.js",
+    "prepublishOnly": "node --check lib/index.js && node --check lib/core.js && node --check lib/client.js"
+  }
+}