@mzzsfy/dsh-session-manager 0.9.3 → 0.9.4

package/README.md

@@ -89,4 +89,4 @@ node scripts/dev-link.mjs dsh-session-manager   # 仓库根执行:归一 profile
 
 ## dsh 版本兼容
 
-0.1.2-rc.1 / 0.1.5-rc.3 通过:归档入口、激活 live、diagnostics 0 findings。0.1.7-rc.1 上宿主服务拓扑变化(workspaceRegistry 激活链)导致本包七项 inject 未满足、HTTP 面 404,功能待宿主 rc 线定型后专项对齐(详见包内 兼容性测试.md 与仓库兼容性进度文档 FIND-RC1-1)。
+按仓库动态窗口验证(scripts/compat/window.mjs),不预置任何固定版本槽:主测 = 渠道 dist-tag 最新 rc,完全适配口径;基线 = npm latest,不崩溃底线口径;主测与基线同版时收敛单槽。兼容面以窗口实测为准,不逐版本承诺。逐轮实测结论见 `docs/兼容性测试/逐包测试进度.md` 与本包 `兼容性测试.md`。

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mzzsfy/dsh-session-manager",
   "description": "会话自动归档与管理:超期自动归档、归档面板、删除进系统回收站、还原后一键重挂载",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "type": "module",
   "main": "src/index.js",
   "exports": {
@@ -18,6 +18,13 @@
       "external": [
         "@mzzsfy/dsh-toast/client"
       ]
+    },
+    "compatibility": {
+      "dshReleases": {
+        "0.2.0-rc.1": "unknown",
+        "0.2.0-rc.2": "compatible",
+        "0.2.1-alpha.1": "unknown"
+      }
     }
   },
   "scripts": {

package/src/client.js

@@ -665,7 +665,7 @@ function SessionManagerApp(props) {
 
 // 面板设置项悬停说明:原生 title(设置侧栏为滚动容器,CSS 气泡会被 overflow
 // 裁剪,JS 定位复杂度不成比例);文案与功能行为同源维护,由源码契约测试锁定
-const ARCHIVE_OVERVIEW_TITLE = '超过阈值天数未活跃的会话自动移入归档;触发时机为新会话创建、插件启动与周期检查;归档会话在本面板管理,可恢复或删除。'
+const ARCHIVE_OVERVIEW_TITLE = '超过阈值天数未活跃的会话自动移入归档;触发时机为新会话创建、插件启动与周期检查;归档会话在本面板管理,可恢复或删除;恢复后 10 分钟内暂停自动归档,期间发言即恢复正常活跃计时。'
 const ARCHIVE_DAYS_TITLE = '会话超过该天数未活跃(产物无更新)即自动归档,空白(无消息)会话不参与归档;0 = 关闭自动归档。仅对产物可读的会话评估,产物不可读的跳过以免误归档,已归档的会话不会重复处理。'
 const ARCHIVE_INTERVAL_TITLE = '周期检查的间隔小时数,到期会话在下一轮检查时归档;0 = 关闭周期检查(新会话创建与插件启动时的检查不受影响);调小最迟等新间隔即可提前触发,调大自下一轮排期起生效。'
 

package/src/core.mjs

@@ -24,10 +24,19 @@ export function updatedAtOf(header, activityAtMs) {
   return Math.max(header.createdAt, activityAtMs ?? 0)
 }
 
+// 取消归档全局宽限时长:恢复会话到用户发出首条消息之间的评估窗口保护,
+// 首条消息更新产物 mtime 后由阈值自然接管;只查阅不发言的会话宽限后正常归档
+export const UNARCHIVE_GRACE_MS = 10 * 60 * 1000
+
+/** 宽限期判定:取消归档后 graceMs 内暂停自动归档(用户恢复即意图信号)。 */
+export function unarchiveGraceActive(unarchivedAtMs, nowMs, graceMs = UNARCHIVE_GRACE_MS) {
+  if (!Number.isFinite(unarchivedAtMs) || unarchivedAtMs <= 0) return false
+  return nowMs - unarchivedAtMs < graceMs
+}
+
 /**
  * 归档评估状态机:按阈值筛出待归档会话 id。
  * @param records - 候选行 {id, archived, running, blank, updatedAt}
- * @returns 超期且未归档、非运行中、非空白的会话 id
  */
 export function selectArchiveCandidates({ records, nowMs, thresholdDays }) {
   if (!Number.isFinite(thresholdDays) || thresholdDays <= 0) return []

package/src/index.js

@@ -26,6 +26,8 @@ import {
   mergeDeletedEntry,
   removeDeletedEntry,
   selectArchiveCandidates,
+  UNARCHIVE_GRACE_MS,
+  unarchiveGraceActive,
   updatedAtOf,
 } from './core.mjs'
 import { moveToQuarantine, restoreFromQuarantine, trashPath } from './trash.mjs'
@@ -217,6 +219,9 @@ function rejectMethod(req, res, method) {
 /** @param {import('@deepseek-ai/cordis').Context} ctx */
 export function apply(ctx, config) {
   let evaluating = false
+  // 取消归档全局宽限起点(进程内,重启失效可接受):恢复会话到用户发出首条
+  // 消息之间的评估窗口保护,首条消息更新产物 mtime 后由阈值自然接管
+  let unarchivedAtMs = 0
   // 删除路由同 id 并发去重(进程内)
   const inFlightDeletes = new Set()
 
@@ -258,6 +263,8 @@ export function apply(ctx, config) {
       const persistence = ctx.get('sessionPersistence')
       const records = await ctx.sessionQuery.listSessions()
       const nowMs = Date.now()
+      // 全局宽限短路:恢复动作后 graceMs 内暂停归档,保护「恢复 → 首条消息」窗口
+      if (unarchiveGraceActive(unarchivedAtMs, nowMs)) return
       const cutoff = nowMs - days * DAY_MS
       const candidates = []
       for (const recordItem of records) {
@@ -385,6 +392,11 @@ export function apply(ctx, config) {
     })
   }
 
+  // 宽限记账:取消归档时更新宽限起点(进程内变量,无持久化副作用)
+  function recordUnarchiveGrace() {
+    unarchivedAtMs = Date.now()
+  }
+
   // 台账命中查询:同 id 曾删除过(重删场景的幽灵资格依据);域不可用时按未命中
   async function ledgerHasEntry(sessionId) {
     try {
@@ -451,7 +463,9 @@ export function apply(ctx, config) {
       handler: async (req, res) => {
         if (!rejectMethod(req, res, 'POST')) return
         try {
-          await removeArchivedId(await requireSessionId(req))
+          const sessionId = await requireSessionId(req)
+          await removeArchivedId(sessionId)
+          await recordUnarchiveGrace()
           sendJson(res, 200, { ok: true })
         } catch (error) {
           respondError(ctx, res, error)

package/test/core.test.mjs

@@ -26,6 +26,8 @@ import {
   projectDeletedRows,
   removeDeletedEntry,
   selectArchiveCandidates,
+  UNARCHIVE_GRACE_MS,
+  unarchiveGraceActive,
   updatedAtOf,
   workspaceTitleForSession,
   workspaceTitleOf,
@@ -80,6 +82,18 @@ test('阈值负值与非有限值防御性关闭', () => {
   assert.deepEqual(selectArchiveCandidates({ records: [record({})], nowMs: NOW, thresholdDays: Number.NaN }), [])
 })
 
+test('全局宽限:取消归档后 graceMs 内宽限生效,到期与非法输入失效', () => {
+  assert.equal(unarchiveGraceActive(NOW - 2 * 60 * 1000, NOW), true)
+  assert.equal(unarchiveGraceActive(NOW - UNARCHIVE_GRACE_MS, NOW), false)
+  assert.equal(unarchiveGraceActive(0, NOW), false)
+  assert.equal(unarchiveGraceActive(undefined, NOW), false)
+  assert.equal(unarchiveGraceActive(Number.NaN, NOW), false)
+})
+
+test('全局宽限:常量与天级时长的量级自洽', () => {
+  assert.equal(UNARCHIVE_GRACE_MS, 10 * 60 * 1000)
+})
+
 test('updatedAt 取创建时间与最近活跃的较大者', () => {
   assert.equal(updatedAtOf({ createdAt: 100 }, 50), 100)
   assert.equal(updatedAtOf({ createdAt: 100 }, 500), 500)

package/test/index.test.mjs

@@ -76,7 +76,7 @@ function makeDomain(initialIds) {
 // 台账域句柄;openRejected 模拟台账域打开失败
 function makeLedgerDomain(entries) {
   const domain = {
-    state: { deleted: entries },
+    state: { deleted: entries, unarchivedAt: 0 },
     writes: 0,
     global: {
       get: () => domain.state,
@@ -481,6 +481,40 @@ test('取消归档路由:快照领先域时补全清理(重试路径)', skipMiss
   assert.deepEqual(registry.state.archivedSessionIds, [])
 })
 
+test('取消归档宽限:恢复后 graceMs 内同进程评估暂停,不秒归档', skipMissingDeps, async () => {
+  const dir = await mkdtemp(path.join(tmpdir(), 'sm-grace-'))
+  try {
+    const artifact = path.join(dir, 's1.jsonl')
+    await writeFile(artifact, '{"header":1}\n{"event":0}\n')
+    const DAY_MS = 24 * 60 * 60 * 1000
+    const stale = Date.now() - 30 * DAY_MS
+    await utimes(artifact, stale / 1000, stale / 1000)
+    const headers = [{ id: 's1', cwd: 'C:\\x', createdAt: stale }]
+    const ctxBundle = makeCtx({
+      archivedIds: [],
+      headers,
+      agents: new Map(),
+      sessionPersistence: { locate: () => ({ path: artifact }) },
+      domain: makeDomain([]),
+    })
+    const { activateSettings, registry, handlers, eventHandlers } = ctxBundle
+    activateSettings()
+    await waitFor(() => registry.archiveCalls.length > 0)
+    assert.deepEqual(registry.archiveCalls, ['s1'])
+    // 手动恢复:归档集合移除 + 进程内宽限生效
+    const res = response()
+    await handlers.get('/api/session-manager/unarchive')(request('s1'), res)
+    assert.equal(res.status, 200)
+    assert.deepEqual(registry.state.archivedSessionIds, [])
+    // 宽限内经新会话创建触发评估:同产物仍超期,但不再归档
+    eventHandlers['session/created']({ header: { cwd: 'C:\\x' } })
+    await new Promise((resolve) => setTimeout(resolve, 80))
+    assert.deepEqual(registry.archiveCalls, ['s1'], '宽限期内不得重新归档')
+  } finally {
+    await rm(dir, { recursive: true, force: true })
+  }
+})
+
 test('info 路由:会话不存在拒绝', skipMissingDeps, async () => {
   const { handlers } = makeCtx({ archivedIds: [], headers: [], agents: new Map() })
   const res = response()