@telosmaylx/dsh-session-notify 0.1.7 → 0.1.9

package/lib/core.js

@@ -25,6 +25,96 @@ function tableFor(language) {
   return LABELS[language] || LABELS.zh
 }
 
+/**
+ * 各语言默认推送标题（按结束原因差异化）。
+ * 优先级：titleTemplates[kind] > titleTemplate（全局模板）> 本表。
+ */
+const DEFAULT_TITLES = {
+  zh: { completed: '任务已完成', aborted: '任务已中止', blocked: '任务被阻塞', error: '任务出错', 'max-tokens': '任务达到输出上限' },
+  'zh-tw': { completed: '任務已完成', aborted: '任務已中止', blocked: '任務被阻塞', error: '任務出錯', 'max-tokens': '任務達到輸出上限' },
+  en: { completed: 'Task completed', aborted: 'Task aborted', blocked: 'Task blocked', error: 'Task failed', 'max-tokens': 'Task hit the output cap' },
+  ja: { completed: 'タスク完了', aborted: 'タスク中止', blocked: 'タスクがブロックされました', error: 'タスクエラー', 'max-tokens': '出力上限に到達' },
+  ko: { completed: '작업 완료', aborted: '작업 중단됨', blocked: '작업 차단됨', error: '작업 오류', 'max-tokens': '출력 한도 도달' },
+}
+
+/**
+ * 渲染某原因的实际推送标题：
+ *  titleTemplates[kind]（按原因定制）> titleTemplate（全局模板）> DEFAULT_TITLES[lang][kind]。
+ * 模板支持 {title} 占位符（会话标题，缺失为空）；渲染后为空时回退默认标题。
+ * @param {string} kind
+ * @param {{ language?: string; titleTemplate?: string; titleTemplates?: Record<string, string> }} opts
+ * @param {string} [titleValue]
+ * @returns {string}
+ */
+export function renderTitle(kind, opts = {}, titleValue = '') {
+  const language = LABELS[opts.language] ? opts.language : 'zh'
+  const per = (opts.titleTemplates && typeof opts.titleTemplates[kind] === 'string' && opts.titleTemplates[kind].trim() !== '') ? opts.titleTemplates[kind] : ''
+  const global = typeof opts.titleTemplate === 'string' && opts.titleTemplate.trim() !== '' ? opts.titleTemplate : ''
+  const fallback = (DEFAULT_TITLES[language] && DEFAULT_TITLES[language][kind]) || DEFAULT_TITLES.zh[kind] || '任务已完成'
+  const tpl = per || global || fallback
+  const out = String(tpl).replaceAll('{title}', titleValue).trim()
+  return out || fallback
+}
+
+/**
+ * 各语言默认正文句式（templates 留空时的回退文案）。
+ * 按 reason 差异化表达，避免清一色「（用时 X，消耗 Y）」：
+ *  - completed：括号紧凑式；aborted/blocked：句号拆句；error：错误详情前置；
+ *  - max-tokens：句号拆句 + 建议；generic：兜底。
+ * 标签内嵌会话标题：{titleBlock}（带语言引号；无标题时为空块，自动退回「会话已完成」）。
+ * 其他占位符：{errBlock} 错误详情块（含分隔符，无错误为空）、{dur} 用时、{use} 消耗。
+ * 仅当用时与消耗都有数据时启用；数据不全回退到 buildNotice 的 parts 拼接逻辑（自动省略缺失项）。
+ */
+const DEFAULT_PHRASES = {
+  zh: {
+    completed: '会话{titleBlock}已完成（用时 {dur}，消耗 {use}）。',
+    aborted: '会话{titleBlock}已中止。用时 {dur}，消耗 {use}。',
+    blocked: '会话{titleBlock}被阻塞。用时 {dur}，消耗 {use}。',
+    error: '会话{titleBlock}出错{errBlock}（用时 {dur}，消耗 {use}）。',
+    'max-tokens': '会话{titleBlock}达到输出上限。用时 {dur}，消耗 {use}，建议拆分任务后重试。',
+    generic: '会话{titleBlock}已结束。用时 {dur}，消耗 {use}。',
+  },
+  'zh-tw': {
+    completed: '會話{titleBlock}已完成（用時 {dur}，消耗 {use}）。',
+    aborted: '會話{titleBlock}已中止。用時 {dur}，消耗 {use}。',
+    blocked: '會話{titleBlock}被阻塞。用時 {dur}，消耗 {use}。',
+    error: '會話{titleBlock}出錯{errBlock}（用時 {dur}，消耗 {use}）。',
+    'max-tokens': '會話{titleBlock}達到輸出上限。用時 {dur}，消耗 {use}，建議拆分任務後重試。',
+    generic: '會話{titleBlock}已結束。用時 {dur}，消耗 {use}。',
+  },
+  en: {
+    completed: 'Session {titleBlock} completed (took {dur}, used {use}).',
+    aborted: 'Session {titleBlock} aborted. Took {dur}, used {use}.',
+    blocked: 'Session {titleBlock} blocked. Took {dur}, used {use}.',
+    error: 'Session {titleBlock} failed{errBlock} (took {dur}, used {use}).',
+    'max-tokens': 'Session {titleBlock} hit the output-token cap. Took {dur}, used {use} — consider splitting the task.',
+    generic: 'Session {titleBlock} ended. Took {dur}, used {use}.',
+  },
+  ja: {
+    completed: 'セッション{titleBlock}完了（所要 {dur}、消費 {use}）。',
+    aborted: 'セッション{titleBlock}中止。所要 {dur}、消費 {use}。',
+    blocked: 'セッション{titleBlock}がブロックされました。所要 {dur}、消費 {use}。',
+    error: 'セッション{titleBlock}エラー{errBlock}（所要 {dur}、消費 {use}）。',
+    'max-tokens': 'セッション{titleBlock}が出力トークン上限に到達。所要 {dur}、消費 {use}。タスクの分割をおすすめします。',
+    generic: 'セッション{titleBlock}終了。所要 {dur}、消費 {use}。',
+  },
+  ko: {
+    completed: '세션{titleBlock} 완료（소요 {dur}, 소모 {use}）。',
+    aborted: '세션{titleBlock} 중단됨. 소요 {dur}, 소모 {use}.',
+    blocked: '세션{titleBlock} 차단됨. 소요 {dur}, 소모 {use}.',
+    error: '세션{titleBlock} 오류{errBlock}（소요 {dur}, 소모 {use}）.',
+    'max-tokens': '세션{titleBlock} 출력 한도 도달. 소요 {dur}, 소모 {use} — 작업 분할을 권장합니다.',
+    generic: '세션{titleBlock} 종료. 소요 {dur}, 소모 {use}.',
+  },
+}
+
+/** 会话标题块：带语言引号（zh/zh-tw/ja/ko「」，en "）；无标题返回空块。 */
+function titleValueBlock(language, titleValue) {
+  const v = typeof titleValue === 'string' ? titleValue.trim() : ''
+  if (!v) return ''
+  return language === 'en' ? `"${v}"` : `「${v}」`
+}
+
 /**
  * 按语言取 reason 标签。
  * @param {string} kind
@@ -218,6 +308,7 @@ export function buildNotice(kind, reasonData, { startedAt, endedAt, usage = null
   const templates = custom.templates ?? {}
   const label = labelFor(kind, language)
   const detail = detailFor(reasonData, language)
+  const errText = plainError(reasonData)
   let summary = `${label}${detail}`
   const durationLine = includeDuration ? formatDuration(endedAt - startedAt, language) : null
   const usageLine = includeUsage ? summarizeUsage(usage, language) : null
@@ -229,6 +320,7 @@ export function buildNotice(kind, reasonData, { startedAt, endedAt, usage = null
   if (usageLine) parts.push(`${L.use} ${usageLine}`)
   const suffix = parts.length ? `（${parts.join('，')}）` : ''
   const template = templates[kind]
+  const phraseTpl = (DEFAULT_PHRASES[language] && DEFAULT_PHRASES[language][kind]) || (DEFAULT_PHRASES[language] && DEFAULT_PHRASES[language].generic) || ''
   let text
   if (typeof template === 'string' && template.trim() !== '') {
     // 自定义模板：占位符替换，保持 summary 与正文一致的语义
@@ -236,11 +328,21 @@ export function buildNotice(kind, reasonData, { startedAt, endedAt, usage = null
       label,
       duration: durationLine ?? '',
       usage: usageLine ?? '',
-      error: plainError(reasonData) || 'none', // 无报错时显示 none，而非空串
+      error: errText || 'none', // 无报错时显示 none，而非空串
       cache: cacheLine,
       tps: tpsLine,
       title: typeof titleValue === 'string' ? titleValue : '',
     })
+  } else if (durationLine && usageLine && phraseTpl) {
+    // 默认句式（用时+消耗都有时启用，按 reason 差异化表达）
+    const errBlock = errText ? L.sep + errText : ''
+    const titleBlock = titleValueBlock(language, titleValue)
+    text = phraseTpl
+      .replaceAll('{label}', label)
+      .replaceAll('{titleBlock}', titleBlock)
+      .replaceAll('{errBlock}', errBlock)
+      .replaceAll('{dur}', durationLine)
+      .replaceAll('{use}', usageLine)
   } else if (language === 'en') {
     text = `${summary}${suffix ? ` (${parts.join(', ')}).` : '.'}`
   } else if (language === 'ja') {

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,
@@ -130,6 +138,13 @@ export function apply(ctx, config = {}) {
         'max-tokens': 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.7",
-  "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"
+  }
+}