dsh-better-workspace 0.36.10 → 0.36.12

package/README.md

@@ -129,7 +129,7 @@ DSH 的侧边栏浏览区是一个公开插槽 `sidebar.workspaces`(single),官
 
 - 会话**跨工作区**拖拽仍被拒绝(会话归属工作区);同一工作区内的分组归属已随拖拽生效(v0.18.0:拖到别组的行改写前缀,拖到自己的工作区行移出分组,右键也有「移出分组」)。
 - 搜索为本地标题过滤(两层扁平化后逐工作区匹配);宿主内容搜索(`session.search`)计划接回。
-- flat(平铺)视图未接管,层级树即视图。侧栏切到「单列表 / 按工作区」时,新会话页的选择器退化为**一层完整标题**的工作区列表(仍可选,不再分组)。
+- flat(平铺)视图未接管,层级树即视图。侧栏切到「单列表」时,新会话页的选择器退化为**一层完整标题**的工作区列表(仍可选,不再分组);切到「按工作区」时(v0.36.11 起),只要「工作区分组」开着(磁盘+名称 / 仅名称),侧栏与新会话页选择器都显示**名称树挂顶层**的结构(名称组与磁盘容器平级,切换即时生效);「工作区分组」设为「磁盘目录」时保持官方的散开平铺。
 - 新会话页选择器里的分组开合是**选择器本地状态**(默认全展开):它不写侧栏的折叠状态,免得选工作区时被侧栏的折叠挡住目标。
 
 ## 开发

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.36.10",
+  "version": "0.36.12",
   "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.10",
+  "version": "0.36.12",
   "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

@@ -8273,7 +8273,15 @@ window.__ModuleLoader__.load({
       // the user report "拖拽中树会乱/落点漂移". Drop targets are now
       // answered by the stable render; nothing re-flows mid-drag.
       const tree = React.useMemo(() => {
-        const built = buildTree(items, workspaceGroupMode, wsFolders, folderOrderMap)
+        // v0.36.11: "workspaces" (groupBy === 'workspace') turns OFF disk
+        // nesting — official semantics — but the NAME tree stays on when the
+        // user enabled one (workspaceGroupMode !== 'disk'). A plain buildTree
+        // mode of 'slash' expresses exactly that: name groups at the root,
+        // every workspace at the top, entry.sub always null.
+        const treeMode = groupBy === 'workspace' && workspaceGroupMode !== 'disk'
+          ? 'slash'
+          : workspaceGroupMode
+        const built = buildTree(items, treeMode, wsFolders, folderOrderMap)
         if (!compactChains) return built
         const folders = built.folders.map((f) => materializeChain(compressTree(f)))
         // v0.36.5: keep the MIXED root sequence across chain compression —
@@ -8285,14 +8293,21 @@ window.__ModuleLoader__.load({
           ? built.seq.map((item) => item.kind === 'folder' ? { kind: 'folder', node: byName.get(item.node.name) || item.node } : item)
           : built.seq
         return { ...built, folders, workspaces: built.workspaces, seq }
-      }, [items, compactChains, workspaceGroupMode, wsFolders, folderOrderMap])
+      }, [items, compactChains, groupBy, workspaceGroupMode, wsFolders, folderOrderMap])
       // UNCOMPRESSED tree, for the new-group dialog only. compressTree merges a
       // single-child chain into one row that stands for BOTH a group and the
       // workspace under it — fine for drawing, useless for choosing a
       // container: one half must stay unselectable and the other must be
       // selectable, and a merged row cannot be both. (It also carried no
       // `name`, which is how a lone "E" rendered blank.)
-      const rawTree = React.useMemo(() => buildTree(items, workspaceGroupMode, wsFolders, folderOrderMap), [items, workspaceGroupMode, wsFolders, folderOrderMap])
+      // v0.36.11: same groupBy-aware mode as the rendered tree — the
+      // new-group dialog must mirror the hierarchy the user actually sees.
+      const rawTree = React.useMemo(() => buildTree(
+        items,
+        groupBy === 'workspace' && workspaceGroupMode !== 'disk' ? 'slash' : workspaceGroupMode,
+        wsFolders,
+        folderOrderMap,
+      ), [items, groupBy, workspaceGroupMode, wsFolders, folderOrderMap])
       // Disk-layer ancestry for drag semantics (same derivation as buildTree).
       const diskParentMap = React.useMemo(() => diskParentMapOf(items), [items])
 
@@ -8619,7 +8634,10 @@ window.__ModuleLoader__.load({
         // hierarchy to mirror, so they fall back to a flat workspace list.
         // Offering a nesting the sidebar is not showing would be a lie about
         // where the new group lands.
+        // v0.36.11: "workspaces" + an enabled name layer shows a root-level
+        // name tree — mirror it instead of claiming there is no hierarchy.
         const treeView = groupBy === 'workspace-tree'
+          || (groupBy === 'workspace' && workspaceGroupMode !== 'disk')
         if (kind === 'workspace') {
           // "Top level" IS a real target here (a group at the root of the
           // workspace tree), so it is a node like any other.
@@ -10173,6 +10191,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
@@ -10208,7 +10237,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) {
@@ -10263,14 +10292,28 @@ window.__ModuleLoader__.load({
       } else if (groupBy === 'flat') {
         bodyRows.push(...renderFlatRows())
       } else if (groupBy === 'workspace') {
-        // Official 'workspace' mode (v0.13): one level — every workspace at
-        // the root, no name groups, no disk nesting, no chain compression.
-        // Session rows keep the slash toggle; disk-nested children do not
-        // recurse here because raw items carry no .sub level.
-        // flatWorkspaceEntry, never the raw item: see its note — the raw one
-        // has no `leaf` and the row would render nameless.
-        for (const workspace of items || []) {
-          bodyRows.push(...renderWorkspaceEntry({ workspace: flatWorkspaceEntry(workspace) }, 0, wsPulseOf(workspace)))
+        if (workspaceGroupMode === 'disk') {
+          // Official 'workspace' mode (v0.13): one level — every workspace at
+          // the root, no name groups, no disk nesting, no chain compression.
+          // Session rows keep the slash toggle; disk-nested children do not
+          // recurse here because raw items carry no .sub level.
+          // flatWorkspaceEntry, never the raw item: see its note — the raw
+          // one has no `leaf` and the row would render nameless.
+          for (const workspace of items || []) {
+            bodyRows.push(...renderWorkspaceEntry({ workspace: flatWorkspaceEntry(workspace) }, 0, wsPulseOf(workspace)))
+          }
+        } else {
+          // v0.36.11: with a NAME layer enabled (disk-slash / slash), the
+          // official scatter contradicts the user's mental model — the name
+          // tree the sidebar has been rendering all along should stay a tree,
+          // just lifted to the root (disk nesting OFF = 'slash' mode in the
+          // tree memo above). Same render loop as the tree branch below:
+          // mixed sequence, drag events, ungrouped block all apply.
+          for (const item of levelSeqOf(tree)) {
+            bodyRows.push(...(item.kind === 'ws'
+              ? renderWorkspaceEntry({ workspace: item.entry }, 0, wsPulseOf(item.entry))
+              : renderPlainFolder(item.node, 0)))
+          }
         }
         bodyRows.push(...renderUngroupedBlock())
       } else {