dsh-turn-undo 0.0.1 → 0.0.2

package/README.md

@@ -5,7 +5,7 @@
 ## 功能
 
 - ✅ 每条用户消息的操作栏注入一个“撤销”按钮（↺）。
-- ✅ 弹窗显示本轮会恢复/删除/修改的文件，并给出警告。
+- ✅ 弹窗显示撤销该消息后会影响的全部文件——包括该消息之后所有轮次的改动（不只是消息本轮的），并给出警告。
 - ✅ 确认后：
   - 恢复工作区文件到**发送该消息之前**的快照状态。
   - 通过 DSH 原生的 `sessionController.fork` 从该消息之前 fork 出新会话。
@@ -24,7 +24,7 @@ dsh plugin --profile <name> add dsh-turn-undo
 ## 使用
 
 1. 在对话中，每条用户消息的操作栏会出现撤销按钮。
-2. 点击按钮，弹窗列出本轮影响的文件。
+2. 点击按钮，弹窗列出撤销该消息后会影响的文件（该消息及之后所有轮次的改动）。
 3. 点击“确认恢复并继续”：
    - 文件恢复。
    - 旧会话被标记为 `（已撤销）`。
@@ -47,7 +47,7 @@ dsh plugin --profile <name> add dsh-turn-undo
   - 对“第一条用户消息”前面没有 completed turn 时，fall back 到 `ctx.sessionController.create({ cwd, agentPreset })` 创建空白会话。
   - 旧会话通过 `ctx.sessionController.rename` 加上 `（已撤销）` 前缀。
 - **HTTP API**：
-  - `GET /api/turn-undo?sessionId=...&messageSeq=...&promptText=...`：预览本轮影响。
+  - `GET /api/turn-undo?sessionId=...&messageSeq=...&promptText=...`：预览撤销该消息后会影响的文件（该消息之后所有轮次改动的并集）。
   - `POST /api/turn-undo`（body `{ sessionId, messageSeq, promptText }`）：执行恢复 + fork。
 
 ### 客户端（`client.js`）

package/client.js

@@ -90,6 +90,7 @@ window.__ModuleLoader__.load({
           '.dtu-status{margin:0;overflow-wrap:anywhere;color:var(--dsw-alias-label-secondary);font-size:13px;line-height:20px}',
           '.dtu-files{min-width:0;max-width:100%;box-sizing:border-box;max-height:220px;overflow:auto;border:1px solid var(--dsw-alias-border-l2);border-radius:10px}',
           '.dtu-file{display:flex;justify-content:space-between;gap:16px;min-width:0;padding:8px 10px;border-bottom:1px solid var(--dsw-alias-border-l1);font-size:12px}.dtu-file:last-child{border-bottom:0}',
+          '.dtu-more{display:flex;justify-content:center;gap:8px;padding:8px 10px;font-size:12px;color:var(--dsw-alias-label-tertiary)}',
           '.dtu-file code{min-width:0;overflow:hidden;text-overflow:ellipsis;color:var(--dsw-alias-label-secondary)}',
           '.dtu-kind{flex:none;color:var(--dsw-alias-label-tertiary)}',
           '.dtu-warning,.dtu-error{box-sizing:border-box;max-width:100%;margin:0;padding:10px 12px;overflow-wrap:anywhere;word-break:break-word;border-radius:10px;font-size:12px;line-height:18px}',
@@ -329,7 +330,7 @@ window.__ModuleLoader__.load({
             ),
           ),
           open ? h(RestoreDialog, {
-            sessionId: sessionId, messageText: messageText, turn: messageSeq,
+            sessionId: sessionId, messageText: messageText,
             onClose: close, preview: preview, loading: loading, error: error,
             applying: applying, done: done, changes: changes,
             previewError: previewError, noSnapshot: noSnapshot, canApply: canApply, applyRestore: applyRestore,
@@ -340,7 +341,6 @@ window.__ModuleLoader__.load({
       function RestoreDialog(props) {
         var sessionId = props.sessionId
         var messageText = props.messageText
-        var turn = props.turn
         var onClose = props.onClose
         var preview = props.preview
         var loading = props.loading
@@ -353,6 +353,13 @@ window.__ModuleLoader__.load({
         var canApply = props.canApply
         var applyRestore = props.applyRestore
 
+        // 文件很多时避免一次性渲染大量 DOM（性能优化）：只渲染前 200 个，
+        // 其余折叠成一条提示。总数仍在标题里显示。
+        var MAX_PREVIEW_FILES = 200
+        var shownChanges = changes.length > MAX_PREVIEW_FILES
+          ? changes.slice(0, MAX_PREVIEW_FILES)
+          : changes
+
         return reactDom.createPortal(
           h('div', { className: 'dtu-overlay', onClick: onClose },
             h('div', { className: 'dtu-dialog', onClick: function (e) { e.stopPropagation() } },
@@ -377,12 +384,16 @@ window.__ModuleLoader__.load({
                   ? h('div', { className: 'dtu-section' },
                       h('div', { className: 'dtu-section-label' }, '将影响的文件 (' + changes.length + ' 个)'),
                       h('div', { className: 'dtu-files' },
-                        changes.map(function (change, idx) {
+                        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,
                       ),
                     ) : null,
                 (!loading && !previewError && changes.length > 0)

package/index.js

@@ -887,6 +887,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)
         return json(response, 200, preview)
       }
@@ -922,6 +925,18 @@ function createHandler(ctx, runtime, sessions, agents) {
         //    empty snapshot chain and skip file restoration.
         try { await runtime.waitForSnapshots() } catch {}
 
+        // 3.5 Safety snapshot: before this irreversible restore wipes files,
+        //    force-capture the CURRENT workspace into the session chain (as a
+        //    fractional turn just past the newest snapshot) so the user can
+        //    restore again to the pre-undo state if needed. Non-fatal on failure.
+        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)
+        } catch (e) {
+          console.warn('[turn-undo] safety snapshot failed (non-fatal):', e?.message)
+        }
+
         // 4. Restore files to the best snapshot at/before restoreTurn.
         let restoreResult
         if (restoreTurn !== null) {
@@ -1026,49 +1041,46 @@ SnapshotStore.prototype.preview = function (sessionId, targetTurn) {
     return { ok: true, status: 'ready', targetTurn: null, totalChanges: 0, changes: [] }
   }
 
-  // The turn/end snapshot shows the workspace after AI work in this turn.
-  let target = null
+  // 撤销"发送这条消息之前"会一并回退该消息之后的所有改动，因此影响范围 =
+  // baseline（targetTurn 之前最近的快照，即恢复到什么状态）与 latest
+  // （会话最新快照，即撤销点之后累积到当前的状态终点）之差。
+  // baseline 取小于 targetTurn 的最新快照：正常是该 turn/start 快照
+  // (T - 0.5)，若中间某 turn 无文件变化没写 manifest，则回退到更早的最近
+  // 快照；对于没有前置快照的首条消息，用空对象 {} 作为基线（即回到空状态）。
+  let baseline = null
   for (const m of chain) {
-    if (m.turn === targetTurn) {
-      target = m
-      break
+    if (m.turn < targetTurn && (baseline === null || m.turn > baseline.turn)) {
+      baseline = m
     }
   }
-  if (!target) {
+  const baselineManifest = baseline ? baseline.manifest : {}
+
+  if (chain.length === 0) {
     return { ok: true, status: 'ready', targetTurn, totalChanges: 0, changes: [], noSnapshot: true }
   }
 
-  // Use the newest snapshot strictly before this turn as the baseline.
-  // It is normally the turn/start snapshot (T - 0.5), but if an intermediate
-  // turn had no file changes, no manifest was written, so we fall back to the
-  // most recent available baseline. For the very first turn we use an empty
-  // baseline.
-  let prev = null
-  for (const m of chain) {
-    if (m.turn < targetTurn && (prev === null || m.turn > prev.turn)) {
-      prev = m
-    }
-  }
-  const prevManifest = prev ? prev.manifest : {}
+  // 会话最新快照 = 撤销点之后所有改动的累积终点。
+  const latest = chain[chain.length - 1]
+  const latestManifest = latest.manifest
 
-  // Calculate changes: files that differ between turn/start and turn/end.
+  // 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 = []
-  const targetManifest = target.manifest
-
-  for (const rel of Object.keys(targetManifest)) {
-    const entry = targetManifest[rel]
-    if (!prevManifest[rel]) {
+  for (const rel of Object.keys(latestManifest)) {
+    const entry = latestManifest[rel]
+    if (!baselineManifest[rel]) {
       changes.push({ path: rel, kind: 'created' })
     } else {
-      const prevEntry = prevManifest[rel]
+      const prevEntry = baselineManifest[rel]
       if (entry.hash !== prevEntry.hash) {
         changes.push({ path: rel, kind: 'modified' })
       }
     }
   }
 
-  for (const rel of Object.keys(prevManifest)) {
-    if (!targetManifest[rel]) {
+  for (const rel of Object.keys(baselineManifest)) {
+    if (!latestManifest[rel]) {
       changes.push({ path: rel, kind: 'deleted' })
     }
   }
@@ -1076,7 +1088,7 @@ SnapshotStore.prototype.preview = function (sessionId, targetTurn) {
   return {
     ok: true,
     status: 'ready',
-    targetTurn: target.turn,
+    targetTurn,
     totalChanges: changes.length,
     changes,
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-turn-undo",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Undo to any point in a DSH conversation — revert files and fork a new session",
   "type": "module",
   "main": "index.js",
@@ -24,7 +24,10 @@
     "client.js",
     "cordis.patch.yml"
   ],
-  "repository": "github:gege9527/dsh-turn-undo",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/gege9527/dsh-turn-undo.git"
+  },
   "bugs": "https://github.com/gege9527/dsh-turn-undo/issues",
   "homepage": "https://github.com/gege9527/dsh-turn-undo#readme",
   "license": "MIT",
@@ -39,4 +42,4 @@
       "optional": false
     }
   }
-}
+}