dsh-session-mng 0.1.1 → 0.1.3

package/client.js

@@ -43,7 +43,13 @@ window.__ModuleLoader__.load({
         sortCreated: '创建时间',
         sortSize: '大小',
         sortTitle: '标题',
-        showSubagents: '显示子会话',
+        showSubagents: '显示子代理会话',
+        showSubagentsHint: '子代理会话由委派产生，默认隐藏；分支会话始终显示。',
+        showBlank: '显示空会话',
+        cleanupBlank: '清理空会话（{n}）',
+        cleanupBlankHint: '批量删除已归档的空会话；未归档的空会话需先归档。',
+        blankActiveHint: '另有 {n} 个未归档空会话，归档后才能清理。',
+        hiddenBlankCount: '已隐藏 {n} 个空会话',
         selectAll: '全选当前列表',
         expandAll: '展开全部',
         collapseAll: '收起全部',
@@ -65,7 +71,14 @@ window.__ModuleLoader__.load({
         untitled: '（未命名）',
         running: '运行中',
         archived: '已归档',
-        subagent: '子会话',
+        subagent: '子代理',
+        branch: '分支',
+        fromParent: '↳ 来自：{title}',
+        hiddenSubagentCount: '已隐藏 {n} 个子代理会话',
+        forkCount: '{n} 分支',
+        forkCountHint: '该会话有 {n} 个分支会话',
+        parentSession: '父会话',
+        parentMissing: '来源父会话已不存在',
         pinned: '已置顶',
         liveBadge: '已打开',
         noCwd: '无工作目录',
@@ -108,7 +121,9 @@ window.__ModuleLoader__.load({
         moving: '正在移动…',
         moveNoTarget: '没有可移动到的目标工作区。',
         moveLiveHint: '该会话已在当前 DSH 进程中打开，重启 DSH 后再移动。',
-        moveSubagentHint: '子会话不能单独移动。',
+        moveSubagentHint: '子代理会话不能单独移动。',
+        moveForkHint: '分支会话必须和父会话留在同一工作区，暂不支持单独移动。',
+        moveForkChildrenHint: '该会话有 {n} 个分支会话；移动只迁移本会话，分支会留在原工作区并继续独立使用。',
         moveDescendantsHint: '该会话包含子代理会话，暂时不能单独移动。',
         deleteAction: '彻底删除',
         deleteHint: '只允许删除已归档会话；删除后日志目录与工作区记录都会被移除，无法恢复。',
@@ -125,6 +140,7 @@ window.__ModuleLoader__.load({
         deleteNotArchived: '只有已归档会话可以彻底删除。',
         deleteLiveHint: '该会话已在当前 DSH 进程中打开，重启 DSH 后再删除。',
         deleteCascadeNote: '如果该会话有子代理会话，会一并删除。',
+        deleteForkNote: '另有 {n} 个历史分支会话不会被删除，但会失去「来自父会话」的来源标识；如需一起删除，请把它们也勾选进来。',
         archiveAction: '归档',
         archiving: '正在归档…',
         archiveDone: '已归档 {n} 个会话。',
@@ -159,7 +175,7 @@ window.__ModuleLoader__.load({
         timeout: '模型调用超时。',
         llmError: '模型调用失败：{message}',
         liveHint: '已打开的会话不能移动或彻底删除；重启 DSH 后重试。',
-        moveUnavailableHint: '所选会话中存在不可移动项（如跨工作区、有子会话或状态未就绪）。',
+        moveUnavailableHint: '所选会话中存在不可移动项（如跨工作区、分支/子代理会话或状态未就绪）。',
         archiveHint: '归档后会话会从活跃列表移到已归档，可在本页恢复。',
         moveArchivedHint: '移动不会改变归档状态，会话仍会留在已归档。',
         working: '处理中…',
@@ -192,6 +208,12 @@ window.__ModuleLoader__.load({
         sortSize: 'Size',
         sortTitle: 'Title',
         showSubagents: 'Show subagent sessions',
+        showSubagentsHint: 'Subagent sessions are produced by delegation and stay hidden by default; branch sessions are always listed.',
+        showBlank: 'Show empty sessions',
+        cleanupBlank: 'Clean up empty sessions ({n})',
+        cleanupBlankHint: 'Permanently delete archived empty sessions; unarchived empty sessions must be archived first.',
+        blankActiveHint: '{n} unarchived empty sessions must be archived before cleanup.',
+        hiddenBlankCount: '{n} empty sessions hidden',
         selectAll: 'Select all shown',
         expandAll: 'Expand all',
         collapseAll: 'Collapse all',
@@ -214,6 +236,13 @@ window.__ModuleLoader__.load({
         running: 'Running',
         archived: 'Archived',
         subagent: 'Subagent',
+        branch: 'Branch',
+        fromParent: '↳ from: {title}',
+        hiddenSubagentCount: '{n} subagent sessions hidden',
+        forkCount: '{n} branch',
+        forkCountHint: 'This session has {n} branch sessions',
+        parentSession: 'Parent session',
+        parentMissing: 'Source session no longer exists',
         pinned: 'Pinned',
         liveBadge: 'Open',
         noCwd: 'No working directory',
@@ -257,6 +286,8 @@ window.__ModuleLoader__.load({
         moveNoTarget: 'No target workspace is available.',
         moveLiveHint: 'This session is open in this DSH process; restart DSH and retry.',
         moveSubagentHint: 'Subagent sessions cannot be moved on their own.',
+        moveForkHint: 'A branch session must stay in its parent\'s workspace, so it cannot be moved on its own.',
+        moveForkChildrenHint: 'This session has {n} branch sessions; moving migrates only this session, and the branches stay in the original workspace and keep working independently.',
         moveDescendantsHint: 'This session has subagent descendants and cannot move alone yet.',
         deleteAction: 'Delete permanently',
         deleteHint: 'Only archived sessions can be deleted. The log directory and workspace record are removed; this cannot be undone.',
@@ -273,6 +304,7 @@ window.__ModuleLoader__.load({
         deleteNotArchived: 'Only archived sessions can be permanently deleted.',
         deleteLiveHint: 'This session is open in this DSH process; restart DSH and retry.',
         deleteCascadeNote: 'Any subagent descendants are deleted too.',
+        deleteForkNote: '{n} branch sessions are not deleted, but they lose their "from parent" label. Select them too if they should be deleted as well.',
         archiveAction: 'Archive',
         archiving: 'Archiving…',
         archiveDone: 'Archived {n} sessions.',
@@ -307,7 +339,7 @@ window.__ModuleLoader__.load({
         timeout: 'The model call timed out.',
         llmError: 'The model call failed: {message}',
         liveHint: 'An open session cannot be moved or deleted; restart DSH and retry.',
-        moveUnavailableHint: 'Some selected sessions cannot be moved (cross-workspace, subagent descendants, or not ready).',
+        moveUnavailableHint: 'Some selected sessions cannot be moved (cross-workspace, branch or subagent sessions, or not ready).',
         archiveHint: 'Archiving moves the session from the active list to the archived list; restore it here.',
         moveArchivedHint: 'Moving does not change the archive state; the session stays archived.',
         working: 'Working…',
@@ -393,6 +425,7 @@ window.__ModuleLoader__.load({
 .dsm-row-main{display:flex;flex-direction:column;align-items:flex-start;gap:1px;min-width:0;
  border:none;background:transparent;color:inherit;font:inherit;text-align:left;padding:0;cursor:pointer}
 .dsm-row-title{max-width:100%;font-size:13px;line-height:19px;font-weight:500;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.dsm-branch-glyph{margin-right:4px;font-size:12px;line-height:1;color:var(--dsw-alias-label-secondary);opacity:.85}
 .dsm-row-meta{max-width:100%;font-size:11px;line-height:16px;color:var(--dsw-alias-label-secondary);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dsm-badges{display:flex;align-items:center;gap:4px;flex-wrap:wrap}
 .dsm-badge{display:inline-flex;align-items:center;height:17px;padding:0 5px;border-radius:4px;font-size:10px;line-height:17px;
@@ -430,6 +463,22 @@ window.__ModuleLoader__.load({
 .dsm-scope-row .dsm-mono{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dsm-danger-box{border:1px solid var(--dsw-alias-state-error-primary);border-radius:8px;padding:10px;background:var(--dsw-alias-bg-layer-1)}
 .dsm-danger-box h3{color:var(--dsw-alias-state-error-primary)}
+.dsm-scope-overlay{position:fixed;inset:0;z-index:1000;display:flex;align-items:center;justify-content:center;
+ padding:20px;background:rgba(0,0,0,.58)}
+.dsm-scope-dialog{display:flex;flex-direction:column;width:min(660px,100%);max-height:min(82vh,760px);
+ border:1px solid var(--dsw-alias-state-error-primary);border-radius:10px;overflow:hidden;
+ background:var(--dsw-alias-bg-layer-2);box-shadow:0 24px 70px rgba(0,0,0,.5)}
+.dsm-scope-head{display:flex;align-items:center;justify-content:space-between;gap:10px;
+ padding:11px 14px;border-bottom:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-layer-1)}
+.dsm-scope-head h3{margin:0;font-size:13px;line-height:18px;color:var(--dsw-alias-state-error-primary)}
+.dsm-scope-body{flex:1 1 auto;min-height:0;overflow:auto;padding:12px 14px}
+.dsm-scope-foot{display:flex;flex-direction:column;gap:8px;padding:10px 14px;
+ border-top:1px solid var(--dsw-alias-border-l1);background:var(--dsw-alias-bg-layer-1)}
+.dsm-scope-dialog .dsm-scope-list{max-height:none;overflow:visible;margin:8px 0}
+@media (max-width:640px){
+ .dsm-scope-overlay{padding:10px}
+ .dsm-scope-dialog{max-height:92vh}
+}
 .dsm-footer{font-size:11px;line-height:17px;color:var(--dsw-alias-label-secondary)}
 .dsm-spin{display:inline-block;width:12px;height:12px;border:2px solid var(--dsw-alias-border-l2);
  border-top-color:var(--dsw-alias-brand-primary);border-radius:50%;animation:dsm-spin .8s linear infinite;vertical-align:-2px}
@@ -517,6 +566,7 @@ window.__ModuleLoader__.load({
       if (code === 'session-running') return t('sessionRunning')
       if (code === 'session-writer-held') return t('writerHeld')
       if (code === 'has-descendants') return t('moveDescendantsHint')
+      if (code === 'branch-session') return t('moveForkHint')
       if (code === 'archived-required') return t('deleteNotArchived')
       if (code === 'unsupported-backend') return t('unsupportedBackend')
       if (code === 'unsupported-registry') return t('unsupportedRegistry')
@@ -633,15 +683,28 @@ window.__ModuleLoader__.load({
     }
 
     function Row({ row, selected, onToggle, onOpen, t }) {
+      const depth = row.branchDepth ?? 0
+      const branch = row.kind === 'fork'
+      const forkCount = row.forkCount ?? 0
       const badges = []
       if (row.running) badges.push(h(Badge, { key: 'run', tone: 'run' }, t('running')))
       if (row.archived) badges.push(h(Badge, { key: 'arch' }, t('archived')))
       if (row.live) badges.push(h(Badge, { key: 'live', tone: 'brand' }, t('liveBadge')))
       if (row.pinned) badges.push(h(Badge, { key: 'pin' }, t('pinned')))
+      if (branch) badges.push(h(Badge, { key: 'fork', tone: 'brand' }, t('branch')))
       if (row.isSubagent) badges.push(h(Badge, { key: 'sub', tone: 'warn' }, t('subagent')))
+      if (forkCount > 0) {
+        badges.push(
+          h('span', { key: 'children', title: t('forkCountHint', { n: forkCount }) },
+            h(Badge, null, t('forkCount', { n: forkCount }))),
+        )
+      }
       return h(
         'div',
-        { className: `dsm-row${selected === true ? ' selected' : ''}` },
+        {
+          className: `dsm-row${selected === true ? ' selected' : ''}${depth > 0 ? ' dsm-row-branch' : ''}`,
+          style: depth > 0 ? { paddingLeft: `${depth * 18}px` } : undefined,
+        },
         h('input', {
           type: 'checkbox',
           checked: selected === true,
@@ -651,10 +714,20 @@ window.__ModuleLoader__.load({
         h(
           'button',
           { type: 'button', className: 'dsm-row-main', onClick: onOpen, title: row.cwd || row.id },
-          h('span', { className: 'dsm-row-title' }, row.title === '' ? t('untitled') : row.title),
+          h(
+            'span',
+            { className: 'dsm-row-title' },
+            depth > 0 ? h('span', { className: 'dsm-branch-glyph', 'aria-hidden': 'true' }, '↳') : null,
+            row.title === '' ? t('untitled') : row.title,
+          ),
           h(
             'span',
             { className: 'dsm-row-meta' },
+            branch && row.parentTitle !== ''
+              ? `${t('fromParent', { title: row.parentTitle })} · `
+              : branch && row.parentPresent === false
+                ? `${t('parentMissing')} · `
+                : '',
             row.cwd === '' ? t('noCwd') : row.cwd,
             ' · ',
             row.id,
@@ -919,6 +992,7 @@ window.__ModuleLoader__.load({
       React.useEffect(() => {
         const controller = new AbortController()
         setPhase('loading')
+        setChecked(false)
         post('delete/preview', { sessionIds: ids }, controller.signal)
           .then((value) => {
             if (controller.signal.aborted) return
@@ -933,43 +1007,89 @@ window.__ModuleLoader__.load({
         return () => controller.abort()
       }, [idsKey, t])
 
+      React.useEffect(() => {
+        const onKeyDown = (event) => {
+          if (event.key !== 'Escape') return
+          event.preventDefault()
+          event.stopPropagation()
+          if (busy !== true) onCancel()
+        }
+        document.addEventListener('keydown', onKeyDown, true)
+        return () => document.removeEventListener('keydown', onKeyDown, true)
+      }, [busy, onCancel])
+
       const rows = preview?.sessions ?? []
       const blocked = rows.some((row) => row.live || row.running)
+      const ready = phase === 'ready' && preview !== null
       return h(
         'div',
-        { className: 'dsm-danger-box' },
-        h('h3', null, t('deleteScope')),
-        h('p', { className: 'dsm-hint', style: { margin: '0 0 6px' } }, t('deleteHint')),
-        phase === 'loading'
-          ? h('p', { className: 'dsm-hint' }, t('deletePreviewLoading'))
-          : phase === 'error'
-            ? h('p', { className: 'dsm-error' }, error)
-            : h(
-                React.Fragment,
-                null,
-                h('div', { className: 'dsm-hint' },
-                  `${t('deleteRoots')}: ${preview?.roots?.length ?? 0} · ${t('deleteDescendants')}: ${preview?.descendantCount ?? 0} · ${t('deleteTotalSize', { size: formatBytes(preview?.totalBytes ?? 0) })}`,
-                ),
-                h('div', { className: 'dsm-scope-list' },
-                  rows.map((row) =>
-                    h(
-                      'div',
-                      { key: row.id, className: 'dsm-scope-row' },
-                      h('span', { className: 'dsm-badge' }, row.descendant ? t('scopeChild') : t('scopeRoot')),
-                      h('span', { className: 'dsm-mono', title: row.dir ?? row.id }, row.id),
-                      row.live ? h(Badge, { tone: 'brand' }, t('liveBadge')) : null,
-                      row.running ? h(Badge, { tone: 'run' }, t('running')) : null,
-                      row.missing ? h(Badge, { tone: 'warn' }, t('missingDir')) : null,
-                      row.readable === false ? h(Badge, { tone: 'warn' }, t('unreadable')) : null,
-                      h('span', { style: { marginLeft: 'auto' } }, formatBytes(row.bytes)),
+        {
+          className: 'dsm-scope-overlay',
+          onMouseDown: (event) => {
+            if (event.target === event.currentTarget && busy !== true) onCancel()
+          },
+        },
+        h(
+          'div',
+          {
+            className: 'dsm-scope-dialog',
+            role: 'dialog',
+            'aria-modal': 'true',
+            'aria-label': t('deleteScope'),
+          },
+          h(
+            'div',
+            { className: 'dsm-scope-head' },
+            h('h3', null, t('deleteScope')),
+            h('button', {
+              type: 'button',
+              className: 'dsm-btn ghost',
+              'aria-label': t('close'),
+              disabled: busy,
+              onClick: onCancel,
+            }, '×'),
+          ),
+          h(
+            'div',
+            { className: 'dsm-scope-body' },
+            h('p', { className: 'dsm-hint', style: { margin: '0 0 8px' } }, t('deleteHint')),
+            phase === 'loading'
+              ? h('p', { className: 'dsm-hint' }, t('deletePreviewLoading'))
+              : phase === 'error'
+                ? h('p', { className: 'dsm-error' }, error)
+                : h(
+                    React.Fragment,
+                    null,
+                    h('div', { className: 'dsm-hint' },
+                      `${t('deleteRoots')}: ${preview?.roots?.length ?? 0} · ${t('deleteDescendants')}: ${preview?.descendantCount ?? 0} · ${t('deleteTotalSize', { size: formatBytes(preview?.totalBytes ?? 0) })}`,
+                    ),
+                    (preview?.forkChildren?.length ?? 0) > 0
+                      ? h('p', { className: 'dsm-hint' }, t('deleteForkNote', { n: preview.forkChildren.length }))
+                      : null,
+                    h('div', { className: 'dsm-scope-list' },
+                      rows.map((row) =>
+                        h(
+                          'div',
+                          { key: row.id, className: 'dsm-scope-row' },
+                          h('span', { className: 'dsm-badge' }, row.descendant ? t('scopeChild') : t('scopeRoot')),
+                          h('span', { className: 'dsm-mono', title: row.dir ?? row.id }, row.id),
+                          row.live ? h(Badge, { tone: 'brand' }, t('liveBadge')) : null,
+                          row.running ? h(Badge, { tone: 'run' }, t('running')) : null,
+                          row.missing ? h(Badge, { tone: 'warn' }, t('missingDir')) : null,
+                          row.readable === false ? h(Badge, { tone: 'warn' }, t('unreadable')) : null,
+                          h('span', { style: { marginLeft: 'auto' } }, formatBytes(row.bytes)),
+                        ),
+                      ),
                     ),
+                    h('p', { className: 'dsm-hint', style: { margin: '0 0 6px' } }, t('deleteCascadeNote')),
+                    blocked ? h('p', { className: 'dsm-error' }, t('deleteLiveHint')) : null,
                   ),
-                ),
-                h('p', { className: 'dsm-hint', style: { margin: '0 0 6px' } }, t('deleteCascadeNote')),
-                blocked
-                  ? h('p', { className: 'dsm-error' }, t('deleteLiveHint'))
-                  : null,
-                h('label', { className: 'dsm-check', style: { marginBottom: 8 } },
+          ),
+          h(
+            'div',
+            { className: 'dsm-scope-foot' },
+            ready
+              ? h('label', { className: 'dsm-check' },
                   h('input', {
                     type: 'checkbox',
                     checked,
@@ -977,20 +1097,22 @@ window.__ModuleLoader__.load({
                     onChange: (event) => setChecked(event.target.checked),
                   }),
                   t('deleteConfirmCheck'),
-                ),
-                h(
-                  'div',
-                  { className: 'dsm-actions' },
-                  h('button', {
-                    type: 'button',
-                    className: 'dsm-btn danger',
-                    disabled: busy || blocked || checked !== true,
-                    onClick: () => onConfirmed(ids),
-                  }, busy ? t('deleting') : t('deleteConfirm')),
-                  h('button', { type: 'button', className: 'dsm-btn ghost', disabled: busy, onClick: onCancel }, t('cancel')),
-                  blocked ? h('span', { className: 'dsm-hint' }, t('liveHint')) : null,
-                ),
-              ),
+                )
+              : null,
+            h(
+              'div',
+              { className: 'dsm-actions' },
+              h('button', {
+                type: 'button',
+                className: 'dsm-btn danger',
+                disabled: busy || ready !== true || blocked || checked !== true,
+                onClick: () => onConfirmed(ids),
+              }, busy ? t('deleting') : t('deleteConfirm')),
+              h('button', { type: 'button', className: 'dsm-btn ghost', disabled: busy, onClick: onCancel }, t('cancel')),
+              blocked ? h('span', { className: 'dsm-hint' }, t('liveHint')) : null,
+            ),
+          ),
+        ),
       )
     }
 
@@ -1046,6 +1168,7 @@ window.__ModuleLoader__.load({
               row.archived ? h(Badge, null, t('archived')) : null,
               row.live ? h(Badge, { tone: 'brand' }, t('liveBadge')) : null,
               row.pinned ? h(Badge, null, t('pinned')) : null,
+              row.kind === 'fork' ? h(Badge, { tone: 'brand' }, t('branch')) : null,
               row.isSubagent ? h(Badge, { tone: 'warn' }, t('subagent')) : null,
             ),
           ),
@@ -1067,6 +1190,16 @@ window.__ModuleLoader__.load({
             { className: 'dsm-meta' },
             h('dt', null, t('workspace')),
             h('dd', null, row.workspaceTitle || t('workspaceUngrouped')),
+            row.kind === 'fork'
+              ? h(React.Fragment, null,
+                  h('dt', null, t('parentSession')),
+                  h('dd', null,
+                    row.parentTitle !== ''
+                      ? row.parentTitle
+                      : row.parentPresent === false
+                        ? t('parentMissing')
+                        : (row.parentSessionId || '')))
+              : null,
             h('dt', null, t('path')),
             h('dd', { title: row.cwd }, h('span', { className: 'dsm-mono' }, row.cwd || t('noCwd'))),
             h('dt', null, t('id')),
@@ -1096,9 +1229,12 @@ window.__ModuleLoader__.load({
           h('h3', null, t('moveTo')),
           h('p', { className: 'dsm-hint', style: { margin: '0 0 8px' } }, t('moveHint')),
           row.archived ? h('p', { className: 'dsm-hint', style: { margin: '0 0 8px' } }, t('moveArchivedHint')) : null,
+          movable && (row.forkCount ?? 0) > 0
+            ? h('p', { className: 'dsm-hint', style: { margin: '0 0 8px' } }, t('moveForkChildrenHint', { n: row.forkCount }))
+            : null,
           !movable
             ? h('p', { className: 'dsm-hint' },
-                row.live ? t('moveLiveHint') : row.isSubagent ? t('moveSubagentHint') : row.can?.move === false ? t('moveDescendantsHint') : t('moveNoTarget'))
+                row.live ? t('moveLiveHint') : row.kind === 'fork' ? t('moveForkHint') : row.isSubagent ? t('moveSubagentHint') : row.can?.move === false ? t('moveDescendantsHint') : t('moveNoTarget'))
             : h(
                 'div',
                 { className: 'dsm-title-row' },
@@ -1149,11 +1285,43 @@ window.__ModuleLoader__.load({
     // Page
     // ---------------------------------------------------------------------
 
+    /**
+     * Order one group's rows so a branch sits directly under its parent, the
+     * way the sidebar nests it. A branch whose parent is filtered out of this
+     * group stays at the top level and keeps its "from parent" meta line.
+     */
+    function orderBranchRows(rows) {
+      const ids = new Set(rows.map((row) => row.id))
+      const childrenOf = new Map()
+      const tops = []
+      for (const row of rows) {
+        const parentId = row.kind === 'fork' ? row.parentSessionId : null
+        if (parentId !== null && parentId !== row.id && ids.has(parentId)) {
+          const list = childrenOf.get(parentId) ?? []
+          list.push(row)
+          childrenOf.set(parentId, list)
+        } else {
+          tops.push(row)
+        }
+      }
+      const out = []
+      const visited = new Set()
+      const visit = (row, depth) => {
+        if (visited.has(row.id)) return
+        visited.add(row.id)
+        out.push(depth === 0 ? row : { ...row, branchDepth: depth })
+        for (const child of childrenOf.get(row.id) ?? []) visit(child, depth + 1)
+      }
+      for (const row of tops) visit(row, 0)
+      // A corrupt parent cycle must not silently drop rows from the list.
+      return out.length === rows.length ? out : rows
+    }
+
     /**
      * Derive the filtered / grouped / rendered view for the list.
      * Pure so the selection-pruning effect can use it before the loading guard.
      */
-    function computeView({ state, tab, workspaceFilter, query, sort, expanded, defaultExpanded, limits }) {
+    function computeView({ state, tab, workspaceFilter, query, sort, expanded, defaultExpanded, limits, showBlank }) {
       const rows = state?.sessions ?? []
       const workspaceOrder = state?.workspaces ?? []
       const text = query.trim().toLowerCase()
@@ -1163,8 +1331,9 @@ window.__ModuleLoader__.load({
         if (tab === 'archived' && !row.archived) return false
         if (workspaceFilter === 'ungrouped' && row.workspaceId !== null) return false
         if (workspaceFilter !== 'all' && workspaceFilter !== 'ungrouped' && row.workspaceId !== workspaceFilter) return false
+        if (showBlank !== true && row.blank === true) return false
         if (filtering) {
-          const haystack = `${row.title}\n${row.cwd}\n${row.id}`.toLowerCase()
+          const haystack = `${row.title}\n${row.cwd}\n${row.id}\n${row.parentTitle ?? ''}`.toLowerCase()
           if (!haystack.includes(text)) return false
         }
         return true
@@ -1177,7 +1346,7 @@ window.__ModuleLoader__.load({
       })
       const baseGroups = []
       for (const workspace of workspaceOrder) {
-        const groupRows = sorted.filter((row) => row.workspaceId === workspace.id)
+        const groupRows = orderBranchRows(sorted.filter((row) => row.workspaceId === workspace.id))
         if (groupRows.length === 0) continue
         baseGroups.push({
           ...workspace,
@@ -1185,7 +1354,7 @@ window.__ModuleLoader__.load({
           bytes: groupRows.reduce((sum, row) => sum + row.sizeBytes, 0),
         })
       }
-      const ungroupedRows = sorted.filter((row) => row.workspaceId === null)
+      const ungroupedRows = orderBranchRows(sorted.filter((row) => row.workspaceId === null))
       if (ungroupedRows.length > 0) {
         baseGroups.push({
           id: 'ungrouped',
@@ -1233,6 +1402,7 @@ window.__ModuleLoader__.load({
       const [bulkTarget, setBulkTarget] = React.useState('')
       const [expanded, setExpanded] = React.useState(null)
       const [limits, setLimits] = React.useState({})
+      const [showBlank, setShowBlank] = React.useState(false)
       const abortRef = React.useRef(null)
       const searchRef = React.useRef(null)
       const listScroll = React.useRef(0)
@@ -1298,6 +1468,7 @@ window.__ModuleLoader__.load({
         if (selectedId === null) return undefined
         const onKeyDown = (event) => {
           if (event.key === 'Escape') {
+            if (document.querySelector('.dsm-scope-overlay') !== null) return
             event.stopPropagation()
             backToList()
           }
@@ -1308,13 +1479,13 @@ window.__ModuleLoader__.load({
 
       React.useEffect(() => {
         setLimits({})
-      }, [tab, workspaceFilter, query, includeSubagents])
+      }, [tab, workspaceFilter, query, includeSubagents, showBlank])
 
       const rows = state?.sessions ?? []
       const defaultExpanded = (state?.totals?.all ?? 0) <= DEFAULT_COLLAPSE_AFTER
       const view = React.useMemo(
-        () => computeView({ state, tab, workspaceFilter, query, sort, expanded, defaultExpanded, limits }),
-        [state, tab, workspaceFilter, query, sort, expanded, defaultExpanded, limits],
+        () => computeView({ state, tab, workspaceFilter, query, sort, expanded, defaultExpanded, limits, showBlank }),
+        [state, tab, workspaceFilter, query, sort, expanded, defaultExpanded, limits, showBlank],
       )
       const viewKey = React.useMemo(
         () => [
@@ -1323,10 +1494,11 @@ window.__ModuleLoader__.load({
           workspaceFilter,
           query,
           includeSubagents ? 1 : 0,
+          showBlank ? 1 : 0,
           defaultExpanded ? 1 : 0,
           expanded === null ? 'auto' : [...expanded].sort().join(','),
         ].join('|'),
-        [state?.generatedAt, tab, workspaceFilter, query, includeSubagents, defaultExpanded, expanded],
+        [state?.generatedAt, tab, workspaceFilter, query, includeSubagents, showBlank, defaultExpanded, expanded],
       )
       React.useEffect(() => {
         setSelected((previous) => {
@@ -1455,10 +1627,14 @@ window.__ModuleLoader__.load({
         return h('div', { className: 'dsm-page' }, h('p', { className: 'dsm-hint' }, h(Spinner, { t, label: t('loading') })))
       }
 
+      const rowsForTabs = rows.filter((row) => showBlank || row.blank !== true)
+      const blankRows = rows.filter((row) => row.blank === true)
+      const blankArchivedRows = blankRows.filter((row) => row.archived === true && row.can?.delete === true)
+      const blankActiveCount = blankRows.filter((row) => row.archived !== true || row.can?.delete !== true).length
       const tabs = [
-        { key: 'all', label: t('tabAll'), count: rows.length },
-        { key: 'active', label: t('tabActive'), count: rows.filter((row) => !row.archived).length },
-        { key: 'archived', label: t('tabArchived'), count: rows.filter((row) => row.archived).length },
+        { key: 'all', label: t('tabAll'), count: rowsForTabs.length },
+        { key: 'active', label: t('tabActive'), count: rowsForTabs.filter((row) => !row.archived).length },
+        { key: 'archived', label: t('tabArchived'), count: rowsForTabs.filter((row) => row.archived).length },
       ]
       const visibleAllSelected = view.visibleRows.length > 0 && view.visibleRows.every((row) => selected.has(row.id))
       const selectedRows = view.visibleRows.filter((row) => selected.has(row.id))
@@ -1564,9 +1740,27 @@ window.__ModuleLoader__.load({
                 archived: state.totals.archived,
                 size: formatBytes(state.totals.bytes),
               }),
+              blankRows.length > 0 && !showBlank
+                ? ` · ${t('hiddenBlankCount', { n: blankRows.length })}`
+                : '',
+              (state.totals?.hiddenSubagents ?? 0) > 0 && !includeSubagents
+                ? ` · ${t('hiddenSubagentCount', { n: state.totals.hiddenSubagents })}`
+                : '',
             ),
+            blankActiveCount > 0 && showBlank
+              ? h('p', { className: 'dsm-hint' }, t('blankActiveHint', { n: blankActiveCount }))
+              : null,
           ),
           h('div', { className: 'dsm-head-actions' },
+            blankArchivedRows.length > 0
+              ? h('button', {
+                  type: 'button',
+                  className: 'dsm-btn',
+                  disabled: busy,
+                  title: `${t('cleanupBlankHint')}${blankActiveCount > 0 ? ` ${t('blankActiveHint', { n: blankActiveCount })}` : ''}`,
+                  onClick: () => setBulkDeleteIds(blankArchivedRows.map((row) => row.id)),
+                }, t('cleanupBlank', { n: blankArchivedRows.length }))
+              : null,
             h('button', { type: 'button', className: 'dsm-btn', disabled: busy, onClick: () => void load({ silent: true }) },
               busy ? h(Spinner, { t, label: t('working') }) : t('refresh')),
           ),
@@ -1631,7 +1825,7 @@ window.__ModuleLoader__.load({
             h('option', { value: 'size' }, t('sortSize')),
             h('option', { value: 'title' }, t('sortTitle')),
           ),
-          h('label', { className: 'dsm-check' },
+          h('label', { className: 'dsm-check', title: t('showSubagentsHint') },
             h('input', {
               type: 'checkbox',
               checked: includeSubagents,
@@ -1639,6 +1833,14 @@ window.__ModuleLoader__.load({
             }),
             t('showSubagents'),
           ),
+          h('label', { className: 'dsm-check' },
+            h('input', {
+              type: 'checkbox',
+              checked: showBlank,
+              onChange: (event) => setShowBlank(event.target.checked),
+            }),
+            t('showBlank'),
+          ),
         ),
         view.visibleRows.length > 0
           ? h(
@@ -1699,7 +1901,11 @@ window.__ModuleLoader__.load({
                     }, t('clearSelection')),
                     !selectedMovable && selectedRows.length > 0
                       ? h('span', { className: 'dsm-hint' },
-                          selectedRows.some((row) => row.live || row.running) ? t('liveHint') : t('moveUnavailableHint'))
+                          selectedRows.some((row) => row.live || row.running)
+                            ? t('liveHint')
+                            : selectedRows.some((row) => row.kind === 'fork')
+                              ? t('moveForkHint')
+                              : t('moveUnavailableHint'))
                       : null,
                   )
                 : null,