dsh-sessions-manager 3.5.0 → 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.5.0",
+  "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']
 
@@ -1129,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}
@@ -1465,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 集合持久化）
@@ -1503,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 一致）
@@ -1511,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
@@ -1549,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).

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/index.js

@@ -7,11 +7,11 @@
 // (workspaceRegistry + storageDomain), folds titles/dates/workspace tags from
 // session persistence, physically removes a session's log file on delete, and
 // relocates a conversation (session) between workspaces on move.
-import { mkdir, realpath, rename, stat, unlink, writeFile } from 'node:fs/promises'
+import { mkdir, readFile, realpath, rename, stat, unlink, writeFile } from 'node:fs/promises'
 import { basename, dirname, isAbsolute, join } from 'node:path'
 import { readFileSync } from 'node:fs'
 import { homedir } from 'node:os'
-import { rewriteFrame0Cwd } from './zstd-frame.js'
+import { rewriteFrame0CwdInMemory, scanZstdFrames } from './zstd-frame.js'
 import { renderSessionMarkdown } from './markdown.js'
 import { createStarIndex } from './star-index.js'
 import { aggregateStorage } from './storage-stats.js'
@@ -637,15 +637,36 @@ export function apply(ctx) {
       const newPath = locatePath(newHeaderObj)
       if (!oldPath || !newPath || oldPath === newPath) return false
       const backupPath = `${oldPath}.move-backup-${Date.now()}`
+      const stagedPath = `${newPath}.move-stage-${process.pid}-${Date.now()}`
+      let destinationInstalled = false
       try {
         // Ensure the destination project directory exists (rename does not
         // create it). Without this, the rename silently no-ops on ENOENT and
         // the log stays put while workspace.json is wrongly updated.
         await mkdir(dirname(newPath), { recursive: true })
-        await rename(oldPath, backupPath)             // current log to safety
-        await rewriteFrame0Cwd(backupPath, canonical) // frame0 cwd -> newPath
-        await rename(backupPath, newPath)             // relocate to the new workspace dir
+        try {
+          await stat(newPath)
+          throw new Error('移动失败：目标位置已存在同名会话日志')
+        } catch (e) {
+          if (e && e.code !== 'ENOENT') throw e
+        }
+        await rename(oldPath, backupPath) // keep the original byte-identical until verification succeeds
+        const original = await readFile(backupPath)
+        const originalFrames = scanZstdFrames(original).frames
+        if (originalFrames.length === 0) throw new Error('移动前校验失败：会话日志没有完整 zstd 帧')
+        const rewritten = rewriteFrame0CwdInMemory(original, canonical)
+        const rewrittenFrames = scanZstdFrames(rewritten).frames
+        if (rewrittenFrames.length !== originalFrames.length) throw new Error('移动后校验失败：会话日志帧数发生变化')
+        const originalTail = original.subarray(originalFrames[0].end)
+        const rewrittenTail = rewritten.subarray(rewrittenFrames[0].end)
+        if (!originalTail.equals(rewrittenTail)) throw new Error('移动后校验失败：会话事件内容发生变化')
+        await writeFile(stagedPath, rewritten, { mode: 0o600 })
+        await rename(stagedPath, newPath)
+        destinationInstalled = true
+        await unlink(backupPath)
       } catch (e) {
+        try { await unlink(stagedPath) } catch (_) {}
+        if (destinationInstalled) { try { await unlink(newPath) } catch (_) {} }
         try { await rename(backupPath, oldPath) } catch (_) {}
         if (e && e.code !== 'ENOENT') throw e
         return false

package/src/zstd-frame.js

@@ -20,33 +20,71 @@ export const ZSTD_MAGIC = 0xFD2FB528
 const CHECKSUM_OPTS = { params: { [zlib.constants.ZSTD_c_checksumFlag]: 1 } }
 
 /**
- * Locate real zstd frame boundaries in a concatenated-frame buffer.
- *
- * Scanning for the 4-byte magic alone produces FALSE POSITIVES: the same byte
- * sequence can occur inside compressed data. Every candidate is therefore
- * validated by attempting decompression; only offsets that decode are kept.
+ * Parse complete concatenated Zstandard frames without decompressing them.
+ * Invalid complete structure rejects; EOF inside the final frame is reported
+ * as torn rather than guessed from magic bytes occurring in compressed data.
  *
  * @param {Buffer} buf
- * @returns {number[]} ascending offsets of real frame starts
+ * @param {number} maxFrames
+ * @returns {{frames: Array<{start:number,end:number}>, tornStart?: number}}
  */
-export function findZstdFrameStarts(buf) {
-  const starts = []
-  for (let i = 0; i + 4 <= buf.length; i++) {
-    if (buf.readUInt32LE(i) !== ZSTD_MAGIC) continue
-    try {
-      // Two checks are needed, not just one:
-      //  - a magic inside compressed data fails to decode and throws
-      //  - a BARE 4-byte magic at the very end of the buffer decodes to an
-      //    EMPTY result without throwing, so non-empty output is required too
-      // Every real frame carries at least one JSON line, so neither case can
-      // be a genuine frame start.
-      const out = zlib.zstdDecompressSync(buf.subarray(i, i + Math.min(buf.length - i, 1000000)))
-      if (out.length > 0) starts.push(i)
-    } catch (_) {
-      // Not a real frame boundary — the magic bytes occurred inside compressed data.
+export function scanZstdFrames(buf, maxFrames = Number.POSITIVE_INFINITY) {
+  const frames = []
+  let offset = 0
+  while (offset < buf.length) {
+    const start = offset
+    if (buf.length - offset < 4) return { frames, tornStart: start }
+    if (buf.readUInt32LE(offset) !== ZSTD_MAGIC) {
+      throw new Error(`会话日志格式异常（字节 ${offset} 的 zstd magic 无效）`)
+    }
+    offset += 4
+    if (offset === buf.length) return { frames, tornStart: start }
+
+    const descriptor = buf.readUInt8(offset++)
+    if ((descriptor & 0x18) !== 0) throw new Error(`会话日志格式异常（字节 ${offset - 1} 使用保留帧头位）`)
+    const contentSizeFlag = descriptor >>> 6
+    const singleSegment = (descriptor & 0x20) !== 0
+    const checksum = (descriptor & 0x04) !== 0
+    const dictionaryFlag = descriptor & 0x03
+    const dictionaryBytes = dictionaryFlag === 3 ? 4 : dictionaryFlag
+    const contentSizeBytes = contentSizeFlag === 0 ? (singleSegment ? 1 : 0) : 1 << contentSizeFlag
+    const remainingHeaderBytes = (singleSegment ? 0 : 1) + dictionaryBytes + contentSizeBytes
+    if (buf.length - offset < remainingHeaderBytes) return { frames, tornStart: start }
+    offset += remainingHeaderBytes
+
+    for (;;) {
+      if (buf.length - offset < 3) return { frames, tornStart: start }
+      const blockHeader = buf.readUIntLE(offset, 3)
+      offset += 3
+      const lastBlock = (blockHeader & 1) !== 0
+      const blockType = (blockHeader >>> 1) & 0x03
+      const blockSize = blockHeader >>> 3
+      if (blockType === 0x03) throw new Error(`会话日志格式异常（字节 ${offset - 3} 使用保留块类型）`)
+      const payloadBytes = blockType === 0x01 ? 1 : blockSize
+      if (buf.length - offset < payloadBytes) return { frames, tornStart: start }
+      offset += payloadBytes
+      if (lastBlock) break
+    }
+    if (checksum) {
+      if (buf.length - offset < 4) return { frames, tornStart: start }
+      offset += 4
     }
+    frames.push({ start, end: offset })
+    if (frames.length === maxFrames) return { frames }
   }
-  return starts
+  return { frames }
+}
+
+/** Backward-compatible frame-start view used by diagnostics and tests. */
+export function findZstdFrameStarts(buf) {
+  return scanZstdFrames(buf).frames.map((frame) => frame.start)
+}
+
+function firstFrame(buf) {
+  const scan = scanZstdFrames(buf, 1)
+  const frame = scan.frames[0]
+  if (!frame) throw new Error('会话日志格式异常（无完整 zstd 帧）')
+  return frame
 }
 
 /**
@@ -64,10 +102,9 @@ export function findZstdFrameStarts(buf) {
  */
 export function rewriteFrame0Cwd(filePath, newCwd) {
   const buf = readFileSync(filePath)
-  const starts = findZstdFrameStarts(buf)
-  if (starts.length === 0) throw new Error('会话日志格式异常（无 zstd 帧）')
-  const end0 = starts.length > 1 ? starts[1] : buf.length
-  const frame0 = buf.subarray(starts[0], end0)
+  const frame = firstFrame(buf)
+  const end0 = frame.end
+  const frame0 = buf.subarray(frame.start, end0)
   const text = zlib.zstdDecompressSync(frame0).toString('utf8')
   const nl = text.indexOf('\n')
   const line = nl >= 0 ? text.slice(0, nl) : text
@@ -91,10 +128,9 @@ export function rewriteFrame0Cwd(filePath, newCwd) {
  * @returns {Buffer} rewritten log
  */
 export function rewriteFrame0CwdInMemory(buf, newCwd) {
-  const starts = findZstdFrameStarts(buf)
-  if (starts.length === 0) throw new Error('会话日志格式异常（无 zstd 帧）')
-  const end0 = starts.length > 1 ? starts[1] : buf.length
-  const frame0 = buf.subarray(starts[0], end0)
+  const frame = firstFrame(buf)
+  const end0 = frame.end
+  const frame0 = buf.subarray(frame.start, end0)
   const text = zlib.zstdDecompressSync(frame0).toString('utf8')
   const nl = text.indexOf('\n')
   const line = nl >= 0 ? text.slice(0, nl) : text
@@ -128,10 +164,8 @@ export function buildSessionLog(header, events = []) {
  * @returns {{obj: object, lineCount: number}}
  */
 export function readFrame0(buf) {
-  const starts = findZstdFrameStarts(buf)
-  if (starts.length === 0) throw new Error('会话日志格式异常（无 zstd 帧）')
-  const end0 = starts.length > 1 ? starts[1] : buf.length
-  const text = zlib.zstdDecompressSync(buf.subarray(starts[0], end0)).toString('utf8')
+  const frame = firstFrame(buf)
+  const text = zlib.zstdDecompressSync(buf.subarray(frame.start, frame.end)).toString('utf8')
   const lines = text.split('\n').filter((l) => l.length > 0)
   return { obj: JSON.parse(lines[0]), lineCount: lines.length }
 }