dsh-better-workspace 0.6.0 → 0.7.1

package/README.md

@@ -59,7 +59,7 @@ web/                 ← 虚拟分组(不是真实目录,纯命名层级)
 ### 其余亮点
 
 - **文件夹式收起**:点工作区行 = 收起/展开该工作区的全部会话(收起后行上保留会话数角标);会话分组同样可收起;搜索时自动全部展开。
-- **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组;会话行可拖拽——同工作区拖到另一会话上/下调整顺序,拖到会话子分组即移动进该分组。显示顺序 = 宿主手动序,拖拽结果立即生效。
+- **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组;会话行可拖拽——同工作区拖到另一会话上/下调整顺序,拖到会话子分组即移动进该分组。显示顺序 = 宿主手动序,拖拽结果立即生效。拖拽工作区期间,单链合并显示的行(如 工作/A)临时展开回文件夹树——路径里的每一级都是可投放的分组行,松手后自动合并回去。
 - **不丢原生能力**:会话行(打开/重命名/分叉/归档)、每工作区「新会话」、当前会话高亮、官方状态灯(蓝色运行环 / 琥珀待交互 / 绿色完成提醒)、**活跃定时任务角标**(有活动 Schedule 的会话显示闹钟图标,与官方行一致)、未分组会话兜底、中英双语跟随界面语言。
 - **对话空态页同样生效**:会话空态页的「添加工作区」菜单走的也是本插件的拾取交互,同样带所属分组弹窗。
 

package/README_EN.md

@@ -57,7 +57,7 @@ Session titles nest on `/` too (e.g. `test1/plugin maintenance`). Session groups
 ### More highlights
 
 - **Folder-style collapse**: clicking a workspace row collapses/expands all of its sessions (the row keeps a session counter when collapsed); session groups collapse too; search force-expands everything.
-- **Native drag restored**: drag a workspace row above/below another to reorder (writes back the host registry order) or onto a folder row to move it into that group; drag session rows to reorder within the same workspace or onto a session group to move. Display order = host manual order, drag results are visible immediately.
+- **Native drag restored**: drag a workspace row above/below another to reorder (writes back the host registry order) or onto a folder row to move it into that group; drag session rows to reorder within the same workspace or onto a session group to move. Display order = host manual order, drag results are visible immediately. While dragging a workspace, merged single-chain rows (e.g. work/A) temporarily re-expand into folder rows — every level of the path becomes a drop target, and chains merge back when the drag ends.
 - **Native capabilities kept**: open/rename/fork/archive sessions, per-workspace new-session, current-session highlight, official status dots (blue running ring / amber pending / green done), **active-schedule badge** (alarm clock icon for sessions with active Schedule records, matching the official rows), ungrouped-session fallback, zh/en localization.
 - **Conversation hero too**: the empty-state “Add workspace” menu uses the same picking interaction with the same group popup.
 

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "main": "./src/index.js",
   "description": "侧边栏工作区层级树:名称中的 / 即虚拟分组(web/前端 · web/后端),添加工作区的目录流附所属分组弹窗,重命名即时重排层级,可新建空分组。Hierarchy tree for the DSH sidebar workspace list.",
   "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-better-workspace",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "DSH web plugin: a hierarchical workspace tree for the sidebar. Workspace titles containing \"/\" group into virtual folders (web/前端 · web/后端); the add-workspace directory flow gains a parent-group popup; renames re-derive the tree; a new-folder button creates empty levels.",
   "type": "module",
   "repository": {
@@ -43,7 +43,8 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test tests/smoke.mjs"
+    "test": "node --test tests/smoke.mjs",
+    "version": "node -e \"const fs=require('fs');const m=JSON.parse(fs.readFileSync('dsh.plugin.json','utf8'));const v=JSON.parse(fs.readFileSync('package.json','utf8')).version;m.version=v;fs.writeFileSync('dsh.plugin.json',JSON.stringify(m,null,2)+'\\n')\" && git add dsh.plugin.json"
   },
   "keywords": [
     "dsh",

package/src/client.js

@@ -65,7 +65,7 @@ window.__ModuleLoader__.load({
       'settings.expand': '展开',
       'settings.collapse': '收起',
       'settings.compactChains': '单链分组折叠显示',
-      'settings.compactChains.hint': '单层链合并为一行,出现多个子级时自动展开为树状;展开状态与自定义外观保存在当前浏览器。',
+      'settings.compactChains.hint': '单层链合并为一行,出现多个子级时自动展开为树状;拖拽工作区期间单链临时展开回文件夹树,可放入任意一级;展开状态与自定义外观保存在当前浏览器。',
       'custom.title': '自定义外观',
       'custom.color': '颜色',
       'custom.glow': '发光',
@@ -151,7 +151,7 @@ window.__ModuleLoader__.load({
       'settings.expand': 'Expand',
       'settings.collapse': 'Collapse',
       'settings.compactChains': 'Merge single-child chains',
-      'settings.compactChains.hint': 'Single-child chains merge into one row; levels with multiple children expand as a tree. State and custom styling persist in this browser.',
+      'settings.compactChains.hint': 'Single-child chains merge into one row; levels with multiple children expand as a tree. Chains re-expand into folder rows while you drag a workspace, so it can drop into any level. State and custom styling persist in this browser.',
       'custom.title': 'Customize',
       'custom.color': 'Color',
       'custom.glow': 'Glow',
@@ -1157,6 +1157,12 @@ window.__ModuleLoader__.load({
       const [customize, setCustomize] = React.useState(null) // { kind, entryKey, name }
       const [errorText, setErrorText] = React.useState(null)
       const [drag, setDrag] = React.useState(null) // { kind: 'workspace'|'session', source, over } | null
+      // Workspace drags arm their state one frame LATE (see workspaceDragEvents):
+      // arming synchronously re-renders during the dragstart dispatch, the chain
+      // expansion inserts rows above the drag source, the cursor leaves the
+      // source element, and Chromium cancels the whole gesture. dragEnd clears
+      // the timer so a same-tick cancel never leaves a ghost drag behind.
+      const wsDragArmTimer = React.useRef(null)
       const normalizedQuery = query.trim().toLowerCase()
       const now = Date.now()
 
@@ -1209,11 +1215,19 @@ window.__ModuleLoader__.load({
         ungrouped.sort((a, b) => b.updatedAt - a.updatedAt)
       }
 
+      // While a workspace drag is active, single-child chains render UNCOMPRESSED:
+      // a merged "group/workspace" row hides every folder level of the chain inside
+      // its label, and those levels are exactly the drop targets for "move into
+      // this group". Suspending the merge for the drag's duration re-exposes each
+      // level as a real folder row (folder expansion defaults apply); when the
+      // drag ends, the chains merge back. Session drags keep the merged view —
+      // their drop targets live inside workspace rows, which compression merges.
+      const draggingWorkspace = drag !== null && drag.kind === 'workspace'
       const tree = React.useMemo(() => {
         const built = buildTree(items, storeFolders)
-        if (!compactChains) return built
+        if (!compactChains || draggingWorkspace) return built
         return { ...built, folders: built.folders.map(compressTree), workspaces: built.workspaces }
-      }, [items, storeFolders, compactChains])
+      }, [items, storeFolders, compactChains, draggingWorkspace])
 
       const sessionsOf = (workspace) => {
         const rows = []
@@ -1316,9 +1330,28 @@ window.__ModuleLoader__.load({
             event.dataTransfer.effectAllowed = 'move'
             event.dataTransfer.setData('text/plain', workspace.workspaceId)
           } catch { /* drag payload is best-effort */ }
-          setDrag({ kind: 'workspace', source: { workspaceId: workspace.workspaceId, leaf: workspace.leaf, folderPath: workspace.folderPath || '' }, over: null })
+          // Drag identity derives from the RAW title, never the displayed leaf:
+          // a compressed single-chain row shows "group/workspace" as its leaf with
+          // folderPath '' — carrying that would make move-into / cross-folder
+          // drops rebuild titles like "x/group/workspace". The real leaf and
+          // folder keep every drop target's rename correct.
+          const segs = splitTitleSegs(workspace.title)
+          const sourceLeaf = segs.length > 0 ? segs[segs.length - 1] : (workspace.leaf || String(workspace.workspaceId))
+          const sourceFolder = segs.length > 1 ? segs.slice(0, -1).join('/') : ''
+          // Deferred by one frame on purpose (Chromium cancels a just-started
+          // drag whose source element is moved out from under the cursor; see
+          // wsDragArmTimer above). By the next frame the gesture has settled
+          // and the chain expansion is an ordinary mid-drag update.
+          if (wsDragArmTimer.current !== null) clearTimeout(wsDragArmTimer.current)
+          wsDragArmTimer.current = setTimeout(() => {
+            wsDragArmTimer.current = null
+            setDrag({ kind: 'workspace', source: { workspaceId: workspace.workspaceId, leaf: sourceLeaf, folderPath: sourceFolder }, over: null })
+          }, 0)
+        },
+        onDragEnd: () => {
+          if (wsDragArmTimer.current !== null) { clearTimeout(wsDragArmTimer.current); wsDragArmTimer.current = null }
+          setDrag(null)
         },
-        onDragEnd: () => setDrag(null),
         onDragOver: (event) => {
           if (!dragMatches('workspace')) return
           event.preventDefault()