dsh-turn-undo 0.0.5 → 0.0.7

package/client.js

@@ -146,6 +146,10 @@ window.__ModuleLoader__.load({
           '.dtu-trigger{display:inline-flex;align-items:center;justify-content:center;width:24px;height:24px;padding:0;border:0;border-radius:6px;background:transparent;color:var(--dsw-alias-label-tertiary);cursor:pointer}',
           '.dtu-trigger:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-secondary)}',
           '.dtu-trigger:disabled{cursor:not-allowed;opacity:.5}',
+          // 点击后浏览器保留 :focus，hover 底色会「粘住」不恢复 —— 鼠标移开时
+          // 显式清掉 focus/active 态的背景与描边。
+          '.dtu-trigger:focus{outline:none}',
+          '.dtu-trigger:focus:not(:hover),.dtu-trigger:focus-visible:not(:hover),.dtu-trigger:active:not(:hover){background:transparent;color:var(--dsw-alias-label-tertiary)}',
           '.dtu-overlay{position:fixed;inset:0;background:rgba(0,0,0,.5);display:flex;align-items:center;justify-content:center;z-index:10000}',
           '.dtu-dialog{box-sizing:border-box;width:min(560px,100%);max-height:calc(100dvh - 48px);overflow:auto;background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l2);border-radius:12px;box-shadow:0 8px 32px rgba(0,0,0,.2)}',
           '.dtu-body{display:flex;flex-direction:column;gap:14px;width:100%;min-width:0;max-width:100%;box-sizing:border-box;padding:18px}',
@@ -197,33 +201,7 @@ window.__ModuleLoader__.load({
         document.head.appendChild(styleEl)
       }
 
-      function openRestoredSession(sessionId, draftText) {
-        try {
-          ctx.sessions.open(sessionId)
-        } catch (error) {
-          console.warn('[turn-undo] openRestoredSession open failed:', error.message)
-          return
-        }
-        if (!draftText) return
-        function trySetDraft(remaining) {
-          if (remaining <= 0) return
-          try {
-            var scope = ctx.sessions.scope(sessionId)
-            if (scope !== undefined) {
-              ctx.conversation.input.for(scope).setDraft(draftText)
-              return
-            }
-          } catch (error) {
-            if (remaining <= 1) {
-              console.warn('[turn-undo] openRestoredSession setDraft failed:', error.message)
-            }
-          }
-          setTimeout(function () { trySetDraft(remaining - 1) }, 100)
-        }
-        trySetDraft(20)
-      }
-
-      ctx.inject(['slots', 'sessions', 'conversation'], function (scope) {
+      ctx.inject(['slots', 'conversation', 'uiWorkspace'], function (scope) {
         scope.effect(function () {
           return scope.slots.inject('conversation.session.header.actions', function () {
             return scope.slots.register({
@@ -231,13 +209,21 @@ window.__ModuleLoader__.load({
               id: 'turn-undo-portals',
               order: 100,
               inject: function () {
-                var sessionsSvc = scope.sessions
+                var workspaceSvc = scope.uiWorkspace
                 var conversationSvc = scope.conversation
                 return {
                   openRestoredSession: function (newSessionId, draftText) {
-                    // Open first: the input shell only exists after the session binding is materialized.
-                    if (sessionsSvc && sessionsSvc.open) {
-                      sessionsSvc.open(newSessionId)
+                    // 导航必须走 uiWorkspace：ISessions 没有 open()，
+                    // 旧的 sessionsSvc.open(...) 永远被 if 守卫静默跳过 —— 这正是
+                    // 「改名了但新会话没打开」的根因。
+                    try {
+                      if (workspaceSvc && typeof workspaceSvc.openSession === 'function') {
+                        workspaceSvc.openSession(newSessionId)
+                      } else {
+                        console.warn('[turn-undo] uiWorkspace.openSession unavailable; new session not opened')
+                      }
+                    } catch (e) {
+                      console.warn('[turn-undo] Failed to open restored session:', e.message)
                     }
                     if (!conversationSvc || !conversationSvc.input || !draftText) return
                     function trySetDraft(remaining) {
@@ -773,7 +759,7 @@ window.__ModuleLoader__.load({
     }
 
     exports.apply = apply
-    exports.inject = ['slots', 'sessions', 'conversation']
+    exports.inject = ['slots', 'conversation', 'uiWorkspace']
     return module.exports
   },
 })

package/index.js

@@ -41,8 +41,16 @@ export const name = 'turn-undo'
 export { SnapshotStore }
 
 // Injected services (via ctx.inject in apply()): webServer, sessions,
-// sessionQuery, agents, sessionController.
-export const inject = ['webServer', 'sessions', 'sessionQuery', 'agents', 'sessionTitle', 'sessionController']
+// sessionQuery, agents, sessionController, workspaceRegistry.
+export const inject = [
+  'webServer',
+  'sessions',
+  'sessionQuery',
+  'agents',
+  'sessionTitle',
+  'sessionController',
+  'workspaceRegistry',
+]
 
 // ---- Configuration defaults ----
 const DEFAULT_SNAPSHOT_TTL_DAYS = 7
@@ -270,6 +278,7 @@ class SnapshotStore {
       sessionId,
       turn,
       timestamp: new Date().toISOString(),
+      cwd,
       totalBytes,
       manifest,
     }
@@ -538,6 +547,10 @@ class SnapshotStore {
    */
   restore(cwd, sessionId, targetTurn) {
     const chain = this.loadChain(sessionId)
+    // Use the cwd from the latest snapshot (captures the workspace root at
+    // capture time). This avoids cross-workspace bugs when the session's
+    // header.cwd has changed or is wrong (e.g. forked from another workspace).
+    const snapCwd = chain.length ? (chain[chain.length - 1].cwd ?? cwd) : cwd
     // Find the NEWEST snapshot whose turn <= targetTurn (best available state
     // at/before the boundary). Filter to only completed turns present.
     let target = null
@@ -551,7 +564,8 @@ class SnapshotStore {
     }
 
     // Restore files to the target manifest state.
-    const ignore = makeIgnore(cwd, this.excludes)
+    const resolveCwd = snapCwd || cwd
+    const ignore = makeIgnore(resolveCwd, this.excludes)
     const manifest = target.manifest
     const rels = Object.keys(manifest)
 
@@ -561,7 +575,7 @@ class SnapshotStore {
     // 1. Write back / refresh files present in target manifest.
     for (const rel of rels) {
       const entry = manifest[rel]
-      const abs = resolve(cwd, rel)
+      const abs = resolve(resolveCwd, rel)
       if (ignore(abs)) continue
       try {
         ensureDir(dirname(abs))
@@ -582,11 +596,11 @@ class SnapshotStore {
     // 2. Delete files present on disk but absent from the target manifest,
     //    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 current = this.walkAll(resolveCwd, ignore)
     const failedDeletions = []
     for (const abs of current) {
       if (ignore(abs)) continue
-      const rel = relative(cwd, abs).split('\\').join('/')
+      const rel = relative(resolveCwd, abs).split('\\').join('/')
       if (!(rel in manifest)) {
         try {
           rmSync(abs, { force: true })
@@ -768,11 +782,26 @@ function resolveForkBoundary(source, messageSeq, promptText) {
       return { boundary: null, turn: null, cwd, reason: 'no-turn-start' }
     }
     const previousEnd = events.findLast(e => e.type === 'turn/end' && e.seq < start.seq)
+
+    // 第一条消息（无前一个 turn/end）也必须 fork：边界取 turn/start 前
+    // 最近的一个「索引==seq」有效事件（会话初始化完成处），子会话继承
+    // workspace/preset/cwd，而不是 create() 一个空白会话 —— 这正是
+    // 「点击撤销后直接创建新会话、没有 fork 出会话」的根因。
+    let boundary = previousEnd ? previousEnd.seq : null
+    if (boundary !== null && !(events[boundary] && events[boundary].seq === boundary)) {
+      boundary = null
+    }
+    if (boundary === null) {
+      const startIdx = events.indexOf(start)
+      for (let i = startIdx - 1; i >= 0; i--) {
+        if (events[i] && events[i].seq === i) { boundary = i; break }
+      }
+    }
     return {
-      boundary: previousEnd ? previousEnd.seq : null,
+      boundary,
       turn,
       cwd,
-      reason: previousEnd ? 'ok' : 'no-previous-end',
+      reason: boundary !== null ? 'ok' : 'no-previous-end',
     }
   }
 
@@ -1038,20 +1067,55 @@ async function executeSurfaceRewind(agent, targetSeq) {
  *   no completed turn before it (e.g. the very first user message).
  * @returns the new child session id.
  */
+/**
+ * Find the workspace that owns `sessionId`, so a `cwd`-less `create()` can pass
+ * `workspaceId` and get attached to the workspace catalogue (visible in the
+ * sidebar). Mirrors upstream `SessionController.forkWorkspace`: only sessions
+ * already indexed as live are visible through `WorkspaceRegistry.list()`.
+ * @returns the owning workspace id, or `undefined` when the session is not
+ * indexed (caller then falls back to a `cwd`-only create).
+ */
+function findWorkspaceIdForSession(ctx, sessionId) {
+  try {
+    const registry = ctx.workspaceRegistry
+    if (!registry || typeof registry.list !== 'function') return undefined
+    for (const workspace of registry.list()) {
+      const ids = workspace && workspace.sessionIds
+      if (Array.isArray(ids) && ids.includes(sessionId)) return workspace.id
+    }
+  } catch (e) {
+    console.warn('[turn-undo] Workspace lookup failed (falling back to cwd):', e.message)
+  }
+  return undefined
+}
+
 async function forkAndMarkUndone(ctx, sessionId, messageSeq, promptText) {
   const source = await readSession(ctx, sessionId)
   if (!source) throw new Error('source session not found')
   const b = resolveForkBoundary(source, messageSeq, promptText)
 
+  console.info(
+    '[turn-undo] resolveBoundary session=' + sessionId,
+    'messageSeq=' + messageSeq,
+    'boundary=' + String(b.boundary),
+    'turn=' + String(b.turn),
+    'reason=' + b.reason,
+  )
   let childId
   if (typeof b.boundary === 'number') {
+    // fork() 会自动把子会话 attach 到 source 所在的 workspace（见上游
+    // commands.ts forkWorkspace），所以 fork 分支在侧栏可见。
     const { sessionId: cid } = await ctx.sessionController.fork({ sessionId, atSeq: b.boundary })
     childId = cid
   } else {
+    // create() 只有显式给 workspaceId 才会 attachSession；只给 cwd 的会话
+    // 不会进 workspace 目录，GUI 侧栏看不到 —— 这正是「原会话改名了但没有
+    // 新会话出现」的根因。所以先反查 source 所属 workspace。
     const cwd = source.header?.cwd
     if (!cwd) throw new Error('cannot undo first message without a cwd')
+    const workspaceId = findWorkspaceIdForSession(ctx, sessionId)
     const created = await ctx.sessionController.create({
-      cwd,
+      ...(workspaceId !== undefined ? { workspaceId } : { cwd }),
       ...(source.header?.agentPreset ? { agentPreset: source.header.agentPreset } : {}),
     })
     childId = created.sessionId
@@ -1123,7 +1187,20 @@ function createHandler(ctx, runtime, sessions, agents) {
           })
         }
 
-        const preview = runtime.store.preview(sessionId, targetTurn, getCwd(source))
+        let preview
+        try {
+          preview = runtime.store.preview(sessionId, targetTurn, getCwd(source))
+        } catch (e) {
+          logger?.warn?.('[turn-undo] preview failed:', e.message)
+          preview = {
+            ok: false,
+            status: 'preview-failed',
+            error: '预览失败：' + e.message,
+            targetTurn,
+            totalChanges: 0,
+            changes: [],
+          }
+        }
         return json(response, 200, preview)
       }
 
@@ -1260,17 +1337,20 @@ export function apply(ctx, config = {}) {
   })
 
   // HTTP API endpoints.
-  ctx.inject(['webServer', 'sessions', 'sessionQuery', 'agents', 'sessionTitle', 'sessionController'], (scope) => {
-    scope.effect(() => {
-      const handler = createHandler(scope, runtime, scope.sessions, scope.agents)
-      scope.webServer.register({
-        kind: 'exact',
-        path: API_PATH,
-        handler,
-      })
-      return () => {}
-    }, 'turn-undo: http-api')
-  })
+  ctx.inject(
+    ['webServer', 'sessions', 'sessionQuery', 'agents', 'sessionTitle', 'sessionController', 'workspaceRegistry'],
+    (scope) => {
+      scope.effect(() => {
+        const handler = createHandler(scope, runtime, scope.sessions, scope.agents)
+        scope.webServer.register({
+          kind: 'exact',
+          path: API_PATH,
+          handler,
+        })
+        return () => {}
+      }, 'turn-undo: http-api')
+    },
+  )
 }
 
 /**
@@ -1322,6 +1402,8 @@ SnapshotStore.prototype.preview = function (sessionId, targetTurn, cwd) {
     return { ok: true, status: 'ready', targetTurn: null, totalChanges: 0, changes: [] }
   }
   const chain = this.loadChain(sessionId)
+  // Use cwd from latest snapshot to avoid cross-workspace path issues
+  const snapCwd = chain.length ? (chain[chain.length - 1].cwd ?? cwd) : cwd
   if (chain.length === 0) {
     return { ok: true, status: 'no-snapshot', targetTurn, totalChanges: 0, changes: [], noSnapshot: true }
   }
@@ -1353,8 +1435,8 @@ SnapshotStore.prototype.preview = function (sessionId, targetTurn, cwd) {
   // preview shows meaningful changes even when the active turn has no snapshot.
   let latestManifest = latest.manifest
   let latestIsLive = false
-  if (targetTurn > latest.turn && cwd) {
-    const live = this.buildLiveManifest(cwd, latest.manifest)
+  if (targetTurn > latest.turn && snapCwd) {
+    const live = this.buildLiveManifest(snapCwd, latest.manifest)
     if (live) {
       latestManifest = live
       latestIsLive = true

package/package.json

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