dsh-ws-recency 0.9.0 → 0.9.2

package/README.md

@@ -12,8 +12,9 @@ DSH 已经把**组内**会话按 `updatedAt` 倒序排好了（排序方式 =
 
 会话超过 `foldDays`（默认 **3 天**）没有更新就折叠起来；整个工作区都过期时，它只剩一行工作区标题——需要翻历史时点开就行。
 
-- **每组只有一个控件**：宿主自己还有没渲染的行时，用它的「展开其余 N 条会话」（N 已含被折叠的行）；宿主把该组渲染完了时，才出现插件的 `展开历史 N` / `收起历史`；
-- 点宿主的「展开其余」会同时放出被折叠的行；它变成「收起」时，折叠也一并复原；
+- **每组一个控件**：宿主的「展开其余 N 条会话」被隐藏，由插件的 `展开历史 N` / `收起历史` 接管。N = 宿主还没渲染的行 + 已折叠的过期行；
+  - 点「展开历史」→ 插件逐轮驱动宿主那个隐藏按钮（每轮它会多渲染 5 条，剩下 ≤5 条时一次全出），直到整组都渲染出来，同时展开过期行——**一次点到全展开**；
+  - 点「收起历史」→ 重新折叠过期行（宿主已渲染的部分仍由插件按时间折叠，不会丢失）；
 - 选中 / 运行中 / 等待处理的会话**永不折叠**（可在设置里关掉这个豁免）；
 - 空白草稿行（新会话）不参与折叠判断；
 - 每 5 分钟自动重算一次，所以跨过 3 天边界的会话会自己折叠，不用刷新。
@@ -97,7 +98,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.2/dsh-ws-recency-0.9.2.tgz
 ```
 
 装完把 `dsh-ws-recency` 加进 `~/.hypers-work/profiles/<profile>/package.json` 的 `dsh.profile.bundles`，重启应用。

package/client.js

@@ -69,6 +69,8 @@
         var MIN_DAYS = 1;
         var MAX_DAYS = 90;
         var DEFAULT_DAYS = 3;
+        /** Safety stop for driving the host's own "show more" (5 rows per click). */
+        var MAX_EXPAND_CLICKS = 40;
         var TICK_MS = 5 * 60 * 1000;
 
         var data = { sessions: null, workspaces: null, settings: null, statuses: null, actions: null, service: null, t: null };
@@ -78,13 +80,12 @@
         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 expandClicks = new Map();
         var expandedSections = new Set();
-        var clickMarked = new WeakSet();
         var headerMarked = new WeakSet();
         var disposed = false;
 
@@ -93,6 +94,7 @@
           "[" + ROOT_ATTR + '="true"]>*{flex:0 0 auto}',
           "[" + HIDDEN_ATTR + '="true"]{display:none !important}',
           "[" + PIN_HIDDEN_ATTR + '="true"]{display:none !important}',
+          '[class*="' + OVERFLOW_TOKEN + '"]{display:none !important}',
           ".wsr-pin{display:flex;flex-direction:column;flex:0 0 auto;padding:2px 0 6px;margin-bottom:4px;border-bottom:.5px solid var(--dsw-alias-border-l2)}",
           ".wsr-pin-head{font-size:11px;line-height:16px;color:var(--dsw-alias-label-tertiary);padding:4px 12px 2px}",
           ".wsr-pin-row{display:flex;align-items:center;gap:8px;height:30px;padding:0 12px;border-radius:6px;cursor:pointer}",
@@ -325,11 +327,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 +368,23 @@
           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);
+        /** The host's own "show more" button, hidden by CSS but still clickable. */
+        function overflowButtonOf(section) {
+          if (typeof section.querySelector !== "function") return null;
+          return section.querySelector('button[class*="' + OVERFLOW_TOKEN + '"]');
         }
 
-        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();
-          });
+        /** The count the host reports on its own button, 0 when there is none. */
+        function labelNumber(button) {
+          if (button === null || button === undefined) return 0;
+          var text = typeof button.textContent === "string" ? button.textContent : "";
+          var match = /\d+/.exec(text);
+          if (match === null) return 0;
+          var value = Number(match[0]);
+          return Number.isFinite(value) && value > 0 ? value : 0;
         }
 
+        /** 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 +406,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;
         }
@@ -462,6 +431,13 @@
          * Fold the rows the host rendered that have not changed for `foldDays`, and
          * offer the group's own control to bring them back. A workspace whose every
          * session is that old therefore renders as a bare header.
+         *
+         * The host's own "show more" button is hidden (CSS) and driven from here: it
+         * only renders five rows at a time and cannot collapse once everything is
+         * rendered, which made "show more" look broken next to a fold. Expanding the
+         * group now clicks that hidden button once per pass until the host has
+         * rendered every session, so one click reveals everything; collapsing just
+         * folds the stale rows again.
          */
         function foldRows(entries, settings, sessions, now) {
           var cutoff = now - settings.foldDays * DAY;
@@ -471,10 +447,27 @@
             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 hostHidden = hostButton === null ? 0 : labelNumber(hostButton);
+            var hostExpanded = hostButton !== null
+              && typeof hostButton.getAttribute === "function"
+              && hostButton.getAttribute("aria-expanded") === "true";
+            if (expanded && hostButton !== null && !hostExpanded) {
+              /* The host renders five more per click (or everything when five or
+                 fewer remain) and reports `aria-expanded` once nothing is hidden.
+                 Stopping on that flag is what keeps the loop from collapsing the
+                 very thing it just expanded - a click on an expanded host button
+                 resets the watermark. */
+              var used = expandClicks.get(entry.key) || 0;
+              if (used < MAX_EXPAND_CLICKS) {
+                expandClicks.set(entry.key, used + 1);
+                hostButton.click();
+              }
+            } else if (!expanded) {
+              expandClicks.delete(entry.key);
+            }
+
             var folded = 0;
             for (var j = 0; j < rows.length; j += 1) {
               var row = rows[j];
@@ -493,23 +486,22 @@
               }
             }
 
-            /* 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) {
+            /* ONE control per group: its count is everything the group still hides,
+               both the rows the host did not render and the stale rows this plugin
+               folded. Expanding drives the hidden host button until nothing is left
+               unrendered, so one click reveals the whole group. */
+            var remaining = folded + hostHidden;
+            if (expanded) {
               (function (entryKey) {
                 ensureToggle(section, entryKey, t("fold.hide"), function () {
                   expandedSections.delete(entryKey);
+                  expandClicks.delete(entryKey);
                   schedule();
                 });
               })(entry.key);
-            } else if (folded > 0) {
+            } else if (remaining > 0) {
               (function (entryKey) {
-                ensureToggle(section, entryKey, t("fold.show", { n: folded }), function () {
+                ensureToggle(section, entryKey, t("fold.show", { n: remaining }), function () {
                   expandedSections.add(entryKey);
                   schedule();
                 });
@@ -958,8 +950,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(); });
@@ -970,6 +960,7 @@
           pinHidden.clear();
           if (pinHost !== null && pinHost.parentElement !== null) pinHost.remove();
           pinHost = null;
+          expandClicks.clear();
           roots.forEach(function (root) { root.removeAttribute(ROOT_ATTR); });
           roots.clear();
           var marked = document.querySelectorAll("[" + STATE_ATTR + "]");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-ws-recency",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "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",