dsh-notify-me 1.1.4 → 1.1.5

package/CHANGELOG.md

@@ -6,6 +6,22 @@ All notable changes to **dsh-notify-me** are documented here.
 
 ### 文档
 - 新增 `docs/listing.md`：记录各插件目录/市场的收录方式（提交物、合并方式），以及本插件当前的收录状态；并记下 `awesome-dsh-plugin` 站点构建失败的排查入口（`build-site.yml` 最近一次运行 / issue #4731）。
+- issue #1 / #2 报告的「等待审批 / 提问 / 方案确认不提醒」查清并修复（见 1.1.5）。
+
+## [1.1.5] — 2026-09-14
+
+### 修复
+- **「模型在等你操作」这一路提醒在 DSH `0.1.2-alpha.2` 及以后的运行时上完全不触发**（现象：审批卡片出现、模型停下等待时，没有系统通知、没有提示音、标签页标题也不变；而「回复完成」提醒一直正常）。根因是两个待办数据源同时被上游搬走：
+  - 选中会话的快照 —— `SessionSnapshot.pending` 已不存在（0.1.2-alpha.2 起只剩 `queue / pendingSubmissions / running / …`）；
+  - 会话列表行摘要 —— `SessionSummary.pendingInteraction` 已不存在（只剩 `running / completed`）。
+
+  待办交互改为由 `dsh-client-ui-approval` / `dsh-client-ui-user-questions` 经 `ctx.uiSession.registerPendingInteraction()` 发布到**独立 store** `ctx.uiSession.pendingInteractions`（`Map<sessionId, interaction>`，`interaction.kind` 为 `approval | question | plan-review`）。本版改为订阅该 store：新出现的交互弹一次提醒（`PendingApproval` 取 `toolName` / `reason`，`PendingQuestion` 取 `questions[0].question`），交互消失时释放标签页标记，挂载时已存在的等待也提醒一次。
+  - **为什么不把 `uiSession` 写进 `inject`**：客户端条目的 `inject` 是**硬门控**——服务不存在时条目会永远停在 `pending`，而 web 启动断言会因「有条目未激活」直接抛错（这正是 1.1.3/1.1.4 两次踩过的坑）。`uiSession` 只存在于 `0.1.2-alpha.2` 及以后，写进 `inject` 会让本插件在 `0.1.1-rc.2` 上彻底失效。因此改为**惰性查找**：拿得到就订阅交互 store，拿不到就静默走旧的快照路径，两代宿主都保留完整功能。
+  - 保留 `@deepseek-ai/dsh-client-ui-session` 在 `dsh.client.inject` 中（它是客户端加载图里的 bundle 条目，与服务门控无关）；实测该条目在加载图顺序上位于 `@deepseek-ai/dsh-client-ui-session` 之后（54 个条目中第 44 位 vs 第 10 位），且官方 `dsh-client-ui-approval` / `dsh-client-ui-user-questions` / `dsh-client-ui-open-in-app` / `dsh-client-ui-layout` 等同样以 `"uiSession"` 为服务依赖。
+
+### 变更
+- 两条来源同时可用时按交互 key 去重：同一次等待只提醒一次、也只有一个标签页标记；标题标记的归属固定给交互 store（可用时），避免两路各记一个标记。
+- 测试：`smoke/smoke-test.cjs` 拆成**两代宿主**各跑一遍——旧宿主（无 `uiSession`，快照带 `pending`）与新宿主（`uiSession.pendingInteractions`），新增「重复通知不重复提醒」「挂载前已存在的等待仍提醒一次」「多会话并发等待各提醒一次并逐个释放标记」「两路去重」「主开关关闭时交互通道同样静音」等回归用例。
 
 ## [1.1.4] — 2026-09-13
 

package/lib/client.js

@@ -10,9 +10,16 @@
 // slots/locale services are absent, keeping the reminder core self-contained.
 //
 // What this plugin does (all client-side, no settings transport needed):
-//   - watches the "sessions" service (SessionRuntime): the selected
-//     session's ConversationSnapshot (running / pending interactions) and the
-//     session-list summaries of every other session;
+//   - watches two services, because pending interactions and the running bit
+//     have different owners on current hosts:
+//       * "uiSession" -> pendingInteractions (a Map<sessionId, interaction>
+//         snapshot whose values carry kind 'approval' | 'plan-review' |
+//         'question'). Present since DSH 0.1.2-alpha.2; the controller
+//         snapshots stopped carrying `pending` in the same release, so this is
+//         the only live source of "the agent is waiting on you" on 0.1.2+;
+//       * "sessions" -> the selected session's ConversationSnapshot (running)
+//         and the session-list summaries of every other session (running /
+//         completed), which carry the "reply finished" edge on every version;
 //   - fires a Windows desktop Notification (+ optional sound) when the agent
 //     needs the user's input — pending interaction kinds 'approval',
 //     'plan-review' or 'question' — and when a reply/turn finishes;
@@ -227,14 +234,32 @@ window.__ModuleLoader__.load({
     window.addEventListener("keydown", onFirstGesture, true);
 
     // ────────────────────────── title marker ─────────────────────────
-    var originalTitle = null;
+    // The host owns document.title (it tracks the session/workspace name), so
+    // the base title is re-read on every apply instead of being frozen once —
+    // and the exact string we last wrote is remembered, so the host taking the
+    // title over (or an earlier load leaving a marker behind) can never make us
+    // mistake our own marker for the base title.
     var attentionActive = 0;
+    var hostBase = null; // document.title as the host last left it
+    var writtenTitle = null; // exact string this plugin last put into document.title
+    // Our own marker prefix never belongs to the base title — strip a leftover
+    // one (an earlier load that was closed while a wait was pending, or a title
+    // the host tracked while a marker was up) before storing the base.
+    function cleanBase(t) {
+      var d = texts();
+      var prefixes = [d.marker, TXT.zh.marker, TXT.en.marker];
+      for (var i = 0; i < prefixes.length; i++) {
+        while (t.indexOf(prefixes[i]) === 0) t = t.slice(prefixes[i].length);
+      }
+      return t;
+    }
     function applyTitle() {
       try {
-        if (originalTitle === null) originalTitle = document.title;
-        document.title = (config.enabled && attentionActive > 0)
-          ? texts().marker + originalTitle
-          : originalTitle;
+        var current = String(document.title || "");
+        if (current !== writtenTitle) hostBase = cleanBase(current);
+        var next = (config.enabled && attentionActive > 0) ? texts().marker + hostBase : hostBase;
+        writtenTitle = next;
+        if (current !== next) document.title = next;
       } catch (e) {}
     }
     function acquireTitleMark() {
@@ -245,21 +270,39 @@ window.__ModuleLoader__.load({
       if (attentionActive > 0) attentionActive -= 1;
       applyTitle();
     }
+    // Title marker ownership: on hosts that publish pending interactions
+    // (uiSession) that source owns the marker, but whichever source saw the wait
+    // first must still mark it (the other one may never report that key at all),
+    // so the mark is acquired by the first reporter and released only by its
+    // owner. Without this, the two sources would either double-mark or never
+    // clear the mark.
+    function markAttention(key) {
+      if (attentionKeysMarked[key]) return;
+      attentionKeysMarked[key] = true;
+      acquireTitleMark();
+    }
+    function unmarkAttention(key) {
+      if (!attentionKeysMarked[key]) return;
+      delete attentionKeysMarked[key];
+      releaseTitleMark();
+    }
 
     // ─────────────────────── shared alert core ───────────────────────
     var attentionKeysFired = Object.create(null); // dedupe per pending key
+    var attentionKeysMarked = Object.create(null); // keys currently holding a title mark
     var lastAttentionAt = 0;
 
     function hidden() { return document.hidden || document.visibilityState === "hidden"; }
 
     // Deliver one alert regardless of visibility rules (used by the test
-    // buttons); respects the master switch and permission state.
+    // buttons); respects the master switch and permission state. The title
+    // marker is NOT touched here — its ownership belongs to the watchers
+    // (markAttention / unmarkAttention), which keeps the counter balanced.
     function deliver(kind, title, body) {
       if (!config.enabled) return;
       showToast(kind, title, body);
       if (kind === "attention") {
         playAttentionSound();
-        acquireTitleMark();
       } else {
         playDoneSound();
       }
@@ -282,6 +325,20 @@ window.__ModuleLoader__.load({
       if (!raw || raw === "current") return texts().current;
       return raw;
     }
+    // Display label for a session id we only know from the interaction map:
+    // the list row's title, the localized "current" placeholder for the selected
+    // session, the raw id as a last resort.
+    function labelForSessionId(sid) {
+      try {
+        var st = listStore && listStore.getSnapshot();
+        if (st) {
+          var sum = st.byId && st.byId[sid];
+          if (sum) return sessionLabelText({ label: sum.displayTitle || sum.title || "" });
+          if (st.current === sid) return texts().current;
+        }
+      } catch (e) {}
+      return sid;
+    }
     function fireAttention(kind, sessionLabel, detail) {
       var d = texts();
       var label = d.kind[kind] || d.kindDefault;
@@ -302,11 +359,13 @@ window.__ModuleLoader__.load({
     // also drops its title marker again shortly after, so a test never leaves a
     // standing "waiting on you" mark in the tab.
     var TEST_MARK_RELEASE_MS = 6000;
+    var TEST_MARK_KEY = "test:attention";
     function testAlert(kind) {
       var d = texts();
       if (kind === "attention") {
         deliver("attention", "DSH · " + d.kind.question, d.testAttention);
-        setTimeout(function () { releaseTitleMark(); }, TEST_MARK_RELEASE_MS);
+        markAttention(TEST_MARK_KEY);
+        setTimeout(function () { unmarkAttention(TEST_MARK_KEY); }, TEST_MARK_RELEASE_MS);
       } else {
         deliver("done", d.doneTitle, d.testDone);
       }
@@ -320,16 +379,52 @@ window.__ModuleLoader__.load({
     var currentFaceId = null;
     var listStore = null;
     var rootCtx = null; // client cordis context, captured at apply()
+    // uiSession pending-interaction watcher (DSH >= 0.1.2-alpha.2)
+    var uiPending = false; // true once the interaction snapshot is readable
+    var uiSub = null;
+    var uiBaseline = Object.create(null); // sessionId -> { key: string }
 
+    // One-line detail for a pending interaction. Two shapes reach this:
+    //   * the pre-0.1.2 controller payload (approval/question requested frames)
+    //     — flat, its text under `text`/`question`/…;
+    //   * the 0.1.2+ uiSession interaction objects — class instances whose own
+    //     fields are the detail (PendingApproval: toolName/reason/callId,
+    //     PendingQuestion: questions[]).
     function textFromPayload(payload) {
       if (!payload || typeof payload !== "object") return "";
-      var keys = ["text", "question", "prompt", "title", "summary", "description", "message", "operation", "name", "tool"];
+      function clip(s) {
+        s = String(s).replace(/\s+/g, " ").trim();
+        if (!s) return "";
+        return s.length > 160 ? s.slice(0, 160) + "…" : s;
+      }
+      // scalar fields (covers the flat pre-0.1.2 payloads and PendingApproval)
+      var keys = ["text", "question", "prompt", "title", "summary", "description", "message", "operation", "toolName", "reason", "name", "tool"];
       for (var i = 0; i < keys.length; i++) {
         var v = payload[keys[i]];
-        if (typeof v === "string" && v.trim()) return v.length > 160 ? v.slice(0, 160) + "…" : v;
-        if (typeof v === "object" && v !== null && typeof v.text === "string" && v.text.trim()) {
-          var s = v.text;
-          return s.length > 160 ? s.slice(0, 160) + "…" : s;
+        if (typeof v === "string") {
+          var s = clip(v);
+          if (s) {
+            // PendingApproval carries both the tool and the human-readable
+            // reason — "pwsh" alone says nothing useful in a toast.
+            if (keys[i] === "toolName" && typeof payload.reason === "string" && clip(payload.reason)) {
+              return s + " · " + clip(payload.reason);
+            }
+            return s;
+          }
+        } else if (v && typeof v === "object" && typeof v.text === "string" && clip(v.text)) {
+          return clip(v.text);
+        }
+      }
+      // nested batches (PendingQuestion.questions -> { question, detail, options })
+      var qs = payload.questions;
+      if (Array.isArray(qs) && qs.length > 0) {
+        var q = qs[0];
+        if (typeof q === "string") return clip(q);
+        if (q && typeof q === "object") {
+          var qk = ["question", "title", "text", "detail"];
+          for (var j = 0; j < qk.length; j++) {
+            if (typeof q[qk[j]] === "string" && clip(q[qk[j]])) return clip(q[qk[j]]);
+          }
         }
       }
       return "";
@@ -372,12 +467,14 @@ window.__ModuleLoader__.load({
       //    First evaluation of a session also lands here (prevPendingKeys empty),
       //    so a wait that already existed when the plugin (or page) mounted still
       //    alerts once.
+      //    On hosts that expose uiSession this is the fallback path only: the
+      //    interaction snapshot there is the authoritative source, and it drives
+      //    the title marker itself (see the uiSession watcher below).
       if (newKeys.length > 0) {
         var it = newKeys[0];
-        var detail = textFromPayload(it.payload);
-        if (!detail) detail = "";
-        fireAttention(it.kind, sessionLabelText(row), detail);
+        fireAttention(it.kind, sessionLabelText(row), textFromPayload(it.payload));
         lastAttentionAt = Date.now();
+        markAttention(it.key);
       }
 
       // 2) a non-selected session finished while we were away (sidebar "done")
@@ -406,8 +503,8 @@ window.__ModuleLoader__.load({
       };
 
       // a wait we alerted about has been resolved -> drop the title marker
-      if (prev && prevPendingKeys.length > 0 && pendingNow.length === 0) {
-        releaseTitleMark();
+      if (!uiPending && prev && prevPendingKeys.length > 0 && pendingNow.length === 0) {
+        for (var r = 0; r < prevPendingKeys.length; r++) unmarkAttention(prevPendingKeys[r]);
       }
     }
 
@@ -476,6 +573,7 @@ window.__ModuleLoader__.load({
         var st = listStore.getSnapshot();
         var cur = st && st.current;
         bindCurrentFace();
+        bindUiSession();
         var byId = (st && st.byId) || {};
         for (var sid in byId) {
           if (sid === cur) continue; // current handled by the face watcher
@@ -487,25 +585,98 @@ window.__ModuleLoader__.load({
       } catch (e) {}
     }
 
-    // ──────────────────────── global control API ─────────────────────
-    var api = {
-      // keep in sync with package.json "version" on every release
-      version: "1.1.4",
-      get config() { return readConfig(); },
-      setConfig: function (patch) { return setConfigLocal(patch); },
-      resetConfig: function () {
-        try { localStorage.removeItem(LS_CONFIG); } catch (e) {}
-        config = readConfig();
-        return config;
-      },
-      // manual test; run it after clicking anywhere so permission can be granted.
-      // Test alerts fire regardless of the page-open visibility rules.
-      test: function (kind) {
-        kind = kind === "attention" ? "attention" : "done";
-        unlockOnce();
-        testAlert(kind);
-        return "sent " + kind + " (lang=" + effectiveLang() + ", permission=" + ("Notification" in window ? Notification.permission : "n/a") + ")";
+    // ─────────────── uiSession pending-interaction watcher ───────────
+    // DSH >= 0.1.2-alpha.2 moved pending interactions out of the Controller
+    // snapshots into their own store (uiSession.pendingInteractions), a
+    // Map<sessionId, interaction> whose values carry kind + key + sessionId and
+    // the domain's own detail fields. It is the only live "the agent is waiting
+    // on you" source on those hosts.
+    //
+    // The service is looked up lazily rather than declared in `inject`:
+    // a cordis `inject` entry is a hard gate (the entry never activates while
+    // the service is missing, and a never-activated entry makes the whole web
+    // boot audit fail), while hosts older than 0.1.2-alpha.2 have no uiSession
+    // at all and must keep working through the controller path above.
+    function bindUiSession() {
+      if (uiSub) return;
+      var svc = null;
+      try { svc = rootCtx && rootCtx.uiSession; } catch (e) { svc = null; }
+      var store = svc && svc.pendingInteractions;
+      if (!store || typeof store.getSnapshot !== "function" || typeof store.subscribe !== "function") return;
+      uiPending = true; // this watcher now owns the title marker
+      uiSub = store.subscribe(function () { try { evalUiPending(); } catch (e) {} });
+      evalUiPending(); // seed: a wait that predates this plugin still alerts once
+    }
+    function evalUiPending() {
+      var svc = null;
+      try { svc = rootCtx && rootCtx.uiSession; } catch (e) { svc = null; }
+      var store = svc && svc.pendingInteractions;
+      if (!store || typeof store.getSnapshot !== "function") return;
+      var snap = store.getSnapshot(); // Map<sessionId, interaction>
+      if (!snap || typeof snap.forEach !== "function") return;
+      var seen = Object.create(null);
+      snap.forEach(function (it, sid) {
+        if (!it) return;
+        seen[sid] = true;
+        var key = it.key || (it.kind + ":" + sid);
+        var prev = uiBaseline[sid];
+        // new interactions alert once; a wait that already existed on bind
+        // (no baseline yet for that session) alerts here too.
+        if (prev && prev.key === key) return;
+        uiBaseline[sid] = { key: key };
+        // a wait replaced by a newer one in the same session: the old mark goes
+        // with it, otherwise the tab would keep one stale marker per replacement
+        if (prev) unmarkAttention(prev.key);
+        if (attentionKeysFired[key]) { markAttention(key); return; } // already alerted, still needs its mark
+        attentionKeysFired[key] = true;
+        fireAttention(it.kind, labelForSessionId(sid), textFromPayload(it));
+        lastAttentionAt = Date.now();
+        markAttention(key);
+      });
+      for (var sid2 in uiBaseline) {
+        if (seen[sid2]) continue;
+        // interaction answered, cancelled, or its session went away
+        unmarkAttention(uiBaseline[sid2].key);
+        delete uiBaseline[sid2];
       }
+    }
+    function detachUiSession() {
+      if (uiSub) { try { uiSub(); } catch (e) {} uiSub = null; }
+      // drop every mark this watcher holds; hosts without the interaction store
+      // go back to the controller marker path
+      for (var s in uiBaseline) unmarkAttention(uiBaseline[s].key);
+      uiBaseline = Object.create(null);
+      uiPending = false;
+    }
+
+    // ──────────────────────── global control API ─────────────────────
+    // Expose the control API. Merge instead of replace: a consumer (or a test
+    // harness) may have registered onEvent before the plugin applied, and that
+    // hook must survive — binding the interaction store can deliver an alert
+    // synchronously, in the middle of apply().
+    var api = window.__dshNotifyMe;
+    if (!api || typeof api !== "object") api = {};
+    try {
+      Object.defineProperty(api, "config", {
+        get: function () { return readConfig(); },
+        configurable: true
+      });
+    } catch (e) {}
+    // keep in sync with package.json "version" on every release
+    api.version = "1.1.5";
+    api.setConfig = function (patch) { return setConfigLocal(patch); };
+    api.resetConfig = function () {
+      try { localStorage.removeItem(LS_CONFIG); } catch (e) {}
+      config = readConfig();
+      return config;
+    };
+    // manual test; run it after clicking anywhere so permission can be granted.
+    // Test alerts fire regardless of the page-open visibility rules.
+    api.test = function (kind) {
+      kind = kind === "attention" ? "attention" : "done";
+      unlockOnce();
+      testAlert(kind);
+      return "sent " + kind + " (lang=" + effectiveLang() + ", permission=" + ("Notification" in window ? Notification.permission : "n/a") + ")";
     };
     window.__dshNotifyMe = api;
 
@@ -739,6 +910,14 @@ window.__ModuleLoader__.load({
     }
 
     // ────────────────────────── plugin body ──────────────────────────
+    // Hard service requirements only. `uiSession` is deliberately NOT listed:
+    // a cordis inject entry is a hard gate (the entry stays pending while the
+    // service is missing, and the web boot audit fails on entries that never
+    // activate), while hosts older than 0.1.2-alpha.2 have no uiSession at all.
+    // It is therefore looked up lazily in bindUiSession(), with the controller
+    // path above as the fallback. The bundle entry
+    // "@deepseek-ai/dsh-client-ui-session" stays in package.json's
+    // dsh.client.inject so the load order keeps the bundle in the graph.
     var inject = ["sessions", "locale", "slots"];
 
     /**
@@ -788,12 +967,16 @@ window.__ModuleLoader__.load({
           }
           listStore = sessionsSvc.list;
           unsubs.push(sessionsSvc.list.subscribe(onListChanged));
-          // initial scan (baseline only; no alerts for pre-existing state)
+          // Interaction source first: it owns the title marker once present, so
+          // binding it before the controller scan keeps a single mark per wait.
+          bindUiSession();
+          // initial scan (baseline only; no alerts for pre-existing sessions)
           onListChanged();
           // binding may resolve a tick later; re-check periodically while idle
           retryTimer = setInterval(function () {
             if (disposed) return;
             try { bindCurrentFace(); } catch (e) {}
+            try { bindUiSession(); } catch (e) {}
           }, 1500);
           try { console.log("[dsh-notify-me] active — window.__dshNotifyMe 可配置提醒 (enabled=" + config.enabled + ", lang=" + effectiveLang() + ", toast=" + config.toast + ", sound=" + config.sound + ")"); } catch (e) {}
         } catch (e) {
@@ -804,6 +987,7 @@ window.__ModuleLoader__.load({
           if (retryTimer) clearInterval(retryTimer);
           for (var i = 0; i < unsubs.length; i++) { try { unsubs[i](); } catch (e) {} }
           detachFace();
+          detachUiSession();
         };
       }, "dsh-notify-me: watchers");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-notify-me",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "DSH 桌面消息提醒插件：模型需要你操作（审批/方案确认/提问的可操作提醒）或回复在后台完成时，系统通知+提示音+标签页标题提醒你；可在设置页开关并切换通知语言。Desktop notification & message alerts for DeepSeek Harness web — toasts, sounds and a tab-title marker when the agent needs your input (approval / plan review / question) or a reply finishes in the background; toggleable from Settings with zh/en notification language.",
   "license": "MIT",
   "type": "module",