dsh-better-workspace 0.36.11 → 0.36.13

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.36.11",
+  "version": "0.36.13",
   "main": "./src/index.js",
   "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);新会话页的工作区选择器同树。Workspace tree for the DSH sidebar workspace list, nested by official disk folders with optional \"/\"-name grouping; the New Session workspace picker shows the same tree.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.36.11",
+  "version": "0.36.13",
   "description": "侧边栏工作区树:按官方磁盘目录嵌套(官方 workspace-tree 语义),可选按名称中的 / 分组(默认关闭,设置里开启);新会话页的工作区选择器同树(同一份视图选项即时同步);添加工作区走官方目录流。Workspace tree for the DSH sidebar: disk-path nesting (official workspace-tree semantics), with optional \"/\"-name grouping (off by default), and the same tree in the New Session workspace picker; add-workspace rides the official directory flow.",
   "type": "module",
   "repository": {

package/src/client.js

@@ -7432,7 +7432,11 @@ window.__ModuleLoader__.load({
 
       const rows = React.useMemo(() => {
         const out = []
-        const flatMode = groupBy !== 'workspace-tree'
+        // ONE view rule for every tree-shaped surface (sidebar memo, new-group
+        // chooser, this picker): "workspaces" keeps the name tree whenever a
+        // name layer is on — only a purely disk flat view or 'flat' collapses.
+        const flatMode = groupBy === 'flat'
+          || (groupBy === 'workspace' && workspaceGroupMode === 'disk')
         const isFolded = (key) => folded[key] === true
         const toggle = (key) => {
           setFolded((prev) => {
@@ -10191,6 +10195,17 @@ window.__ModuleLoader__.load({
       }
       const wsHasCurrent = (w) => !!currentId && !!w
         && ((w.sessionIds || []).includes(currentId) || subHasCurrent(w.sub))
+      // Name groups (slash view) have no disk path to prefix-match; the
+      // folder glyph lights up whenever its SUBTREE holds the current
+      // session — the official ProjectRow rule, applied tree-wide.
+      const nodeHoldsCurrent = (level) => {
+        if (!level || !currentId) return false
+        for (const item of levelSeqOf(level)) {
+          if (item.kind === 'ws') { if (wsHasCurrent(item.entry)) return true }
+          else if (nodeHoldsCurrent(item.node)) return true
+        }
+        return false
+      }
       const currentWsPath = currentId
         ? ((items || []).find((w) => (w.sessionIds || []).includes(currentId)) || {}).path
         : undefined
@@ -10226,7 +10241,7 @@ window.__ModuleLoader__.load({
           custStyle: rowStyleOf('folder:' + idPath),
           iconMode: (styleEntry('folder:' + idPath) || {}).icon || 'solid',
           pulse: expanded ? null : folderPulseOf(node),
-          active: pathHoldsCurrent(currentWsPath, node.path),
+          active: pathHoldsCurrent(currentWsPath, node.path) || nodeHoldsCurrent(node),
           t,
         })]
         if (expanded) {