@wangxiaocuo/dsh-session-trash 0.6.4 → 0.6.6

package/CHANGELOG.md

@@ -4,6 +4,36 @@
 
 ## [Unreleased]
 
+## [0.6.6] - 2026-11-11
+
+### Added
+
+- 回收站页支持按移入时间、标题、大小、到期时间排序，可勾选多个条目批量恢复（只含工作区仍存在的条目），并支持全选当前页。
+- 含子会话的条目可以展开查看成员列表（父/子会话 ID 与大小）。
+- 同源浏览器标签页通过 `BroadcastChannel` 实时同步回收站变更，不再需要切换焦点或手动刷新。
+
+### Changed
+
+- 类型收紧：`members.js` 的 `Member`/`TrashEntry` 与 `state.js` 的状态投影形状改为具体类型。
+
+## [0.6.5] - 2026-11-11
+
+### Added
+
+- 回收站页可以清理不含会话日志的空无主对象（`POST /orphans/forget`）；可能含日志的无主对象继续保留，供人工处理。
+- CI 增加 `lib/**` 覆盖率门槛（行 85 / 分支 70 / 函数 84）和 README 的 CI badge。
+- 新增 tag 触发的 release workflow：typecheck、单测、smoke、真实 Host e2e 通过后 `npm publish --provenance` 并创建 GitHub Release；使用 npm Trusted Publishing，无需 `NPM_TOKEN`。
+
+### Changed
+
+- `GET /state` 改为纯只读；页面打开时由客户端显式调用 `POST /sweep` 触发节流维护，读请求不再可能触发永久删除。
+- 锁竞争：Host 在报 `LOCKED` 前短暂重试，客户端对 `LOCKED` 自动重试一次；`trash()` 的 lineage/preflight 移到锁外，缩短持锁时间。
+- 收紧 `lib/errors.js` 和 `lib/fsops.js` 的类型（`any` 换成 `unknown` 与具体形状）。
+
+### Tests
+
+- 覆盖页面维护扫描（成功/节流/失败）、空无主对象清理、锁重试和客户端 LOCKED 重试。
+
 ## [0.6.4] - 2026-11-11
 
 ### Added
@@ -94,6 +124,8 @@
 
 - 回收站工具栏的「永久删除全部」与二次确认；`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
 [0.6.2]: https://github.com/wangxiaocuo/dsh-session-trash/compare/v0.6.1...v0.6.2

package/README.en.md

@@ -1,5 +1,7 @@
 # dsh-session-trash
 
+[![CI](https://github.com/wangxiaocuo/dsh-session-trash/actions/workflows/ci.yml/badge.svg)](https://github.com/wangxiaocuo/dsh-session-trash/actions/workflows/ci.yml)
+
 [简体中文](./README.md) | English
 
 [GitHub](https://github.com/wangxiaocuo/dsh-session-trash) · [npm](https://www.npmjs.com/package/@wangxiaocuo/dsh-session-trash) · [Changelog](./CHANGELOG.md)
@@ -13,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.
@@ -113,13 +117,15 @@ All routes live under `/plugins/dsh-session-trash/api/` and are registered as ex
 
 | Method | Path | Description |
 |---|---|---|
-| `GET` | `/state` | Config, index state, entries, stats, and cleanup diagnostics; may schedule a throttled page-open cleanup |
+| `GET` | `/state` | Config, index state, entries, stats, and cleanup diagnostics (read-only; never sweeps) |
+| `POST` | `/sweep` | No body; runs one throttled page-open maintenance sweep; whether expired entries are deleted depends on `enableAutoCleanup` |
 | `POST` | `/preflight` | `{ sessionId }` returns `{ eligible: true, descendants }` or `{ eligible: false, code, message, details? }`; `descendants` is the number of hidden children that move along |
 | `POST` | `/trash` | `{ sessionId }`; moves the whole session tree (parent plus hidden subagent children) and returns `{ ok, entry }` |
 | `POST` | `/restore` | `{ sessionId, mode: 'normal' \| 'orphan' }` |
 | `POST` | `/purge` | `{ sessionId }`; permanently deletes the session log |
 | `POST` | `/purge-all` | No body; permanently deletes every entry in the trash, dropping `missing` index records only; returns `{ ok, purged, forgotten, failed }` |
 | `POST` | `/forget` | `{ sessionId }`; removes only a `missing` index entry |
+| `POST` | `/orphans/forget` | No body; removes empty unindexed object directories that hold no session log; returns `{ ok, removed }` |
 | `POST` | `/reveal` | `{ sessionId }`; opens the original workspace |
 | `POST` | `/cleanup` | No body; runs one cleanup sweep |
 | `POST` | `/rebuild` | No body; rebuilds the index only in protection mode |
@@ -165,11 +171,13 @@ The index schema is v2; a v1 index is upgraded automatically on startup and pres
 - Orphan restore never recreates the original workspace directory and never reattaches the session to a workspace.
 - Archive and pin state survive trash and restore. The Trash page does not manage either set.
 - 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`. A process paused for more than 10 minutes can lose the lock to another process.
+- 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.
 
 ## Development
 
@@ -177,6 +185,7 @@ The index schema is v2; a v1 index is upgraded automatically on startup and pres
 pnpm install
 pnpm test          # unit tests + real-DOM component tests (jsdom)
 pnpm typecheck     # tsc --checkJs (currently lib/ and index.js)
+pnpm test:coverage # coverage (CI thresholds apply to lib/**)
 pnpm test:smoke    # Host smoke test (real Cordis, plain Node)
 npm run test:e2e   # real dsh web end-to-end (desktop app or npm-installed DSH)
 ```
@@ -189,11 +198,20 @@ What CI verifies:
 |---|---|
 | Unit tests, Host smoke test | CI: Ubuntu Node 20/22, Windows Node 22 |
 | Package contents (`npm pack`) | CI: Ubuntu |
+| Coverage thresholds (`lib/**`, lines 85 / branches 70 / functions 84) | CI: Ubuntu Node 22 |
 | Real `dsh web` end to end (npm-installed DSH) | CI: Ubuntu, Windows (Node 22) |
 | Real `dsh web` end to end (desktop app) | macOS + DSH 0.2.2-rc.1 (run manually) |
 
 `npm run test:e2e` boots a real `dsh web` Host in a temporary `DSH_HOME` and runs the full flow. By default it discovers the desktop app in the platform's usual install locations (or uses `DSH_ELECTRON`); set `DSH_E2E_DSH_BIN` to the `lib/bin.js` of an npm-installed `@deepseek-ai/dsh` to boot the Host with plain Node instead - CI and Linux/Windows use that mode, with no desktop app required. When no Host is found it prints a skip message and exits 0. The cleanup-failure scenario that relies on POSIX permission bits is skipped on Windows. Set `DSH_E2E_KEEP=1` to keep the temporary home and logs.
 
+### Releasing (maintainers)
+
+1. Bump the version in `package.json` and update `CHANGELOG.md`, then commit and push.
+2. Create and push a tag: `git tag -a vX.Y.Z -m "..." && git push origin vX.Y.Z`.
+3. The tag runs [release.yml](.github/workflows/release.yml): typecheck, unit tests, smoke test, real-host e2e, then `npm publish --provenance` and a GitHub release.
+
+Publishing uses npm Trusted Publishing (OIDC), so no `NPM_TOKEN` is required: add repository `wangxiaocuo/dsh-session-trash` and workflow `release.yml` under the package's Settings -> Publishing access -> Trusted publishers on npmjs.com. To use an automation token instead, uncomment the `NODE_AUTH_TOKEN` environment variable in release.yml and add the matching secret.
+
 Project layout:
 
 ```text

package/README.md

@@ -1,5 +1,7 @@
 # dsh-session-trash
 
+[![CI](https://github.com/wangxiaocuo/dsh-session-trash/actions/workflows/ci.yml/badge.svg)](https://github.com/wangxiaocuo/dsh-session-trash/actions/workflows/ci.yml)
+
 简体中文 | [English](./README.en.md)
 
 [GitHub](https://github.com/wangxiaocuo/dsh-session-trash) · [npm](https://www.npmjs.com/package/@wangxiaocuo/dsh-session-trash) · [更新记录](./CHANGELOG.md)
@@ -13,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 小时扫描一次；插件激活后和打开回收站页面时也会检查。清理失败按指数退避重试，失败信息显示在页面上。
@@ -112,13 +115,15 @@ npm 安装的插件在「插件」页打开「会话回收站」的详情，展
 
 | 方法 | 路径 | 说明 |
 |---|---|---|
-| `GET` | `/state` | 配置、索引状态、条目、统计和清理诊断；打开页面时可能触发一次节流清理 |
+| `GET` | `/state` | 配置、索引状态、条目、统计和清理诊断（只读，不触发清理） |
+| `POST` | `/sweep` | 无请求体，按节流执行一次页面维护扫描；回收站页面打开时调用，是否删除过期条目由 `enableAutoCleanup` 决定 |
 | `POST` | `/preflight` | `{ sessionId }` 返回 `{ eligible: true, descendants }` 或 `{ eligible: false, code, message, details? }`；`descendants` 是一并移入的隐藏子会话数 |
 | `POST` | `/trash` | `{ sessionId }`，移动整棵会话树（父会话 + 隐藏 subagent 子会话），返回 `{ ok, entry }` |
 | `POST` | `/restore` | `{ sessionId, mode: 'normal' \| 'orphan' }` |
 | `POST` | `/purge` | `{ sessionId }`，永久删除会话日志 |
 | `POST` | `/purge-all` | 无请求体，永久删除回收站中的全部条目；`missing` 记录仅移除索引；返回 `{ ok, purged, forgotten, failed }` |
 | `POST` | `/forget` | `{ sessionId }`，仅移除 `missing` 条目的索引记录 |
+| `POST` | `/orphans/forget` | 无请求体，删除不含会话日志的空无主对象目录；返回 `{ ok, removed }` |
 | `POST` | `/reveal` | `{ sessionId }`，打开原工作区 |
 | `POST` | `/cleanup` | 无请求体，手动执行一次清理 |
 | `POST` | `/rebuild` | 无请求体，仅在索引保护模式下重建 |
@@ -164,11 +169,13 @@ npm 安装的插件在「插件」页打开「会话回收站」的详情，展
 - 孤儿恢复不会重建原工作区目录，也不会重新挂到工作区。
 - 归档和置顶状态会跨回收、恢复保留，回收站页面不管理这两个集合。
 - 永久删除只删除会话日志。附件、图片、投影缓存和搜索索引不会被删除。
+- 无主对象（`meta.json` 损坏或无法识别的对象目录）不会自动删除；页面只能清理其中不含会话日志的空目录，可能含日志的需要人工处理。
 - `/state` 一次返回全部条目摘要，页面在客户端搜索、筛选和分页。
-- 没有跨窗口实时推送。另一个窗口的变更要等刷新或窗口重新获得焦点后出现。
+- 同一浏览器的同源标签页通过 `BroadcastChannel` 实时同步索引变更；不同浏览器或不同设备之间仍需刷新页面。
+- 批量恢复只包含工作区仍存在的条目；工作区缺失的条目需要逐条使用「恢复为孤儿会话」。
 - Windows/Linux 的桌面版尚未手动验证；CI 用 npm 安装的 `dsh web` 覆盖真实 Host 行为，但桌面壳 UI 与桌面专属能力（例如「在文件管理器中显示」）仍只在 macOS 上验证。Windows 上依赖 POSIX 权限位的用例会跳过；超过 260 字符的长路径和符号链接复制受系统设置影响，对应用例在不支持时自动跳过。
 - macOS 的路径比较按大小写不敏感处理。在大小写敏感的 APFS 卷上，仅大小写不同的两个路径会被视为同一位置。
-- 多个 DSH 进程共享同一个 `DSH_HOME` 时，回收站操作通过 `.lock` 串行；进程暂停超过 10 分钟后，锁可能被另一个进程接管。
+- 多个 DSH 进程共享同一个 `DSH_HOME` 时，回收站操作通过 `.lock` 串行；Host 在报 `LOCKED` 前会短暂重试，客户端也会自动重试一次；进程暂停超过 10 分钟后，锁可能被另一个进程接管。
 
 ## 开发
 
@@ -176,6 +183,7 @@ npm 安装的插件在「插件」页打开「会话回收站」的详情，展
 pnpm install
 pnpm test          # 单元测试 + 真实 DOM 组件测试（jsdom）
 pnpm typecheck     # tsc --checkJs（当前覆盖 lib/ 和 index.js）
+pnpm test:coverage # 覆盖率（CI 的门槛只作用于 lib/**）
 pnpm test:smoke    # Host 冒烟测试（真实 Cordis，普通 Node 即可）
 npm run test:e2e   # 真实 dsh web 端到端（桌面版或 npm 安装的 DSH）
 ```
@@ -188,11 +196,20 @@ Host 冒烟测试通过 `@deepseek-ai/cordis` 这个 devDependency 装配真实
 |---|---|
 | 单元测试、Host 冒烟测试 | CI：Ubuntu Node 20/22、Windows Node 22 |
 | 打包内容（`npm pack`） | CI：Ubuntu |
+| 覆盖率门槛（`lib/**`，行 85 / 分支 70 / 函数 84） | CI：Ubuntu Node 22 |
 | 真实 `dsh web` 端到端（npm 安装的 DSH） | CI：Ubuntu、Windows（Node 22） |
 | 真实 `dsh web` 端到端（桌面版） | macOS + DSH 0.2.2-rc.1（手动执行） |
 
 `npm run test:e2e` 会启动真实 `dsh web` Host，在临时 `DSH_HOME` 中跑完整流程。默认按平台在常见安装位置查找桌面版（也可以用 `DSH_ELECTRON` 指定）；设置 `DSH_E2E_DSH_BIN` 指向 npm 安装的 `@deepseek-ai/dsh` 的 `lib/bin.js` 时，改用普通 Node 启动 Host——CI 和 Linux/Windows 都走这条路径，不依赖桌面版。找不到 Host 时打印跳过信息并以 0 退出。依赖 POSIX 权限位的「清理失败」场景在 Windows 上会跳过。设置 `DSH_E2E_KEEP=1` 可以保留临时目录和日志。
 
+### 发布（维护者）
+
+1. 更新 `package.json` 版本和 `CHANGELOG.md`，提交并推送。
+2. 打 tag 并推送：`git tag -a vX.Y.Z -m "..." && git push origin vX.Y.Z`。
+3. tag 会触发 [release.yml](.github/workflows/release.yml)：跑 typecheck、单测、smoke 和真实 Host e2e，然后 `npm publish --provenance` 并创建 GitHub Release。
+
+发布使用 npm Trusted Publishing（OIDC），不需要 `NPM_TOKEN`：在 npmjs.com 的包设置 → Publishing access → Trusted publishers 里添加仓库 `wangxiaocuo/dsh-session-trash` 和 workflow `release.yml`。如果改用 automation token，取消 release.yml 里 `NODE_AUTH_TOKEN` 的注释并添加同名 secret。
+
 项目结构：
 
 ```text