dsh-conversation-recycle-bin 0.3.5 → 0.3.6

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to `dsh-conversation-recycle-bin` are documented here.
 The format follows Keep a Changelog; the project uses Semantic Versioning.
 
+## [0.3.6] — 2026-10-24
+
+对应 `AUDIT-2026-10-24-desktop-web-rc3.md` §7 的四条「建议动作」（A2 / A3 / A5 / A6）。同一节的 A1、A4、A7、A8 复核后判定为产品取舍（不申报未直接消费的 client 依赖、不导出 `Config` 以免设置页脱离非表单语义、归档读保留双源缓存、`missingSessionPaths` 保持成员判定），本版不改。
+
+### Fixed
+
+- **A3 `sessionController` 缺失时抛出的不是插件错误**：`lib/host/lifecycle.js` 新增 `peek()`，把 `ctx.get?.(name) ?? ctx[name]` 的整条退化读取留在 `try` 内。`??` 右侧的属性读会命中 cordis 的 Proxy trap（`cannot get property "sessionController" without inject`），异常类型不是 `DeleteError`，会绕过统一错误映射并让删除在归档前失败。现在 `sessionController` 明确视为可选服务：缺失时跳过 `cancel`，归档与 drain 检查照常执行。新增用例以抛异常的 getter 模拟裁剪组合，断言归档仍然发生。
+- **A6 运行中判定永远落到 `inspect()`**：`lib/host/gateway.js` 的 `probeRunning()` 改为主探 `agents.get(id)?.status === 'running'`（与宿主 `dsh-api-session-controller` 列表行的判据一致），旧的 `Session.running/active/busy` 字段探测降为兜底。删除前置的「是否运行中」现在真正走廉价的实时探测，不必为每次判定重读会话。
+- **A2 事件数列恒为 `—`**：`stat()` 从不返回 `eventCount`，旧代码读的正是这个不存在的字段。活跃会话改用 `Session.seq`（会话存储将其定义为日志长度，精确、纯数值读，不触发已废弃的 `snapshotEvents()`）；已落盘的非活跃会话没有便宜的精确来源，继续返回 `null`、由 UI 显示 `—`，不拿投影游标冒充精确值。新增两个用例（活跃 = 精确值、非活跃 = `null`），并把测试夹具的 `stat()` 改成 0.2.1 的真实形状（去掉 `eventCount`），避免此前的假绿。
+
+### Added
+
+- **A5 `engines.dsh`**：`package.json` 声明 `"dsh": ">=0.2.1-rc.2"`（本插件的实测下限）。该键在安装/声明时由版本闸门读取，运行时不强制；不设上界，因为更晚的版本尚未验证。
+
+### Maintenance
+
+- 测试 138 → **141**（api 41 → 44：活跃/非活跃事件数、无 `sessionController` 的裁剪组合、agents 三态运行判定）。
+- `lib/version.js` 与 `package.json` 同步到 0.3.6（`manifest` 用例守门）。
+
 ## [0.3.5] — 2026-10-22
 
 对应 `AUDIT-2026-10-22-desktop-web-compat.md`：把 0.3.4 之后一直只存在于工作树的修复正式发布，并落地该报告 §9 的全部建议。

package/lib/host/gateway.js

@@ -186,6 +186,21 @@ export function createSessionGateway({ ctx, paths, now = Date.now }) {
    * @returns {boolean|undefined}
    */
   function probeRunning(sessionId) {
+    // Authoritative cheap probe first: the Host computes a list row's `running`
+    // flag from exactly this check (`api-session-controller`: `agents.get(id)
+    // ?.status === "running"`). The `Session` object handed out by `sessions.get`
+    // carries no `running`/`active`/`busy` field, so the legacy probe below can
+    // only ever answer `undefined` on current Hosts.
+    const agents = service('agents')
+    if (agents !== undefined && typeof agents.get === 'function') {
+      try {
+        const agent = agents.get(sessionId)
+        if (agent === undefined || agent === null) return false
+        if (typeof agent.status === 'string') return agent.status === 'running'
+      } catch {
+        // Fall through to the legacy field probe.
+      }
+    }
     const sessions = service('sessions')
     if (sessions === undefined || typeof sessions.get !== 'function') return undefined
     let current
@@ -202,6 +217,31 @@ export function createSessionGateway({ ctx, paths, now = Date.now }) {
     return undefined
   }
 
+  /**
+   * Event count when it is cheaply knowable, `null` otherwise.
+   *
+   * `sessionPersistence.stat()` reports `header`/`revision`/`sizeBytes` (and no
+   * `eventCount` on 0.2.1), so the old `snapshot.eventCount` read was dead. A
+   * live session does expose the count exactly: the session store defines `seq`
+   * as "always the log length" (`dsh-session` `get seq()`), and it is a plain
+   * number read, not a materialized `snapshotEvents()` (that API is deprecated).
+   * For a stored, non-live session there is no equivalent that avoids reading
+   * and parsing the whole log, so the field stays `null` instead of presenting
+   * a projection cursor as an exact count.
+   * @returns {number|null}
+   */
+  function eventCountFor(sessionId, snapshot) {
+    if (typeof snapshot?.eventCount === 'number') return snapshot.eventCount
+    const sessions = service('sessions')
+    if (sessions === undefined || typeof sessions.get !== 'function') return null
+    try {
+      const seq = sessions.get(sessionId)?.seq
+      return typeof seq === 'number' && Number.isFinite(seq) && seq >= 0 ? seq : null
+    } catch {
+      return null
+    }
+  }
+
   async function workspaceFor(session) {
     const workspaces = await workspaceEntities()
     const byId = workspaces.find((workspace) => workspace.id === session.workspaceId)
@@ -251,7 +291,7 @@ export function createSessionGateway({ ctx, paths, now = Date.now }) {
         pinned: fromList?.pinned ?? false,
         createdAt: snapshot?.header?.createdAt ?? null,
         updatedAt: fromList?.updatedAt ?? null,
-        events: typeof snapshot?.eventCount === 'number' ? snapshot.eventCount : null,
+        events: eventCountFor(sessionId, snapshot),
         sizeBytes: typeof snapshot?.sizeBytes === 'number' ? snapshot.sizeBytes : null,
         workspace: workspace === null ? null : { id: workspace.id, title: workspace.title, path: workspace.path, index: entity },
         workspaceId: workspace?.id ?? null,

package/lib/host/lifecycle.js

@@ -20,13 +20,26 @@ import { DeleteError } from '../core/errors.js'
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
 
 export function createLifecycleOps({ ctx, gateway, config, now = Date.now, delay = sleep }) {
-  function service(name) {
-    let value
+  /**
+   * Optional-service probe.
+   *
+   * The property read has to stay inside the `try`: `ctx[name]` goes through
+   * cordis' Proxy trap, which throws `cannot get property "x" without inject`
+   * for a service this composition never provided. `ctx.get?.(name)` alone
+   * resolves to `undefined` in that case, and the `??` fallback would then
+   * throw a foreign error type out of the delete cascade (why a failed `get`
+   * must not be repaired by reading the property outside the guard).
+   */
+  function peek(name) {
     try {
-      value = ctx.get?.(name) ?? ctx[name]
+      return ctx.get?.(name) ?? ctx[name]
     } catch {
-      value = undefined
+      return undefined
     }
+  }
+
+  function service(name) {
+    const value = peek(name)
     if (value === undefined) {
       throw new DeleteError('E_INTERNAL', `The ${name} service is unavailable.`, {})
     }
@@ -55,7 +68,11 @@ export function createLifecycleOps({ ctx, gateway, config, now = Date.now, delay
      */
     async quiesce(session) {
       const registry = service('workspaceRegistry')
-      const controller = ctx.get?.('sessionController') ?? ctx.sessionController
+      // Optional on purpose: a composition without the controller still deletes
+      // the log, it just cannot cancel an in-flight turn first (the archive gate
+      // and the drain check below still hold). `peek` keeps that path from
+      // throwing a cordis error instead of reaching the archive step.
+      const controller = peek('sessionController')
       const wasArchived = session.archived === true
       const drainMs = Math.max(0, Number(config.liveDrainMs) || 0)
 

package/lib/version.js

@@ -5,4 +5,4 @@
  * asserted against it by `test/manifest.test.mjs` so the two can never drift
  * (they did: the constant stayed at 0.1.0 while the package reached 0.1.4).
  */
-export const PLUGIN_VERSION = '0.3.5'
+export const PLUGIN_VERSION = '0.3.6'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-conversation-recycle-bin",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "DSH conversation deletion with an optional, previewed cascade into conversation-associated memory: soft delete + recycle bin, audit trail, batch rate limits and per-session rollback. 删除对话（可选一并删除关联记忆）：软删除与回收站、审计留痕、批量限流、失败回滚。",
   "repository": {
     "type": "git",
@@ -33,7 +33,8 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=20"
+    "node": ">=20",
+    "dsh": ">=0.2.1-rc.2"
   },
   "optionalDependencies": {
     "nodemailer": "^10.1.2"