dsh-session-mng 0.1.2 → 0.1.4

package/client.js

@@ -43,11 +43,14 @@ window.__ModuleLoader__.load({
         sortCreated: '创建时间',
         sortSize: '大小',
         sortTitle: '标题',
-        showSubagents: '显示子会话',
+        showSubagents: '显示子代理会话',
+        showSubagentsHint: '子代理会话由委派产生，默认隐藏；分支会话始终显示。',
         showBlank: '显示空会话',
         cleanupBlank: '清理空会话（{n}）',
         cleanupBlankHint: '批量删除已归档的空会话；未归档的空会话需先归档。',
-        blankActiveHint: '另有 {n} 个未归档空会话，归档后才能清理。',
+        cleanupBlankLockedHint: '有 {n} 个已归档空会话已在 DSH 中打开，重启后才能清理。',
+        archiveBlank: '归档空会话（{n}）',
+        archiveBlankHint: '把未归档的空会话批量归档；归档后即可用「清理空会话」彻底删除。',
         hiddenBlankCount: '已隐藏 {n} 个空会话',
         selectAll: '全选当前列表',
         expandAll: '展开全部',
@@ -70,7 +73,14 @@ window.__ModuleLoader__.load({
         untitled: '（未命名）',
         running: '运行中',
         archived: '已归档',
-        subagent: '子会话',
+        subagent: '子代理',
+        branch: '分支',
+        fromParent: '↳ 来自：{title}',
+        hiddenSubagentCount: '已隐藏 {n} 个子代理会话',
+        forkCount: '{n} 分支',
+        forkCountHint: '该会话有 {n} 个分支会话',
+        parentSession: '父会话',
+        parentMissing: '来源父会话已不存在',
         pinned: '已置顶',
         liveBadge: '已打开',
         noCwd: '无工作目录',
@@ -113,7 +123,9 @@ window.__ModuleLoader__.load({
         moving: '正在移动…',
         moveNoTarget: '没有可移动到的目标工作区。',
         moveLiveHint: '该会话已在当前 DSH 进程中打开，重启 DSH 后再移动。',
-        moveSubagentHint: '子会话不能单独移动。',
+        moveSubagentHint: '子代理会话不能单独移动。',
+        moveForkHint: '分支会话必须和父会话留在同一工作区，暂不支持单独移动。',
+        moveForkChildrenHint: '该会话有 {n} 个分支会话；移动只迁移本会话，分支会留在原工作区并继续独立使用。',
         moveDescendantsHint: '该会话包含子代理会话，暂时不能单独移动。',
         deleteAction: '彻底删除',
         deleteHint: '只允许删除已归档会话；删除后日志目录与工作区记录都会被移除，无法恢复。',
@@ -130,6 +142,7 @@ window.__ModuleLoader__.load({
         deleteNotArchived: '只有已归档会话可以彻底删除。',
         deleteLiveHint: '该会话已在当前 DSH 进程中打开，重启 DSH 后再删除。',
         deleteCascadeNote: '如果该会话有子代理会话，会一并删除。',
+        deleteForkNote: '另有 {n} 个历史分支会话不会被删除，但会失去「来自父会话」的来源标识；如需一起删除，请把它们也勾选进来。',
         archiveAction: '归档',
         archiving: '正在归档…',
         archiveDone: '已归档 {n} 个会话。',
@@ -164,7 +177,7 @@ window.__ModuleLoader__.load({
         timeout: '模型调用超时。',
         llmError: '模型调用失败：{message}',
         liveHint: '已打开的会话不能移动或彻底删除；重启 DSH 后重试。',
-        moveUnavailableHint: '所选会话中存在不可移动项（如跨工作区、有子会话或状态未就绪）。',
+        moveUnavailableHint: '所选会话中存在不可移动项（如跨工作区、分支/子代理会话或状态未就绪）。',
         archiveHint: '归档后会话会从活跃列表移到已归档，可在本页恢复。',
         moveArchivedHint: '移动不会改变归档状态，会话仍会留在已归档。',
         working: '处理中…',
@@ -197,10 +210,13 @@ 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.',
+        cleanupBlankLockedHint: '{n} archived empty sessions are open in this DSH process; restart DSH before cleaning them up.',
+        archiveBlank: 'Archive empty sessions ({n})',
+        archiveBlankHint: 'Archive every unarchived empty session in one batch; they can then be cleaned up with "Clean up empty sessions".',
         hiddenBlankCount: '{n} empty sessions hidden',
         selectAll: 'Select all shown',
         expandAll: 'Expand all',
@@ -224,6 +240,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',
@@ -267,6 +290,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.',
@@ -283,6 +308,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.',
@@ -317,7 +343,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…',
@@ -334,10 +360,13 @@ window.__ModuleLoader__.load({
 
     const CSS = `
 .dsm-page{display:flex;flex-direction:column;gap:12px;font:inherit;color:var(--dsw-alias-label-primary);min-width:0}
-.dsm-head{display:flex;align-items:flex-start;justify-content:space-between;gap:12px;flex-wrap:wrap}
+/* Page head: title and its actions share the first row; the subtitles use the
+   full width below, so the buttons sit in the top-right corner. */
+.dsm-head{display:flex;flex-direction:column;gap:2px;min-width:0}
+.dsm-head-row{display:flex;align-items:center;justify-content:flex-start;gap:12px;flex-wrap:wrap;min-width:0}
 .dsm-title{margin:0;font-size:17px;font-weight:600;line-height:24px}
 .dsm-sub{margin:2px 0 0;font-size:12px;line-height:18px;color:var(--dsw-alias-label-secondary)}
-.dsm-head-actions{display:flex;align-items:center;gap:8px;flex-wrap:wrap}
+.dsm-head-actions{display:flex;align-items:center;gap:8px;flex-wrap:wrap;margin-left:auto}
 .dsm-btn{display:inline-flex;align-items:center;justify-content:center;gap:6px;min-height:28px;padding:0 10px;
  border:1px solid var(--dsw-alias-border-l1);border-radius:6px;background:transparent;color:var(--dsw-alias-label-primary);
  font:inherit;font-size:12px;line-height:18px;cursor:pointer;white-space:nowrap}
@@ -365,6 +394,12 @@ window.__ModuleLoader__.load({
 .dsm-note.warn{border-color:var(--dsw-alias-state-warn-primary)}
 .dsm-note-actions{display:flex;gap:6px;flex-wrap:wrap;flex:0 0 auto}
 .dsm-note detail{flex:1 1 100%}
+/* Operation-result toast: floats above the pane so scrolling never hides it. */
+.dsm-toast{position:fixed;bottom:18px;right:18px;z-index:1200;width:max-content;
+ max-width:min(460px,calc(100vw - 36px));padding:10px 12px;border-radius:8px;
+ background:var(--dsw-alias-bg-layer-2);box-shadow:0 14px 40px rgba(0,0,0,.45);
+ animation:dsm-toast-in .16s ease-out}
+@keyframes dsm-toast-in{from{opacity:0;transform:translateY(6px)}to{opacity:1;transform:none}}
 .dsm-sticky{position:sticky;top:0;z-index:3;display:flex;flex-direction:column;gap:8px;
  padding:6px 0 8px;background:var(--dsw-alias-bg-layer-2);border-bottom:1px solid var(--dsw-alias-border-l1)}
 .dsm-batch{display:flex;align-items:center;gap:8px;flex-wrap:wrap;padding:8px 10px;border-radius:7px;
@@ -403,6 +438,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;
@@ -415,7 +451,10 @@ window.__ModuleLoader__.load({
 .dsm-empty{padding:22px 10px;text-align:center;font-size:12px;color:var(--dsw-alias-label-secondary);
  border:1px dashed var(--dsw-alias-border-l2);border-radius:8px}
 .dsm-detail{display:flex;flex-direction:column;gap:12px}
-.dsm-detail-head{display:flex;align-items:flex-start;justify-content:space-between;gap:10px;flex-wrap:wrap}
+/* The title row and its actions stay in view while the detail page scrolls. */
+.dsm-detail-head{position:sticky;top:0;z-index:2;display:flex;align-items:flex-start;justify-content:space-between;
+ gap:10px;flex-wrap:wrap;padding:6px 0 8px;background:var(--dsw-alias-bg-layer-2);
+ border-bottom:1px solid var(--dsw-alias-border-l1)}
 .dsm-detail-title{margin:0;font-size:16px;line-height:23px;font-weight:600;word-break:break-word}
 .dsm-card{border:1px solid var(--dsw-alias-border-l1);border-radius:8px;background:var(--dsw-alias-bg-layer-1);padding:10px}
 .dsm-card h3{margin:0 0 8px;font-size:12px;line-height:18px;font-weight:600}
@@ -543,6 +582,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')
@@ -631,11 +671,33 @@ window.__ModuleLoader__.load({
       return h('span', null, h('span', { className: 'dsm-spin', 'aria-hidden': 'true' }), ' ', label ?? t('working'))
     }
 
+    /** How long a plain success toast stays before hiding itself. */
+    const NOTICE_HIDE_MS = 5000
+
+    /**
+     * Operation-result toast.
+     *
+     * It floats above the settings pane (instead of sitting in the scroll flow),
+     * so a result is visible no matter where the list is scrolled. A plain
+     * success toast hides itself after a few seconds; failures and notices with
+     * an action stay until the user dismisses them, because they carry details
+     * worth reading.
+     */
     function Notice({ notice, t, onDismiss }) {
+      const dismiss = React.useRef(onDismiss)
+      dismiss.current = onDismiss
+      const transient = notice !== null && notice !== undefined
+        && notice.tone !== 'error' && notice.tone !== 'warn'
+        && notice.details === undefined && notice.action === undefined
+      React.useEffect(() => {
+        if (!transient) return undefined
+        const timer = setTimeout(() => dismiss.current?.(), NOTICE_HIDE_MS)
+        return () => clearTimeout(timer)
+      }, [notice, transient])
       if (notice === null || notice === undefined) return null
       return h(
         'div',
-        { className: `dsm-note ${notice.tone ?? ''}`, role: 'status' },
+        { className: `dsm-note dsm-toast ${notice.tone ?? ''}`, role: 'status' },
         h('div', { style: { flex: '1 1 auto', minWidth: 0 } },
           h('div', null, notice.text),
           notice.detail ? h('div', { className: 'dsm-hint', style: { marginTop: 3 } }, notice.detail) : null,
@@ -659,15 +721,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,
@@ -677,10 +752,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,
@@ -935,30 +1020,44 @@ window.__ModuleLoader__.load({
     // Delete scope (shared by single and batch)
     // ---------------------------------------------------------------------
 
-    function DeleteScope({ ctx, t, ids, onConfirmed, onCancel, busy }) {
+    function DeleteScope({ ctx, t, ids, maxBatch, onConfirmed, onCancel, busy }) {
       const [phase, setPhase] = React.useState('loading')
       const [preview, setPreview] = React.useState(null)
       const [error, setError] = React.useState(null)
       const [checked, setChecked] = React.useState(false)
       const idsKey = ids.join('\u0000')
 
+      // One confirmation may name more sessions than a single request admits
+      // (the empty-session shortcut does). Preview in batches and merge the
+      // scopes so the dialog still shows one combined result.
       React.useEffect(() => {
         const controller = new AbortController()
         setPhase('loading')
         setChecked(false)
-        post('delete/preview', { sessionIds: ids }, controller.signal)
-          .then((value) => {
+        const size = Number.isFinite(maxBatch) && maxBatch > 0 ? maxBatch : 50
+        const merge = async () => {
+          const merged = { roots: [], errors: [], sessions: [], descendantCount: 0, forkChildren: [], totalBytes: 0 }
+          for (let index = 0; index < ids.length; index += size) {
+            const value = await post('delete/preview', { sessionIds: ids.slice(index, index + size) }, controller.signal)
             if (controller.signal.aborted) return
-            setPreview(value)
-            setPhase('ready')
-          })
-          .catch((failure) => {
-            if (failure?.name === 'AbortError') return
-            setError(errorText(t, failure))
-            setPhase('error')
-          })
+            merged.roots.push(...(value?.roots ?? []))
+            merged.errors.push(...(value?.errors ?? []))
+            merged.sessions.push(...(value?.sessions ?? []))
+            merged.descendantCount += value?.descendantCount ?? 0
+            merged.forkChildren.push(...(value?.forkChildren ?? []))
+            merged.totalBytes += value?.totalBytes ?? 0
+          }
+          if (controller.signal.aborted) return
+          setPreview(merged)
+          setPhase('ready')
+        }
+        merge().catch((failure) => {
+          if (failure?.name === 'AbortError') return
+          setError(errorText(t, failure))
+          setPhase('error')
+        })
         return () => controller.abort()
-      }, [idsKey, t])
+      }, [idsKey, maxBatch, t])
 
       React.useEffect(() => {
         const onKeyDown = (event) => {
@@ -1016,6 +1115,9 @@ window.__ModuleLoader__.load({
                     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(
@@ -1118,6 +1220,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,
             ),
           ),
@@ -1139,6 +1242,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')),
@@ -1168,9 +1281,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' },
@@ -1208,6 +1324,7 @@ window.__ModuleLoader__.load({
                     ctx,
                     t,
                     ids: deleteIds,
+                    maxBatch: state.limits?.maxBatch ?? 50,
                     busy,
                     onCancel: () => setShowDelete(false),
                     onConfirmed: (ids) => onDelete(ids),
@@ -1221,6 +1338,38 @@ 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.
@@ -1237,7 +1386,7 @@ window.__ModuleLoader__.load({
         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
@@ -1250,7 +1399,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,
@@ -1258,7 +1407,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',
@@ -1463,17 +1612,43 @@ window.__ModuleLoader__.load({
         return value
       }
 
+      /**
+       * Permanently delete sessions in backend-sized batches. One confirmation
+       * may cover more ids than a single request admits (the empty-session
+       * shortcut can), so the request is split and the totals are summed into
+       * one notice.
+       */
       const deleteRows = async (ids) => {
-        const value = await run(
-          () => post('delete', { sessionIds: ids, confirm: true }),
-          (result) => resultText(result),
-        )
-        if (value !== undefined) {
+        if (ids.length === 0) return undefined
+        const max = state?.limits?.maxBatch ?? 50
+        setBusy(true)
+        setNotice(null)
+        try {
+          let succeeded = 0
+          let failed = 0
+          const failures = []
+          for (let index = 0; index < ids.length; index += max) {
+            const value = await post('delete', { sessionIds: ids.slice(index, index + max), confirm: true })
+            succeeded += value?.totals?.succeeded ?? 0
+            failed += value?.totals?.failed ?? 0
+            for (const item of value?.results ?? []) if (item.ok === false) failures.push(item)
+          }
+          setNotice(
+            failed === 0
+              ? { tone: 'ok', text: t('batchDone', { ok: succeeded, failed: 0 }) }
+              : { tone: 'error', text: t('batchDone', { ok: succeeded, failed }), details: failures.slice(0, 20) },
+          )
           setBulkDeleteIds(null)
           setSelected(new Set())
           if (selectedId !== null && ids.includes(selectedId)) setSelectedId(null)
+          await load({ silent: true })
+          return { totals: { succeeded, failed } }
+        } catch (failure) {
+          setNotice({ tone: 'error', text: errorText(t, failure), detail: failure?.message })
+          return undefined
+        } finally {
+          setBusy(false)
         }
-        return value
       }
 
       const cleanupOrphans = async () => {
@@ -1497,6 +1672,40 @@ window.__ModuleLoader__.load({
         }
       }
 
+      /**
+       * Archive every unarchived empty session, in backend-sized batches. The
+       * user can then clean them up with one confirm dialog.
+       */
+      const archiveBlankSessions = async (ids) => {
+        if (ids.length === 0) return
+        const max = state?.limits?.maxBatch ?? 50
+        setBusy(true)
+        setNotice(null)
+        try {
+          let archived = 0
+          const failures = []
+          for (let index = 0; index < ids.length; index += max) {
+            const value = await post('archive', { sessionIds: ids.slice(index, index + max) })
+            archived += value?.totals?.succeeded ?? 0
+            for (const item of value?.results ?? []) if (item.ok === false) failures.push(item)
+          }
+          if (failures.length === 0) {
+            setNotice({ tone: 'ok', text: t('archiveDone', { n: archived }) })
+          } else {
+            setNotice({
+              tone: 'error',
+              text: t('batchDone', { ok: archived, failed: failures.length }),
+              details: failures.slice(0, 20),
+            })
+          }
+          await load({ silent: true })
+        } catch (failure) {
+          setNotice({ tone: 'error', text: errorText(t, failure) })
+        } finally {
+          setBusy(false)
+        }
+      }
+
       const openSession = (id) => {
         let service
         try {
@@ -1533,8 +1742,9 @@ window.__ModuleLoader__.load({
 
       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 blankUnarchivedRows = blankRows.filter((row) => row.archived !== true)
+      const blankArchivedRows = blankRows.filter((row) => row.archived === true)
+      const blankDeletableRows = blankArchivedRows.filter((row) => row.can?.delete === true)
       const tabs = [
         { key: 'all', label: t('tabAll'), count: rowsForTabs.length },
         { key: 'active', label: t('tabActive'), count: rowsForTabs.filter((row) => !row.archived).length },
@@ -1635,35 +1845,48 @@ window.__ModuleLoader__.load({
         h(
           'div',
           { className: 'dsm-head' },
-          h('div', null,
+          h(
+            'div',
+            { className: 'dsm-head-row' },
             h('h2', { className: 'dsm-title' }, t('pageTitle')),
-            h('p', { className: 'dsm-sub' }, t('pageSubtitle')),
-            h('p', { className: 'dsm-sub' },
-              t('totalLine', {
-                all: state.totals.all,
-                archived: state.totals.archived,
-                size: formatBytes(state.totals.bytes),
-              }),
-              blankRows.length > 0 && !showBlank
-                ? ` · ${t('hiddenBlankCount', { n: blankRows.length })}`
-                : '',
+            h('div', { className: 'dsm-head-actions' },
+              blankUnarchivedRows.length > 0
+                ? h('button', {
+                    type: 'button',
+                    className: 'dsm-btn',
+                    disabled: busy,
+                    title: t('archiveBlankHint'),
+                    onClick: () => void archiveBlankSessions(blankUnarchivedRows.map((row) => row.id)),
+                  }, t('archiveBlank', { n: blankUnarchivedRows.length }))
+                : null,
+              blankArchivedRows.length > 0
+                ? h('button', {
+                    type: 'button',
+                    className: 'dsm-btn',
+                    disabled: busy || blankDeletableRows.length === 0,
+                    title: blankDeletableRows.length === blankArchivedRows.length
+                      ? t('cleanupBlankHint')
+                      : t('cleanupBlankLockedHint', { n: blankArchivedRows.length - blankDeletableRows.length }),
+                    onClick: () => setBulkDeleteIds(blankDeletableRows.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')),
             ),
-            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')),
+          h('p', { className: 'dsm-sub' }, t('pageSubtitle')),
+          h('p', { className: 'dsm-sub' },
+            t('totalLine', {
+              all: state.totals.all,
+              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 })}`
+              : '',
           ),
         ),
         h(Notice, { notice, t, onDismiss: () => setNotice(null) }),
@@ -1726,7 +1949,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,
@@ -1802,7 +2025,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,
@@ -1829,6 +2056,7 @@ window.__ModuleLoader__.load({
               ctx,
               t,
               ids: bulkDeleteIds,
+              maxBatch: state.limits?.maxBatch ?? 50,
               busy,
               onCancel: () => setBulkDeleteIds(null),
               onConfirmed: (ids) => void deleteRows(ids),