@lyhue1991/dsh-soup 0.4.9 → 0.4.10

package/lib/client.js

@@ -392,6 +392,31 @@ window.__ModuleLoader__.load({
     // while a blank conversation is mounted. Keep late async responses from an
     // older caller from overwriting the current session's shared store.
     var sessionTrackGeneration = 0
+
+    // 目录展开状态按 cwd 隔离。刷新/删除/改名/移动后先重拉根目录，
+    // 再按这些路径递归重拉仍存在的已展开目录；切换项目时才清空。
+    var expandedDirs = new Set()
+    var expandedDirsCwd = null
+
+    function forgetExpandedPaths(paths) {
+      var dropped = paths.map(function (p) { return [p, p + '/'] })
+      expandedDirs = new Set(Array.from(expandedDirs).filter(function (p) {
+        return !dropped.some(function (pair) { return p === pair[0] || p.startsWith(pair[1]) })
+      }))
+    }
+
+    function rekeyExpandedPaths(from, to) {
+      var moved = Array.from(expandedDirs).filter(function (p) {
+        return p === from || p.startsWith(from + '/')
+      }).sort(function (a, b) { return a.length - b.length })
+      if (!moved.length) return
+      var next = new Set(Array.from(expandedDirs).filter(function (p) {
+        return p !== from && !p.startsWith(from + '/')
+      }))
+      moved.forEach(function (p) { next.add(to + p.slice(from.length)) })
+      expandedDirs = next
+    }
+
     function setState(patch) {
       state = Object.assign({}, state, patch)
       listeners.forEach(function (fn) { fn() })
@@ -484,6 +509,11 @@ window.__ModuleLoader__.load({
       activeSessionId = sessionId || null
       var cwd = await defaultCwd(sessionId, cwdHint)
       if (generation !== sessionTrackGeneration) return
+      // 换项目时展开状态没有跨项目意义；回到同一项目则保留。
+      if (expandedDirsCwd !== cwd) {
+        expandedDirs.clear()
+        expandedDirsCwd = cwd
+      }
       // 会话切换：预览列表按新 cwd 裁剪（范围外自动关闭），并清掉上一路径的旧错误横幅
       var files = pruneFilesToScope(state.files, cwd)
       lastMtimes = {} // 换了目录，旧 mtime 基线全部作废（首轮 tick 重建基线）
@@ -496,7 +526,26 @@ window.__ModuleLoader__.load({
     async function refresh() {
       if (!state.cwd) return
       var items = await loadDir(state.cwd)
-      if (items) setState({ error: '', tree: items })
+      if (!items) return
+      await restoreExpandedChildren(items)
+      setState({ error: '', tree: items })
+    }
+
+    /** 根目录刷新后，按记住的路径递归恢复已展开目录。 */
+    async function restoreExpandedChildren(nodes) {
+      for (var i = 0; i < nodes.length; i++) {
+        var node = nodes[i]
+        if (node.type !== 'directory' || !expandedDirs.has(node.path)) continue
+        var items = await loadDir(node.path)
+        if (!items) {
+          expandedDirs.delete(node.path)
+          continue
+        }
+        node.open = true
+        node.children = items
+        items.forEach(function (child) { child.parent = node })
+        await restoreExpandedChildren(items)
+      }
     }
 
     // ------------------------------------------------------------------
@@ -624,23 +673,7 @@ window.__ModuleLoader__.load({
     /** 手动刷新：重拉根目录，已展开的子目录逐个重拉、保持展开不收起。 */
     async function refreshAll() {
       if (!state.cwd) return
-      var expanded = []
-      var walk = function (nodes) {
-        for (var i = 0; i < nodes.length; i++) {
-          var n = nodes[i]
-          if (n.type === 'directory' && n.children != null) {
-            if (n.path !== state.cwd) expanded.push({ path: n.path, open: !!n.open })
-            if (n.open && n.children.length) walk(n.children)
-          }
-        }
-      }
-      walk(state.tree)
       await refresh()
-      for (var j = 0; j < expanded.length; j++) {
-        if (!expanded[j].open) continue
-        var node = findNode(state.tree, expanded[j].path)
-        if (node) await reloadDirNode(node)
-      }
     }
 
     async function toggleNode(node) {
@@ -652,10 +685,16 @@ window.__ModuleLoader__.load({
         node.loading = false
         if (items) items.forEach(function (c) { c.parent = node })
         node.children = items || []
-        node.open = true
+        node.open = !!items
+        if (items) expandedDirs.add(node.path)
+        // 拖拽可能把一个已展开目录移进此前收起的父目录。父目录首次展开时，
+        // 也要立即恢复其中被记住的子目录展开状态。
+        if (items) await restoreExpandedChildren(items)
         setState({ tree: state.tree })
       } else {
         node.open = !node.open
+        if (node.open) expandedDirs.add(node.path)
+        else expandedDirs.delete(node.path)
         setState({ tree: state.tree })
       }
     }
@@ -940,11 +979,14 @@ window.__ModuleLoader__.load({
       var paths = Array.from(state.selected)
       setState({ menu: null })
       var errors = []
+      var trashed = []
       for (var i = 0; i < paths.length; i++) {
         var res = await rpc('trash', { path: paths[i] })
-        if (!res || !res.ok) errors.push(baseName(paths[i]) + ': ' + ((res && res.error) || T('explorer.actionFail')) + ((res && res.hint) ? '（' + res.hint + '）' : ''))
+        if (res && res.ok) trashed.push(paths[i])
+        else errors.push(baseName(paths[i]) + ': ' + ((res && res.error) || T('explorer.actionFail')) + ((res && res.hint) ? '（' + res.hint + '）' : ''))
       }
       if (errors.length) setState({ error: errors.join('；') })
+      forgetExpandedPaths(trashed)
       setState({ selected: new Set(), lastIndex: null })
       await refresh()
     }
@@ -958,12 +1000,18 @@ window.__ModuleLoader__.load({
       }
       var dir = parentOf(path)
       var dest = pathJoin(dir, name)
+      var node = findNode(state.tree, path)
+      var isDir = node && node.type === 'directory'
       var sel = new Set(state.selected)
       if (sel.has(path)) { sel.delete(path); sel.add(dest) }
       setState({ renaming: null, selected: sel })
       ;(async function () {
         var res = await rpc('move', { from: path, to: dest })
-        if (!res || !res.ok) setState({ error: (res && res.error) || T('explorer.renameFail') })
+        if (res && res.ok) {
+          if (isDir) rekeyExpandedPaths(path, dest)
+        } else {
+          setState({ error: (res && res.error) || T('explorer.renameFail') })
+        }
         await refresh()
       })()
     }
@@ -1040,6 +1088,7 @@ window.__ModuleLoader__.load({
 
     async function movePaths(paths, targetDir) {
       var errors = []
+      var moved = []
       for (var i = 0; i < paths.length; i++) {
         var p = paths[i]
         if (p === '/' || !p) continue
@@ -1047,10 +1096,18 @@ window.__ModuleLoader__.load({
         var dest = pathJoin(targetDir, name)
         if (dest === p) continue
         if (targetDir === p || targetDir.startsWith(p + '/')) { errors.push(T('explorer.moveIntoSelf', { path: name })); continue }
+        var node = findNode(state.tree, p)
         var res = await rpc('move', { from: p, to: dest })
-        if (!res || !res.ok) errors.push(name + ': ' + ((res && res.error) || T('explorer.actionFail')))
+        if (res && res.ok) {
+          moved.push({ from: p, to: dest, isDir: node && node.type === 'directory' })
+        } else {
+          errors.push(name + ': ' + ((res && res.error) || T('explorer.actionFail')))
+        }
       }
       setState({ dragPaths: null })
+      moved.forEach(function (item) {
+        if (item.isDir) rekeyExpandedPaths(item.from, item.to)
+      })
       if (errors.length) setState({ error: errors.join('；') })
       await refresh()
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lyhue1991/dsh-soup",
   "description": "DSH 项目资源管理器：右侧 details 列文件树（并列网格、宽度与左侧工作区一致 264-420px），有 Session log 时在其右侧、空白新会话在输入框上方右端提供 📁 切换按钮；支持多选、双击展开/打开、右键菜单（打开/系统打开/重命名/废纸篓/新建/复制路径）、拖拽移动、上传。文件「打开」在会话区新增「文件」标签页（原生 conversation.view，与对话/轨迹同级）：文本可编辑 ⌘S 保存、图片预览、二进制提示。附带模型吞吐徽标：输入框正上方显示「正在等待模型...」与彩色 t/s 徽标（数据来自 llm/stream 真实流）。附带 GoalBar 多行展示：把原生单行截断 GoalBar 放开为多行完整显示，编辑用 textarea，工具与数据仍走原生 goal。",
-  "version": "0.4.9",
+  "version": "0.4.10",
   "type": "module",
   "main": "lib/index.js",
   "exports": {