dsh-macos-notify 0.2.1 → 0.3.0

package/README.md

@@ -1,12 +1,12 @@
 # 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 plus 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.
@@ -41,7 +41,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 +88,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 +95,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 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.
 
 ## Notification channels
 
@@ -108,17 +107,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 +125,7 @@ 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.
 - `cordis.patch.yml` — profile bundle patch.
 
 Run the release checks:

package/client.js

@@ -196,7 +196,15 @@ 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) })
+      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 } },
+        }, 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

@@ -53,8 +53,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),
 })
 
 /** 设置页可编辑的提示音字段 */
@@ -295,6 +295,11 @@ function notify(title, body, sound, channel, onResult = () => {}) {
   })
 }
 
+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 的终端收到转义序列会打印乱码，所以必须保守 */
@@ -378,7 +383,7 @@ 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' })
@@ -597,6 +602,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)
     }
   })
 
@@ -780,10 +786,6 @@ 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') {
       titles.set(session.id, event.data.title)
@@ -856,3 +858,13 @@ export function apply(ctx, config) {
     if (digestTimer) clearInterval(digestTimer)
   })
 }
+
+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.3.0",
   "description": "Native macOS notifications and configurable sounds for DeepSeek Harness",
   "type": "module",
   "main": "index.js",
@@ -40,6 +40,7 @@
       "inject": [
         "@deepseek-ai/dsh-client-connection",
         "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-settings",
         "@deepseek-ai/dsh-client-ui-slots"
       ]
     }