dsh-plugin-session-notifier 0.1.1 → 0.1.3

package/README.en.md

@@ -5,7 +5,7 @@
 [![npm](https://img.shields.io/npm/v/dsh-plugin-session-notifier)](https://www.npmjs.com/package/dsh-plugin-session-notifier)
 [![license](https://img.shields.io/github/license/slvayf/dsh-plugin-session-notifier)](LICENSE)
 
-A DeepSeek Harness bundle. It raises a desktop notification and a short chime when a session finishes,
+A DeepSeek Harness session notification bundle. It raises a desktop notification and a short chime when a session finishes,
 fails, or stops to wait for your answer (a question or a tool approval). Nothing is missed while you
 are in another window, watching a video, or playing a game.
 
@@ -21,7 +21,7 @@ The interface follows DSH's Chinese/English setting.
 | The session fails | A low two-note chime and an error notification |
 | The session you are looking at ends | Reminded after about 1 second, effectively immediate |
 | Any other session ends | Waits out the 10/20/30 second merge window to avoid a burst |
-| It continues within 10 seconds | Merged into one reminder |
+| Any other session resumes inside the merge window | Merged into one reminder |
 | You do not come back | Repeats every 30 seconds, at most 3 times, and stops as soon as the page is focused |
 | Subagent sessions | Silent, so one task's internal fan-out never rings |
 
@@ -43,22 +43,33 @@ The panel says so as well.
 
 ## Install
 
-**1. By package name (recommended).** Ask the agent to call:
+**1. From the DSH interface**
+
+1. Open the **Plugins** page in the sidebar
+2. Choose **+ Add plugin** at the top right
+3. Enter `dsh-plugin-session-notifier`, or name a version, for example `dsh-plugin-session-notifier@0.1.2`
+4. Pick the China mainland registry mirror if you are there, it is much faster
+5. Choose **Install**
+
+**2. Ask the agent**
 
 ```
-plugin_manager({ action: "install_bundle", target: "dsh-plugin-session-notifier@0.1.0" })
+plugin_manager({ action: "install_bundle", target: "dsh-plugin-session-notifier" })
 ```
 
-You can also type `dsh-plugin-session-notifier` into **Plugins → Add plugin** yourself. Pick the
-China mainland registry mirror if you are there, it is much faster.
+Omitting the version installs the newest release that has also cleared pnpm's release-age window.
+
+**3. Local development**
 
-**2. Local development:** `plugin_manager({ action: "install_bundle", target: "/absolute/path/dsh-plugin-session-notifier" })`.
+```
+plugin_manager({ action: "install_bundle", target: "/absolute/path/dsh-plugin-session-notifier" })
+```
 
 After installation the left sidebar shows the bell entry, and the `main` panel key is `session-notifier`.
 Compatible DSH versions are declared by `engines.dsh` in `package.json`, currently `>=0.2.1-rc.3`.
 
-Upgrading means uninstalling the old version and installing the new one. The plugin manager does not
-upgrade in place.
+Upgrading a plugin in DeepSeek Harness does not happen in place: uninstall the old version, then install the new one. If a new version is
+reported as still inside pnpm's release-age window (24 hours by default), wait it out or name the version.
 
 ## Limits
 
@@ -93,6 +104,7 @@ upgrade in place.
 | `client.js` | Browser half: the reminder engine and the settings panel |
 | `cordis.patch.yml` | Inserts the plugin row |
 | `locale/*.json` | Title and description the plugin manager displays |
+| `scripts/sync-version.mjs` | Copies the release version into the panel footer |
 | `test/*.mjs` | Engine scenarios plus static style and copy checks |
 | `.github/workflows/` | `ci` runs the checks, `publish` uploads to npm |
 

package/README.md

@@ -1,12 +1,12 @@
-# 会话结束提醒 · Session Notifier
+# 会话提醒 · Session Notifier
 
 [English](README.en.md) | 中文
 
 [![npm](https://img.shields.io/npm/v/dsh-plugin-session-notifier)](https://www.npmjs.com/package/dsh-plugin-session-notifier)
 [![license](https://img.shields.io/github/license/slvayf/dsh-plugin-session-notifier)](LICENSE)
 
-DeepSeek Harness 插件。会话跑完、出错，或者停下来等你回答（提问 / 工具授权）时，
-用桌面通知加提示音提醒你，切到别的窗口、全屏看视频或打游戏时也不会错过。
+DeepSeek Harness 会话通知插件。会话跑完、出错，或者停下来等你回答（提问 / 工具授权）时，
+用桌面通知和提示音提醒你。切到别的窗口、全屏看视频或打游戏时也不会错过。
 
 左侧栏有铃铛入口，点开是设置页，所有开关即时生效。界面跟随 DSH 的中英文设置切换。
 
@@ -19,7 +19,7 @@ DeepSeek Harness 插件。会话跑完、出错，或者停下来等你回答（
 | 会话出错 | 低沉的两声提示音 + 错误通知 |
 | 结束的是你正看着的会话 | 约 1 秒后提醒，几乎即时 |
 | 结束的是其他会话 | 等 10 / 20 / 30 秒的合并窗口再提醒，避免连环响 |
-| 10 秒内又继续跑 | 合并成一次提醒 |
+| 结束的是其他会话，在合并窗口内又继续跑 | 合并成一次提醒 |
 | 你没回来看 | 每 30 秒再提醒一次，最多 3 次，页面获得焦点后立即停止 |
 | 子代理 | 不提醒，避免一个任务内部并行时连环响 |
 
@@ -40,21 +40,33 @@ DeepSeek Harness 插件。会话跑完、出错，或者停下来等你回答（
 
 ## 安装
 
-**一、按包名安装（推荐）**。让智能体调用：
+**一、在 DSH 界面里安装**
+
+1. 侧边栏打开「插件」页
+2. 点右上角「+ 添加插件」
+3. 输入框填 `dsh-plugin-session-notifier`，想装指定版本就在包名后加版本，例如 `dsh-plugin-session-notifier@0.1.2`
+4. 安装源可选「中国大陆镜像源」，国内会快很多
+5. 点「安装」
+
+**二、让智能体安装**
 
 ```
-plugin_manager({ action: "install_bundle", target: "dsh-plugin-session-notifier@0.1.0" })
+plugin_manager({ action: "install_bundle", target: "dsh-plugin-session-notifier" })
 ```
 
-也可以自己在「插件 → 添加插件」里输入 `dsh-plugin-session-notifier`。
-安装源可选「中国大陆镜像源」，国内会快很多。
+不写版本号时，装的是最新的、并且已经过 pnpm 发布观察期的版本。
+
+**三、本地开发**
 
-**二、本地开发**：`plugin_manager({ action: "install_bundle", target: "/绝对路径/dsh-plugin-session-notifier" })`。
+```
+plugin_manager({ action: "install_bundle", target: "/绝对路径/dsh-plugin-session-notifier" })
+```
 
 安装后左侧栏出现铃铛入口，`main` 面板 key 为 `session-notifier`。
 兼容的 DSH 版本由 `package.json` 的 `engines.dsh` 声明，当前为 `>=0.2.1-rc.3`。
 
-升级需要先卸载旧版本再安装新版本，插件管理器不支持原地升级。
+目前 DeepSeek Harness 的插件升级不能原地进行，需要先卸载旧版本，再安装新版本。如果提示某个新版本还处在 pnpm 的发布观察期内
+（默认 24 小时），要么等它过去，要么直接指定版本号安装。
 
 ## 能力边界
 
@@ -84,6 +96,7 @@ plugin_manager({ action: "install_bundle", target: "dsh-plugin-session-notifier@
 | `client.js` | 浏览器半侧，提醒引擎与设置面板 |
 | `cordis.patch.yml` | 插入插件行 |
 | `locale/*.json` | 插件管理器展示用的标题与描述 |
+| `scripts/sync-version.mjs` | 发布时把版本号同步到面板底部 |
 | `test/*.mjs` | 引擎场景、样式、文案的静态检查 |
 | `.github/workflows/` | `ci` 跑检查，`publish` 发 npm |
 

package/client.js

@@ -28,13 +28,17 @@ window.__ModuleLoader__.load({
     /** Monotonic per-page counter: two reminders in one millisecond still need distinct tags. */
     let notificationSeq = 0;
     const RECENT_LIMIT = 12;
+    /** Shown at the foot of the panel; scripts/sync-version.mjs keeps it in step with package.json. */
+    const PLUGIN_VERSION = '0.1.3';
     /** Wait before reminding about the session the user is looking at. */
     const VIEWING_MERGE_MS = 1000;
+    /** Two reminders landing together share one tone instead of stacking two. */
+    const TONE_GAP_MS = 250;
 
     //#region copy
     const zh = {
       'panel.label': '会话提醒',
-      'panel.title': '会话结束提醒',
+      'panel.title': '会话提醒',
       'panel.desc':
         '会话跑完或停下来等你回答时，用桌面通知和提示音提醒你。切到别的窗口、全屏看视频或打游戏时也不会错过。',
       'group.master': '总开关',
@@ -101,11 +105,12 @@ window.__ModuleLoader__.load({
       'notify.test.title': '这是一条测试提醒',
       'notify.test.body': '看到这条通知、听到提示音，就说明提醒已经生效。',
       'session.unknown': '新会话',
+      'footer.version': '版本 {version}',
     };
 
     const en = {
-      'panel.label': 'Session alerts',
-      'panel.title': 'Session end notifier',
+      'panel.label': 'Session Notifier',
+      'panel.title': 'Session Notifier',
       'panel.desc':
         'A desktop notification and a short chime when a session finishes or stops to wait for you — so a task that ends while you are on another window is not missed.',
       'group.master': 'Master switch',
@@ -172,16 +177,17 @@ window.__ModuleLoader__.load({
       'notify.test.title': 'This is a test reminder',
       'notify.test.body': 'If you can see this notification and hear the chime, reminders work.',
       'session.unknown': 'New session',
+      'footer.version': 'Version {version}',
     };
     //#endregion
 
     //#region settings
     /**
-     * Stored-document version. Version 1 shipped with `whenFocused: false` and a 5 s
-     * merge window; those two defaults changed, so a version-1 document is migrated
-     * instead of silently keeping the older values.
+     * Stored-document version, written with every save. Nothing reads it yet: the key
+     * was introduced with the current defaults, so no older document can exist. It is
+     * here so a future default change can migrate instead of guessing.
      */
-    const SETTINGS_VERSION = 2;
+    const SETTINGS_VERSION = 1;
 
     /** Merge-window choices, in milliseconds. */
     const COMBINE_CHOICES = [10000, 20000, 30000];
@@ -223,12 +229,6 @@ window.__ModuleLoader__.load({
         for (const key of Object.keys(DEFAULTS)) {
           if (typeof parsed[key] === typeof DEFAULTS[key]) next[key] = parsed[key];
         }
-        const version = typeof parsed.v === 'number' ? parsed.v : 1;
-        if (version < SETTINGS_VERSION) {
-          // The two defaults that changed; other stored choices stay as the user left them.
-          next.whenFocused = DEFAULTS.whenFocused;
-          next.combineMs = DEFAULTS.combineMs;
-        }
       } catch (_storageUnavailable) {
         // A blocked or corrupt store simply falls back to the defaults.
       }
@@ -287,8 +287,33 @@ window.__ModuleLoader__.load({
       /** Newest-first reminder log for the panel. */
       recent: [],
       recentListeners: new Set(),
+      /** Timers owned by one notification or tone, cleared with the plugin. */
+      timers: new Set(),
+      /** Wall-clock time of the last tone, so two reminders do not overlap. */
+      lastToneAt: 0,
     };
 
+    /**
+     * Run a callback later, keeping its timer id in the owned set.
+     * @param callback - work to run once.
+     * @param delay - delay in milliseconds.
+     * @returns the timer id.
+     */
+    function startTimer(callback, delay) {
+      const id = window.setTimeout(() => {
+        state.timers.delete(id);
+        callback();
+      }, delay);
+      state.timers.add(id);
+      return id;
+    }
+
+    /** Drop every timer this plugin started. */
+    function clearTimers() {
+      for (const id of state.timers) window.clearTimeout(id);
+      state.timers.clear();
+    }
+
     /** Faces assigned when they become available; every consumer tolerates absence. */
     const services = {
       sessions: null,
@@ -397,8 +422,13 @@ window.__ModuleLoader__.load({
      * Play the reminder tone for one kind of event.
      * @param kind - `done`, `awaiting`, `error`, or `test`.
      */
-    function chime(kind) {
+    function chime(kind, force) {
       if (!settings.sound) return;
+      const at = Date.now();
+      if (force !== true) {
+        if (at - state.lastToneAt < TONE_GAP_MS) return;
+        state.lastToneAt = at;
+      }
       const context = audioContext();
       if (context === null) return;
       if (context.state === 'suspended' && typeof context.resume === 'function') {
@@ -439,7 +469,7 @@ window.__ModuleLoader__.load({
         oscillator.start(start + offset);
         oscillator.stop(start + offset + duration + 0.03);
       }
-      window.setTimeout(() => {
+      startTimer(() => {
         try {
           master.disconnect();
         } catch (_disconnected) {
@@ -525,8 +555,8 @@ window.__ModuleLoader__.load({
           // Already gone.
         }
       };
-      window.setTimeout(() => settle('unconfirmed'), 2500);
-      window.setTimeout(() => {
+      startTimer(() => settle('unconfirmed'), 2500);
+      startTimer(() => {
         try {
           notification.close();
         } catch (_closed) {
@@ -657,7 +687,7 @@ window.__ModuleLoader__.load({
      */
     function runTestReminder() {
       primeAudio();
-      chime('test');
+      chime('test', true);
       publishProbe({ status: 'pending' });
       const delivery = notifyDesktop(
         'test',
@@ -688,6 +718,9 @@ window.__ModuleLoader__.load({
       });
       if (!settings.repeat || attempt >= settings.repeatMax) return;
       if (!pageIsAway()) return;
+      // A chain already armed for this session would keep its own timer, and its
+      // callback would delete this newer record.
+      cancelRepeat(sessionId);
       const timer = window.setTimeout(() => {
         state.repeats.delete(sessionId);
         if (!pageIsAway()) return;
@@ -719,13 +752,17 @@ window.__ModuleLoader__.load({
      */
     function scheduleEnd(sessionId, kind) {
       const previous = state.pendingEnd.get(sessionId);
+      // A failed turn reports its error and then its idle edge, so an armed error
+      // outranks the finish that follows it. Otherwise every failure would be
+      // announced as an ordinary completion.
+      const effective = previous !== undefined && previous.kind === 'error' ? 'error' : kind;
       if (previous !== undefined) window.clearTimeout(previous.timer);
       const timer = window.setTimeout(() => {
         state.pendingEnd.delete(sessionId);
         if (!eligible(sessionId)) return;
-        deliver(kind, sessionId, 1);
+        deliver(effective, sessionId, 1);
       }, mergeWindowFor(sessionId));
-      state.pendingEnd.set(sessionId, { timer, kind });
+      state.pendingEnd.set(sessionId, { timer, kind: effective });
     }
 
     /**
@@ -1198,6 +1235,8 @@ window.__ModuleLoader__.load({
                     ),
                   ),
             ),
+
+            h('p', { className: 'sen-version' }, t('footer.version', { version: PLUGIN_VERSION })),
           ),
         ),
       );
@@ -1288,6 +1327,7 @@ window.__ModuleLoader__.load({
       '.sen-btn-primary:hover:not(:disabled){background:var(--dsw-alias-button-primary-hover)}',
       '.sen-actions{display:flex;align-items:center;gap:8px;padding:16px 0;border-bottom:.5px solid var(--dsw-alias-border-l2)}',
       '.sen-empty{margin:16px 0;font-size:13px;line-height:20px;color:var(--dsw-alias-label-tertiary)}',
+      '.sen-version{margin:8px 0 0;font-size:12px;line-height:18px;color:var(--dsw-alias-label-tertiary)}',
       '.sen-recent{list-style:none;margin:0;padding:0}',
       '.sen-recent-row{display:flex;align-items:center;justify-content:space-between;gap:12px;padding:12px 0;border-bottom:.5px solid var(--dsw-alias-border-l2);font-size:13px;line-height:20px}',
       '.sen-recent-name{flex:1 1 auto;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--dsw-alias-label-primary)}',
@@ -1328,6 +1368,7 @@ window.__ModuleLoader__.load({
       ctx.effect(
         () => () => {
           cancelAll();
+          clearTimers();
         },
         'session-notifier: timers',
       );

package/locale/en.json

@@ -1,6 +1,6 @@
 {
   "meta": {
-    "title": "Session End Notifier",
-    "description": "Raises a desktop notification and a short chime when a session finishes or waits for your answer, so you notice while you are away from the page."
+    "title": "Session Notifier",
+    "description": "A desktop notification and a short chime when a session finishes or stops to wait for you — so a task that ends while you are on another window is not missed."
   }
 }

package/locale/zh.json

@@ -1,6 +1,6 @@
 {
   "meta": {
-    "title": "会话结束提醒",
-    "description": "会话跑完或停下来等你回答时，用桌面通知和提示音提醒你，切到别处也不会错过。"
+    "title": "会话提醒",
+    "description": "会话跑完或停下来等你回答时，用桌面通知和提示音提醒你。切到别的窗口、全屏看视频或打游戏时也不会错过。"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-session-notifier",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Desktop notification and a short chime when a DeepSeek Harness session finishes or stops to wait for your answer.",
   "type": "module",
   "exports": {
@@ -49,7 +49,8 @@
   },
   "scripts": {
     "verify": "node test/verify-engine.mjs && node test/check-styles.mjs && node test/check-copy.mjs",
-    "prepublishOnly": "npm run verify"
+    "prepublishOnly": "npm run verify",
+    "version": "node scripts/sync-version.mjs && git add client.js"
   },
   "dsh": {
     "bundle": {