dsh-macos-notify 0.2.1 → 0.4.0

package/README.md

@@ -1,17 +1,18 @@
 # dsh-macos-notify
 
-Native macOS notifications for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness), with event-specific sounds, notification filtering, multi-task coalescing, and a settings card in the DSH Web UI.
+Native macOS notifications for [DeepSeek Harness](https://github.com/deepseek-ai/deepseek-harness), with event-specific sounds, notification filtering, multi-task coalescing, and a first-level settings page in the DSH Web UI.
 
 ## Features
 
 - Notification Center alerts when a turn completes, fails, is blocked, or waits for approval.
 - Separate sounds for completed, error, aborted, and approval events; any event can be muted.
-- System sound picker plus managed custom sound import and deletion from the Web settings card.
+- System sound picker, in-page sound preview via afplay, and managed custom sound import and deletion from the Web settings page.
 - Custom imports are converted to AIFF, limited to 5 MB and 10 seconds, capped at 20 managed files / 50 MB total, and stored in `~/Library/Sounds`.
 - A 1.5-second coalescing window and optional digest mode prevent parallel tasks from flooding Notification Center.
-- Recent notification diagnostics explain whether an event was sent, queued, suppressed, or failed.
+- Recent notification diagnostics explain whether an event was sent, queued, suppressed, or failed; they persist across restarts.
 - A six-event test matrix validates completed, error, approval, aborted, coalesced, and digest notifications.
-- Daily quiet hours and temporary 30-minute, 1-hour, or 24-hour pauses.
+- Daily quiet hours and temporary pauses with custom durations and a remaining-time display.
+- Common toggles and the sound picker save instantly from the read-only view; number inputs are clamped to safe ranges.
 - Duplicate error suppression with a configurable cooldown window.
 - Project path rules for muting, error-only alerts, or important-project bypasses.
 - Minimum turn-duration filtering avoids notifications for near-instant replies.
@@ -41,7 +42,7 @@ Alternatively, install the latest source directly from GitHub:
 npx -y @deepseek-ai/dsh plugin --profile web add github:CrombastiC/dsh-macos-notify
 ```
 
-Then open **Settings → Plugins → Plugin configuration → macOS notifications**.
+Then open **Settings → macOS notifications** from the first-level settings navigation.
 
 To remove the plugin:
 
@@ -88,7 +89,6 @@ The settings namespace is `macos-notify`. Values changed from the Web card apply
 | `pauseUntil` | `0` | Temporary pause deadline as Unix milliseconds; managed by quick actions in the Web card. |
 | `duplicateWindowSec` | `300` | Suppress identical errors from the same session within this window; `0` disables it. |
 | `projectRulesJson` | `[]` | Project rules managed by the Web card. More-specific descendant paths win. |
-| `notifyOnLoad` | `true` | Send a test notification when the plugin loads. |
 
 ### Project rule modes
 
@@ -96,7 +96,7 @@ The settings namespace is `macos-notify`. Values changed from the Web card apply
 - `errors` — allow only errors, blocked events, and approval requests.
 - `important` — bypass minimum-duration, focus, idle, quiet-hour, and temporary-pause filters.
 
-The settings card keeps the last 50 decisions in process memory. Each row records whether an event was sent, queued, suppressed, or failed and includes the reason. This history resets when DSH restarts and does not contain message content.
+The settings page keeps the last 50 decisions, the duplicate-error cooldown state, and recent session titles, persisted to `~/Library/Application Support/dsh-macos-notify/state.json` so they survive DSH restarts. Each row records whether an event was sent, queued, suppressed, or failed and includes the reason. This history does not contain message content.
 
 ## Notification channels
 
@@ -108,17 +108,17 @@ Sound selection applies to the `osascript` channel. With OSC 9, the terminal con
 
 ## Custom sounds
 
-In the settings card, select **Edit → Import sound**. Supported inputs include AAC, AIFF, CAF, FLAC, M4A, MP3, OGG, Opus, and WAV.
+In the settings page, select **Edit → Import sound**. Supported inputs include AAC, AIFF, CAF, FLAC, M4A, MP3, OGG, Opus, and WAV.
 
 The host validates the extension, decoded size, converted duration, managed-file count, and total managed size before writing anything to the user sound directory. Imports are converted to 44.1 kHz mono AIFF using macOS `afconvert`, with `ffmpeg` as a fallback for formats that `afconvert` cannot decode. Existing files are never overwritten; a numeric suffix is added instead.
 
-New imports are recorded in `~/Library/Application Support/dsh-macos-notify/sounds.json` and can be deleted from the settings card. If a sound is currently selected, deletion asks for confirmation and changes affected events to silent. Files remain in `~/Library/Sounds` if the plugin is removed without deleting them first.
+New imports are recorded in `~/Library/Application Support/dsh-macos-notify/sounds.json` and can be deleted from the settings page. If a sound is currently selected, deletion asks for confirmation and changes affected events to silent. Files remain in `~/Library/Sounds` if the plugin is removed without deleting them first.
 
 ## Known limitations
 
 - The plugin is macOS-only. Native notifications use `osascript`, and custom import uses macOS audio tooling.
 - OSC 9 sound behavior belongs to the terminal and ignores the per-event sound selection.
-- The Web settings card uses the trusted `/macos-notify` RPC channel because the current DSH Web settings proxy has a namespace allowlist for built-in settings.
+- The Web settings page uses the trusted `/macos-notify` RPC channel because the current DSH Web settings proxy has a namespace allowlist for built-in settings.
 - Only sounds imported by v0.2.0 or later are tracked as managed sounds. Earlier manually copied/imported files can still be selected, but must be removed from `~/Library/Sounds` manually.
 
 ## Development
@@ -126,7 +126,9 @@ New imports are recorded in `~/Library/Application Support/dsh-macos-notify/soun
 The package is intentionally build-free:
 
 - `index.js` — host plugin, event handling, notification delivery, settings RPC, and sound import.
-- `client.js` — hand-written DSH client module for focus reporting and the Web settings card.
+- `client.js` — hand-written DSH client module for focus reporting and the first-level Web settings page.
+- `src/policy.js` — pure policy helpers (quiet hours, project rules, duplicate merging) covered by unit tests.
+- `src/state.js` — validated, atomic persistence for diagnostics, duplicate state, and session titles.
 - `cordis.patch.yml` — profile bundle patch.
 
 Run the release checks:
@@ -140,7 +142,7 @@ npm pack --dry-run
 
 ## 中文说明
 
-这是一个仅支持 macOS 的 DeepSeek Harness 通知插件。它可以在任务完成、出错、等待审批时发送系统通知，并支持通知诊断、测试矩阵、每日勿扰、临时暂停、自定义声音管理、重复错误抑制、项目规则、焦点抑制、合并通知和定时汇总。推荐从 npm 安装，也可以直接从 GitHub 安装最新版源码。
+这是一个仅支持 macOS 的 DeepSeek Harness 通知插件。它可以在任务完成、出错、等待审批时发送系统通知，并支持通知诊断（跨重启持久化）、afplay 本地试听、测试矩阵、每日勿扰、自定义时长的临时暂停、自定义声音管理与导入指派、常用开关即时保存、重复错误抑制、项目路径自动补全、焦点抑制、合并通知和定时汇总。推荐从 npm 安装，也可以直接从 GitHub 安装最新版源码。
 
 ## License
 

package/client.js

@@ -67,12 +67,19 @@ window.__ModuleLoader__.load({
       var savedState = React.useState(false), saved = savedState[0], setSaved = savedState[1]
       var importingState = React.useState(false), importing = importingState[0], setImporting = importingState[1]
       var testingState = React.useState(''), testing = testingState[0], setTesting = testingState[1]
+      var importTargetState = React.useState('none'), importTarget = importTargetState[0], setImportTarget = importTargetState[1]
       var errorState = React.useState(''), error = errorState[0], setError = errorState[1]
       var fileInput = React.useRef(null), savedTimer = React.useRef(null), testTimer = React.useRef(null)
 
       var loadSettings = function () { return props.call('settings', { op: 'get' }).then(function (value) { setSettings(value); setDraft(toDraft(value)); return value }) }
       var loadCatalog = function () { return props.call('sounds', {}).then(function (value) { if (value && Array.isArray(value.names)) setCatalog(value); return value }) }
-      var loadDiagnostics = function () { return props.call('diagnostics', { op: 'get' }).then(setDiagnostics).catch(function () {}) }
+      var loadDiagnostics = function () {
+        if (document.hidden) return Promise.resolve()
+        return props.call('diagnostics', { op: 'get' }).then(function (next) {
+          if (document.hidden) return
+          setDiagnostics(function (prev) { return JSON.stringify(prev) === JSON.stringify(next) ? prev : next })
+        }).catch(function () {})
+      }
       React.useEffect(function () {
         Promise.all([loadSettings(), loadCatalog(), loadDiagnostics()]).catch(function (err) { setError(String(err && err.message || '设置读取失败')) })
         var timer = setInterval(loadDiagnostics, 5000)
@@ -82,11 +89,45 @@ window.__ModuleLoader__.load({
 
       var patch = toPatch(draft), dirty = JSON.stringify(patch) !== JSON.stringify(toPatch(toDraft(settings)))
       var status = diagnostics.status || {}, pauseActive = Number(status.pauseUntil) > Date.now()
+      var focusCount = Number(status.focusedTabs) || 0
+      var statusNotes = []
+      if (status.quietActive) statusNotes.push('勿扰时段中')
+      if (pauseActive) statusNotes.push('通知已暂停')
+      if (focusCount > 0) statusNotes.push(focusCount + ' 个标签页聚焦中，完成通知将被抑制')
+      var statusNote = statusNotes.length ? statusNotes.join('；') : '运行正常'
       var availableSounds = catalog.names.length ? catalog.names : FALLBACK_SOUNDS
       var change = function (field, value) { setDraft(Object.assign({}, draft, { [field]: value })) }
       var changeSound = function (kind, value) { setDraft(Object.assign({}, draft, { sounds: Object.assign({}, draft.sounds, { [kind]: value }) })) }
+      var NUMBER_BOUNDS = { minDurationSec: [0, 3600], onlyWhenIdleSec: [0, 3600], digestMinutes: [0, 1440], coalesceMs: [0, 60000], duplicateWindowSec: [0, 86400] }
+      var clampNumber = function (field, raw) {
+        var bounds = NUMBER_BOUNDS[field] || [0, Infinity]
+        var num = Math.floor(Number(raw))
+        if (!Number.isFinite(num)) num = bounds[0]
+        return Math.min(bounds[1], Math.max(bounds[0], num))
+      }
+      // 读视图下的单字段即时保存：与快捷暂停同走 op:'set'；批量编辑期间退回草稿模式
+      var saveNow = function (field, value) {
+        setSaving(true); setError('')
+        props.call('settings', { op: 'set', field: field, value: value }).then(function (next) {
+          setSettings(next); setDraft(toDraft(next)); setSaved(true); loadDiagnostics()
+          if (savedTimer.current) clearTimeout(savedTimer.current)
+          savedTimer.current = setTimeout(function () { setSaved(false) }, 1800)
+        }).catch(function (err) { setError(String(err && err.message || '保存失败')) }).finally(function () { setSaving(false) })
+      }
+      var previewSound = function (name) {
+        if (!name || testing) return
+        setTesting('preview:' + name); setError('')
+        props.call('sound/preview', { name: name }).catch(function (err) { setError(String(err && err.message || '试听失败')) }).finally(function () { setTesting('') })
+      }
+      var customPauseState = React.useState('30'), customPause = customPauseState[0], setCustomPause = customPauseState[1]
+      var humanizeDuration = function (ms) {
+        var minutes = Math.max(1, Math.round(ms / 60000))
+        if (minutes < 60) return minutes + ' 分钟'
+        var hours = Math.floor(minutes / 60), rest = minutes % 60
+        return rest ? hours + ' 小时 ' + rest + ' 分钟' : hours + ' 小时'
+      }
       var beginEdit = function () { setDraft(toDraft(settings)); setEditing(true); setSaved(false); setError('') }
-      var cancel = function () { setDraft(toDraft(settings)); setEditing(false); setError('') }
+      var cancel = function () { if (dirty && !window.confirm('放弃未保存的修改？')) return; setDraft(toDraft(settings)); setEditing(false); setError('') }
       var save = function () {
         if (!dirty || saving) return
         setSaving(true); setError('')
@@ -119,7 +160,8 @@ window.__ModuleLoader__.load({
         reader.onload = function () {
           props.call('sound/import', { filename: file.name, data: String(reader.result || '').split(',')[1] || '' }).then(function (result) {
             if (!result || !result.name) throw new Error('导入结果无效')
-            changeSound('completed', result.name); return loadCatalog()
+            if (importTarget !== 'none') changeSound(importTarget, result.name)
+            return loadCatalog()
           }).catch(function (err) { setError(String(err && err.message || '导入失败')) }).finally(function () { setImporting(false) })
         }
         reader.onerror = function () { setImporting(false); setError('声音文件读取失败') }
@@ -145,45 +187,51 @@ window.__ModuleLoader__.load({
       var removeRule = function (index) { change('projectRules', draft.projectRules.filter(function (_, candidate) { return candidate !== index })) }
       var addRule = function () { change('projectRules', draft.projectRules.concat({ path: props.getCurrentCwd() || '', mode: 'mute' })) }
 
-      return h('div', { className: saved ? 'dsh-notify-saved' : '', style: { border: '1px solid var(--dsw-alias-border-l2,#444)', borderRadius: '10px', padding: '14px 16px', fontSize: '13px', display: 'flex', flexDirection: 'column', gap: '12px' } },
+      return h('div', { className: saved ? 'dsh-notify-saved' : '', style: { border: '1px solid var(--dsw-alias-border-l2,#444)', borderRadius: '10px', padding: editing ? '14px 16px 52px' : '14px 16px', fontSize: '13px', display: 'flex', flexDirection: 'column', gap: '12px' } },
         h('style', null, css),
         h('div', { style: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', gap: '10px' } },
           h('div', null, h('strong', null, 'macOS 通知'), h('div', { style: { opacity: .55, fontSize: '11px', marginTop: '2px' } }, '通道：' + (status.channel || settings.channel) + ' · 诊断记录 ' + diagnostics.entries.length + ' 条')),
-          editing ? h('span', { style: { padding: '3px 7px', borderRadius: '99px', fontSize: '11px', background: 'rgba(47,111,237,.1)' } }, '整体编辑中') : h('button', { style: buttonStyle, disabled: saved, onClick: beginEdit }, saved ? '已保存 ✓' : '编辑全部')),
+          editing ? [h('span', { style: { padding: '3px 7px', borderRadius: '99px', fontSize: '11px', background: 'rgba(47,111,237,.1)' } }, '整体编辑中'), dirty ? h('span', { style: { padding: '3px 7px', borderRadius: '99px', fontSize: '11px', background: 'rgba(179,107,0,.15)', color: '#b36b00' } }, '未保存') : null] : h('button', { style: buttonStyle, disabled: saved, onClick: beginEdit }, saved ? '已保存 ✓' : '编辑全部')),
         error ? h('div', { className: 'dsh-notify-error', role: 'alert', style: { padding: '7px 9px', borderRadius: '6px', color: '#d94b43', background: 'rgba(217,75,67,.1)' } }, error) : null,
 
-        h('div', { style: sectionStyle }, h(SectionTitle, { title: '运行状态与测试', note: status.quietActive ? '当前处于勿扰时段' : pauseActive ? '通知已暂停' : '运行正常' }),
+        h('div', { style: sectionStyle }, h(SectionTitle, { title: '运行状态与测试', note: statusNote }),
           h('div', { style: { display: 'flex', gap: '6px', flexWrap: 'wrap' } }, ['completed', 'error', 'approval', 'aborted', 'coalesced', 'digest'].map(function (kind) {
             var names = { completed: '完成', error: '错误', approval: '审批', aborted: '中断', coalesced: '合并', digest: '摘要' }
             return h('button', { key: kind, style: buttonStyle, onClick: function () { test(kind, draft.sounds[kind]) } }, testing === kind ? '发送中…' : '测试' + names[kind])
           })),
-          h('div', { style: { display: 'flex', gap: '6px', flexWrap: 'wrap', alignItems: 'center' } }, h('small', { style: { opacity: .55 } }, pauseActive ? '暂停至 ' + new Date(status.pauseUntil).toLocaleTimeString() : '临时暂停：'),
-            h('button', { style: buttonStyle, onClick: function () { pause(30 * 60 * 1000) } }, '30 分钟'), h('button', { style: buttonStyle, onClick: function () { pause(60 * 60 * 1000) } }, '1 小时'), h('button', { style: buttonStyle, onClick: function () { pause(24 * 60 * 60 * 1000) } }, '24 小时'), pauseActive ? h('button', { style: buttonStyle, onClick: function () { pause(0) } }, '立即恢复') : null)),
+          h('div', { style: { display: 'flex', gap: '6px', flexWrap: 'wrap', alignItems: 'center' } }, h('small', { style: { opacity: .55 } }, pauseActive ? '暂停至 ' + new Date(status.pauseUntil).toLocaleString() + '（剩余约 ' + humanizeDuration(status.pauseUntil - Date.now()) + '）' : '临时暂停：'),
+            h('button', { style: buttonStyle, onClick: function () { pause(30 * 60 * 1000) } }, '30 分钟'), h('button', { style: buttonStyle, onClick: function () { pause(60 * 60 * 1000) } }, '1 小时'), h('button', { style: buttonStyle, onClick: function () { pause(24 * 60 * 60 * 1000) } }, '24 小时'),
+            h('input', { 'aria-label': '自定义暂停分钟数', style: Object.assign({}, inputStyle, { width: '76px' }), type: 'number', min: 1, max: 10080, value: customPause, onChange: function (e) { setCustomPause(e.target.value) } }),
+            h('button', { style: buttonStyle, onClick: function () { var minutes = Math.floor(Number(customPause)); if (minutes > 0) pause(Math.min(minutes, 10080) * 60000) } }, '暂停'),
+            pauseActive ? h('button', { style: buttonStyle, onClick: function () { pause(0) } }, '立即恢复') : null)),
 
         h('div', { style: sectionStyle }, h(SectionTitle, { title: '通知事件与过滤' }),
-          [['onCompleted', '任务完成'], ['onError', '错误与阻止'], ['onApproval', '等待审批'], ['onAborted', '用户中断']].map(function (row) { return h(Toggle, { key: row[0], disabled: !editing, value: draft[row[0]], label: row[1], onChange: function (value) { change(row[0], value) } }) }),
-          h(Toggle, { disabled: !editing, value: draft.onlyWhenUnfocused, label: '仅在 DSH 页面未聚焦时发送完成通知', onChange: function (value) { change('onlyWhenUnfocused', value) } }),
-          h(Toggle, { disabled: !editing, value: draft.includeSubagents, label: '包含子 Agent 会话', onChange: function (value) { change('includeSubagents', value) } }),
-          [['minDurationSec', '完成通知最短耗时（秒）'], ['onlyWhenIdleSec', '键鼠空闲门槛（秒）'], ['digestMinutes', '摘要间隔（分钟）'], ['coalesceMs', '合并窗口（毫秒）'], ['duplicateWindowSec', '重复错误抑制（秒）']].map(function (row) { return h(SettingRow, { key: row[0], label: row[1] }, h('input', { style: inputStyle, type: 'number', min: 0, disabled: !editing, value: draft[row[0]], onChange: function (e) { change(row[0], e.target.value) } })) }),
-          h(SettingRow, { label: '通知通道' }, h('select', { style: inputStyle, disabled: !editing, value: draft.channel, onChange: function (e) { change('channel', e.target.value) } }, h('option', { value: 'auto' }, '自动'), h('option', { value: 'osascript' }, 'osascript'), h('option', { value: 'osc9' }, 'OSC 9')))),
+          [['onCompleted', '任务完成'], ['onError', '错误与阻止'], ['onApproval', '等待审批'], ['onAborted', '用户中断']].map(function (row) { return h(Toggle, { key: row[0], disabled: saving, value: draft[row[0]], label: row[1], onChange: function (value) { if (editing) change(row[0], value); else saveNow(row[0], value) } }) }),
+          h(Toggle, { disabled: saving, value: draft.onlyWhenUnfocused, label: '仅在 DSH 页面未聚焦时发送完成通知', onChange: function (value) { if (editing) change('onlyWhenUnfocused', value); else saveNow('onlyWhenUnfocused', value) } }),
+          h(Toggle, { disabled: saving, value: draft.includeSubagents, label: '包含子 Agent 会话', onChange: function (value) { if (editing) change('includeSubagents', value); else saveNow('includeSubagents', value) } }),
+          [['minDurationSec', '完成通知最短耗时（秒）', 3600], ['onlyWhenIdleSec', '键鼠空闲门槛（秒）', 3600], ['digestMinutes', '摘要间隔（分钟）', 1440], ['coalesceMs', '合并窗口（毫秒）', 60000], ['duplicateWindowSec', '重复错误抑制（秒）', 86400]].map(function (row) { return h(SettingRow, { key: row[0], label: row[1] }, h('input', { style: inputStyle, type: 'number', min: 0, max: row[2], disabled: !editing, value: draft[row[0]], onChange: function (e) { change(row[0], clampNumber(row[0], e.target.value)) } })) }),
+          h(SettingRow, { label: '通知通道', note: 'OSC 9 仅支持 iTerm2、WezTerm、Kitty、Ghostty、Warp' }, h('select', { style: inputStyle, disabled: saving, value: draft.channel, onChange: function (e) { var value = e.target.value; if (editing) change('channel', value); else saveNow('channel', value) } }, h('option', { value: 'auto' }, '自动'), h('option', { value: 'osascript' }, 'osascript'), h('option', { value: 'osc9' }, 'OSC 9')))),
 
         h('div', { style: sectionStyle }, h(SectionTitle, { title: '每日勿扰', note: '使用本机时间' }),
-          h(Toggle, { disabled: !editing, value: draft.quietHoursEnabled, label: '启用每日勿扰时段', onChange: function (value) { change('quietHoursEnabled', value) } }),
+          h(Toggle, { disabled: saving, value: draft.quietHoursEnabled, label: '启用每日勿扰时段', onChange: function (value) { if (editing) change('quietHoursEnabled', value); else saveNow('quietHoursEnabled', value) } }),
           h(SettingRow, { label: '时段' }, h('span', { style: { display: 'flex', alignItems: 'center', gap: '6px' } }, h('input', { 'aria-label': '勿扰开始时间', style: Object.assign({}, inputStyle, { width: '104px' }), type: 'time', disabled: !editing, value: draft.quietStart, onChange: function (e) { change('quietStart', e.target.value) } }), h('span', null, '至'), h('input', { 'aria-label': '勿扰结束时间', style: Object.assign({}, inputStyle, { width: '104px' }), type: 'time', disabled: !editing, value: draft.quietEnd, onChange: function (e) { change('quietEnd', e.target.value) } }))),
-          h(Toggle, { disabled: !editing, value: draft.quietAllowCritical, label: '勿扰时仍允许错误、阻止和审批', onChange: function (value) { change('quietAllowCritical', value) } })),
+          draft.quietHoursEnabled && draft.quietStart === draft.quietEnd ? h('small', { style: { opacity: .7, color: '#b36b00' } }, '开始与结束时间相同视为未启用') : null,
+          h(Toggle, { disabled: saving, value: draft.quietAllowCritical, label: '勿扰时仍允许错误、阻止和审批', onChange: function (value) { if (editing) change('quietAllowCritical', value); else saveNow('quietAllowCritical', value) } })),
 
         h('div', { style: sectionStyle }, h(SectionTitle, { title: '提示音', note: '单个≤5MB/10秒；最多20个/50MB' }),
-          editing ? h('div', { style: rowStyle }, h('input', { ref: fileInput, type: 'file', accept: '.aac,.aif,.aiff,.caf,.flac,.m4a,.mp3,.oga,.ogg,.opus,.wav,audio/*', style: { display: 'none' }, onChange: importFile }), h('button', { style: buttonStyle, disabled: importing, onClick: function () { if (fileInput.current) fileInput.current.click() } }, importing ? '导入中…' : '导入声音'), h('small', { style: { opacity: .55 } }, '已管理 ' + catalog.managed.length + ' 个')) : null,
-          SOUND_ROWS.map(function (row) { var kind = row[0], value = draft.sounds[kind] || '', choices = availableSounds.includes(value) || !value ? availableSounds : [value].concat(availableSounds); return h('div', { key: kind, style: rowStyle }, h('span', { style: { width: '110px' } }, row[1]), h('select', { style: Object.assign({}, inputStyle, { flex: 1, width: 'auto' }), disabled: !editing, value: value, onChange: function (e) { changeSound(kind, e.target.value) } }, h('option', { value: '' }, '静音'), choices.map(function (name) { return h('option', { key: name, value: name }, name) })), h('button', { style: buttonStyle, onClick: function () { test(kind, value) } }, testing === kind ? '播放中…' : '试听')) }),
+          status.channel === 'osc9' ? h('small', { style: { opacity: .55 } }, '当前经 OSC 9 输出：通知声音由终端控制；此处设置对 osascript 通道生效，试听为本地播放') : null,
+          editing ? h('div', { style: rowStyle }, h('input', { ref: fileInput, type: 'file', accept: '.aac,.aif,.aiff,.caf,.flac,.m4a,.mp3,.oga,.ogg,.opus,.wav,audio/*', style: { display: 'none' }, onChange: importFile }), h('button', { style: buttonStyle, disabled: importing, onClick: function () { if (fileInput.current) fileInput.current.click() } }, importing ? '导入中…' : '导入声音'), h('select', { style: Object.assign({}, inputStyle, { width: '150px' }), value: importTarget, onChange: function (e) { setImportTarget(e.target.value) } }, h('option', { value: 'none' }, '导入后不指派'), SOUND_ROWS.map(function (row) { return h('option', { key: row[0], value: row[0] }, '并指派给' + row[1]) })), h('small', { style: { opacity: .55 } }, '已管理 ' + catalog.managed.length + ' 个')) : null,
+          SOUND_ROWS.map(function (row) { var kind = row[0], value = draft.sounds[kind] || '', choices = availableSounds.includes(value) || !value ? availableSounds : [value].concat(availableSounds); return h('div', { key: kind, style: rowStyle }, h('span', { style: { width: '110px' } }, row[1]), h('select', { style: Object.assign({}, inputStyle, { flex: 1, width: 'auto' }), disabled: saving, value: value, onChange: function (e) { var next = e.target.value; if (editing) changeSound(kind, next); else saveNow('sounds', Object.assign({}, draft.sounds, { [kind]: next })) } }, h('option', { value: '' }, '静音'), choices.map(function (name) { return h('option', { key: name, value: name }, name) })), h('button', { style: buttonStyle, disabled: !value, onClick: function () { previewSound(value) } }, testing === 'preview:' + value ? '播放中…' : '试听')) }),
           catalog.managed.length ? h('div', { style: { padding: '8px', borderRadius: '7px', background: 'rgba(127,127,127,.06)' } }, catalog.managed.map(function (item) { return h('div', { key: item.name, style: rowStyle }, h('span', { style: { flex: 1, overflow: 'hidden', textOverflow: 'ellipsis' } }, item.name), h('small', { style: { opacity: .5 } }, (item.bytes / 1024).toFixed(0) + 'KB'), editing ? h('button', { style: Object.assign({}, buttonStyle, { color: '#d94b43' }), onClick: function () { deleteSound(item.name, false) } }, '删除') : null) })) : null),
 
         h('div', { style: sectionStyle }, h(SectionTitle, { title: '项目规则', note: '更具体的路径优先' }),
-          draft.projectRules.length ? draft.projectRules.map(function (rule, index) { return h('div', { key: index, style: { display: 'grid', gridTemplateColumns: 'minmax(0,1fr) 150px auto', gap: '6px' } }, h('input', { style: Object.assign({}, inputStyle, { width: '100%' }), disabled: !editing, value: rule.path, placeholder: '/Users/name/project', onChange: function (e) { updateRule(index, 'path', e.target.value) } }), h('select', { style: Object.assign({}, inputStyle, { width: '100%' }), disabled: !editing, value: rule.mode, onChange: function (e) { updateRule(index, 'mode', e.target.value) } }, Object.keys(RULE_LABELS).map(function (mode) { return h('option', { key: mode, value: mode }, RULE_LABELS[mode]) })), editing ? h('button', { style: Object.assign({}, buttonStyle, { color: '#d94b43' }), onClick: function () { removeRule(index) } }, '移除') : h('span')) }) : h('small', { style: { opacity: .55 } }, '尚未配置项目规则'),
+          h('datalist', { id: 'dsh-notify-cwds' }, (props.getSessionCwds ? props.getSessionCwds() : []).map(function (cwd) { return h('option', { key: cwd, value: cwd }) })),
+          draft.projectRules.length ? draft.projectRules.map(function (rule, index) { return h('div', { key: index, style: { display: 'grid', gridTemplateColumns: 'minmax(0,1fr) 150px auto', gap: '6px' } }, h('input', { style: Object.assign({}, inputStyle, { width: '100%' }), disabled: !editing, value: rule.path, list: 'dsh-notify-cwds', placeholder: '/Users/name/project', onChange: function (e) { updateRule(index, 'path', e.target.value) } }), h('select', { style: Object.assign({}, inputStyle, { width: '100%' }), disabled: !editing, value: rule.mode, onChange: function (e) { updateRule(index, 'mode', e.target.value) } }, Object.keys(RULE_LABELS).map(function (mode) { return h('option', { key: mode, value: mode }, RULE_LABELS[mode]) })), editing ? h('button', { style: Object.assign({}, buttonStyle, { color: '#d94b43' }), onClick: function () { removeRule(index) } }, '移除') : h('span')) }) : h('small', { style: { opacity: .55 } }, '尚未配置项目规则'),
           editing ? h('button', { style: Object.assign({}, buttonStyle, { alignSelf: 'flex-start' }), onClick: addRule }, props.getCurrentCwd() ? '添加当前项目' : '添加规则') : null),
 
         h('div', { style: sectionStyle }, h(SectionTitle, { title: '最近通知诊断', note: '当前进程最近50条' }),
           diagnostics.entries.length ? diagnostics.entries.slice(0, 12).map(function (entry) { var colors = { sent: '#238452', suppressed: '#b36b00', queued: '#3867c8', error: '#d94b43' }, labels = { sent: '已发送', suppressed: '已抑制', queued: '排队中', error: '失败' }; return h('div', { key: entry.id, style: { display: 'grid', gridTemplateColumns: '58px minmax(0,1fr) auto', gap: '7px', padding: '6px 0', borderBottom: '1px solid rgba(127,127,127,.12)' } }, h('span', { style: { color: colors[entry.status], fontSize: '11px', fontWeight: 600 } }, labels[entry.status] || entry.status), h('span', null, h('b', null, entry.label || entry.title || entry.kind), h('small', { style: { display: 'block', opacity: .55 } }, entry.detail)), h('small', { style: { opacity: .45, whiteSpace: 'nowrap' } }, new Date(entry.time).toLocaleTimeString())) }) : h('small', { style: { opacity: .55 } }, '暂无记录，可以点击上方测试按钮。'),
-          diagnostics.entries.length ? h('button', { style: Object.assign({}, buttonStyle, { alignSelf: 'flex-start' }), onClick: function () { props.call('diagnostics', { op: 'clear' }).then(setDiagnostics) } }, '清空记录') : null),
+          diagnostics.entries.length ? h('button', { style: Object.assign({}, buttonStyle, { alignSelf: 'flex-start' }), onClick: function () { if (!window.confirm('清空全部诊断记录？')) return; props.call('diagnostics', { op: 'clear' }).then(setDiagnostics) } }, '清空记录') : null),
 
         editing ? h('div', { style: { position: 'sticky', bottom: '8px', display: 'flex', gap: '8px', padding: '9px', borderRadius: '8px', background: 'var(--dsw-alias-bg-primary,#1d1d1d)', border: '1px solid var(--dsw-alias-border-l2,#444)', boxShadow: '0 5px 18px rgba(0,0,0,.18)' } }, h('button', { style: Object.assign({}, buttonStyle, { fontWeight: 650 }), disabled: !dirty || saving || importing, onClick: save }, saving ? '保存中…' : dirty ? '保存全部' : '没有改动'), h('button', { style: buttonStyle, disabled: saving || importing, onClick: cancel }, '取消')) : null)
     }
@@ -196,7 +244,16 @@ window.__ModuleLoader__.load({
       var timer = setInterval(report, 30000)
       var call = function (endpoint, payload) { return ctx.connection.rpc.call('/macos-notify', endpoint, payload).then(function (result) { if (!result || result.ok !== true) throw new Error(result && result.error && result.error.message || 'RPC 调用失败'); return result.value }) }
       var getCurrentCwd = function () { try { var state = ctx.sessions.list.getSnapshot(); return state.current && state.byId[state.current] && state.byId[state.current].cwd || '' } catch { return '' } }
-      ctx.slots.inject('settings.plugin.item', function* () { yield ctx.slots.register({ name: 'settings.plugin.item', id: 'macos-notify', order: 100, inject: function () { return { call: call, getCurrentCwd: getCurrentCwd } } }, Card) })
+      var getSessionCwds = function () { try { var state = ctx.sessions.list.getSnapshot(); var seen = {}, cwds = []; Object.keys(state.byId || {}).forEach(function (id) { var cwd = state.byId[id] && state.byId[id].cwd; if (cwd && !seen[cwd]) { seen[cwd] = true; cwds.push(cwd) } }); return cwds } catch { return [] } }
+      ctx.slots.inject('settings.section', function () {
+        return ctx.slots.register({
+          name: 'settings.section',
+          id: 'macos-notify',
+          order: 100,
+          label: 'macOS 通知',
+          inject: function () { return { call: call, getCurrentCwd: getCurrentCwd, getSessionCwds: getSessionCwds } },
+        }, Card)
+      })
       ctx.effect(function () { return function () { clearInterval(timer); document.removeEventListener('visibilitychange', report); window.removeEventListener('focus', report); window.removeEventListener('blur', report) } })
     }
     return module.exports

package/index.js

@@ -5,6 +5,19 @@ import { homedir, tmpdir } from 'node:os'
 import { basename, extname, join, resolve } from 'node:path'
 import { promisify } from 'node:util'
 import Schema from '@deepseek-ai/schemastery'
+import {
+  DuplicateTracker,
+  TtlCache,
+  buildNotificationScript,
+  duplicateKey,
+  isCompletionKind,
+  isCriticalKind,
+  matchingProjectRule,
+  minuteOfDay,
+  parseProjectRules,
+  quietHoursActive,
+} from './src/policy.js'
+import { loadStateSync, saveState } from './src/state.js'
 
 export const name = 'dsh-macos-notify'
 export const inject = ['sessions', 'settings']
@@ -53,8 +66,8 @@ export const Config = Schema.object({
   duplicateWindowSec: Schema.number().default(300),
   /** 项目规则 JSON：[{ path, mode }]，mode 为 mute / errors / important */
   projectRulesJson: Schema.string().default('[]'),
-  /** 插件加载时发一条测试通知 */
-  notifyOnLoad: Schema.boolean().default(true),
+  /** 兼容旧配置；成功加载现在始终静默，仅初始化失败时提醒 */
+  notifyOnLoad: Schema.boolean().default(false),
 })
 
 /** 设置页可编辑的提示音字段 */
@@ -78,6 +91,12 @@ function soundRegistryPath() {
   return join(homedir(), 'Library/Application Support/dsh-macos-notify/sounds.json')
 }
 
+/** 决策历史与重复合并状态的落盘位置；测试可通过 DSH_MACOS_NOTIFY_STATE_FILE 重定向 */
+function stateFilePath() {
+  return process.env.DSH_MACOS_NOTIFY_STATE_FILE
+    || join(homedir(), 'Library/Application Support/dsh-macos-notify/state.json')
+}
+
 async function readSoundRegistry() {
   try {
     const parsed = JSON.parse(await readFile(soundRegistryPath(), 'utf8'))
@@ -245,6 +264,31 @@ async function deleteManagedSound(name) {
   await writeSoundRegistry(registry)
 }
 
+/** 试听：把声音名解析为磁盘文件后交给 afplay 本地播放，不经过通知通道 */
+async function previewSound(name) {
+  if (!name || name.includes('/') || name.includes('\\') || name.includes('..')) {
+    throw new Error('声音名无效')
+  }
+  const dir = userSoundsDir()
+  const registry = await readSoundRegistry()
+  const managed = registry.find((item) => item.name === name)
+  const candidates = managed ? [join(dir, managed.filename)] : []
+  for (const base of ['/System/Library/Sounds', '/Library/Sounds', dir]) {
+    for (const extension of SOUND_EXTENSIONS) candidates.push(join(base, `${name}${extension}`))
+  }
+  for (const candidate of candidates) {
+    try {
+      const info = await stat(candidate)
+      if (!info.isFile()) continue
+    } catch {
+      continue
+    }
+    await execFileAsync('/usr/bin/afplay', [candidate])
+    return
+  }
+  throw new Error('找不到声音文件')
+}
+
 /** macOS 系统与用户声音目录；读取失败的目录直接忽略 */
 async function systemSoundNames() {
   const dirs = [
@@ -277,24 +321,23 @@ async function soundCatalog() {
   }
 }
 
-function esc(s) {
-  return String(s).replace(/\\/g, '\\\\').replace(/"/g, '\\"')
-}
-
 function notify(title, body, sound, channel, onResult = () => {}) {
   if (channel === 'osc9') {
     emitOsc9(title, body)
     onResult(null)
     return
   }
-  const soundPart = sound ? ` sound name "${esc(sound)}"` : ''
-  const script = `display notification "${esc(body)}" with title "${esc(title)}"${soundPart}`
-  execFile('osascript', ['-e', script], (err) => {
+  execFile('osascript', ['-e', buildNotificationScript(title, body, sound)], (err) => {
     if (err) console.warn('[dsh-macos-notify] osascript failed:', err.message)
     onResult(err ?? null)
   })
 }
 
+function notifyStartupFailure(err, sound = 'Basso') {
+  const detail = String(err?.message ?? err ?? '未知错误').replace(/\s+/g, ' ').trim().slice(0, 180)
+  notify('DSH', `macOS 通知插件加载失败：${detail || '未知错误'}`, sound, 'osascript')
+}
+
 // —— OSC 9 通道（思路参考 kimi-code 的 terminal-notification.ts）——
 
 /** 认识 OSC 9 桌面通知的终端白名单；不认识 OSC 9 的终端收到转义序列会打印乱码，所以必须保守 */
@@ -331,54 +374,7 @@ function idleSeconds() {
   })
 }
 
-function minuteOfDay(value) {
-  const match = /^(\d{2}):(\d{2})$/.exec(String(value))
-  if (!match) return null
-  const hour = Number(match[1])
-  const minute = Number(match[2])
-  if (hour > 23 || minute > 59) return null
-  return hour * 60 + minute
-}
-
-function quietHoursActive(config, now = new Date()) {
-  if (!config.quietHoursEnabled) return false
-  const start = minuteOfDay(config.quietStart)
-  const end = minuteOfDay(config.quietEnd)
-  if (start === null || end === null || start === end) return false
-  const currentMinute = now.getHours() * 60 + now.getMinutes()
-  return start < end
-    ? currentMinute >= start && currentMinute < end
-    : currentMinute >= start || currentMinute < end
-}
-
-function parseProjectRules(raw) {
-  try {
-    const value = JSON.parse(raw)
-    if (!Array.isArray(value)) return []
-    return value.slice(0, 50).flatMap((item) => {
-      const path = typeof item?.path === 'string' ? item.path.trim() : ''
-      const mode = item?.mode
-      if (!path || !['mute', 'errors', 'important'].includes(mode)) return []
-      return [{ path: resolve(path), mode }]
-    })
-  } catch {
-    return []
-  }
-}
-
-function matchingProjectRule(rules, cwd) {
-  if (!cwd) return null
-  const target = resolve(cwd)
-  return rules
-    .filter((rule) => target === rule.path || target.startsWith(`${rule.path}/`))
-    .sort((a, b) => b.path.length - a.path.length)[0] ?? null
-}
-
-function isCriticalKind(kind) {
-  return kind === '出错' || kind === '被阻止' || kind === '审批'
-}
-
-export function apply(ctx, config) {
+function applyImpl(ctx, config) {
   // 配置三层叠加：schema 默认值 < cordis 组合层（base = 插件 config）< 用户层（设置页）。
   // 设置页写入后经 watch 实时生效，不需要重启。
   const scope = ctx.settings.register('macos-notify', Config, { base: config, applies: 'live' })
@@ -393,16 +389,37 @@ export function apply(ctx, config) {
   // 合并窗口内待发的轮次结束通知（实时通道）
   let pending = []
   let flushTimer = null
-  // digest 通道：只攒「完成」
+  // digest 通道：只攒「完成」；发送时刻绑定在已积累的批次上，设置变更不重置已排定的 deadline
   let digestPending = []
   let digestTimer = null
+  let digestDeadline = 0
   // 最近的通知决策，仅保存在当前进程内；设置页用于解释“为什么没弹”。
   let diagnostics = []
   let diagnosticSeq = 0
   // 重复错误键 -> 首次发送时间、被抑制次数
-  const duplicates = new Map()
+  let duplicates = new DuplicateTracker()
   let projectRules = parseProjectRules(current.projectRulesJson)
 
+  // —— 状态持久化：通知决策、重复合并、会话标题。防抖落盘，退出时立即 flush ——
+  const stateFile = stateFilePath()
+  let persistTimer = null
+  const schedulePersist = () => {
+    if (persistTimer) return
+    persistTimer = setTimeout(() => {
+      persistTimer = null
+      saveState(stateFile, {
+        diagnostics,
+        duplicates: duplicates.toJSON(),
+        titles: [...titles.entries()],
+      }).catch((err) => console.warn('[dsh-macos-notify] state persist failed:', err?.message ?? err))
+    }, 500)
+    persistTimer.unref?.()
+  }
+  const restored = loadStateSync(stateFile)
+  if (diagnostics.length === 0 && restored.diagnostics.length) diagnostics = restored.diagnostics
+  if (duplicates.size === 0 && restored.duplicates.length) duplicates = DuplicateTracker.fromJSON(restored.duplicates)
+  if (titles.size === 0 && restored.titles.length) for (const [id, title] of restored.titles) titles.set(id, title)
+
   const record = (status, item, detail, extra = {}) => {
     diagnostics.unshift({
       id: ++diagnosticSeq,
@@ -418,6 +435,7 @@ export function apply(ctx, config) {
       ...extra,
     })
     if (diagnostics.length > MAX_DIAGNOSTICS) diagnostics.length = MAX_DIAGNOSTICS
+    schedulePersist()
   }
 
   // 通知通道：auto 在支持的终端里走 OSC 9（终端自己转系统通知），否则 osascript
@@ -531,9 +549,21 @@ export function apply(ctx, config) {
             return { ok: false, error: { code: 'internal', message: String(err?.message ?? err), details: {} } }
           }
         }
+        if (endpoint === 'sound/preview') {
+          try {
+            await previewSound(typeof payload?.name === 'string' ? payload.name.trim() : '')
+            return { ok: true, value: null }
+          } catch (err) {
+            console.warn('[dsh-macos-notify] sound preview failed:', err?.message ?? err)
+            return { ok: false, error: { code: 'internal', message: String(err?.message ?? err), details: {} } }
+          }
+        }
         if (endpoint === 'diagnostics') {
           const op = payload?.op ?? 'get'
-          if (op === 'clear') diagnostics = []
+          if (op === 'clear') {
+            diagnostics = []
+            schedulePersist()
+          }
           anyFocused()
           return {
             ok: true,
@@ -547,6 +577,7 @@ export function apply(ctx, config) {
                 pauseUntil: current.pauseUntil,
                 pending: pending.length,
                 digestPending: digestPending.length,
+                digestDeadline,
               },
             },
           }
@@ -558,7 +589,7 @@ export function apply(ctx, config) {
           if (op === 'set' && typeof payload.field === 'string') {
             try {
               await scope.update({ [payload.field]: payload.value })
-              return { ok: true, value: null }
+              return { ok: true, value: scope.get() }
             } catch (err) {
               return { ok: false, error: { code: 'internal', message: String(err?.message ?? err), details: {} } }
             }
@@ -597,6 +628,7 @@ export function apply(ctx, config) {
       console.log('[dsh-macos-notify] RPC intercept mounted')
     } catch (err) {
       console.error('[dsh-macos-notify] RPC intercept failed:', err)
+      notifyStartupFailure(err, current.sounds.error)
     }
   })
 
@@ -649,41 +681,44 @@ export function apply(ctx, config) {
   }
 
   const applyDuplicatePolicy = (item) => {
-    if (!['出错', '被阻止'].includes(item.kind) || current.duplicateWindowSec <= 0) return true
-    const now = Date.now()
-    const key = `${item.sessionId ?? ''}\u0000${item.kind}\u0000${item.body}`
-    const previous = duplicates.get(key)
-    const windowMs = current.duplicateWindowSec * 1000
-    if (previous && now - previous.at < windowMs) {
-      previous.count += 1
-      record('suppressed', item, `重复通知已合并（本窗口第 ${previous.count} 次）`)
+    if (!['出错', '被阻止'].includes(item.kind)) return true
+    const decision = duplicates.admit(duplicateKey(item), Date.now(), current.duplicateWindowSec * 1000)
+    schedulePersist()
+    if (!decision.send) {
+      record('suppressed', item, `重复通知已合并（本窗口第 ${decision.count} 次）`)
       return false
     }
-    if (previous?.count) item.body += `（此前重复 ${previous.count} 次）`
-    duplicates.set(key, { at: now, count: 0 })
-    for (const [candidate, value] of duplicates) {
-      if (now - value.at > Math.max(windowMs * 2, 60_000)) duplicates.delete(candidate)
-    }
+    if (decision.suffix) item.body += decision.suffix
     return true
   }
 
+  // 键鼠空闲查询要 fork ioreg，5 秒内复用上次结果
+  const idleCache = new TtlCache(5000)
+  const idleSecondsCached = async () => {
+    const cached = idleCache.get(Date.now())
+    if (cached.hit) return cached.value
+    const idle = await idleSeconds()
+    idleCache.set(Date.now(), idle)
+    return idle
+  }
+
   // 发送前再检查实时策略；摘要可能在进入队列后才跨入勿扰时段。
   const gateAndNotify = async (items, sendBatch) => {
     let allowed = items.filter(applyTimePolicy)
     if (allowed.length === 0) return
     if (current.onlyWhenUnfocused && anyFocused()) {
       allowed = allowed.filter((item) => {
-        if (item.kind !== '完成' || item.important) return true
+        if (!isCompletionKind(item.kind) || item.important) return true
         record('suppressed', item, 'DSH Web 页面当前处于聚焦状态')
         return false
       })
     }
-    const idleCandidates = allowed.filter((item) => item.kind === '完成' && !item.important)
+    const idleCandidates = allowed.filter((item) => isCompletionKind(item.kind) && !item.important)
     if (current.onlyWhenIdleSec > 0 && idleCandidates.length) {
-      const idle = await idleSeconds()
+      const idle = await idleSecondsCached()
       if (idle < current.onlyWhenIdleSec) {
         allowed = allowed.filter((item) => {
-          if (item.kind !== '完成' || item.important) return true
+          if (!isCompletionKind(item.kind) || item.important) return true
           record('suppressed', item, `键鼠仅空闲 ${Math.floor(idle)} 秒，要求 ${current.onlyWhenIdleSec} 秒`)
           return false
         })
@@ -737,40 +772,52 @@ export function apply(ctx, config) {
     })
   }
 
-  const setupDigest = () => {
+  // 摘要按绝对 deadline 触发：入队时排定，设置变更只重挂定时器、不重置等待时间；
+  // 关闭摘要时立即发掉已积累的批次，避免通知滞留。
+  const armDigest = () => {
     if (digestTimer) {
-      clearInterval(digestTimer)
+      clearTimeout(digestTimer)
       digestTimer = null
     }
-    if (current.digestMinutes > 0) {
-      digestTimer = setInterval(flushDigest, current.digestMinutes * 60_000)
+    if (current.digestMinutes <= 0 || digestPending.length === 0) {
+      digestDeadline = 0
+      return
     }
+    if (!digestDeadline) digestDeadline = Date.now() + current.digestMinutes * 60_000
+    digestTimer = setTimeout(() => {
+      digestTimer = null
+      digestDeadline = 0
+      flushDigest()
+    }, Math.max(0, digestDeadline - Date.now()))
+    digestTimer.unref?.()
   }
-  setupDigest()
 
-  // 设置页写入实时生效：换配置快照、重算通道、按新间隔重建 digest 定时器
+  // 设置页写入实时生效：换配置快照、重算通道、按新间隔重挂 digest 定时器
   scope.watch((next) => {
     current = next
     resolvedChannel = resolveChannel()
     projectRules = parseProjectRules(current.projectRulesJson)
-    setupDigest()
+    if (current.digestMinutes <= 0 && digestPending.length) flushDigest()
+    armDigest()
   })
 
   const enqueue = (kind, title, body, sound, session, options = {}) => {
     const item = makeItem(kind, title, body, sound, session)
     if (!applyProjectRule(item)) return
-    if (kind === '完成' && options.durationSec < current.minDurationSec && !item.important) {
+    if (isCompletionKind(kind) && options.durationSec < current.minDurationSec && !item.important) {
       record('suppressed', item, `任务耗时 ${options.durationSec.toFixed(1)} 秒，短于 ${current.minDurationSec} 秒`)
       return
     }
     if (!applyDuplicatePolicy(item)) return
-    if (kind === '完成' && current.digestMinutes > 0) {
+    if (isCompletionKind(kind) && current.digestMinutes > 0) {
       digestPending.push(item)
       record('queued', item, `已进入 ${current.digestMinutes} 分钟摘要队列`)
+      armDigest()
       return
     }
     if (current.coalesceMs <= 0) {
       void gateAndNotify([item], (allowed) => {
+        const { title, body, sound } = render(allowed)
         send(title, body + runningSuffix(), sound, allowed)
       })
       return
@@ -780,13 +827,12 @@ export function apply(ctx, config) {
     if (!flushTimer) flushTimer = setTimeout(flush, current.coalesceMs)
   }
 
-  if (current.notifyOnLoad) {
-    send('DSH', 'macOS 通知插件已加载', current.sounds.completed, [], { detail: '插件加载测试通知' })
-  }
-
   ctx.on('session/event', (session, event) => {
     if (event.type === 'session/title') {
+      // 标题按会话累积，封顶避免长驻进程缓慢泄漏
+      if (titles.size >= 200) titles.delete(titles.keys().next().value)
       titles.set(session.id, event.data.title)
+      schedulePersist()
       return
     }
 
@@ -840,10 +886,12 @@ export function apply(ctx, config) {
     if (event.type === 'approval/asked' && current.onApproval) {
       // 审批需要人处理，立即发，不合并
       const reason = event.data.reason ? ` — ${event.data.reason}` : ''
-      const body = `${label(session)}: ${event.data.toolName}${reason}`
-      const item = makeItem('审批', '等待审批', body, current.sounds.approval, session)
+      const item = makeItem('审批', '等待审批', `${label(session)}: ${event.data.toolName}${reason}`, current.sounds.approval, session)
       if (applyProjectRule(item)) {
-        void gateAndNotify([item], (allowed) => send('等待审批', body, current.sounds.approval, allowed))
+        void gateAndNotify([item], (allowed) => {
+          const { title, body, sound } = render(allowed)
+          send(title, body, sound, allowed)
+        })
       }
     } else if (event.type === 'approval/asked') {
       record('suppressed', makeItem('审批', '等待审批', label(session), current.sounds.approval, session), '审批通知已关闭')
@@ -854,5 +902,24 @@ export function apply(ctx, config) {
   ctx.effect(() => () => {
     if (flushTimer) clearTimeout(flushTimer)
     if (digestTimer) clearInterval(digestTimer)
+    if (persistTimer) {
+      clearTimeout(persistTimer)
+      persistTimer = null
+    }
+    saveState(stateFile, {
+      diagnostics,
+      duplicates: duplicates.toJSON(),
+      titles: [...titles.entries()],
+    }).catch(() => {})
   })
 }
+
+export function apply(ctx, config) {
+  try {
+    return applyImpl(ctx, config)
+  } catch (err) {
+    console.error('[dsh-macos-notify] plugin initialization failed:', err)
+    notifyStartupFailure(err, config?.sounds?.error)
+    throw err
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-macos-notify",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "Native macOS notifications and configurable sounds for DeepSeek Harness",
   "type": "module",
   "main": "index.js",
@@ -9,7 +9,7 @@
     "./client": "./client.js",
     "./package.json": "./package.json"
   },
-  "files": ["index.js", "client.js", "cordis.patch.yml"],
+  "files": ["index.js", "client.js", "src/policy.js", "src/state.js", "cordis.patch.yml"],
   "keywords": ["dsh-plugin", "deepseek-harness", "macos", "notifications"],
   "author": "CrombastiC",
   "license": "MIT",
@@ -30,7 +30,8 @@
   },
   "os": ["darwin"],
   "scripts": {
-    "test": "node --test tests/*.test.mjs"
+    "test": "node --test tests/*.test.mjs",
+    "prepublishOnly": "node --check index.js && node --check client.js && node --check src/policy.js && node --check src/state.js && npm test"
   },
   "dsh": {
     "bundle": { "patch": "./cordis.patch.yml" },
@@ -40,6 +41,7 @@
       "inject": [
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-slots"
       ]
     }

package/src/policy.js

@@ -0,0 +1,137 @@
+// 纯策略函数：时间窗、项目规则、重复合并。不碰 IO，便于脱离插件宿主单测。
+import { resolve } from 'node:path'
+
+/** 关键事件：勿扰时段和「errors」项目规则下仍然放行 */
+export function isCriticalKind(kind) {
+  return kind === '出错' || kind === '被阻止' || kind === '审批'
+}
+
+/** 「完成类」通知：唯一受 最短耗时 / 聚焦 / 空闲 / 摘要 过滤约束的类型 */
+export function isCompletionKind(kind) {
+  return kind === '完成'
+}
+
+/** 本机 HH:mm -> 当日分钟数；格式无效返回 null */
+export function minuteOfDay(value) {
+  const match = /^(\d{2}):(\d{2})$/.exec(String(value))
+  if (!match) return null
+  const hour = Number(match[1])
+  const minute = Number(match[2])
+  if (hour > 23 || minute > 59) return null
+  return hour * 60 + minute
+}
+
+/** 每日勿扰是否生效；支持跨午夜区间，start === end 视为未配置 */
+export function quietHoursActive(config, now = new Date()) {
+  if (!config.quietHoursEnabled) return false
+  const start = minuteOfDay(config.quietStart)
+  const end = minuteOfDay(config.quietEnd)
+  if (start === null || end === null || start === end) return false
+  const currentMinute = now.getHours() * 60 + now.getMinutes()
+  return start < end
+    ? currentMinute >= start && currentMinute < end
+    : currentMinute >= start || currentMinute < end
+}
+
+/** 项目规则 JSON -> [{ path, mode }]；非法项丢弃，最多 50 条，相对路径按本进程 cwd 解析 */
+export function parseProjectRules(raw) {
+  try {
+    const value = JSON.parse(raw)
+    if (!Array.isArray(value)) return []
+    return value.slice(0, 50).flatMap((item) => {
+      const path = typeof item?.path === 'string' ? item.path.trim() : ''
+      const mode = item?.mode
+      if (!path || !['mute', 'errors', 'important'].includes(mode)) return []
+      return [{ path: resolve(path), mode }]
+    })
+  } catch {
+    return []
+  }
+}
+
+/** 命中 cwd 的最具体规则；前缀比较要求完整路径段，避免 /tmp 误匹配 /tmpx */
+export function matchingProjectRule(rules, cwd) {
+  if (!cwd) return null
+  const target = resolve(cwd)
+  return rules
+    .filter((rule) => target === rule.path || target.startsWith(`${rule.path}/`))
+    .sort((a, b) => b.path.length - a.path.length)[0] ?? null
+}
+
+export function duplicateKey(item) {
+  return `${item.sessionId ?? ''}\u0000${item.kind}\u0000${item.body}`
+}
+
+/**
+ * 重复通知合并器：相同 key 在窗口内只发第一条；窗口过期后的第一条会带上
+ * 「此前重复 N 次」的汇总。窗口按条目各自的首次发送时间独立计算。
+ */
+export class DuplicateTracker {
+  #entries = new Map()
+
+  /**
+   * @param {string} key 重复判定键
+   * @param {number} now 当前时间戳（毫秒），显式传入便于测试
+   * @param {number} windowMs 抑制窗口毫秒数；<=0 时直通且不记录状态
+   * @returns {{ send: boolean, count?: number, suffix: string }}
+   *   send=false 时 count 为本窗口内已合并次数；send=true 时 suffix 需追加到正文（可为空串）
+   */
+  admit(key, now, windowMs) {
+    if (!(windowMs > 0)) return { send: true, suffix: '' }
+    const previous = this.#entries.get(key)
+    if (previous && now - previous.at < windowMs) {
+      previous.count += 1
+      return { send: false, count: previous.count }
+    }
+    const suffix = previous?.count ? `（此前重复 ${previous.count} 次）` : ''
+    this.#entries.set(key, { at: now, count: 0 })
+    const threshold = Math.max(windowMs * 2, 60_000)
+    for (const [candidate, value] of this.#entries) {
+      if (now - value.at > threshold) this.#entries.delete(candidate)
+    }
+    return { send: true, suffix }
+  }
+
+  get size() {
+    return this.#entries.size
+  }
+
+  /** 供持久化：[key, { at, count }] 数组 */
+  toJSON() {
+    return [...this.#entries.entries()]
+  }
+
+  static fromJSON(entries) {
+    const tracker = new DuplicateTracker()
+    for (const [key, value] of entries) tracker.#entries.set(key, value)
+    return tracker
+  }
+}
+
+/** AppleScript 字符串转义 + 通知脚本组装；换行会截断 display notification 的字面量，压成空格 */
+export function buildNotificationScript(title, body, sound) {
+  const clean = (value) => String(value).replace(/\r?\n/g, ' ')
+  const quote = (value) => value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+  const soundPart = sound ? ` sound name "${quote(sound)}"` : ''
+  return `display notification "${quote(clean(body))}" with title "${quote(clean(title))}"${soundPart}`
+}
+
+/** 极简 TTL 缓存：命中返回 { hit: true, value }，过期或未填充返回 { hit: false } */
+export class TtlCache {
+  constructor(ttlMs) {
+    this.ttlMs = ttlMs
+    this.value = null
+    this.at = 0
+    this.filled = false
+  }
+
+  get(now) {
+    return this.filled && now - this.at < this.ttlMs ? { hit: true, value: this.value } : { hit: false, value: null }
+  }
+
+  set(now, value) {
+    this.at = now
+    this.value = value
+    this.filled = true
+  }
+}

package/src/state.js

@@ -0,0 +1,58 @@
+// 通知决策历史、重复合并状态、会话标题的磁盘持久化。
+// 文件缺失或损坏一律按空状态处理，绝不让坏文件拖垮通知插件。
+import { readFileSync } from 'node:fs'
+import { mkdir, rename, writeFile } from 'node:fs/promises'
+import { dirname } from 'node:path'
+
+export const STATE_VERSION = 1
+export const MAX_PERSISTED_DIAGNOSTICS = 50
+export const MAX_PERSISTED_DUPLICATES = 500
+export const MAX_PERSISTED_TITLES = 200
+
+/** 校验并收敛状态；各字段独立取舍，坏条目丢弃而不是整体作废 */
+export function sanitizeState(raw) {
+  const state = { diagnostics: [], duplicates: [], titles: [] }
+  if (!raw || typeof raw !== 'object') return state
+  if (Array.isArray(raw.diagnostics)) {
+    state.diagnostics = raw.diagnostics
+      .filter((item) => item && typeof item === 'object')
+      .slice(0, MAX_PERSISTED_DIAGNOSTICS)
+  }
+  if (Array.isArray(raw.duplicates)) {
+    state.duplicates = raw.duplicates.slice(0, MAX_PERSISTED_DUPLICATES).flatMap((entry) => {
+      const value = Array.isArray(entry) ? entry[1] : null
+      if (!entry || typeof entry[0] !== 'string' || !value
+        || typeof value.at !== 'number' || typeof value.count !== 'number') return []
+      return [[entry[0], { at: value.at, count: value.count }]]
+    })
+  }
+  if (Array.isArray(raw.titles)) {
+    state.titles = raw.titles
+      .slice(-MAX_PERSISTED_TITLES)
+      .flatMap((entry) => (
+        Array.isArray(entry) && typeof entry[0] === 'string' && typeof entry[1] === 'string'
+          ? [[entry[0], entry[1]]]
+          : []
+      ))
+  }
+  return state
+}
+
+/** 初始化时同步读取：保证恢复完成后再处理任何事件，不存在恢复与事件的竞态 */
+export function loadStateSync(file) {
+  try {
+    return sanitizeState(JSON.parse(readFileSync(file, 'utf8')))
+  } catch {
+    return { diagnostics: [], duplicates: [], titles: [] }
+  }
+}
+
+/** 先写临时文件再 rename，避免崩溃留下半个 JSON */
+export async function saveState(file, state) {
+  const clean = sanitizeState(state)
+  const payload = JSON.stringify({ version: STATE_VERSION, ...clean }, null, 2)
+  const temp = `${file}.tmp`
+  await mkdir(dirname(file), { recursive: true })
+  await writeFile(temp, payload, { mode: 0o600 })
+  await rename(temp, file)
+}