dsh-better-workspace 0.5.0 → 0.7.0

package/README.md

@@ -34,7 +34,7 @@ web/                 ← 虚拟分组(不是真实目录,纯命名层级)
 <table>
 <tr>
 <td align="center" width="58%"><img src="docs/screenshots/3-appearance-dialog.png" alt="外观自定义弹窗(实时预览)"/></td>
-<td valign="top"><b>外观自定义</b><br/>右键任意一层(工作区分组 / 工作区 / 会话 / 会话分组)→「自定义外观」:颜色(预设色板 + 取色器 + RGB)、发光强度(0..14 拖动条,只作用于文字)、字体粗细、字体阴影开关、图标(与 dsh 图标库同族的 66 个,工作区与工作区分组专属),底部带实时预览。清除自定义一键复原。</td>
+<td valign="top"><b>外观自定义</b><br/>右键任意一层(工作区分组 / 工作区 / 会话 / 会话分组)→「自定义外观」:颜色(预设色板 + 取色器 + RGB)、发光强度(0..14 拖动条,只作用于文字)、字体粗细、字体阴影开关、图标(与 dsh 图标库同族的 69 个,工作区与工作区分组专属),底部带实时预览。清除自定义一键复原。</td>
 </tr>
 <tr>
 <td align="center" width="58%"><img src="docs/screenshots/2-customized-tree.png" alt="外观自定义效果"/></td>
@@ -59,8 +59,8 @@ web/                 ← 虚拟分组(不是真实目录,纯命名层级)
 ### 其余亮点
 
 - **文件夹式收起**:点工作区行 = 收起/展开该工作区的全部会话(收起后行上保留会话数角标);会话分组同样可收起;搜索时自动全部展开。
-- **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组;会话行可拖拽——同工作区拖到另一会话上/下调整顺序,拖到会话子分组即移动进该分组。显示顺序 = 宿主手动序,拖拽结果立即生效。
-- **不丢原生能力**:会话行(打开/重命名/分叉/归档)、每工作区「新会话」、当前会话高亮、官方状态灯(蓝色运行环 / 琥珀待交互 / 绿色完成提醒)、未分组会话兜底、中英双语跟随界面语言。
+- **拖拽还原原版能力**:工作区行可拖拽——拖到另一工作区行上/下半即调整顺序(写回宿主 registry 序),拖到分组行则移动进该分组;会话行可拖拽——同工作区拖到另一会话上/下调整顺序,拖到会话子分组即移动进该分组。显示顺序 = 宿主手动序,拖拽结果立即生效。拖拽工作区期间,单链合并显示的行(如 工作/A)临时展开回文件夹树——路径里的每一级都是可投放的分组行,松手后自动合并回去。
+- **不丢原生能力**:会话行(打开/重命名/分叉/归档)、每工作区「新会话」、当前会话高亮、官方状态灯(蓝色运行环 / 琥珀待交互 / 绿色完成提醒)、**活跃定时任务角标**(有活动 Schedule 的会话显示闹钟图标,与官方行一致)、未分组会话兜底、中英双语跟随界面语言。
 - **对话空态页同样生效**:会话空态页的「添加工作区」菜单走的也是本插件的拾取交互,同样带所属分组弹窗。
 
 ## 安装

package/README_EN.md

@@ -32,7 +32,7 @@ Session titles nest on `/` too (e.g. `test1/plugin maintenance`). Session groups
 <table>
 <tr>
 <td align="center" width="58%"><img src="docs/screenshots/3-appearance-dialog.png" alt="Appearance dialog with live preview"/></td>
-<td valign="top"><b>Appearance customization</b><br/>Right-click any row (workspace folder / workspace / session / session group) → Customize: color (swatches + picker + RGB), glow strength (0–14 slider, text only), font weight, font shadow, an icon grid (66 icons from the dsh primitives family, workspace &amp; folder rows only), with a live preview at the bottom. Reset returns to default in one click.</td>
+<td valign="top"><b>Appearance customization</b><br/>Right-click any row (workspace folder / workspace / session / session group) → Customize: color (swatches + picker + RGB), glow strength (0–14 slider, text only), font weight, font shadow, an icon grid (69 icons from the dsh primitives family, workspace &amp; folder rows only), with a live preview at the bottom. Reset returns to default in one click.</td>
 </tr>
 <tr>
 <td align="center" width="58%"><img src="docs/screenshots/2-customized-tree.png" alt="Custom appearance result"/></td>
@@ -57,8 +57,8 @@ 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 capabilities kept**: open/rename/fork/archive sessions, per-workspace new-session, current-session highlight, official status dots (blue running ring / amber pending / green done), ungrouped-session fallback, zh/en localization.
+- **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.
 
 ## Install

package/dsh.plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "dsh-external/dsh-better-workspace",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "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.5.0",
+  "version": "0.7.0",
   "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": {

package/src/client.js

@@ -52,6 +52,7 @@ window.__ModuleLoader__.load({
       'status.planReview': '等待计划确认',
       'status.question': '等待回答',
       'status.subagents': '{n} 个子任务运行中',
+      'schedule.active': '有活动定时任务',
       'menu.rename': '重命名',
       'menu.delete': '删除',
       'menu.fork': '分叉',
@@ -64,7 +65,7 @@ window.__ModuleLoader__.load({
       'settings.expand': '展开',
       'settings.collapse': '收起',
       'settings.compactChains': '单链分组折叠显示',
-      'settings.compactChains.hint': '单层链合并为一行,出现多个子级时自动展开为树状;展开状态与自定义外观保存在当前浏览器。',
+      'settings.compactChains.hint': '单层链合并为一行,出现多个子级时自动展开为树状;拖拽工作区期间单链临时展开回文件夹树,可放入任意一级;展开状态与自定义外观保存在当前浏览器。',
       'custom.title': '自定义外观',
       'custom.color': '颜色',
       'custom.glow': '发光',
@@ -137,6 +138,7 @@ window.__ModuleLoader__.load({
       'status.planReview': 'Waiting for plan review',
       'status.question': 'Waiting for answer',
       'status.subagents': '{n} subagent(s) running',
+      'schedule.active': 'Has active scheduled task',
       'menu.rename': 'Rename',
       'menu.delete': 'Delete',
       'menu.fork': 'Fork',
@@ -149,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',
@@ -268,18 +270,33 @@ window.__ModuleLoader__.load({
       && !(archivedSet && archivedSet.has(summary.id))
       && (!summary.blank || summary.id === current)
 
+    /**
+     * Active-schedule marker, mirroring the official tree's
+     * hasActiveSchedule(): the list projection carries one entry per active
+     * Schedule record, and a non-empty projection is the badge's only gate.
+     * Defensive shapes (missing/mis-typed projection) degrade to false.
+     */
+    const hasActiveScheduleOf = (summary) => !!(summary
+      && summary.projectionValues
+      && Array.isArray(summary.projectionValues.schedule)
+      && summary.projectionValues.schedule.length > 0)
+
     /**
      * Running subagent descendants per session (light lineage walk over
-     * parentSessionId links) — a parent row keeps its "ongoing" ring while a
-     * spawned subagent is still working.
+     * parent links) — a parent row keeps its "ongoing" ring while a spawned
+     * subagent is still working. The client SessionSummary exposes the
+     * parent as parentId (the session controller maps parentSessionId to
+     * parentId on the wire); the old parentSessionId spelling is kept as a
+     * fallback for profiles serving the pre-rename shape.
      */
     const subagentRunningCounts = (byId) => {
       const children = new Map()
       for (const id of Object.keys(byId || {})) {
         const summary = byId[id]
-        if (!summary || !summary.parentSessionId) continue
-        let list = children.get(summary.parentSessionId)
-        if (!list) { list = []; children.set(summary.parentSessionId, list) }
+        const parentId = summary && (summary.parentId || summary.parentSessionId)
+        if (!summary || !parentId) continue
+        let list = children.get(parentId)
+        if (!list) { list = []; children.set(parentId, list) }
         list.push(summary)
       }
       const countFor = (rootId) => {
@@ -458,9 +475,10 @@ window.__ModuleLoader__.load({
       '.bw-row-label{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
       '.bw-row-count{flex:none;font-size:11px;color:var(--dsw-alias-label-quaternary,#8a8a8a)}',
       '.bw-row-time{flex:none;font-size:11px;color:var(--dsw-alias-label-quaternary,#8a8a8a)}',
+      '.bw-schedule-badge{flex:none;display:inline-flex;align-items:center;color:var(--dsw-alias-label-tertiary,#9a9a9a);margin:0 6px}',
       '.bw-row-actions{flex:none;display:none;align-items:center;gap:2px}',
       '.bw-row:hover .bw-row-actions{display:flex}',
-      '.bw-row:hover .bw-row-time,.bw-row:hover .bw-row-count{display:none}',
+      '.bw-row:hover .bw-row-time,.bw-row:hover .bw-row-count,.bw-row:hover .bw-schedule-badge{display:none}',
       '.bw-dot{flex:none;width:6px;height:6px;border-radius:50%;background:transparent}',
       '.bw-session-row{font-size:12.5px;color:var(--dsw-alias-label-secondary,#b8b8b8);min-height:26px}',
       '.bw-sgroup-row{font-size:12.5px;color:var(--dsw-alias-label-tertiary,#9a9a9a);min-height:24px}',
@@ -842,6 +860,9 @@ window.__ModuleLoader__.load({
             : E('span', { className: 'bw-dot' }),
         ),
         E('span', { className: 'bw-row-label' }, node.leaf || node.title),
+        node.hasActiveSchedule
+          ? E('span', { className: 'bw-schedule-badge', role: 'img', 'aria-label': t('schedule.active'), title: t('schedule.active') }, icon('IconAlarmClockOutline16', 14))
+          : null,
         E('span', { className: 'bw-row-time' }, timeLabel(node.updatedAt, now, t)),
       )
     }
@@ -890,6 +911,7 @@ window.__ModuleLoader__.load({
       'IconSettingsOutline16', 'IconShareOutline16', 'IconStopFill16', 'IconThinkOutline14',
       'IconThinkOutline16', 'IconTrashOutline16', 'IconUserOutline16', 'IconWarningOutline16',
       'IconLikeOutline16', 'IconDislikeOutline16', 'IconFollowsystemOutline16',
+      'IconAlarmClockOutline16', 'IconClockOutline16', 'IconDatabaseOutline16',
     ]
 
     /**
@@ -1178,6 +1200,7 @@ window.__ModuleLoader__.load({
             blank: !!summary.blank,
             running: !!summary.running,
             completed: summary.completed === true,
+            hasActiveSchedule: hasActiveScheduleOf(summary),
             subagents: subCounts.get(id) || 0,
             updatedAt: summary.updatedAt || 0,
             pending: pendingKindOf(pending, id),
@@ -1186,11 +1209,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 = []
@@ -1204,6 +1235,7 @@ window.__ModuleLoader__.load({
             blank: !!summary.blank,
             running: !!summary.running,
             completed: summary.completed === true,
+            hasActiveSchedule: hasActiveScheduleOf(summary),
             subagents: subCounts.get(id) || 0,
             updatedAt: summary.updatedAt || 0,
             pending: pendingKindOf(pending, id),
@@ -1292,7 +1324,15 @@ 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('/') : ''
+          setDrag({ kind: 'workspace', source: { workspaceId: workspace.workspaceId, leaf: sourceLeaf, folderPath: sourceFolder }, over: null })
         },
         onDragEnd: () => setDrag(null),
         onDragOver: (event) => {

package/src/index.js

@@ -40,7 +40,16 @@ export function apply(ctx) {
         const settings = sctx && sctx.settings
         if (!settings || typeof settings.register !== 'function') return
         const Schema = sm.default
-        settings.register(ds.settingsNamespace('better-workspace'), Schema.object({ compactChains: Schema.boolean().default(true) }))
+        // dsh >= 0.1.2-alpha.2 removed the settingsNamespace() helper from
+        // @deepseek-ai/dsh-settings: register() now takes a plain string and
+        // validates it at runtime (parseSettingsNamespace). The helper's old
+        // signature was compile-time branding only, so a plain string is also
+        // accepted by the older register() — one call, both eras. Only use the
+        // helper when the installed package still ships it.
+        const ns = typeof ds.settingsNamespace === 'function'
+          ? ds.settingsNamespace('better-workspace')
+          : 'better-workspace'
+        settings.register(ns, Schema.object({ compactChains: Schema.boolean().default(true) }))
         log('[dsh-better-workspace] settings namespace registered: better-workspace')
       })
       .catch((error) => {