dsh-sessions-manager 3.4.2 → 3.5.1

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.4.2",
+  "version": "3.5.1",
   "type": "module",
   "main": "lib/index.js",
   "exports": {

package/src/client/index.jsx

@@ -11,7 +11,7 @@
  */
 
 import React, { useEffect, useMemo, useRef, useState } from 'react'
-import { canDropOnWorkspace, dotStateFor, sessionForNodes, starredOf, workspaceForNodes } from './logic.js'
+import { authoritativeTitleForFirstPaint, canDropOnWorkspace, dotStateFor, sessionForNodes, starredOf, workspaceForNodes } from './logic.js'
 
 export const inject = ['slots']
 
@@ -219,6 +219,7 @@ function installSettingsNavIcons(ctx) {
 function SessionPanel({ workspacesSvc }) {
   const [sessions, setSessions] = useState(null)
   const [workspaces, setWorkspaces] = useState([])
+  const [capabilities, setCapabilities] = useState(null)
   const initialPrefs = useRef(loadPanelPrefs()).current
   // 注意：'storage' 已从可持久化取值中移除（它不再是视图），旧版残留的
   // filter='storage' 会自动回落到 'all'，避免落到一个已不存在的界面。
@@ -276,14 +277,16 @@ function SessionPanel({ workspacesSvc }) {
     Promise.all([
       postJSON('/archived-sessions/sessions', {}),
       postJSON('/archived-sessions/workspaces', {}),
+      postJSON('/archived-sessions/capabilities', {}),
     ])
-      .then(([s, works]) => {
+      .then(([s, works, caps]) => {
         // Permanently-purged sessions must never re-appear here, even if DSH's
         // in-memory session index still lists them after the file was unlinked.
         const purged = dsmLoadPurged()
         const visible = (s.items || []).filter((x) => !purged.has(String(x.sessionId)))
         setSessions(visible)
         setWorkspaces(works.items || [])
+        setCapabilities(caps || null)
         setSelected({})
         setDelTarget(null)
         setConfirmBatch(false)
@@ -393,6 +396,9 @@ function SessionPanel({ workspacesSvc }) {
     const w = workspaces.find((x) => x.workspaceId === id)
     return w ? w.path : ''
   }
+  const actionCapability = (name) => (capabilities && capabilities.actions && capabilities.actions[name]) || { available: false, reason: '正在检查当前 DSH 的兼容能力…' }
+  const canPurge = actionCapability('purge')
+  const canMove = actionCapability('move')
 
   const archivedList = sessions ? sessions.filter((x) => x.archived) : []
   const activeList = sessions ? sessions.filter((x) => !x.archived) : []
@@ -473,7 +479,12 @@ function SessionPanel({ workspacesSvc }) {
   const verifyTrash = () => {
     setTrashBusy('__verify')
     postJSON('/archived-sessions/trash/verify', {})
-      .then((r) => { setTrashBusy(null); setTrashCheck(r); showToast(r.missing ? `发现 ${r.missing} 条日志缺失` : '回收站校验通过') })
+      .then((r) => {
+        setTrashBusy(null); setTrashCheck(r)
+        if (r.missing) showToast(`发现 ${r.missing} 条日志缺失`)
+        else if (r.unverified) showToast(`${r.unverified} 条日志位置由当前 Runtime 管理，无法直接核验`)
+        else showToast('回收站校验通过')
+      })
       .catch((e) => { setTrashBusy(null); setError(String((e && e.message) || e)) })
   }
 
@@ -554,6 +565,7 @@ function SessionPanel({ workspacesSvc }) {
   }
 
   const doMove = (it) => {
+    if (!canMove.available) { setError(canMove.reason || '当前环境不支持跨工作区移动'); return }
     const targetPath = moveMode === 'new' ? newPath.trim() : wsPath(targetWs)
     if (!targetPath) { setError('请选择已有工作区或输入新的目标目录路径'); return }
     setBusy(it.sessionId)
@@ -591,6 +603,7 @@ function SessionPanel({ workspacesSvc }) {
   }
 
   const openMoveFor = (it) => {
+    if (!canMove.available) { setError(canMove.reason || '当前环境不支持跨工作区移动'); return }
     if (openMove === it.sessionId) { setOpenMove(null); return }
     setTargetWs(workspaces.length ? (targetWs || workspaces[0].workspaceId) : '')
     setMoveMode('existing')
@@ -663,15 +676,20 @@ function SessionPanel({ workspacesSvc }) {
         >⋯</button>
         {openMenu === it.sessionId && (
           <div className="more-menu" role="menu">
-            {items.map(([id, label]) => (
+            {items.map(([id, label]) => {
+              const blocked = id === 'move' && !canMove.available
+              return (
               <button
                 key={id}
                 type="button"
                 role="menuitem"
                 className={'more-item' + (id === 'delete' ? ' more-item-danger' : '')}
+                disabled={blocked}
+                title={blocked ? canMove.reason : undefined}
                 onClick={() => runMenu(id, it)}
               >{label}</button>
-            ))}
+              )
+            })}
           </div>
         )}
       </div>
@@ -1034,9 +1052,10 @@ function SessionPanel({ workspacesSvc }) {
             </select>
           </div>
           <div className="sess-field"><label>数据检查</label><button type="button" className="archv-btn" disabled={trashBusy !== null} onClick={verifyTrash}>{trashBusy === '__verify' ? '校验中…' : '校验日志完整性'}</button></div>
-          <div className="sess-field"><label>永久清理</label><button type="button" className="archv-btn archv-del" disabled={trashBusy !== null || !trash.length} onClick={() => setPurgeTarget('__all')}>清空回收站</button></div>
+          <div className="sess-field"><label>永久清理</label><button type="button" className="archv-btn archv-del" disabled={trashBusy !== null || !trash.length || !canPurge.available} title={!canPurge.available ? canPurge.reason : undefined} onClick={() => setPurgeTarget('__all')}>清空回收站</button></div>
         </div>
-        {trashCheck && <div className={trashCheck.missing ? 'archv-err' : 'archv-empty'} role="status">校验完成：{trashCheck.healthy} 条正常，{trashCheck.missing} 条日志缺失。</div>}
+        {!canPurge.available && <div className="archv-empty" role="status">{canPurge.reason}</div>}
+        {trashCheck && <div className={trashCheck.missing ? 'archv-err' : 'archv-empty'} role="status">校验完成：{trashCheck.healthy} 条正常，{trashCheck.missing} 条日志缺失，{trashCheck.unverified || 0} 条无法直接核验。</div>}
         {trash.length === 0 ? (
           <div className="dsm-trash-empty">回收站为空。删除的会话会先进入这里，可恢复或彻底删除。</div>
         ) : (
@@ -1047,7 +1066,7 @@ function SessionPanel({ workspacesSvc }) {
                 <span className="dsm-trash-date">{fmtDate(t.deletedAt)}</span>
                 <span className="dsm-trash-actions">
                   <button type="button" className="archv-btn" disabled={trashBusy !== null} onClick={() => restoreTrash(t.sessionId)}>恢复</button>
-                  <button type="button" className="archv-btn archv-del" disabled={trashBusy !== null} onClick={() => setPurgeTarget(t.sessionId)}>彻底删除</button>
+                  <button type="button" className="archv-btn archv-del" disabled={trashBusy !== null || !canPurge.available} title={!canPurge.available ? canPurge.reason : undefined} onClick={() => setPurgeTarget(t.sessionId)}>彻底删除</button>
                 </span>
               </div>
             ))}
@@ -1110,7 +1129,7 @@ const SIDEBAR_AUG_CSS = `
 .dsm-sub-cur{font-size:11px;color:var(--dsw-alias-state-business-primary);flex:none;margin-left:8px}
 .dsm-dot{position:absolute;left:6px;top:50%;transform:translateY(-50%);width:8px;height:8px;border-radius:50%;box-sizing:border-box;cursor:pointer;pointer-events:auto;z-index:1}
 .dsm-dot-unread-manual{background:var(--dsw-alias-state-business-primary)}
-.dsm-dot-waiting{background:var(--dsw-alias-state-warning-primary)}
+.dsm-dot-waiting{background:var(--dsw-alias-state-warn-primary,#F59E0B)}
 .dsm-dot-unread{background:var(--dsw-alias-state-success-primary)}
 .dsm-drag-source{opacity:.48}
 .dsm-drop-target{position:relative;background:color-mix(in srgb,var(--dsw-alias-state-business-primary) 10%,transparent)!important;outline:2px solid var(--dsw-alias-state-business-primary);outline-offset:-2px;border-radius:8px}
@@ -1169,6 +1188,14 @@ let dsmTrashIds = null
 let dsmServerPurgedIds = new Set()
 let dsmAuthoritativeTitles = new Map()
 let dsmTrashTick = 0
+let dsmCapabilities = null
+async function dsmLoadCapabilities() {
+  try { dsmCapabilities = await postJSON('/archived-sessions/capabilities', {}) } catch (e) { /* unknown stays safely unavailable */ }
+  return dsmCapabilities
+}
+function dsmActionCapability(name) {
+  return dsmCapabilities && dsmCapabilities.actions && dsmCapabilities.actions[name]
+}
 async function dsmLoadTrashIds() {
   try {
     const r = await postJSON('/archived-sessions/sidebar-state', {})
@@ -1385,6 +1412,11 @@ function installSidebarSessionMenuAug() {
     const move = mk('移动会话', ICON_MOVE, false)
     const del = mk('删除会话', ICON_DEL, true)
     const mark = mk(dsmLoadManual().has(info.id) ? '标记已读' : '标记未读', ICON_UNREAD, false)
+    const moveCapability = dsmActionCapability('move')
+    if (!moveCapability || !moveCapability.available) {
+      move.btn.disabled = true
+      move.btn.title = (moveCapability && moveCapability.reason) || '正在检查当前版本的移动能力'
+    }
     if (mark.btn.firstChild) mark.btn.firstChild.style.color = 'var(--dsw-alias-state-business-primary)'
     const chev = document.createElement('span')
     chev.style.cssText = 'margin-left:auto;flex:none;color:var(--dsw-alias-label-tertiary);font-size:14px;line-height:1'
@@ -1433,7 +1465,7 @@ function installSidebarSessionMenuAug() {
 // Left-side per-session status dot (DOM shim). The color is driven by DSH's
 // REAL session status, read from the row's own StateDot ([data-state]):
 //   手动标记未读（蓝） = 用户在 ⋯ 菜单或点击圆点手动标记，localStorage 持久化（最高优先级）
-//   工作中（黄）       = DSH state 'running'
+//   工作中（黄）       = DSH state 'ongoing'（旧版兼容 'running'）
 //   需用户反馈（琥珀） = DSH state 'warning'（有追问需用户反馈）
 //   完成后未读（绿）   = DSH state 'done' 且用户尚未读过（read 集合）
 //   完成已读（不显示） = DSH state 'done' 且已读过（read 集合持久化）
@@ -1471,7 +1503,7 @@ function installSidebarStatusDots() {
   }
   // Dot colors per the user's scheme. We read DSH's REAL session status from the
   // row's own StateDot (its [data-state] attr) and recolor it:
-  //   running  → 黄  工作中
+  //   ongoing/running → 黄  工作中
   //   warning  → 琥珀 有追问需用户反馈
   //   done     → 绿  完成后未读（读过则不再显示）
   //   error    → 红  出错/需关注（与 DSH 自带 StateDot 一致）
@@ -1479,11 +1511,12 @@ function installSidebarStatusDots() {
   const COLOR = {
     manual: 'var(--dsw-alias-state-business-primary)',        // 蓝 手动标记未读
     running: '#EAB308',                                       // 黄 工作中 (DSH running)
-    feedback: 'var(--dsw-alias-state-warning-primary)',       // 琥珀 需用户反馈 (DSH warning)
+    feedback: 'var(--dsw-alias-state-warn-primary, #F59E0B)', // 琥珀 需用户反馈 (DSH warning)
     done: 'var(--dsw-alias-state-success-primary)',           // 绿 完成后未读 (DSH done)
     error: 'var(--dsw-alias-state-error-primary)',            // 红 出错/需关注 (DSH error)
   }
   const manualUnread = dsmLoadManual()
+  const titleInitializedRows = new WeakSet()
   const paint = () => {
     // Recompute the active session on every paint so the active row is never
     // shown from a stale `curActive` (the click that changes aria-selected
@@ -1517,12 +1550,20 @@ function installSidebarStatusDots() {
       // Session is opened. Paint the latest log-folded title from the host
       // authority without materializing the Session or changing its log.
       const authoritativeTitle = dsmAuthoritativeTitles.get(id)
-      if (authoritativeTitle) {
+      if (!titleInitializedRows.has(row)) {
         const node = rowNode(row) || {}
         const expected = new Set([node.title, node.displayTitle, node.name].filter((value) => typeof value === 'string'))
         const spans = [...row.children].filter((el) => el.tagName === 'SPAN' && !el.querySelector('[data-state]') && (el.textContent || '').trim())
         const titleEl = spans.find((el) => expected.has((el.textContent || '').trim())) || spans[0]
-        if (titleEl && titleEl.textContent !== authoritativeTitle) titleEl.textContent = authoritativeTitle
+        if (titleEl) {
+          const correction = authoritativeTitleForFirstPaint({
+            firstPaint: true,
+            rendered: titleEl.textContent || '',
+            authoritative: authoritativeTitle || '',
+          })
+          if (correction) titleEl.textContent = correction
+          titleInitializedRows.add(row)
+        }
       }
       // Read DSH's REAL session status from the row's own StateDot and recolor
       // it with the user's scheme (we also hide DSH's dot so only ours shows).
@@ -1647,6 +1688,8 @@ function installSidebarWorkspaceDrag() {
   }, true)
 
   document.addEventListener('dragstart', (event) => {
+    const moveCapability = dsmActionCapability('move')
+    if (!moveCapability || !moveCapability.available) return
     const row = eventRow(event)
     const item = row && sessionForRow(row)
     if (!item || moving) return
@@ -1729,6 +1772,7 @@ function installSidebarWorkspaceDrag() {
 }
 
 export function apply(ctx) {
+  dsmLoadCapabilities()
   installSettingsNavIcons(ctx)
   installSidebarSessionMenuAug()
   installSidebarStatusDots()

package/src/client/logic.js

@@ -10,6 +10,7 @@
 export function dotStateFor({ manualUnread = false, dataState = '', isActive = false } = {}) {
   if (manualUnread) return 'manual'
   switch (dataState) {
+    case 'ongoing':
     case 'running': return 'running'
     case 'warning': return 'feedback'
     case 'error': return 'error'
@@ -18,6 +19,13 @@ export function dotStateFor({ manualUnread = false, dataState = '', isActive = f
   }
 }
 
+// 权威标题只修正新出现 DOM 行的冷态标题。行一旦完成首次 paint，后续文本
+// 变化属于 DSH Core 的实时更新（例如重命名），插件不得再用轮询快照覆盖。
+export function authoritativeTitleForFirstPaint({ firstPaint = false, rendered = '', authoritative = '' } = {}) {
+  if (!firstPaint || !authoritative || rendered === authoritative) return null
+  return authoritative
+}
+
 // 拖拽迁移前置校验：同工作区拦截（workspacePath 相等即拒绝）。
 // 无 workspacePath 的会话（如侧栏 live 行尚未同步）放行，由 host 最终裁决。
 export function canDropOnWorkspace(item, target) {

package/src/compat/capabilities.js

@@ -0,0 +1,34 @@
+function action(available, reason = null) {
+  return { available: !!available, reason: available ? null : reason }
+}
+
+export function detectCapabilities({ persistence, workspaceRegistry }) {
+  const handleApi = !!(persistence && typeof persistence.open === 'function')
+  const legacyRead = !!(persistence && typeof persistence.readFrom === 'function')
+  const legacyLocate = !!(persistence && (typeof persistence.locate === 'function'
+    || (persistence.backend && typeof persistence.backend.locate === 'function')))
+  const workspaceInternals = !!(workspaceRegistry
+    && workspaceRegistry.headers && workspaceRegistry.sessionPaths
+    && typeof workspaceRegistry.replaceHeaderIndex === 'function')
+
+  return {
+    persistence: handleApi ? 'session-handle' : 'legacy',
+    actions: {
+      read: action(legacyRead || handleApi, '当前 DSH 未提供可识别的会话读取接口'),
+      archive: action(!!(workspaceRegistry && typeof workspaceRegistry.archiveSession === 'function'), '当前 DSH 未提供归档接口'),
+      trash: action(legacyRead || handleApi, '当前 DSH 无法读取会话，不能安全移入回收站'),
+      restoreTrash: action(true),
+      purge: action(!handleApi && legacyLocate, '当前 DSH 版本尚未提供经过验证的安全永久删除能力'),
+      move: action(!handleApi && legacyRead && legacyLocate && workspaceInternals, '当前 DSH 版本尚未提供经过验证的跨工作区迁移能力'),
+    },
+  }
+}
+
+export function requireCapability(capabilities, name) {
+  const value = capabilities && capabilities.actions && capabilities.actions[name]
+  if (value && value.available) return
+  const error = new Error((value && value.reason) || `当前环境不支持 ${name}`)
+  error.status = 409
+  error.code = 'DSM_CAPABILITY_UNAVAILABLE'
+  throw error
+}

package/src/compat/persistence.js

@@ -0,0 +1,72 @@
+// Compatibility boundary for the two DSH persistence generations supported by
+// dsh-sessions-manager. Business code consumes normalized headers and complete
+// inspections; it never needs to know whether DSH returned a legacy header or
+// a handle-era SessionPersistenceSnapshot.
+
+function asHeader(value) {
+  if (!value || typeof value !== 'object') return null
+  const candidate = value.header && typeof value.header === 'object' ? value.header : value
+  return candidate.id == null ? null : candidate
+}
+
+export function normalizePersistenceEntry(value) {
+  const header = asHeader(value)
+  if (!header) return null
+  const snapshot = value && value.header === header ? value : null
+  return {
+    header,
+    snapshot,
+    id: String(header.id),
+    sizeBytes: snapshot && Number.isFinite(snapshot.sizeBytes) ? Number(snapshot.sizeBytes) : null,
+    eventCount: snapshot && Number.isSafeInteger(snapshot.eventCount) ? snapshot.eventCount : null,
+    revision: snapshot ? snapshot.revision : null,
+  }
+}
+
+export function normalizePersistenceList(values) {
+  if (!Array.isArray(values)) return []
+  return values.map(normalizePersistenceEntry).filter(Boolean)
+}
+
+export function createPersistenceAdapter(service) {
+  if (!service || typeof service.list !== 'function') throw new TypeError('sessionPersistence.list is required')
+
+  async function listEntries(options) {
+    return normalizePersistenceList(await service.list(options))
+  }
+
+  async function readSession(id, offset = 0) {
+    if (typeof service.readFrom === 'function') {
+      const result = await service.readFrom(id, offset)
+      return {
+        meta: result && result.meta ? result.meta : null,
+        inheritedEventCount: result && Number.isSafeInteger(result.inheritedEventCount) ? result.inheritedEventCount : 0,
+        events: result && Array.isArray(result.events) ? result.events : [],
+      }
+    }
+    if (typeof service.open !== 'function') throw new Error('当前 DSH 持久化服务不支持读取会话')
+    const handle = await service.open(id, 'read')
+    if (!handle || typeof handle.read !== 'function' || typeof handle.close !== 'function') {
+      try { if (handle && typeof handle.close === 'function') await handle.close() } catch {}
+      throw new Error('DSH 返回了无效的 SessionHandle')
+    }
+    try {
+      const events = await handle.read(offset)
+      return {
+        meta: handle.header || handle.meta || null,
+        inheritedEventCount: Number.isSafeInteger(handle.inheritedEventCount) ? handle.inheritedEventCount : 0,
+        events: Array.isArray(events) ? events : [...(events || [])],
+      }
+    } finally {
+      await handle.close()
+    }
+  }
+
+  function locate(header) {
+    if (typeof service.locate === 'function') return service.locate(header)
+    return null
+  }
+
+  const kind = typeof service.open === 'function' ? 'session-handle' : 'legacy'
+  return { kind, listEntries, readSession, locate }
+}