dsh-sessions-manager 3.5.2 → 3.5.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-sessions-manager",
   "description": "DSH 设置面板会话管理器：归档 / 恢复 / 彻底删除 / 移动到其他工作区，带工作区标签与会话日期；统一「会话管理」面板。Session manager for the DeepSeek Harness settings panel — archive / restore / permanently delete / move sessions across workspaces, with workspace tags & session dates in one unified panel.",
-  "version": "3.5.2",
+  "version": "3.5.4",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

package/src/client/index.jsx

@@ -1353,9 +1353,15 @@ function installSidebarSessionMenuAug() {
     sub.setAttribute('data-dsm-sub', '')
     sub.innerHTML = '<div class="dsm-sub-loading">加载工作区…</div>'
     const r = moveBtn.getBoundingClientRect()
-    sub.style.top = Math.max(8, Math.round(r.top - 4)) + 'px'
-    sub.style.left = Math.round(r.right + 10) + 'px'
+    // Fixed-position card: once the async content renders it can be tall or
+    // wide enough to hang past the viewport edges, so re-clamp both anchors
+    // against the rendered size.
+    const placeSub = () => {
+      sub.style.top = Math.max(8, Math.min(Math.round(r.top - 4), window.innerHeight - sub.offsetHeight - 8)) + 'px'
+      sub.style.left = Math.max(8, Math.min(Math.round(r.right + 10), window.innerWidth - sub.offsetWidth - 8)) + 'px'
+    }
     document.body.appendChild(sub)
+    placeSub()
     const closeSub = () => {
       activeSubClose = null
       if (sub.parentNode) sub.remove()
@@ -1384,7 +1390,7 @@ function installSidebarSessionMenuAug() {
       const items = ws.items || []
       const cur = (sess.items || []).find((x) => x.sessionId === info.id)
       const curPath = cur ? cur.workspacePath : (info.cwd || null)
-      if (!items.length) { sub.innerHTML = '<div class="dsm-sub-empty">（暂无可用工作区）</div>'; return }
+      if (!items.length) { sub.innerHTML = '<div class="dsm-sub-empty">（暂无可用工作区）</div>'; placeSub(); return }
       sub.innerHTML = ''
       items.forEach((w) => {
         const isCur = !!curPath && w.path === curPath
@@ -1414,8 +1420,10 @@ function installSidebarSessionMenuAug() {
         })
         sub.appendChild(b)
       })
+      placeSub()
     }).catch((e) => {
       sub.innerHTML = '<div class="dsm-sub-err">' + escapeHtml(String((e && e.message) || e)) + '</div>'
+      placeSub()
     })
   }
   const openDeleteConfirm = (id) => {
@@ -1510,6 +1518,11 @@ function installSidebarSessionMenuAug() {
     viewport.appendChild(del.wrap)
     // 标记未读 goes to the very top of the menu (above DSH's native items).
     viewport.insertBefore(mark.wrap, viewport.firstElementChild)
+    // DSH's portalled Menu clamped its position using the height it measured
+    // before this shim injected rows, so the grown card can hang past the
+    // viewport bottom and cover the sidebar foot. Reuse the host's own
+    // placement by firing the resize event it listens for while open.
+    window.dispatchEvent(new Event('resize'))
   }
 
   const seen = new WeakSet()

package/src/compat/persistence.js

@@ -13,6 +13,8 @@
 //     is an opaque change token valid ONLY within one service instance and one
 //     session id (see src/session-meta-cache.js).
 
+import { locateSessionArtifacts } from '../handle-era-paths.js'
+
 const DEFAULT_CHUNK = 400
 // 防御上限：一次 inspect 的分块循环绝不能无限自旋（后端 read 行为异常时快速失败）。
 const MAX_CHUNKS = 20000

package/src/index.js

@@ -554,7 +554,9 @@ export function apply(ctx) {
     const entry = store.items.find((t) => String(t.sessionId) === sid)
     let originalPath = entry && typeof entry.originalPath === 'string' ? entry.originalPath : null
     if (!originalPath && header) {
-      const loc = persistence.locate(header)
+      // handle 时代官方收走了 locate，用守卫式推导（root → 目录结构 → id 归属）
+      // 代替：推导成功且文件在盘 = 真核验通过，而不是标注 unverified 放行。
+      const loc = await persistence.locateVerified(header).catch(() => null)
       if (loc && typeof loc.path === 'string') originalPath = loc.path
     }
     if (originalPath) {
@@ -625,12 +627,31 @@ export function apply(ctx) {
       const entry = store.items.find((t) => String(t.sessionId) === sid)
       if (!entry) { const error = new Error('回收站中找不到该会话'); error.status = 404; throw error }
       let target = null
+      let locatedHeader = null
       try {
         const entries = await persistence.listEntries()
         const current = entries.find((entry) => entry.id === sid)
-        const located = current && persistence.locate(current.header)
+        locatedHeader = current ? current.header : null
+        // locateVerified：legacy 走官方 locate；handle 时代官方收走了 locate，
+        // 改由三层守卫推导（root → 目录结构 → id 归属），失败返回 null。
+        // 比仅靠回收站条目里的 originalPath 更可靠：originalPath 过期或缺失时
+        // 仍能从当前存储布局重新推导。
+        const located = current ? await persistence.locateVerified(current.header) : null
         if (located && typeof located.path === 'string') target = located.path
       } catch (e) {}
+      // 幽灵记录兜底：会话不在 list 里（后端索引滞后/索引缺失）但日志仍在盘上。
+      // 用 statSession 拿官方 header，再走守卫推导，避免退化成「只删单文件」
+      // 或直接 409 拒绝。
+      if (!locatedHeader && typeof persistence.statSession === 'function') {
+        try {
+          const snap = await persistence.statSession(sid)
+          if (snap && snap.header) {
+            locatedHeader = snap.header
+            const located = await persistence.locateVerified(snap.header)
+            if (located && typeof located.path === 'string') target = located.path
+          }
+        } catch (e) {}
+      }
       if (!target && typeof entry.originalPath === 'string') target = entry.originalPath
       if (!target) {
         const error = new Error('无法确认该会话的物理日志位置，已停止永久删除')