dsh-ws-recency 0.9.1 → 0.9.2

package/README.md

@@ -12,7 +12,9 @@ DSH 已经把**组内**会话按 `updatedAt` 倒序排好了（排序方式 =
 
 会话超过 `foldDays`（默认 **3 天**）没有更新就折叠起来；整个工作区都过期时，它只剩一行工作区标题——需要翻历史时点开就行。
 
-- **两个控件各管一件事**：宿主的「展开其余 N 条会话」负责让**宿主渲染**更多行（数字由宿主自己报，插件不再改写它）；插件的 `展开历史 N` / `收起历史` 只负责把**已渲染但过期**的行折叠起来，点两次就是展开、收起一对；
+- **每组一个控件**：宿主的「展开其余 N 条会话」被隐藏，由插件的 `展开历史 N` / `收起历史` 接管。N = 宿主还没渲染的行 + 已折叠的过期行；
+  - 点「展开历史」→ 插件逐轮驱动宿主那个隐藏按钮（每轮它会多渲染 5 条，剩下 ≤5 条时一次全出），直到整组都渲染出来，同时展开过期行——**一次点到全展开**；
+  - 点「收起历史」→ 重新折叠过期行（宿主已渲染的部分仍由插件按时间折叠，不会丢失）；
 - 选中 / 运行中 / 等待处理的会话**永不折叠**（可在设置里关掉这个豁免）；
 - 空白草稿行（新会话）不参与折叠判断；
 - 每 5 分钟自动重算一次，所以跨过 3 天边界的会话会自己折叠，不用刷新。
@@ -96,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.1/dsh-ws-recency-0.9.1.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 };
@@ -82,6 +84,7 @@
         var dots = new Set();
         var pinHidden = new Set();
         var pinHost = null;
+        var expandClicks = new Map();
         var expandedSections = new Set();
         var headerMarked = new WeakSet();
         var disposed = false;
@@ -91,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}",
@@ -364,6 +368,22 @@
           return session !== undefined && session !== null && session.blank === true;
         }
 
+        /** 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 + '"]');
+        }
+
+        /** 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;
@@ -411,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;
@@ -418,9 +445,29 @@
             var entry = entries[i];
             var section = entry.section;
             var rows = rowElements(section);
+            var hostButton = overflowButtonOf(section);
             markHeader(entry.header, entry.key);
 
             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];
@@ -439,22 +486,22 @@
               }
             }
 
-            /* 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. */
+            /* 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();
                 });
@@ -913,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.1",
+  "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",