@wangxiaocuo/dsh-session-trash 0.6.5 → 0.6.6

package/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 ## [Unreleased]
 
+## [0.6.6] - 2026-11-11
+
+### Added
+
+- 回收站页支持按移入时间、标题、大小、到期时间排序，可勾选多个条目批量恢复（只含工作区仍存在的条目），并支持全选当前页。
+- 含子会话的条目可以展开查看成员列表（父/子会话 ID 与大小）。
+- 同源浏览器标签页通过 `BroadcastChannel` 实时同步回收站变更，不再需要切换焦点或手动刷新。
+
+### Changed
+
+- 类型收紧：`members.js` 的 `Member`/`TrashEntry` 与 `state.js` 的状态投影形状改为具体类型。
+
 ## [0.6.5] - 2026-11-11
 
 ### Added
@@ -112,6 +124,7 @@
 
 - 回收站工具栏的「永久删除全部」与二次确认；`missing` 记录只移出索引，不删除会话文件。
 
+[0.6.6]: https://github.com/wangxiaocuo/dsh-session-trash/compare/v0.6.5...v0.6.6
 [0.6.5]: https://github.com/wangxiaocuo/dsh-session-trash/compare/v0.6.4...v0.6.5
 [0.6.4]: https://github.com/wangxiaocuo/dsh-session-trash/compare/v0.6.3...v0.6.4
 [0.6.3]: https://github.com/wangxiaocuo/dsh-session-trash/compare/v0.6.2...v0.6.3

package/README.en.md

@@ -15,7 +15,9 @@ Status: feature complete. CI (GitHub Actions) runs the unit tests, the Host smok
 - Right-click a session in the sidebar and choose "Move to trash". It is available for cold sessions with no running turn, job, subagent, or scheduled task; hidden subagent children move with their parent and are restored together.
 - For sessions that are still open, still running work, or own visible child sessions, the menu keeps a labelled explanatory "Move to trash" item that states why the move is unavailable instead of hiding the entry entirely.
 - After the move, the shared DSH Toast offers one action: Undo. Undo tries a normal restore first and falls back to an orphan restore when the original workspace is gone.
-- The Trash page in Settings shows title, Session ID, original workspace, trashed date, remaining days, size, and status. The list supports search, filters, and paging at 50 rows per page.
+- The Trash page in Settings shows title, Session ID, original workspace, trashed date, remaining days, size, and status. The list supports search, filters, sorting by trashed date/title/size/expiry, and paging at 50 rows per page.
+- Entries with hidden sub-sessions show a count badge and can expand to list every member (parent/child session IDs and sizes); restore and permanent deletion still operate on the whole tree.
+- Select multiple entries to restore them as a batch (only rows whose workspace still exists), including a select-all-page checkbox.
 - Row actions include restore, restore as orphan, permanent deletion, removal from the index, copying the Session ID, and revealing the original workspace in Finder or Explorer.
 - The toolbar's "Delete all permanently" empties the whole trash after one confirmation: it deletes every trashed session log and drops file-missing records from the index. Attachments, images, and search-index rows are not deleted.
 - Cleanup keeps entries for 30 days by default and runs every 6 hours. It also runs shortly after activation and when the Trash page opens. Failed cleanup runs are retried with exponential backoff, and the page shows the failure.
@@ -171,7 +173,8 @@ The index schema is v2; a v1 index is upgraded automatically on startup and pres
 - Permanent deletion removes the session log only. Attachments, images, projection-cache rows, and search-index rows are not deleted.
 - Unindexed objects (object directories whose `meta.json` is damaged or unreadable) are never deleted automatically; the page can only clean empty leftovers that hold no session log, and anything that may contain logs is left for manual inspection.
 - `/state` returns all entry summaries in one response. Search, filtering, and paging happen in the Client.
-- There is no cross-window live push. Another window's change appears after a refresh or when the window regains focus.
+- Same-origin tabs in the same browser sync index changes through `BroadcastChannel`; different browsers or machines still need a refresh.
+- Batch restore only covers rows whose workspace still exists; entries with a missing workspace need an individual orphan restore.
 - The desktop apps on Windows and Linux have not been verified manually; CI boots an npm-installed `dsh web` Host, so desktop-shell UI and desktop-only features (such as reveal in the file manager) are still verified on macOS only. On Windows, cases that rely on POSIX permission bits are skipped, and long paths over 260 characters / symlink copying depend on system configuration (the related tests skip themselves when unsupported).
 - macOS path comparison is case-insensitive. On a case-sensitive APFS volume, paths that differ only by case are treated as the same location.
 - Multiple DSH processes sharing one `DSH_HOME` serialize trash operations through `.lock`. The Host retries briefly before reporting `LOCKED`, and the Client retries once automatically; a process paused for more than 10 minutes can lose the lock to another process.

package/README.md

@@ -15,8 +15,9 @@ DeepSeek Harness 的会话回收站插件。冷会话可以从侧边栏移出，
 - 侧边栏右键会话，选择「移入回收站」。只有冷会话、没有运行中的 turn、job、subagent 或定时任务时才能移入；会话跑过的隐藏 subagent 子会话会随父会话一起移入、一起恢复。
 - 对仍打开的会话、正在运行的会话或含可见子会话的会话，菜单保留一个带原因的「移入回收站」说明项：点开解释为什么暂时不能移入，而不是把菜单项直接隐藏。
 - 移入后显示 DSH 共享 Toast，只有「撤销」一个动作。撤销先尝试正常恢复，原工作区不存在时改为孤儿恢复。
-- 设置页「回收站」显示标题、Session ID、原工作区、移入时间、剩余天数、大小和状态。列表支持搜索、筛选，每页 50 条。
-- 含子会话的条目显示「含 N 个子会话」徽章；恢复和永久删除按整棵树处理，不做部分恢复。
+- 设置页「回收站」显示标题、Session ID、原工作区、移入时间、剩余天数、大小和状态。列表支持搜索、筛选、按移入时间/标题/大小/到期排序，每页 50 条。
+- 含子会话的条目显示「含 N 个子会话」徽章，可展开查看每个成员（父/子会话 ID 与大小）；恢复和永久删除按整棵树处理，不做部分恢复。
+- 可勾选多个条目批量恢复（只对工作区仍存在的条目开放），也支持全选当前页。
 - 行操作包括恢复、恢复为孤儿会话、永久删除、从索引移除、复制 Session ID，以及在 Finder 或资源管理器中显示原工作区。
 - 工具栏「永久删除全部」在二次确认后清空回收站：删除所有已移入的会话日志，并把文件缺失的记录移出索引；附件、图片和搜索索引等衍生物不删除。
 - 默认保留 30 天，每 6 小时扫描一次；插件激活后和打开回收站页面时也会检查。清理失败按指数退避重试，失败信息显示在页面上。
@@ -170,7 +171,8 @@ npm 安装的插件在「插件」页打开「会话回收站」的详情，展
 - 永久删除只删除会话日志。附件、图片、投影缓存和搜索索引不会被删除。
 - 无主对象（`meta.json` 损坏或无法识别的对象目录）不会自动删除；页面只能清理其中不含会话日志的空目录，可能含日志的需要人工处理。
 - `/state` 一次返回全部条目摘要，页面在客户端搜索、筛选和分页。
-- 没有跨窗口实时推送。另一个窗口的变更要等刷新或窗口重新获得焦点后出现。
+- 同一浏览器的同源标签页通过 `BroadcastChannel` 实时同步索引变更；不同浏览器或不同设备之间仍需刷新页面。
+- 批量恢复只包含工作区仍存在的条目；工作区缺失的条目需要逐条使用「恢复为孤儿会话」。
 - Windows/Linux 的桌面版尚未手动验证；CI 用 npm 安装的 `dsh web` 覆盖真实 Host 行为，但桌面壳 UI 与桌面专属能力（例如「在文件管理器中显示」）仍只在 macOS 上验证。Windows 上依赖 POSIX 权限位的用例会跳过；超过 260 字符的长路径和符号链接复制受系统设置影响，对应用例在不支持时自动跳过。
 - macOS 的路径比较按大小写不敏感处理。在大小写敏感的 APFS 卷上，仅大小写不同的两个路径会被视为同一位置。
 - 多个 DSH 进程共享同一个 `DSH_HOME` 时，回收站操作通过 `.lock` 串行；Host 在报 `LOCKED` 前会短暂重试，客户端也会自动重试一次；进程暂停超过 10 分钟后，锁可能被另一个进程接管。

package/client.js

@@ -21,6 +21,13 @@ window.__ModuleLoader__.load({
     const EXPIRING_DAYS = 3
     /** Filter identifiers in their sidebar order. */
     const FILTERS = ['all', 'workspace-exists', 'workspace-missing', 'expiring']
+    /** Sort options in their menu order. */
+    const SORT_OPTIONS = [
+      { value: 'trashed', key: 'sortTrashed' },
+      { value: 'title', key: 'sortTitle' },
+      { value: 'size', key: 'sortSize' },
+      { value: 'expires', key: 'sortExpires' },
+    ]
     /** Locale keys for each filter label. */
     const FILTER_LABEL_KEYS = {
       all: 'filterAll',
@@ -56,12 +63,38 @@ window.__ModuleLoader__.load({
 
     /** Open trash views subscribe here so one successful mutation refreshes them all. */
     const revisionListeners = new Set()
+    /** Cross-window channel name; same-origin tabs refresh each other. */
+    const REVISION_CHANNEL_NAME = 'dsh-session-trash/revision'
+    /** Lazily created BroadcastChannel shared by every view in this tab. */
+    let revisionChannel = null
+    let revisionChannelTried = false
 
     /**
-     * Notify every mounted trash view that the Host index changed.
+     * Open the cross-window revision channel once, when the platform supports it.
      * @returns {void}
      */
-    function bumpRevision() {
+    function ensureRevisionChannel() {
+      if (revisionChannelTried) return
+      revisionChannelTried = true
+      const Ctor = typeof window === 'undefined' ? undefined : window.BroadcastChannel
+      if (typeof Ctor !== 'function') return
+      try {
+        revisionChannel = new Ctor(REVISION_CHANNEL_NAME)
+        revisionChannel.addEventListener('message', (event) => {
+          if (event === null || event === undefined) return
+          const data = event.data
+          if (data === null || typeof data !== 'object') return
+          if (data.type === 'revision') notifyRevisionListeners()
+        })
+      } catch {
+        revisionChannel = null
+      }
+    }
+
+    /**
+     * @returns {void}
+     */
+    function notifyRevisionListeners() {
       for (const listener of [...revisionListeners]) {
         try {
           listener()
@@ -71,11 +104,27 @@ window.__ModuleLoader__.load({
       }
     }
 
+    /**
+     * Notify every mounted trash view in this tab and across same-origin tabs.
+     * @returns {void}
+     */
+    function bumpRevision() {
+      ensureRevisionChannel()
+      notifyRevisionListeners()
+      if (revisionChannel === null) return
+      try {
+        revisionChannel.postMessage({ type: 'revision' })
+      } catch {
+        // A closed channel must never break the mutation that triggered it.
+      }
+    }
+
     /**
      * @param {() => void} listener refresh callback.
      * @returns {() => void} unsubscribe.
      */
     function subscribeRevision(listener) {
+      ensureRevisionChannel()
       revisionListeners.add(listener)
       return () => {
         revisionListeners.delete(listener)
@@ -97,6 +146,24 @@ window.__ModuleLoader__.load({
       searchPlaceholder: '搜索标题、Session ID 或原始工作区',
       searchClear: '清除搜索',
       resultsCount: '显示 {shown} / {total} 个会话',
+      selectRow: '选择「{title}」',
+      selectAll: '全选本页可选会话',
+      selectedCount: '已选择 {count} 个会话',
+      clearSelection: '取消选择',
+      batchRestore: '恢复选中',
+      batchRestoring: '正在恢复…',
+      batchRestoreDoneOne: '已恢复 {count} 个会话',
+      batchRestoreDoneOther: '已恢复 {count} 个会话',
+      batchRestorePartial: '已恢复 {restored} 个会话，{failed} 个失败',
+      sortLabel: '排序方式',
+      sortTrashed: '按移入时间（最新在前）',
+      sortTitle: '按标题',
+      sortSize: '按大小（最大在前）',
+      sortExpires: '按到期时间（最早在前）',
+      expandMembers: '展开子会话',
+      collapseMembers: '收起子会话',
+      memberParent: '父会话',
+      memberSubagent: '子会话',
       filterLabel: '筛选回收站',
       filterAll: '全部',
       filterWorkspaceExists: '工作区仍存在',
@@ -259,6 +326,24 @@ window.__ModuleLoader__.load({
       searchPlaceholder: 'Search title, Session ID, or original workspace',
       searchClear: 'Clear search',
       resultsCount: 'Showing {shown} of {total} sessions',
+      selectRow: 'Select “{title}”',
+      selectAll: 'Select all selectable sessions on this page',
+      selectedCount: 'Selected: {count} sessions',
+      clearSelection: 'Clear selection',
+      batchRestore: 'Restore selected',
+      batchRestoring: 'Restoring…',
+      batchRestoreDoneOne: 'Restored {count} session',
+      batchRestoreDoneOther: 'Restored {count} sessions',
+      batchRestorePartial: 'Restored {restored}; {failed} failed',
+      sortLabel: 'Sort by',
+      sortTrashed: 'Newest trashed first',
+      sortTitle: 'Title',
+      sortSize: 'Largest first',
+      sortExpires: 'Expiring soonest first',
+      expandMembers: 'Show sub-sessions',
+      collapseMembers: 'Hide sub-sessions',
+      memberParent: 'Parent',
+      memberSubagent: 'Sub-session',
       filterLabel: 'Filter the trash',
       filterAll: 'All',
       filterWorkspaceExists: 'Workspace exists',
@@ -433,6 +518,27 @@ window.__ModuleLoader__.load({
       return format(template, { ...values, count })
     }
 
+    /**
+     * Compare two trash entries for the selected sort order.
+     *
+     * @param {any} left first entry.
+     * @param {any} right second entry.
+     * @param {string} sortKey active sort identifier.
+     * @param {string | undefined} locale active locale.
+     * @returns {number} comparator result.
+     */
+    function compareEntries(left, right, sortKey, locale) {
+      const titleOf = (entry) => (typeof entry.title === 'string' && entry.title !== '' ? entry.title : entry.sessionId)
+      if (sortKey === 'title') return String(titleOf(left)).localeCompare(String(titleOf(right)), locale)
+      if (sortKey === 'size') return (Number(right.sizeBytes) || 0) - (Number(left.sizeBytes) || 0)
+      if (sortKey === 'expires') {
+        const leftAt = typeof left.expiresAt === 'number' ? left.expiresAt : Number.POSITIVE_INFINITY
+        const rightAt = typeof right.expiresAt === 'number' ? right.expiresAt : Number.POSITIVE_INFINITY
+        return leftAt - rightAt
+      }
+      return (right.trashedAt ?? 0) - (left.trashedAt ?? 0)
+    }
+
     /**
      * @param {number | null | undefined} bytes raw byte count.
      * @returns {string} a compact human-readable size, or an em dash when unknown.
@@ -848,6 +954,26 @@ window.__ModuleLoader__.load({
       .dsh-trash__dialogBody { margin: 0; font-size: 13px; line-height: 1.6; color: var(--dsw-alias-label-secondary); overflow-wrap: anywhere; }
       .dsh-trash__dialogActions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 4px; }
       .dsh-trash__srOnly { position: absolute; width: 1px; height: 1px; margin: -1px; padding: 0; overflow: hidden; clip: rect(0 0 0 0); white-space: nowrap; border: 0; }
+      .dsh-trash__controlsRight { display: flex; flex-wrap: wrap; align-items: center; gap: 10px 12px; margin-left: auto; }
+      .dsh-trash__selectAll { display: inline-flex; align-items: center; gap: 6px; font-size: 12.5px; line-height: 1.5; color: var(--dsw-alias-label-secondary); cursor: pointer; white-space: nowrap; }
+      .dsh-trash__selectAllInput { width: 14px; height: 14px; margin: 0; flex: none; accent-color: var(--dsw-alias-state-business-primary); }
+      .dsh-trash__sort { display: inline-flex; align-items: center; gap: 6px; font-size: 12.5px; line-height: 1.5; color: var(--dsw-alias-label-secondary); }
+      .dsh-trash__sortLabel { white-space: nowrap; }
+      .dsh-trash__sortSelect { height: 28px; padding: 0 8px; border: 0.5px solid var(--dsw-alias-border-l2); border-radius: var(--dsw-radius-sm); background: var(--dsw-alias-bg-layer-1); color: var(--dsw-alias-label-primary); font: inherit; font-size: 12.5px; }
+      .dsh-trash__sortSelect:focus-visible { outline: var(--dsw-focus-ring-width, 2px) solid var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary)); outline-offset: 1px; }
+      .dsh-trash__rowCheck { width: 15px; height: 15px; margin: 3px 0 0; flex: none; accent-color: var(--dsw-alias-state-business-primary); }
+      .dsh-trash__batch { display: flex; flex-wrap: wrap; align-items: center; gap: 8px; padding: 10px 12px; border: 0.5px solid var(--dsw-alias-border-l2); border-radius: var(--dsw-radius-md); background: var(--dsw-alias-bg-layer-2); }
+      .dsh-trash__batchCount { margin-right: auto; font-size: 12.5px; line-height: 1.5; color: var(--dsw-alias-label-secondary); }
+      .dsh-trash__membersWrap { display: flex; flex-direction: column; gap: 6px; margin-top: 4px; }
+      .dsh-trash__membersToggle { appearance: none; align-self: flex-start; border: none; background: none; padding: 0; color: var(--dsw-alias-state-business-primary); font: inherit; font-size: 12.5px; line-height: 1.5; cursor: pointer; }
+      .dsh-trash__membersToggle:hover { text-decoration: underline; }
+      .dsh-trash__membersToggle:focus-visible { outline: var(--dsw-focus-ring-width, 2px) solid var(--dsw-focus-ring-color, var(--dsw-alias-state-business-primary)); outline-offset: 2px; }
+      .dsh-trash__members { list-style: none; margin: 0; padding: 0 0 0 10px; display: flex; flex-direction: column; gap: 4px; border-left: 2px solid var(--dsw-alias-border-l1); }
+      .dsh-trash__member { display: flex; flex-wrap: wrap; align-items: center; gap: 6px; font-size: 12.5px; line-height: 1.5; color: var(--dsw-alias-label-secondary); }
+      .dsh-trash__memberKind { color: var(--dsw-alias-label-tertiary); }
+      .dsh-trash__memberId { font-family: var(--dsw-font-mono, monospace); word-break: break-all; }
+      .dsh-trash__memberSize { margin-left: auto; color: var(--dsw-alias-label-tertiary); }
+
       @media (max-width: 560px) {
         .dsh-trash__row { flex-direction: column; }
         .dsh-trash__rowActions { align-self: flex-end; }
@@ -1188,6 +1314,10 @@ window.__ModuleLoader__.load({
         const [query, setQuery] = React.useState('')
         const [filter, setFilter] = React.useState('all')
         const [page, setPage] = React.useState(1)
+        const [selectedIds, setSelectedIds] = React.useState(() => new Set())
+        const [sortKey, setSortKey] = React.useState('trashed')
+        const [expandedRows, setExpandedRows] = React.useState(() => new Set())
+        const [batchRestoring, setBatchRestoring] = React.useState(false)
         const abortRef = React.useRef(null)
         const searchRef = React.useRef(null)
         const panelRef = React.useRef(null)
@@ -1434,7 +1564,7 @@ window.__ModuleLoader__.load({
 
         const data = view.data
         const entries = data !== null && Array.isArray(data.entries) ? [...data.entries] : []
-        entries.sort((left, right) => (right.trashedAt ?? 0) - (left.trashedAt ?? 0))
+        entries.sort((left, right) => compareEntries(left, right, sortKey, locale))
         const retentionDays =
           data !== null && data.config !== undefined && typeof data.config.retentionDays === 'number'
             ? data.config.retentionDays
@@ -1467,7 +1597,12 @@ window.__ModuleLoader__.load({
         const refreshing = view.status === 'refreshing'
         const readsBusy = loading || refreshing
         const pendingCount =
-          pendingRows.size + (cleaning ? 1 : 0) + (purgingAll ? 1 : 0) + (rebuilding ? 1 : 0) + (forgettingOrphans ? 1 : 0)
+          pendingRows.size +
+          (cleaning ? 1 : 0) +
+          (purgingAll ? 1 : 0) +
+          (rebuilding ? 1 : 0) +
+          (forgettingOrphans ? 1 : 0) +
+          (batchRestoring ? 1 : 0)
         /** Any write (row action or maintenance) is in flight. */
         const mutationBusy = pendingCount > 0
         const corrupt = data !== null && data.index !== undefined && data.index.status === 'corrupt'
@@ -1512,6 +1647,10 @@ window.__ModuleLoader__.load({
         const pageStart = (currentPage - 1) * PAGE_SIZE
         const visibleEntries = filteredEntries.slice(pageStart, pageStart + PAGE_SIZE)
         const filtersActive = normalizedQuery !== '' || filter !== 'all'
+        const pageSelectable = visibleEntries.filter((entry) => isSelectable(entry))
+        const selectedEntries = entries.filter((entry) => selectedIds.has(entry.sessionId) && isSelectable(entry))
+        const allPageSelected =
+          pageSelectable.length > 0 && pageSelectable.every((entry) => selectedIds.has(entry.sessionId))
 
         /**
          * @returns {void} focus the search field when it is mounted.
@@ -1546,13 +1685,118 @@ window.__ModuleLoader__.load({
           }
         }
 
+        /**
+         * @param {object} entry wire entry.
+         * @returns {boolean} whether this row can join a batch restore.
+         */
+        function isSelectable(entry) {
+          return entry.canRestore === true && entry.requiresOrphanRestore !== true
+        }
+
+        /**
+         * @param {string} sessionId selected row identity.
+         * @returns {void}
+         */
+        function toggleSelected(sessionId) {
+          setSelectedIds((previous) => {
+            const next = new Set(previous)
+            if (next.has(sessionId)) next.delete(sessionId)
+            else next.add(sessionId)
+            return next
+          })
+        }
+
+        /**
+         * @param {boolean} checked whether the page should be selected.
+         * @returns {void}
+         */
+        function togglePageSelection(checked) {
+          setSelectedIds((previous) => {
+            const next = new Set(previous)
+            for (const entry of pageSelectable) {
+              if (checked) next.add(entry.sessionId)
+              else next.delete(entry.sessionId)
+            }
+            return next
+          })
+        }
+
+        /**
+         * @returns {void}
+         */
+        function clearSelection() {
+          setSelectedIds(new Set())
+        }
+
+        /**
+         * @param {string} sessionId row whose member list is toggled.
+         * @returns {void}
+         */
+        function toggleExpanded(sessionId) {
+          setExpandedRows((previous) => {
+            const next = new Set(previous)
+            if (next.has(sessionId)) next.delete(sessionId)
+            else next.add(sessionId)
+            return next
+          })
+        }
+
+        /**
+         * Restore every selected row, one Host request at a time. Failures are
+         * collected per row and summarized in one Toast.
+         *
+         * @returns {Promise<void>} completion of the operation.
+         */
+        async function performBatchRestore() {
+          if (!beginWrite()) return
+          const targets = selectedEntries.slice()
+          setBatchRestoring(true)
+          let restored = 0
+          let failed = 0
+          try {
+            for (const entry of targets) {
+              if (!aliveRef.current) return
+              const outcome = await sendMutation('restore', { sessionId: entry.sessionId, mode: 'normal' })
+              if (!aliveRef.current || outcome.kind === 'cancelled') return
+              if (outcome.kind !== 'response') {
+                failed += 1
+                recordRowError(entry, transportMessage(outcome.kind))
+                continue
+              }
+              if (!outcome.ok) {
+                failed += 1
+                recordRowError(entry, describeActionFailure(outcome.status, outcome.payload, t))
+                continue
+              }
+              restored += 1
+              clearRowError(entry.sessionId)
+            }
+            if (!aliveRef.current) return
+            bumpRevision()
+            clearSelection()
+            const message =
+              failed === 0
+                ? countText(t, 'batchRestoreDone', restored)
+                : format(t('batchRestorePartial'), { restored, failed })
+            ctx.contextMenus.notify(message, failed === 0)
+            announce(message)
+          } finally {
+            endWrite()
+            if (aliveRef.current) setBatchRestoring(false)
+          }
+        }
+
         /**
          * @param {object} entry wire entry.
          * @param {string} message localized failure text.
          * @returns {void}
          */
-        function fail(entry, message) {
+        function recordRowError(entry, message) {
           setRowErrors((previous) => ({ ...previous, [entry.sessionId]: message }))
+        }
+
+        function fail(entry, message) {
+          recordRowError(entry, message)
           ctx.contextMenus.notify(message, false)
         }
 
@@ -2178,13 +2422,48 @@ window.__ModuleLoader__.load({
                           h(CloseGlyph, { size: 11 }),
                         ),
                   ),
-                  filtersActive
-                    ? h(
-                        'span',
-                        { className: 'dsh-trash__resultsCount' },
-                        format(t('resultsCount'), { shown: filteredEntries.length, total: entries.length }),
-                      )
-                    : null,
+                  h(
+                    'div',
+                    { className: 'dsh-trash__controlsRight' },
+                    filtersActive
+                      ? h(
+                          'span',
+                          { className: 'dsh-trash__resultsCount' },
+                          format(t('resultsCount'), { shown: filteredEntries.length, total: entries.length }),
+                        )
+                      : null,
+                    h(
+                      'label',
+                      { className: 'dsh-trash__selectAll' },
+                      h('input', {
+                        type: 'checkbox',
+                        className: 'dsh-trash__selectAllInput',
+                        checked: allPageSelected,
+                        'aria-label': t('selectAll'),
+                        disabled: pageSelectable.length === 0 || loading || mutationBusy || corrupt,
+                        onChange: (event) => togglePageSelection(event.target.checked),
+                      }),
+                      h('span', null, t('selectAll')),
+                    ),
+                    h(
+                      'label',
+                      { className: 'dsh-trash__sort' },
+                      h('span', { className: 'dsh-trash__sortLabel' }, t('sortLabel')),
+                      h(
+                        'select',
+                        {
+                          className: 'dsh-trash__sortSelect',
+                          value: sortKey,
+                          'aria-label': t('sortLabel'),
+                          onChange: (event) => {
+                            setSortKey(event.target.value)
+                            setPage(1)
+                          },
+                        },
+                        SORT_OPTIONS.map((option) => h('option', { value: option.value, key: option.value }, t(option.key))),
+                      ),
+                    ),
+                  ),
                 ),
                 h(
                   'div',
@@ -2212,6 +2491,37 @@ window.__ModuleLoader__.load({
                 ),
               )
 
+        const batchBar =
+          selectedEntries.length === 0
+            ? null
+            : h(
+                'div',
+                { className: 'dsh-trash__batch', key: 'batch', role: 'region', 'aria-label': format(t('selectedCount'), { count: selectedEntries.length }) },
+                h('span', { className: 'dsh-trash__batchCount' }, format(t('selectedCount'), { count: selectedEntries.length })),
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'dsh-trash__button',
+                    onClick: () => {
+                      void performBatchRestore()
+                    },
+                    disabled: loading || mutationBusy || corrupt,
+                  },
+                  batchRestoring ? t('batchRestoring') : t('batchRestore'),
+                ),
+                h(
+                  'button',
+                  {
+                    type: 'button',
+                    className: 'dsh-trash__button',
+                    onClick: clearSelection,
+                    disabled: batchRestoring,
+                  },
+                  t('clearSelection'),
+                ),
+              )
+
         let panelBody
         if (view.status === 'loading') {
           panelBody = h(
@@ -2259,6 +2569,16 @@ window.__ModuleLoader__.load({
               return h(
                 'li',
                 { className: 'dsh-trash__row', key: entry.sessionId, 'aria-busy': rowBusy ? 'true' : 'false' },
+                isSelectable(entry)
+                  ? h('input', {
+                      type: 'checkbox',
+                      className: 'dsh-trash__rowCheck',
+                      checked: selectedIds.has(entry.sessionId),
+                      'aria-label': format(t('selectRow'), { title }),
+                      disabled: rowBusy || mutationBusy || corrupt || loading,
+                      onChange: () => toggleSelected(entry.sessionId),
+                    })
+                  : null,
                 h(
                   'div',
                   { className: 'dsh-trash__rowMain' },
@@ -2293,6 +2613,41 @@ window.__ModuleLoader__.load({
                     h('span', { className: 'dsh-trash__dot', 'aria-hidden': true }, '·'),
                     h('span', null, formatBytes(entry.sizeBytes)),
                   ),
+                  entry.subagentCount > 0
+                    ? h(
+                        'div',
+                        { className: 'dsh-trash__membersWrap' },
+                        h(
+                          'button',
+                          {
+                            type: 'button',
+                            className: 'dsh-trash__membersToggle',
+                            'aria-expanded': expandedRows.has(entry.sessionId) ? 'true' : 'false',
+                            onClick: () => toggleExpanded(entry.sessionId),
+                          },
+                          expandedRows.has(entry.sessionId) ? t('collapseMembers') : t('expandMembers'),
+                        ),
+                        expandedRows.has(entry.sessionId)
+                          ? h(
+                              'ul',
+                              { className: 'dsh-trash__members' },
+                              (Array.isArray(entry.members) ? entry.members : []).map((member) =>
+                                h(
+                                  'li',
+                                  { className: 'dsh-trash__member', key: member.sessionId },
+                                  h(
+                                    'span',
+                                    { className: 'dsh-trash__memberKind' },
+                                    member.origin === 'subagent' ? t('memberSubagent') : t('memberParent'),
+                                  ),
+                                  h('code', { className: 'dsh-trash__memberId' }, member.sessionId),
+                                  h('span', { className: 'dsh-trash__memberSize' }, formatBytes(member.sizeBytes)),
+                                ),
+                              ),
+                            )
+                          : null,
+                      )
+                    : null,
                   error !== null && error !== undefined && error !== ''
                     ? h(
                         'div',
@@ -2418,6 +2773,7 @@ window.__ModuleLoader__.load({
           banners,
           toolbar,
           controls,
+          batchBar,
           panel,
           footnote,
           h('div', { className: 'dsh-trash__srOnly', role: 'status', 'aria-live': 'polite' }, announcement),

package/lib/members.js

@@ -8,39 +8,74 @@
  */
 
 /**
- * @param {any} entry index entry (v1 or v2 shape).
- * @returns {object|null} the parent member, or null when the entry has no directory data.
+ * @typedef {object} Member
+ * @property {string} sessionId
+ * @property {'subagent' | null} [origin]
+ * @property {string} [title]
+ * @property {string} [originalSessionDir]
+ * @property {string} [originalLogPath]
+ * @property {string} [persistenceProjectDirHint]
+ * @property {string} [formatStatus]
+ * @property {number | null} [sizeBytes]
+ * @property {number | null} [fileCount]
+ */
+
+/**
+ * @typedef {object} TrashEntry
+ * @property {string} sessionId
+ * @property {string} [trashId]
+ * @property {string} [state]
+ * @property {string} [title]
+ * @property {number} [trashedAt]
+ * @property {number} [startedAt]
+ * @property {string | null} [originalCwd]
+ * @property {boolean} [workspaceExistsAtDeletion]
+ * @property {string} [originalSessionDir]
+ * @property {string} [originalLogPath]
+ * @property {string} [persistenceProjectDirHint]
+ * @property {string} [formatStatus]
+ * @property {number | null} [sizeBytes]
+ * @property {number | null} [fileCount]
+ * @property {string | null} [lastError]
+ * @property {Member[]} [members]
+ */
+
+/**
+ * @param {unknown} entry index entry (v1 or v2 shape).
+ * @returns {Member | null} the parent member, or null when the entry has no directory data.
  */
 export function parentMember(entry) {
   if (entry === null || typeof entry !== 'object') return null
-  if (typeof entry.sessionId !== 'string' || entry.sessionId === '') return null
+  const record = /** @type {Record<string, any>} */ (entry)
+  if (typeof record.sessionId !== 'string' || record.sessionId === '') return null
   return {
-    sessionId: entry.sessionId,
+    sessionId: record.sessionId,
     origin: null,
-    title: typeof entry.title === 'string' ? entry.title : entry.sessionId,
-    originalSessionDir: entry.originalSessionDir,
-    originalLogPath: entry.originalLogPath,
-    persistenceProjectDirHint: entry.persistenceProjectDirHint,
-    formatStatus: entry.formatStatus,
-    sizeBytes: entry.sizeBytes,
-    fileCount: entry.fileCount,
+    title: typeof record.title === 'string' ? record.title : record.sessionId,
+    originalSessionDir: record.originalSessionDir,
+    originalLogPath: record.originalLogPath,
+    persistenceProjectDirHint: record.persistenceProjectDirHint,
+    formatStatus: record.formatStatus,
+    sizeBytes: record.sizeBytes,
+    fileCount: record.fileCount,
   }
 }
 
 /**
- * @param {any} entry index entry (v1 or v2 shape).
- * @returns {any[]} every owned directory, parent first.
+ * @param {unknown} entry index entry (v1 or v2 shape).
+ * @returns {Member[]} every owned directory, parent first.
  */
 export function memberList(entry) {
-  if (entry !== null && typeof entry === 'object' && Array.isArray(entry.members) && entry.members.length > 0) {
-    return entry.members
+  if (entry !== null && typeof entry === 'object') {
+    const record = /** @type {Record<string, any>} */ (entry)
+    if (Array.isArray(record.members) && record.members.length > 0) return record.members
   }
   const parent = parentMember(entry)
   return parent === null ? [] : [parent]
 }
 
 /**
- * @param {readonly any[]} members member list.
+ * @param {ReadonlyArray<Partial<Member> | null | undefined>} members member list.
  * @returns {{ sizeBytes: number, fileCount: number }} summed measurable totals.
  */
 export function aggregateMetrics(members) {
@@ -57,21 +92,26 @@ export function aggregateMetrics(members) {
  * Shape-level validation shared by the durable index and object sidecars.
  * Path strictness belongs to the sidecar validator.
  *
- * @param {any} member candidate member.
+ * @param {unknown} member candidate member.
  * @returns {boolean} whether the member carries the required v2 identity.
  */
 export function isValidMemberShape(member) {
   if (member === null || typeof member !== 'object' || Array.isArray(member)) return false
-  if (typeof member.sessionId !== 'string' || member.sessionId === '' || member.sessionId.length > 256) return false
-  if (member.origin !== undefined && member.origin !== null && member.origin !== 'subagent') return false
-  if (member.title !== undefined && typeof member.title !== 'string') return false
-  if (member.formatStatus !== undefined && member.formatStatus !== 'current' && member.formatStatus !== 'migration-required') {
+  const record = /** @type {Record<string, any>} */ (member)
+  if (typeof record.sessionId !== 'string' || record.sessionId === '' || record.sessionId.length > 256) return false
+  if (record.origin !== undefined && record.origin !== null && record.origin !== 'subagent') return false
+  if (record.title !== undefined && typeof record.title !== 'string') return false
+  if (
+    record.formatStatus !== undefined &&
+    record.formatStatus !== 'current' &&
+    record.formatStatus !== 'migration-required'
+  ) {
     return false
   }
-  if (member.sizeBytes !== undefined && member.sizeBytes !== null && typeof member.sizeBytes !== 'number') return false
-  if (member.fileCount !== undefined && member.fileCount !== null && typeof member.fileCount !== 'number') return false
+  if (record.sizeBytes !== undefined && record.sizeBytes !== null && typeof record.sizeBytes !== 'number') return false
+  if (record.fileCount !== undefined && record.fileCount !== null && typeof record.fileCount !== 'number') return false
   for (const key of ['originalSessionDir', 'originalLogPath', 'persistenceProjectDirHint']) {
-    if (member[key] !== undefined && member[key] !== null && typeof member[key] !== 'string') return false
+    if (record[key] !== undefined && record[key] !== null && typeof record[key] !== 'string') return false
   }
   return true
 }
@@ -79,17 +119,19 @@ export function isValidMemberShape(member) {
 /**
  * Whether the v2 member list is internally consistent with its parent entry.
  *
- * @param {any} entry index entry carrying `members`.
+ * @param {unknown} entry index entry carrying `members`.
  * @returns {boolean} whether the list is acceptable.
  */
 export function isValidMemberList(entry) {
   if (entry === null || typeof entry !== 'object') return false
-  if (!Array.isArray(entry.members) || entry.members.length === 0 || entry.members.length > 64) return false
+  const record = /** @type {Record<string, any>} */ (entry)
+  const members = record.members
+  if (!Array.isArray(members) || members.length === 0 || members.length > 64) return false
   const seen = new Set()
-  for (const member of entry.members) {
+  for (const member of members) {
     if (!isValidMemberShape(member)) return false
     if (seen.has(member.sessionId)) return false
     seen.add(member.sessionId)
   }
-  return entry.members[0].sessionId === entry.sessionId
+  return members[0].sessionId === record.sessionId
 }

package/lib/state.js

@@ -48,18 +48,60 @@ async function directoryExists(directory) {
   }
 }
 
+/**
+ * @typedef {object} TrashConfig
+ * @property {number} retentionDays
+ * @property {number} sweepIntervalHours
+ * @property {boolean} enableAutoCleanup
+ */
+
+/**
+ * @typedef {object} CleanupDiagnostics
+ * @property {boolean} enabled
+ * @property {boolean} timerBacked
+ * @property {number | null} lastAttemptAt
+ * @property {number | null} lastSuccessAt
+ * @property {number | null} nextSweepAt
+ * @property {number | null} retryAt
+ * @property {number} consecutiveFailures
+ * @property {object | null} lastRun
+ */
+
+/**
+ * @typedef {object} StateEntry
+ * @property {string} sessionId
+ * @property {string | undefined} title
+ * @property {number | undefined} trashedAt
+ * @property {number | null} expiresAt
+ * @property {string | null} originalCwd
+ * @property {boolean | null} workspaceExistsAtDeletion
+ * @property {boolean | null} workspaceNowExists
+ * @property {number | null} sizeBytes
+ * @property {number | null} fileCount
+ * @property {string | null} formatStatus
+ * @property {string | undefined} state
+ * @property {boolean} canRestore
+ * @property {boolean} canPurge
+ * @property {boolean} canForget
+ * @property {boolean} requiresOrphanRestore
+ * @property {string | null} lastError
+ * @property {string | null} lastErrorCode
+ * @property {number} subagentCount
+ * @property {{ sessionId: string, origin: 'subagent' | null, sizeBytes: number | null }[]} members
+ */
+
 /**
  * Build the read-only `/state` projection from the committed index.
  *
  * @param {{
  *   store: import('./store.js').TrashStore,
- *   config: { retentionDays: number, sweepIntervalHours: number, enableAutoCleanup: boolean },
+ *   config: TrashConfig,
  *   trashRootDisplay: string,
  *   nextSweepAt?: () => number | null,
- *   cleanup?: () => any,
- *   directoryExists?: (directory?: any) => Promise<boolean>,
+ *   cleanup?: () => CleanupDiagnostics | null,
+ *   directoryExists?: (directory?: string | null) => Promise<boolean>,
  * }} deps state inputs.
- * @returns {{ snapshot: () => Promise<any>, describe: (entry: any) => Promise<any> }} the state service.
+ * @returns {{ snapshot: () => Promise<object>, describe: (entry: import('./members.js').TrashEntry) => Promise<StateEntry> }} the state service.
  */
 export function createStateService({
   store,
@@ -70,13 +112,13 @@ export function createStateService({
   directoryExists: probeDirectory = directoryExists,
 }) {
   /**
-   * @returns {any} cleanup diagnostics, or a neutral fallback.
+   * @returns {CleanupDiagnostics} cleanup diagnostics, or a neutral fallback.
    */
   function cleanupDiagnostics() {
     if (typeof cleanup === 'function') {
       try {
         const value = cleanup()
-        if (value !== null && typeof value === 'object') return value
+        if (value !== null && typeof value === 'object') return /** @type {CleanupDiagnostics} */ (value)
       } catch {
         // Diagnostics must never break the read-only state projection.
       }
@@ -94,10 +136,10 @@ export function createStateService({
   }
 
   /**
-   * @param {any} entry committed index entry.
+   * @param {import('./members.js').TrashEntry} entry committed index entry.
    * @param {Map<string, Promise<boolean>>} [probeCache] workspace probes already
    *   started for this snapshot, so entries sharing a cwd probe it once.
-   * @returns {Promise<any>} the wire entry.
+   * @returns {Promise<StateEntry>} the wire entry.
    */
   async function describeEntry(entry, probeCache = new Map()) {
     const cwd = typeof entry.originalCwd === 'string' && entry.originalCwd !== '' ? entry.originalCwd : null
@@ -140,12 +182,12 @@ export function createStateService({
 
   return {
     /**
-     * @param {any} entry committed index entry.
-     * @returns {Promise<any>} the wire entry.
+     * @param {import('./members.js').TrashEntry} entry committed index entry.
+     * @returns {Promise<StateEntry>} the wire entry.
      */
     describe: describeEntry,
     /**
-     * @returns {Promise<any>} the complete `/state` response body.
+     * @returns {Promise<object>} the complete `/state` response body.
      */
     async snapshot() {
       const probeCache = new Map()

package/lib/trash-service.js

@@ -1036,6 +1036,7 @@ export function createTrashService({ ctx, store, eligibility, config, logger, pa
 
       const plan = Array.isArray(verdict.members) ? verdict.members : []
       if (plan.length === 0) throw new TrashError('SESSION_NOT_FOUND', 'This session is not in session storage.')
+      /** @type {import('./members.js').Member[]} */
       const members = []
       let parentSnapshot
       for (let index = 0; index < plan.length; index += 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wangxiaocuo/dsh-session-trash",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "description": "DeepSeek Harness plugin: move cold sessions into a recoverable trash, restore them within the retention window, or delete their logs permanently.",
   "license": "MIT",
   "author": "wangxiaocuo",