dsh-turn-undo 0.0.2 → 0.0.4

package/client.js

@@ -9,10 +9,27 @@
 //      messages carry these flow kinds (AI replies use "assistant-step",
 //      "tool-call", etc. and are never selected).
 //   2. Inside the row, find the message actions container (the element
-//      holding the copy/branch buttons). We locate it by taking the parent of
-//      the row's first <button> (dimension-independent of hashed CSS classes).
+//      holding the copy/branch buttons). DSH seats the row's renderer inside
+//      passthrough wrappers (slot outlets render display:contents with one
+//      child), so we walk down firstElementChild past single-child wrappers
+//      to the UserStyleBubble root, whose LAST direct element child is the
+//      MessageIconActions row (dimension-independent of hashed CSS classes).
+//      "Parent of the first button" broke after the ui-attachment refactor:
+//      attachment thumbnails are <button>s that render before the actions
+//      row, so the first button is no longer the copy control.
 //   3. That parent element becomes the portal target for the undo button.
 //
+// DSH 0.1.6+ CSS-reveals a user/steering row's .actions strip only on
+// hover/focus while a later user/steering row exists
+// (MessageIconActions.module.css:
+//  :is([data-chat-flow-kind='user'],[data-chat-flow-kind='steering']):has(
+//    ~ :is(...)) .actions { opacity:0 }). A portal button inside .actions
+//  would inherit that invisibility, so collectPortalTargets tags the
+//  injected container with `data-dtu-always` and the plugin stylesheet
+//  forces `[data-dtu-always]{opacity:1!important}`, keeping the undo
+//  control permanently visible without changing DSH's hover behavior for
+//  the native copy/branch controls elsewhere in the row.
+//
 // Communication:
 //   GET  /api/turn-undo?sessionId=...&turn=...   -> preview
 //   POST /api/turn-undo                          -> restore
@@ -28,18 +45,68 @@ window.__ModuleLoader__.load({
     var API_PATH = '/api/turn-undo'
     var USER_ROW_SELECTOR = '[data-chat-flow-kind="user"][data-chat-anchor-key], [data-chat-flow-kind="steering"][data-chat-anchor-key]'
 
-    // 定位用户/steering 消息的操作行容器。
-    // 运行时用户行内没有 data-actions-reveal（该属性只在 turn-tail 上）；
-    // 直接用稳定结构：取行内第一个 <button>（copy 等）的 parentElement 作为操作行。
+    // Locate the user/steering message's IconActions row container.
+    //
+    // Structure (ChatNodeSeat.tsx + MessageItem.tsx UserStyleBubble, DSH 0.1.6+):
+    //   div[data-chat-flow-kind="user"]        (row, .flowItem)
+    //     div[data-slot="conversation.chat.node"]  (SlotOutlet anchor,
+    //                                              display:contents passthrough)
+    //       div.userRow                         (UserStyleBubble root)
+    //         div.userStack                     // bubble + attachment rows
+    //         div.actions                       // MessageIconActions row,
+    //                                             LAST child of userRow
+    //
+    // The number of passthrough wrappers between the row and userRow is NOT
+    // stable across DSH versions (renderSlot outlets, providers, ...), so we
+    // cannot hardcode `row.firstElementChild.lastElementChild`. Instead walk
+    // down firstElementChild while the element is a single-child passthrough
+    // (SlotOutlet anchors render display:contents with exactly one child);
+    // the first element with 2+ children is userRow — UserStyleBubble always
+    // renders [userStack, actions], and actions is always its LAST child.
+    //
+    // The container must NOT be located by "parent of the first <button>":
+    // since the ui-attachment refactor, image thumbnails / file-card retry
+    // controls are <button>s that render INSIDE userStack (attachmentRow),
+    // before the actions row. The first button in document order is then an
+    // attachment control, whose parent is the attachment row — landing the
+    // undo button next to the image.
+    //
+    // DSH 0.1.6+ additionally CSS-gates the whole .actions strip to
+    // opacity:0 on any user/steering row that has a later user/steering
+    // sibling (MessageIconActions.module.css `:has(~ …) .actions{opacity:0}`),
+    // revealing it only on row hover/focus. A portal child inside .actions
+    // would be invisible at rest, so collectPortalTargets tags the resolved
+    // container with `data-dtu-always` and the plugin stylesheet forces
+    // `[data-dtu-always]{opacity:1!important}` — the undo control stays
+    // permanently visible on every user row.
     function findIconActions(row) {
       if (!row || row.nodeType !== 1) return null
       var kind = row.getAttribute('data-chat-flow-kind')
       if (kind !== 'user' && kind !== 'steering') return null
-      var firstButton = row.querySelector('button')
-      if (!firstButton) return null
-      var actions = firstButton.parentElement
+      // Walk down through passthrough wrappers (slot outlets etc.): each
+      // renders exactly one child. Stop at the first element with more than
+      // one child — that is userRow ([userStack, actions]). The depth cap is
+      // a runaway guard, not an expected bound.
+      var el = row.firstElementChild
+      var depth = 0
+      while (el && el.children.length <= 1 && depth < 8) {
+        el = el.firstElementChild
+        depth++
+      }
+      if (!el || el.children.length < 2) return null
+      var actions = el.lastElementChild
+      if (!actions || actions.nodeType !== 1) return null
       if (!actions || actions.nodeType !== 1) return null
+      // Guard: the actions row always carries at least one direct <button>
+      // (the copy control). If it does not, the row has no action strip and
+      // there is nowhere to seat the undo button.
       if (actions.querySelectorAll(':scope > button').length < 1) return null
+      // The guard is content-level: an attachment gallery or retry control
+      // that leaked into this container means the DOM structure drifted, and
+      // seating the undo button there would repeat the "next to the image"
+      // bug. Reject rather than inject into the wrong element.
+      if (actions.querySelector('[data-variant]')) return null
+      if (actions.querySelector('img')) return null
       return actions
     }
 
@@ -100,6 +167,32 @@ window.__ModuleLoader__.load({
           '.dtu-btn{padding:8px 16px;border:0;border-radius:6px;font-size:14px;cursor:pointer}',
           '.dtu-btn-cancel{background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-secondary)}.dtu-btn-cancel:hover{background:var(--dsw-alias-interactive-bg-hover)}',
           '.dtu-btn-primary{background:var(--dsw-alias-state-business-primary);color:#fff;font-weight:500;min-width:120px}.dtu-btn-primary:hover{opacity:.9}.dtu-btn-primary:disabled{opacity:.5;cursor:not-allowed}',
+          '.dtu-file{cursor:pointer}.dtu-file:hover{background:var(--dsw-alias-bg-layer-3)}',
+          '.dtu-fullscreen-diff{position:fixed;inset:0;background:var(--dsw-alias-bg-layer-1);z-index:11000;display:flex;flex-direction:column}',
+          '.dtu-fullscreen-header{display:flex;align-items:center;gap:12px;padding:12px 16px;background:var(--dsw-alias-bg-layer-2);border-bottom:1px solid var(--dsw-alias-border-l2);flex-shrink:0}',
+          '.dtu-fullscreen-back{background:transparent;border:0;font-size:14px;cursor:pointer;color:var(--dsw-alias-label-secondary);padding:6px 10px;border-radius:6px}.dtu-fullscreen-back:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}',
+          '.dtu-fullscreen-path{font-size:14px;font-weight:600;color:var(--dsw-alias-label-primary);margin:0;flex:1;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
+          '.dtu-fullscreen-close{background:transparent;border:0;font-size:24px;cursor:pointer;color:var(--dsw-alias-label-tertiary);padding:4px 8px;border-radius:6px}.dtu-fullscreen-close:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}',
+          '.dtu-fullscreen-body{flex:1;display:flex;flex-direction:column;overflow:hidden}',
+          '.dtu-diff-columns-wrapper{display:flex;padding:0 16px 8px;font-size:11px;font-weight:600;color:var(--dsw-alias-label-tertiary);text-transform:uppercase;letter-spacing:0.5px;flex-shrink:0}',
+          '.dtu-diff-column-label{flex:1;text-align:center;border-bottom:1px solid var(--dsw-alias-border-l2);padding-bottom:4px}',
+          '.dtu-diff-scroll-container{flex:1;overflow:auto}',
+          '.dtu-diff-row{display:flex;border-bottom:1px solid var(--dsw-alias-border-l1);min-height:21px}',
+          '.dtu-diff-row-removed{background:rgba(248,81,73,.15)}',
+          '.dtu-diff-row-added{background:rgba(63,185,80,.15)}',
+          '.dtu-diff-cell{flex:1;font-family:monospace;font-size:13px;line-height:21px;padding:0 8px 0 52px;display:flex;white-space:pre-wrap;word-break:break-all;position:relative}',
+          '.dtu-diff-cell-left{border-right:1px solid var(--dsw-alias-border-l1)}',
+          '.dtu-diff-cell-removed{color:#f85149}',
+          '.dtu-diff-cell-added{color:#39b54e}',
+          '.dtu-diff-line-num{position:absolute;left:4px;top:0;width:44px;text-align:right;color:var(--dsw-alias-label-tertiary);font-size:12px;pointer-events:none;padding-right:4px}',
+          '.dtu-diff-line-num-empty{visibility:hidden}',
+          '.dtu-diff-empty{display:flex;align-items:center;justify-content:center;height:100%;color:var(--dsw-alias-label-tertiary);font-size:14px}',
+          // 插件把 portal 按钮注入 .actions 行；DSH 0.1.6+ 对"后面还有 user 行"的
+          // user/steering 行默认 .actions{opacity:0}（仅 hover/focus 显现），
+          // 注入按钮会跟着消失。给注入的容器打 data-dtu-always，用 !important
+          // 强制常显，且不影响 DSH 原生 copy/branch 的 hover 行为（它们仍在
+          // .actions 里，随父盒透明度一起显隐，与撤销按钮一致的常显）。
+          '[data-dtu-always]{opacity:1!important}',
         ].join('')
         document.head.appendChild(styleEl)
       }
@@ -175,16 +268,24 @@ window.__ModuleLoader__.load({
         var sessionId = props.sessionId
         var openRestoredSessionProp = props.openRestoredSession
         var useChat = props.useChat
+
+        // 卡死根因 1：裸用 `useChat(s => s.nodes.values())`。
+        // NodesView.values() 在 upsert 后构建**新数组**（流式输出期间几乎每帧都 dirty），
+        // 而 useSyncExternalStoreWithSelector 的默认比较是 Object.is(选择器返回值)
+        // → 组件每帧重渲染 → useLayoutEffect([nodes]) 每帧 teardown/recreate
+        // body-subtree 的 MutationObserver + 全页扫描 → GUI 卡死。
+        // 修复：用 eq 按内容比较，内容不变时选择器返回旧数组引用，渲染与 effect 都稳定。
         var nodes = useChat(function (snapshot) {
           return snapshot.nodes ? snapshot.nodes.values() : []
-        })
+        }, sameNodeList)
+
         var targetsState = useState([])
         var targets = targetsState[0]
         var setTargets = targetsState[1]
 
         useLayoutEffect(function () {
           var active = true
-          var queued = false
+          var timer = 0
           var refresh = function () {
             if (!active) return
             var next = collectPortalTargets(nodes)
@@ -192,19 +293,55 @@ window.__ModuleLoader__.load({
               return samePortalTargets(current, next) ? current : next
             })
           }
-          var queueRefresh = function () {
-            if (queued || !active) return
-            queued = true
-            queueMicrotask(function () {
-              queued = false
-              refresh()
-            })
+          // 卡死根因 2：observer 回调对**任何** body 变更都跑全页扫描
+          // （流式 token、输入框、hover 状态都在内）。只有关心 user/steering 行
+          // 内部的变更才值得重扫；其余记录直接丢弃。
+          // 再叠加 80ms 时间防抖，把"每帧重扫"压成"静默期结束后扫一次"。
+          var isRelevant = function (record) {
+            var target = record.target
+            var relevant = false
+            var node = target
+            while (node && node.nodeType === 1) {
+              if (node.hasAttribute && node.hasAttribute('data-chat-anchor-key')) {
+                relevant = node.getAttribute('data-chat-flow-kind') === 'user'
+                  || node.getAttribute('data-chat-flow-kind') === 'steering'
+                if (relevant) break
+              }
+              node = node.parentNode
+            }
+            if (!relevant && record.addedNodes) {
+              for (var i = 0; i < record.addedNodes.length; i++) {
+                var added = record.addedNodes[i]
+                var probe = added
+                while (probe && probe.nodeType === 1) {
+                  if (probe.hasAttribute && probe.hasAttribute('data-chat-anchor-key')) {
+                    relevant = probe.getAttribute('data-chat-flow-kind') === 'user'
+                      || probe.getAttribute('data-chat-flow-kind') === 'steering'
+                    break
+                  }
+                  probe = probe.parentNode
+                }
+                if (relevant) break
+              }
+            }
+            return relevant
+          }
+          var queueRefresh = function (records) {
+            if (!active) return
+            for (var i = 0; i < records.length; i++) {
+              if (isRelevant(records[i])) {
+                if (timer) clearTimeout(timer)
+                timer = setTimeout(refresh, 80)
+                return
+              }
+            }
           }
           refresh()
           var observer = new MutationObserver(queueRefresh)
           observer.observe(document.body, { childList: true, subtree: true })
           return function () {
             active = false
+            if (timer) clearTimeout(timer)
             observer.disconnect()
           }
         }, [nodes])
@@ -225,6 +362,27 @@ window.__ModuleLoader__.load({
         return portals
       }
 
+      // eq for the useChat selector: content-level equality so the selected array
+      // keeps its reference across snapshots whose node set did not structurally
+      // change. A streaming frame that only refreshes node payloads therefore
+      // neither re-renders this component nor re-runs the observer effect.
+      //
+      // 注意：不能把 `sameNodeList` 放在 RestoreMessagePortals 内部——
+      // hook 行在函数声明提升之前执行时，词法作用域里的函数声明虽已提升，
+      // 但 useChat 的第二参必须是一个稳定可调用对象；放模块级最稳。
+      function sameNodeList(left, right) {
+        if (left === right) return true
+        if (left.length !== right.length) return false
+        for (var i = 0; i < left.length; i++) {
+          var a = left[i]
+          var b = right[i]
+          var av = ('key' in a && 'data' in a) ? a : { key: 'node', data: a }
+          var bv = ('key' in b && 'data' in b) ? b : { key: 'node', data: b }
+          if (av.key !== bv.key || av.data !== bv.data) return false
+        }
+        return true
+      }
+
       function RestoreMessageAction(props) {
         var matched = props.matched
         var sessionId = props.sessionId
@@ -338,7 +496,128 @@ window.__ModuleLoader__.load({
         )
       }
 
-      function RestoreDialog(props) {
+      // Full-screen VSCode-style diff overlay — side-by-side with single scrollbar
+            // Full-screen VSCode-style diff overlay — single scrollbar, line numbers
+      function DiffOverlay(props) {
+        var onClose = props.onClose
+        var change = props.change
+        
+        var isCreated = change.kind === 'created'
+        var isDeleted = change.kind === 'deleted'
+        var isModified = change.kind === 'modified'
+        
+        // 构建 diff 行数据
+        var diffRows = []
+        
+        if (change.diff && change.diff.hunks) {
+          var oldLine = 0
+          var newLine = 0
+          
+          for (var i = 0; i < change.diff.hunks.length; i++) {
+            var hunk = change.diff.hunks[i]
+            
+            if (hunk.type === 'removed') {
+              diffRows.push({
+                type: 'removed',
+                text: hunk.value,
+                oldLine: ++oldLine,
+                newLine: null
+              })
+            } else if (hunk.type === 'added') {
+              diffRows.push({
+                type: 'added',
+                text: hunk.value,
+                oldLine: null,
+                newLine: ++newLine
+              })
+            } else {
+              diffRows.push({
+                type: 'same',
+                text: hunk.value,
+                oldLine: ++oldLine,
+                newLine: ++newLine
+              })
+            }
+          }
+        }
+        
+        var leftLabel = isCreated ? '' : '原始版本'
+        var rightLabel = isDeleted ? '' : '修改后版本'
+        
+        // 安全转义 HTML
+        function escapeHtml(text) {
+          if (!text) return ''
+          return text
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/"/g, '&quot;')
+            .replace(/'/g, '&#039;')
+        }
+        
+        return reactDom.createPortal(
+          h('div', {
+            className: 'dtu-fullscreen-diff',
+            onClick: onClose,
+            onKeyDown: function (e) {
+              if (e.key === 'Escape') onClose()
+            }
+          },
+            h('div', { className: 'dtu-fullscreen-header', onClick: function (e) { e.stopPropagation() } },
+              h('button', {
+                className: 'dtu-fullscreen-back',
+                onClick: onClose
+              }, '← 关闭'),
+              h('span', { className: 'dtu-fullscreen-path' }, change.path),
+              h('div', null,
+                isCreated ? h('span', { style: { color: '#39b54e', fontSize: '11px' } }, '● 新文件') : null,
+                isDeleted ? h('span', { style: { color: '#f85149', fontSize: '11px' } }, '● 已删除') : null,
+                isModified ? h('span', { style: { color: '#f85149', fontSize: '11px', marginRight: '8px' } }, '● 删除') : null,
+                isModified ? h('span', { style: { color: '#39b54e', fontSize: '11px' } }, '● 添加') : null
+              ),
+              h('button', {
+                className: 'dtu-fullscreen-close',
+                onClick: onClose
+              }, '✕')
+            ),
+            h('div', { className: 'dtu-fullscreen-body' },
+              h('div', { className: 'dtu-diff-columns-wrapper' },
+                leftLabel ? h('div', { className: 'dtu-diff-column-label' }, leftLabel) : null,
+                rightLabel ? h('div', { className: 'dtu-diff-column-label' }, rightLabel) : null
+              ),
+              h('div', { className: 'dtu-diff-scroll-container' },
+                diffRows.length > 0
+                  ? h('div', null, diffRows.map(function (row, idx) {
+                      var rowClass = 'dtu-diff-row'
+                      if (row.type === 'removed') rowClass += ' dtu-diff-row-removed'
+                      else if (row.type === 'added') rowClass += ' dtu-diff-row-added'
+                      
+                      var escapedText = escapeHtml(row.text)
+                      
+                      // 根据行类型决定左右栏内容
+                      var leftText = (row.type === 'added') ? '' : escapedText
+                      var rightText = (row.type === 'removed') ? '' : escapedText
+                      
+                      return h('div', { key: idx, className: rowClass },
+                        // 左栏
+                        h('div', { className: 'dtu-diff-cell dtu-diff-cell-left' },
+                          h('span', { className: 'dtu-diff-line-num' }, row.oldLine || ''),
+                          leftText
+                        ),
+                        // 右栏
+                        h('div', { className: 'dtu-diff-cell dtu-diff-cell-right' },
+                          h('span', { className: 'dtu-diff-line-num' }, row.newLine || ''),
+                          rightText
+                        )
+                      )
+                    }))
+                  : h('div', { className: 'dtu-diff-empty' }, '(无差异)')
+              )
+            )
+          ),
+          document.body
+        )
+      }function RestoreDialog(props) {
         var sessionId = props.sessionId
         var messageText = props.messageText
         var onClose = props.onClose
@@ -352,6 +631,11 @@ window.__ModuleLoader__.load({
         var noSnapshot = props.noSnapshot
         var canApply = props.canApply
         var applyRestore = props.applyRestore
+        
+        // Diff viewing state
+        var showDiffState = useState(null)
+        var showDiff = showDiffState[1]
+        var viewingDiff = showDiffState[0]
 
         // 文件很多时避免一次性渲染大量 DOM（性能优化）：只渲染前 200 个，
         // 其余折叠成一条提示。总数仍在标题里显示。
@@ -384,16 +668,29 @@ window.__ModuleLoader__.load({
                   ? h('div', { className: 'dtu-section' },
                       h('div', { className: 'dtu-section-label' }, '将影响的文件 (' + changes.length + ' 个)'),
                       h('div', { className: 'dtu-files' },
-                        shownChanges.map(function (change, idx) {
-                          return h('div', { key: idx, className: 'dtu-file' },
-                            h('code', {}, change.path),
-                            h('span', { className: 'dtu-kind' }, kindLabel(change.kind)),
-                          )
-                        }),
-                        (changes.length > shownChanges.length)
-                          ? h('div', { className: 'dtu-more' },
-                              '… 还有 ' + (changes.length - shownChanges.length) + ' 个文件未显示'
-                            ) : null,
+                        h('div', { className: 'dtu-files' },
+                          shownChanges.map(function (change, idx) {
+                            var isModified = change.kind === 'modified' && change.diff
+                            return h('div', {
+                              key: idx,
+                              className: 'dtu-file',
+                              onClick: isModified ? function () { showDiff(isModified ? change : null) } : undefined,
+                              style: isModified ? { cursor: 'pointer' } : {}
+                            },
+                              h('code', {}, change.path),
+                              h('span', { className: 'dtu-kind' }, kindLabel(change.kind)),
+                              isModified ? h('span', { className: 'dtu-diff-indicator', style: { fontSize: '11px', marginLeft: '4px', opacity: '.6' } }, '👁') : null
+                            )
+                          }),
+                          (changes.length > shownChanges.length)
+                            ? h('div', { className: 'dtu-more' },
+                                '… 还有 ' + (changes.length - shownChanges.length) + ' 个文件未显示'
+                              ) : null,
+                        ),
+                        // Full-screen diff overlay
+                        viewingDiff
+                          ? h(DiffOverlay, { change: viewingDiff, onClose: function () { showDiff(null) } })
+                          : null,
                       ),
                     ) : null,
                 (!loading && !previewError && changes.length > 0)
@@ -458,6 +755,13 @@ window.__ModuleLoader__.load({
           // 用与 findIconActions 相同的稳定策略定位操作行容器。
           var actions = findIconActions(row)
           if (!actions) continue
+          // DSH 0.1.6+ 的 CSS：有"后续 user/steering 行"的 user 行，其 .actions
+          // 默认 opacity:0（仅 hover/focus 显现），portal 进去的撤销按钮会跟着
+          // 不可见。给容器打 data-dtu-always，配合全局 [data-dtu-always]
+          // {opacity:1!important} 让注入按钮常显。
+          if (!actions.hasAttribute('data-dtu-always')) {
+            actions.setAttribute('data-dtu-always', '')
+          }
           targets.push({ container: actions, matched: target.matched })
         }
         return targets
@@ -478,4 +782,4 @@ window.__ModuleLoader__.load({
     exports.inject = ['slots', 'sessions', 'conversation']
     return module.exports
   },
-})
+})

package/index.js

@@ -28,7 +28,7 @@ import {
   readdirSync,
   readlinkSync,
   rmSync,
-  linkSync,
+  chmodSync,
   createWriteStream,
   createReadStream,
 } from 'node:fs'
@@ -195,7 +195,7 @@ class SnapshotStore {
    * Capture the workspace at cwd into the session's chain.
    * Returns the manifest (or null if unchanged since the session's last).
    */
-  capture(cwd, sessionId, turn) {
+  async capture(cwd, sessionId, turn) {
     ensureDir(this.objDir)
     ensureDir(join(this.snapDir, sessionId))
 
@@ -229,13 +229,15 @@ class SnapshotStore {
       // Reuse previous object if content unchanged (compare size+mtime via
       // prev manifest, else re-hash the file).
       const prev = prevManifest && prevManifest[rel]
-      if (prev && prev.size === st.size && prev.mtime === st.mtimeMs) {
+      const prevMode = prev && prev.mode
+      const currentMode = st.mode.toString(8).padStart(4, '0')
+      if (prev && prev.size === st.size && prev.mtime === st.mtimeMs && prevMode === currentMode) {
         entry = prev // unchanged — reuse (no new object written)
       } else {
         const hash = hashFile(abs)
         const objPath = join(this.objDir, hash)
         if (!existsSync(objPath)) {
-          this.copyIntoObjects(abs, objPath)
+          await this.copyIntoObjects(abs, objPath)
         }
         entry = {
           kind: 'file',
@@ -355,37 +357,46 @@ class SnapshotStore {
    * where the newly-materialized file is immediately superseded by the next
    * turn's capture and there is no long-lived object to corrupt.
    */
-  copyIntoObjects(src, dst) {
+  async copyIntoObjects(src, dst) {
+    let success = false
     try {
       copyFileSync(src, dst)
+      success = true
     } catch {
       // e.g. src vanished mid-read; try streaming fallback
       try {
         const rs = createReadStream(src)
         const ws = createWriteStream(dst)
-        rs.pipe(ws)
-        return new Promise((resolve, reject) => {
+        await new Promise((resolve, reject) => {
           rs.on('error', reject)
           ws.on('error', reject)
           ws.on('finish', resolve)
         })
+        success = true
       } catch (e) {
         console.warn('[turn-undo] object write failed:', e.message)
       }
     }
+    // Verify the written object hash matches the source
+    if (success) {
+      const srcHash = hashFile(src)
+      const dstHash = hashFile(dst)
+      if (srcHash !== dstHash) {
+        // Hash mismatch — file was corrupted during copy
+        try { unlinkSync(dst) } catch {}
+        throw new Error(`Object hash mismatch: expected ${srcHash}, got ${dstHash}`)
+      }
+    }
   }
 
   /** Materialize an object into the workspace (write-back during restore). */
-  materializeObject(objPath, dest) {
+  materializeObject(objPath, dest, mode) {
     try {
       unlinkSync(dest)
     } catch { /* may not exist */ }
     ensureDir(dirname(dest))
-    try {
-      linkSync(objPath, dest) // hard link back: cheap + safe (object won't be re-modified)
-    } catch {
-      copyFileSync(objPath, dest)
-    }
+    copyFileSync(objPath, dest)
+    if (mode) chmodSync(dest, parseInt(mode, 8))
   }
 
   manifestsEqual(a, b) {
@@ -398,10 +409,122 @@ class SnapshotStore {
       if (!eb) return false
       if (ea.kind !== eb.kind) return false
       if (ea.hash !== eb.hash) return false
+      if (ea.mode !== eb.mode) return false
     }
     return true
   }
 
+  /** Read an object file from the content-addressed store and return its text content. */
+  readObjectContent(hash) {
+    if (!hash) return null
+    const objPath = join(this.objDir, hash)
+    if (!existsSync(objPath)) return null
+    try {
+      return readFileSync(objPath, 'utf-8')
+    } catch {
+      return null
+    }
+  }
+
+  /** Generate a simple line-based diff between two arrays of lines. */
+  generateDiff(oldLines, newLines, contextLines = 10) {
+    const m = oldLines.length
+    const n = newLines.length
+    const dp = Array.from({ length: m + 1 }, () => Array(n + 1).fill(0))
+    for (let i = 1; i <= m; i++) {
+      for (let j = 1; j <= n; j++) {
+        if (oldLines[i - 1] === newLines[j - 1]) {
+          dp[i][j] = dp[i - 1][j - 1] + 1
+        } else {
+          dp[i][j] = Math.max(dp[i - 1][j], dp[i][j - 1])
+        }
+      }
+    }
+
+    const result = []
+    let i = m
+    let j = n
+
+    while (i > 0 || j > 0) {
+      if (i > 0 && j > 0 && oldLines[i - 1] === newLines[j - 1]) {
+        result.push({ type: 'same', value: oldLines[i - 1] })
+        i--
+        j--
+      } else if (j > 0 && (i === 0 || dp[i][j - 1] >= dp[i - 1][j])) {
+        result.push({ type: 'added', value: newLines[j - 1] })
+        j--
+      } else {
+        result.push({ type: 'removed', value: oldLines[i - 1] })
+        i--
+      }
+    }
+
+    result.reverse()
+
+    // 如果有上下文行数限制，过滤只保留变化行及其上下文
+    if (contextLines > 0) {
+      // 找出所有变化的行索引
+      const changedIndices = new Set()
+      for (let idx = 0; idx < result.length; idx++) {
+        if (result[idx].type !== 'same') {
+          changedIndices.add(idx)
+        }
+      }
+
+      // 标记需要包含的行
+      const keepIndices = new Set()
+      for (const idx of changedIndices) {
+        // 保留变化行本身
+        keepIndices.add(idx)
+        // 保留前后 contextLines 行
+        for (let k = 1; k <= contextLines; k++) {
+          if (idx - k >= 0) keepIndices.add(idx - k)
+          if (idx + k < result.length) keepIndices.add(idx + k)
+        }
+      }
+
+      // 过滤结果
+      const filtered = []
+      for (let idx = 0; idx < result.length; idx++) {
+        if (keepIndices.has(idx)) {
+          filtered.push(result[idx])
+        } else if (result[idx].type === 'same') {
+          // 省略相同行标记
+          filtered.push({ type: 'same', value: '...' })
+        }
+      }
+
+      // 合并连续的省略标记
+      const merged = []
+      for (const item of filtered) {
+        if (item.type === 'same' && item.value === '...') {
+          if (merged.length > 0 && merged[merged.length - 1].value === '...') {
+            continue // 跳过连续的省略
+          }
+        }
+        merged.push(item)
+      }
+
+      return merged
+    }
+
+    return result
+  }
+
+  /** Read manifest entries into a map of path -> content */
+  readManifestContents(manifest) {
+    const contents = {}
+    for (const [rel, entry] of Object.entries(manifest)) {
+      if (entry.kind === 'file' && entry.hash) {
+        const content = this.readObjectContent(entry.hash)
+        if (content !== null) {
+          contents[rel] = content
+        }
+      }
+    }
+    return contents
+  }
+
   /** Load snapshot manifests for a session, oldest first. */
   loadChain(sessionId) {
     const dir = join(this.snapDir, sessionId)
@@ -439,6 +562,7 @@ class SnapshotStore {
 
     let restoredFiles = 0
     let deletedFiles = 0
+    const skippedFiles = [] // Track files that couldn't be restored
     // 1. Write back / refresh files present in target manifest.
     for (const rel of rels) {
       const entry = manifest[rel]
@@ -448,12 +572,15 @@ class SnapshotStore {
         ensureDir(dirname(abs))
         if (entry.kind === 'file') {
           const objPath = join(this.objDir, entry.hash)
-          if (!existsSync(objPath)) continue
-          this.materializeObject(objPath, abs)
+          if (!existsSync(objPath)) {
+            skippedFiles.push({ path: rel, reason: 'object_missing' })
+            continue
+          }
+          this.materializeObject(objPath, abs, entry.mode)
           restoredFiles++
         }
       } catch (e) {
-        /* skip un-restorable files */
+        skippedFiles.push({ path: rel, reason: 'materialize_failed', error: e.message })
       }
     }
 
@@ -461,6 +588,7 @@ class SnapshotStore {
     //    except excluded dirs. Only within cwd. Uses a boundary-unlimited walk
     //    (unlike scan, whose caps would silently stop the pruning early).
     const current = this.walkAll(cwd, ignore)
+    const failedDeletions = []
     for (const abs of current) {
       if (ignore(abs)) continue
       const rel = relative(cwd, abs).split('\\').join('/')
@@ -468,18 +596,31 @@ class SnapshotStore {
         try {
           rmSync(abs, { force: true })
           deletedFiles++
-        } catch { /* noop */ }
+        } catch (e) {
+          failedDeletions.push({ path: rel, error: e.message })
+        }
       }
     }
+    // If any deletions failed, mark the restore as partially failed
+    if (failedDeletions.length > 0) {
+      console.warn('[turn-undo] restore failed to delete', failedDeletions.length, 'files:', failedDeletions.map(f => f.path).join(', '))
+    }
 
-    return {
-      ok: true,
+    const result = {
+      ok: skippedFiles.length === 0 && failedDeletions.length === 0,
       restoredFiles,
       deletedFiles,
+      skippedFiles,
+      failedDeletions,
       targetTurn,
       restoredTurn: target.turn,
       totalFiles: rels.length,
     }
+    // Log skipped files for debugging
+    if (skippedFiles.length > 0) {
+      console.warn('[turn-undo] restore skipped', skippedFiles.length, 'files:', skippedFiles.map(f => f.path).join(', '))
+    }
+    return result
   }
 
   /**
@@ -707,7 +848,7 @@ class SnapshotRuntime {
     const run = prev.then(async () => {
       // brief delay so writes settle
       await wait(this.delayMs)
-      const result = this.store.capture(cwd, sessionId, turn)
+      const result = await this.store.capture(cwd, sessionId, turn)
       this.store.cleanup()
       return result
     })
@@ -890,7 +1031,9 @@ function createHandler(ctx, runtime, sessions, agents) {
         // Wait for any in-flight snapshot capture so the preview reflects the
         // latest committed workspace state (avoids showing a stale turn/end).
         try { await runtime.waitForSnapshots() } catch {}
-        const preview = runtime.store.preview(sessionId, targetTurn)
+        const source = await readSession(ctx, sessionId)
+        const cwd = source ? getCwd(source) : undefined
+        const preview = runtime.store.preview(sessionId, targetTurn, cwd)
         return json(response, 200, preview)
       }
 
@@ -932,7 +1075,7 @@ function createHandler(ctx, runtime, sessions, agents) {
         try {
           const chain = runtime.store.loadChain(sessionId)
           const lastTurn = chain.length ? chain[chain.length - 1].turn : 0
-          await runtime.captureNow(cwd, sessionId, lastTurn + 0.5)
+          await runtime.captureNow(cwd, sessionId, lastTurn + 0.999)
         } catch (e) {
           console.warn('[turn-undo] safety snapshot failed (non-fatal):', e?.message)
         }
@@ -1033,9 +1176,35 @@ export function apply(ctx, config = {}) {
   })
 }
 
+/**
+ * Build a manifest from the current workspace state without persisting it.
+ * Used by preview when the target turn is beyond the latest snapshot.
+ */
+SnapshotStore.prototype.buildLiveManifest = function (cwd) {
+  const ignore = makeIgnore(cwd, this.excludes)
+  const files = this.scan(cwd, ignore)
+  if (!files) return null
+  const manifest = {}
+  for (const p of files) {
+    const abs = p
+    let st
+    try { st = lstatSync(abs) } catch { continue }
+    if (!st.isFile()) continue
+    const rel = relative(cwd, abs).split('\\').join('/')
+    manifest[rel] = {
+      kind: 'file',
+      hash: hashFile(abs),
+      size: st.size,
+      mtime: st.mtimeMs,
+      mode: st.mode.toString(8).padStart(4, '0'),
+    }
+  }
+  return manifest
+}
+
 // Add preview helper to SnapshotStore prototype.
 // Returns the files that changed during the target turn (turn/end vs turn/start).
-SnapshotStore.prototype.preview = function (sessionId, targetTurn) {
+SnapshotStore.prototype.preview = function (sessionId, targetTurn, cwd) {
   const chain = this.loadChain(sessionId)
   if (targetTurn === null) {
     return { ok: true, status: 'ready', targetTurn: null, totalChanges: 0, changes: [] }
@@ -1061,27 +1230,69 @@ SnapshotStore.prototype.preview = function (sessionId, targetTurn) {
 
   // 会话最新快照 = 撤销点之后所有改动的累积终点。
   const latest = chain[chain.length - 1]
-  const latestManifest = latest.manifest
+
+  // If targetTurn is beyond the latest snapshot (e.g., the turn hasn't ended
+  // yet or snapshots were skipped), compare baseline against the CURRENT
+  // workspace state instead of the stale latest snapshot. This ensures the
+  // preview shows meaningful changes even when the active turn has no snapshot.
+  let latestManifest
+  if (targetTurn > latest.turn && cwd) {
+    const live = this.buildLiveManifest(cwd)
+    latestManifest = live || latest.manifest
+  } else {
+    latestManifest = latest.manifest
+  }
 
   // Calculate changes between latest and baseline: these are the files that
   // undo (restoring to baseline) will affect — every change made at or after
   // the target turn.
   const changes = []
+  
+  // Read manifest contents for diff computation
+  const baselineContents = this.readManifestContents(baselineManifest)
+  const latestContents = this.readManifestContents(latestManifest)
+  
+  const deleted = []
+  const created = []
+
+  // Collect deleted files
+  for (const rel of Object.keys(baselineManifest)) {
+    if (!latestManifest[rel]) {
+      changes.push({ path: rel, kind: 'deleted' })
+      deleted.push({ path: rel, hash: baselineManifest[rel].hash })
+    }
+  }
+
+  // Collect created and modified files
   for (const rel of Object.keys(latestManifest)) {
     const entry = latestManifest[rel]
     if (!baselineManifest[rel]) {
       changes.push({ path: rel, kind: 'created' })
+      created.push({ path: rel, hash: entry.hash })
     } else {
       const prevEntry = baselineManifest[rel]
       if (entry.hash !== prevEntry.hash) {
-        changes.push({ path: rel, kind: 'modified' })
+        const oldContent = baselineContents[rel] || ''
+        const newContent = latestContents[rel] || ''
+        const oldLines = oldContent.split('\n')
+        const newLines = newContent.split('\n')
+        const diff = this.generateDiff(oldLines, newLines, 10)
+        changes.push({ 
+          path: rel, 
+          kind: 'modified',
+          diff: { oldLines: oldLines.length, newLines: newLines.length, hunks: diff }
+        })
       }
     }
   }
 
-  for (const rel of Object.keys(baselineManifest)) {
-    if (!latestManifest[rel]) {
-      changes.push({ path: rel, kind: 'deleted' })
+  // Detect rename/move: same content hash, different path
+  for (let i = 0; i < deleted.length; i++) {
+    for (let j = 0; j < created.length; j++) {
+      if (deleted[i].hash === created[j].hash) {
+        deleted[i].matched = true
+        created[j].matched = true
+      }
     }
   }
 
@@ -1091,5 +1302,9 @@ SnapshotStore.prototype.preview = function (sessionId, targetTurn) {
     targetTurn,
     totalChanges: changes.length,
     changes,
+    renameMap: deleted.filter(d => d.matched).map(d => ({ 
+      oldPath: d.path, 
+      newPath: created.find(c => c.matched)?.path 
+    })).filter(Boolean),
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-turn-undo",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Undo to any point in a DSH conversation — revert files and fork a new session",
   "type": "module",
   "main": "index.js",