dsh-ws-recency 0.9.0 → 0.9.1

package/README.md

@@ -12,8 +12,7 @@ DSH 已经把**组内**会话按 `updatedAt` 倒序排好了（排序方式 =
 
 会话超过 `foldDays`（默认 **3 天**）没有更新就折叠起来；整个工作区都过期时，它只剩一行工作区标题——需要翻历史时点开就行。
 
-- **每组只有一个控件**：宿主自己还有没渲染的行时，用它的「展开其余 N 条会话」（N 已含被折叠的行）；宿主把该组渲染完了时，才出现插件的 `展开历史 N` / `收起历史`；
-- 点宿主的「展开其余」会同时放出被折叠的行；它变成「收起」时，折叠也一并复原；
+- **两个控件各管一件事**：宿主的「展开其余 N 条会话」负责让**宿主渲染**更多行（数字由宿主自己报，插件不再改写它）；插件的 `展开历史 N` / `收起历史` 只负责把**已渲染但过期**的行折叠起来，点两次就是展开、收起一对；
 - 选中 / 运行中 / 等待处理的会话**永不折叠**（可在设置里关掉这个豁免）；
 - 空白草稿行（新会话）不参与折叠判断；
 - 每 5 分钟自动重算一次，所以跨过 3 天边界的会话会自己折叠，不用刷新。
@@ -97,7 +96,7 @@ dsh plugin --profile <profile> add github:chyxhtc/dsh-ws-recency
 或固定版本的预构建包：
 
 ```powershell
-dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.9.0/dsh-ws-recency-0.9.0.tgz
+dsh plugin --profile <profile> add https://github.com/chyxhtc/dsh-ws-recency/releases/download/v0.9.1/dsh-ws-recency-0.9.1.tgz
 ```
 
 装完把 `dsh-ws-recency` 加进 `~/.hypers-work/profiles/<profile>/package.json` 的 `dsh.profile.bundles`，重启应用。

package/client.js

@@ -78,13 +78,11 @@
         var written = new Set();
         var roots = new Set();
         var hidden = new Set();
-        var labelled = new Set();
         var toggles = new Set();
         var dots = new Set();
         var pinHidden = new Set();
         var pinHost = null;
         var expandedSections = new Set();
-        var clickMarked = new WeakSet();
         var headerMarked = new WeakSet();
         var disposed = false;
 
@@ -325,11 +323,6 @@
           return out;
         }
 
-        function overflowButtonOf(section) {
-          if (typeof section.querySelector !== "function") return null;
-          return section.querySelector('button[class*="' + OVERFLOW_TOKEN + '"]');
-        }
-
         function isActiveRow(row) {
           if (typeof row.querySelector !== "function") return false;
           return row.querySelector('[data-state="ongoing"], [data-state="warning"]') !== null;
@@ -371,55 +364,7 @@
           return session !== undefined && session !== null && session.blank === true;
         }
 
-        /**
-         * Rewrite the host button's count so it reports what is really hidden: the
-         * host counts only the rows it did not render, and the fold hides a few more.
-         */
-        function rewriteLabel(button, extraHidden) {
-          if (button === null || button === undefined) return;
-          if (typeof button.textContent !== "string" || button.dataset === undefined) return;
-          var base = button.dataset.wsrBase;
-          if (typeof base !== "string") {
-            base = button.textContent;
-            button.dataset.wsrBase = base;
-            labelled.add(button);
-          }
-          var match = /\d+/.exec(base);
-          if (match === null) return;
-          var hostCount = Number(match[0]);
-          if (!Number.isFinite(hostCount)) return;
-          var total = hostCount + extraHidden;
-          var text = total <= 0 ? base : base.slice(0, match.index) + String(total) + base.slice(match.index + match[0].length);
-          if (button.textContent !== text) button.textContent = text;
-        }
-
-        function releaseLabel(button) {
-          if (button === null || button === undefined || button.dataset === undefined) return;
-          var base = button.dataset.wsrBase;
-          if (typeof base === "string") {
-            if (button.textContent !== base) button.textContent = base;
-            delete button.dataset.wsrBase;
-          }
-          labelled.delete(button);
-        }
-
-        function markButton(button, key) {
-          if (typeof button.addEventListener !== "function" || clickMarked.has(button)) return;
-          clickMarked.add(button);
-          button.addEventListener("click", function () {
-            if (disposed) return;
-            /* The host's own control is the only one while it exists, so it has to
-               carry the fold too: `aria-expanded` still reads the pre-click state
-               (React delegates at the root, this listener runs first), which is
-               exactly what decides whether the click reveals or hides. */
-            var expanded = typeof button.getAttribute === "function"
-              && button.getAttribute("aria-expanded") === "true";
-            if (expanded) expandedSections.delete(key);
-            else expandedSections.add(key);
-            schedule();
-          });
-        }
-
+        /** Collapsing a group resets its fold state, so the click is observed. */
         function markHeader(header, key) {
           if (typeof header.addEventListener !== "function" || headerMarked.has(header)) return;
           headerMarked.add(header);
@@ -441,11 +386,15 @@
             button.addEventListener("click", function (event) {
               if (disposed) return;
               if (event !== undefined && typeof event.stopPropagation === "function") event.stopPropagation();
-              onClick();
+              var current = button.wsrOnClick;
+              if (typeof current === "function") current();
             });
             section.appendChild(button);
             toggles.add(button);
           }
+          /* The handler is refreshed every pass: the button toggles between "show"
+             and "hide", and a captured first callback would only ever show. */
+          button.wsrOnClick = onClick;
           if (button.textContent !== label) button.textContent = label;
           return button;
         }
@@ -469,10 +418,7 @@
             var entry = entries[i];
             var section = entry.section;
             var rows = rowElements(section);
-            var hostButton = overflowButtonOf(section);
             markHeader(entry.header, entry.key);
-            if (hostButton !== null) markButton(hostButton, entry.key);
-            releaseLabel(hostButton);
 
             var expanded = expandedSections.has(entry.key);
             var folded = 0;
@@ -493,14 +439,13 @@
               }
             }
 
-            /* ONE control per group: while the host offers its own "show more"
-               button, that button is the control (its count already carries the
-               folded rows below). Only a group the host finished rendering gets
-               this plugin's own toggle. */
-            if (hostButton !== null) {
-              dropToggle(section);
-              rewriteLabel(hostButton, expanded ? 0 : folded);
-            } else if (expanded) {
+            /* The host's own "show more" button and this fold are two different
+               things: the host decides which rows it RENDERS, this plugin decides
+               which rendered rows stay VISIBLE. Touching the host's label or its
+               click made the two fight (a count nobody could trust, and a collapse
+               that never came back), so they stay separate: the group gets its own
+               "show history" control whenever something is folded. */
+            if (expanded) {
               (function (entryKey) {
                 ensureToggle(section, entryKey, t("fold.hide"), function () {
                   expandedSections.delete(entryKey);
@@ -958,8 +903,6 @@
             if (element.removeAttribute !== undefined) element.removeAttribute(HIDDEN_ATTR);
           });
           hidden.clear();
-          labelled.forEach(function (button) { releaseLabel(button); });
-          labelled.clear();
           toggles.forEach(function (button) { button.remove(); });
           toggles.clear();
           dots.forEach(function (dot) { dot.remove(); });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ws-recency",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Sidebar session management for DeepSeek Harness: workspace groups sorted by latest activity, stale history folded, a global pinned section, follow-up marks, and session delete into a recoverable trash.",
   "license": "MIT",
   "author": "chyxhtc",