dsh-delete-session 0.1.4 → 0.1.5

package/README.md

@@ -27,6 +27,7 @@ DSH 侧边栏的会话菜单只有**重命名 / 分叉 / 归档**——归档只
 - **菜单内删除** —— 侧边栏会话 `...` 菜单直接多出「删除会话」；会话 ID 从菜单的 React fiber 读取，永远作用于你点的那一行，**不会切换当前会话**
 - **风险确认** —— 首次删除弹出确认对话框：显示会话标题与 ID，勾选「我已了解，永久删除」后确认按钮才可用
 - **确认一次后可跳过** —— 对话框里勾选「不再询问，以后直接删除」，之后点菜单项直接删除（左下角 toast 提示）；**按住 Shift 点击**可临时恢复弹窗；清除 `localStorage['dsh-delete-session:skip-confirm']` 可永久恢复
+- **多选批量删除** —— 会话菜单里的「多选」进入选择模式：每行左侧出现勾选圈，点整行即勾选（不会打开会话），底部操作条显示「已选 N 个 / 取消 / 删除」；点删除**立即批量执行**（无确认弹窗、无全选、所有行都可选），完成后 toast 汇总并刷新列表；Esc 或「取消」退出
 - **真正的删除** —— 停止运行中的 agent（cancel + 等待空闲）→ flush / detach 活跃会话 → 删除磁盘会话目录（原始 ID 与 `session-` 前缀两种写法）→ 持久化服务复核 → 清理工作区记账，侧栏不会残留「未分组」孤儿
 - **默认安全** —— 宿主路由仅限本机回环（回环 socket + 回环 Host 头 + 同源校验）；被 DSH 打开占用的会话会被明确拒绝（409），绝不与活跃写者竞争
 - **中英双语** —— 菜单项与对话框跟随 DSH 界面语言（zh / en）
@@ -54,6 +55,7 @@ dsh plugin --profile web add github:DDDMUC/dsh-delete-session
 2. 选择底部的「删除会话」
 3. 首次：勾选「我已了解，永久删除」（想省事可同时勾选「不再询问，以后直接删除」）→ 点「删除」
 4. 之后：直接删除，左下角出现 toast 提示
+5. 批量删除：会话菜单 →「多选」→ 勾选多个会话 → 底部「删除」；Esc 或「取消」退出选择模式
 
 <div align="center">
   <a href="https://raw.githubusercontent.com/DDDMUC/dsh-delete-session/main/assets/dialog.jpg">
@@ -74,6 +76,7 @@ dsh plugin --profile web add github:DDDMUC/dsh-delete-session
 - 被 DSH 当前打开占用的会话：删除会自动等待写所有权释放（通常几秒）后完成；极少数仍被占用的情况会提示稍后重试或重启 DSH
 - 菜单注入是 DOM shim：核心 UI 若调整菜单结构或行 fiber 形状，可能不再注入菜单项（不影响其他功能）
 - 删除不可恢复：没有回收站，也没有撤销
+- 批量删除目前**逐条顺序执行**：空闲会话很快，被 DSH 打开过的会话每条需要等待写所有权释放（最多数秒），一次选很多时整体耗时会变长（后续版本会并发化）
 
 ### 兼容性
 
@@ -109,6 +112,7 @@ This plugin puts Delete back where you already click: the session row's `...` me
 - **Delete from the menu** — a "Delete session" row appears in the sidebar session `...` menu; the session id is read from the menu's React fiber, so the action always targets the row you clicked and **never switches the active conversation**
 - **Risk consent** — the first delete opens a confirmation dialog with the session title and id; the confirm button unlocks only after ticking "I understand"
 - **Confirm once, then skip** — tick "Don't ask again" and later deletes run directly from the menu (a toast reports the result); **hold Shift while clicking** to force the dialog back, or clear `localStorage['dsh-delete-session:skip-confirm']` to restore it permanently
+- **Multi-select batch delete** — "Select multiple" in the session menu enters selection mode: every row gets a round checkbox, clicking a row toggles it (it never opens the conversation), and a bottom bar shows "N selected / Cancel / Delete". Delete runs **immediately** (no confirm dialog, no select-all, every row selectable) and reports a toast summary; Esc or Cancel exits
 - **Real deletion** — stops a running agent (cancel + quiescence), flushes and detaches the live session, removes the on-disk session directories (both the raw and `session-` prefixed id), verifies through the persistence service, then cleans workspace accounting so no orphan shows up under "Ungrouped"
 - **Safe by default** — the host route is loopback-only (loopback socket, loopback Host header, same-origin check); a session still held open by DSH is refused with 409 instead of racing the active writer
 - **Bilingual** — the menu item and dialog follow the DSH interface language (zh / en)
@@ -136,6 +140,7 @@ Restart `dsh web` to apply.
 2. Pick "Delete session" at the bottom
 3. First time: tick "I understand - delete permanently" (tick "Don't ask again" too if you like) and confirm
 4. Afterwards: the session is deleted directly, with a toast
+5. Batch delete: session menu -> "Select multiple" -> tick rows -> "Delete" in the bottom bar; Esc or Cancel exits
 
 <div align="center">
   <a href="https://raw.githubusercontent.com/DDDMUC/dsh-delete-session/main/assets/dialog.jpg">
@@ -156,6 +161,7 @@ Restart `dsh web` to apply.
 - A session DSH currently holds open: the delete waits for the write lease to be released (usually a few seconds) and then completes; in the rare case it stays busy, the dialog asks you to retry later or restart DSH
 - The menu injection is a DOM shim: core UI changes to the menu markup or row fiber shape may stop the item from being injected (nothing else breaks)
 - Deletion is permanent: there is no trash bin and no undo
+- Batch delete currently runs **sequentially**: idle sessions are fast, while a session DSH has opened waits for its write lease (up to a few seconds), so a large selection takes longer (a future version will parallelize it)
 
 ### Compatibility
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-delete-session",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Delete sessions from the DSH Web sidebar: adds a Delete action to the session row menu with a risk-consent dialog, then removes the session log, workspace accounting and live session state.",
   "type": "module",
   "main": "src/index.js",

package/src/client.js

@@ -33,6 +33,13 @@ window.__ModuleLoader__.load({
       busy: '该会话正被 DSH 打开，删除未能完成；请稍后重试（通常几秒后即可），或重启 DSH 后再试。',
       notFound: '未找到该会话（可能已被删除）。',
       untitled: '未命名会话',
+      multiSelect: '多选',
+      cancelSelect: '取消',
+      selectedCount: (n) => `已选 ${n} 个`,
+      deleteSelected: '删除',
+      batchDone: (n) => `已删除 ${n} 个会话`,
+      batchPartial: (ok, fail) => `已删除 ${ok} 个，${fail} 个失败`,
+      batchFailed: '批量删除失败：',
     }
 
     const en = {
@@ -49,6 +56,13 @@ window.__ModuleLoader__.load({
       busy: 'This session is currently open in DSH; the delete did not complete. Try again in a moment (usually a few seconds), or restart DSH and retry.',
       notFound: 'Session not found (it may already be deleted).',
       untitled: 'Untitled session',
+      multiSelect: 'Select multiple',
+      cancelSelect: 'Cancel',
+      selectedCount: (n) => `${n} selected`,
+      deleteSelected: 'Delete',
+      batchDone: (n) => `Deleted ${n} session(s)`,
+      batchPartial: (ok, fail) => `Deleted ${ok}, ${fail} failed`,
+      batchFailed: 'Batch delete failed: ',
     }
 
     let localeSvc = null
@@ -158,6 +172,14 @@ window.__ModuleLoader__.load({
       '.dsdel-btn:disabled{opacity:.5;cursor:default}',
       '.dsdel-danger{border-color:var(--dsw-alias-state-error-primary,#e5484d);background:var(--dsw-alias-state-error-primary,#e5484d);color:#fff}',
       '.dsdel-toast{position:fixed;bottom:20px;left:50%;transform:translateX(-50%);z-index:2147483601;background:Canvas;color:CanvasText;border:1px solid color-mix(in srgb,CanvasText 25%,transparent);padding:9px 16px;border-radius:999px;font-size:12px;box-shadow:0 8px 24px rgba(0,0,0,.25);max-width:min(92vw,460px);cursor:pointer}',
+      '.dsdel-check{display:inline-flex;align-items:center;justify-content:center;width:18px;height:18px;border-radius:50%;border:1.5px solid var(--dsw-alias-border-l3,rgba(128,128,128,.5));background:transparent;flex:none;margin-right:8px;box-sizing:border-box;cursor:pointer}',
+      '.dsdel-check-on{background:var(--dsw-alias-state-business-primary,#4c6ef5);border-color:var(--dsw-alias-state-business-primary,#4c6ef5)}',
+      '.dsdel-check-on::after{content:"";width:9px;height:5px;border-left:2px solid #fff;border-bottom:2px solid #fff;transform:rotate(-45deg) translateY(-1px)}',
+      '.dsdel-bar{position:fixed;left:12px;bottom:12px;z-index:2147483600;display:flex;align-items:center;gap:10px;padding:10px 12px;border-radius:12px;border:1px solid var(--dsw-alias-border-l3,rgba(128,128,128,.3));box-shadow:0 12px 32px rgba(0,0,0,.28);color:var(--dsw-alias-label-primary,inherit);font-size:13px;background:linear-gradient(var(--dsw-alias-bg-layer-2,#fff),var(--dsw-alias-bg-layer-2,#fff)),linear-gradient(var(--dsw-alias-bg-layer-2,#fff),var(--dsw-alias-bg-layer-2,#fff)),linear-gradient(var(--dsw-alias-bg-layer-2,#fff),var(--dsw-alias-bg-layer-2,#fff)),var(--dsw-alias-bg-base,#fff)}',
+      '.dsdel-bar-count{white-space:nowrap}',
+      '.dsdel-bar-btn{appearance:none;min-height:30px;padding:0 12px;border:1px solid var(--dsw-alias-border-l2,rgba(128,128,128,.4));background:var(--dsw-alias-fill-elevated,rgba(128,128,128,.08));color:var(--dsw-alias-label-primary,inherit);border-radius:8px;font-size:13px;cursor:pointer}',
+      '.dsdel-bar-btn:disabled{opacity:.5;cursor:default}',
+      '.dsdel-bar-danger{border-color:var(--dsw-alias-state-error-primary,#e5484d);background:var(--dsw-alias-state-error-primary,#e5484d);color:#fff}',
     ].join('')
 
     function ensureStyle() {
@@ -305,45 +327,222 @@ window.__ModuleLoader__.load({
       })
     }
 
+    // --- multi-select ----------------------------------------------------------
+    // Entered from the session menu ("多选"). While active, every session row
+    // gets a round checkbox, clicking a row toggles it instead of opening the
+    // conversation, and a bottom bar runs the batch delete. No select-all and
+    // no per-row disabling: every row is selectable and the batch deletes
+    // immediately (the single-session flow keeps its own consent dialog).
+
+    let selecting = false
+    const selected = new Set()
+    let bar = null
+    let decorateRaf = null
+    let rowObserver = null
+
+    function sessionIdFromRow(row) {
+      let fiber = findFiber(row)
+      let guard = 0
+      while (fiber && guard++ < 300) {
+        const props = fiber.memoizedProps
+        if (props && props.node && typeof props.node.id === 'string' && props.node.id) return props.node.id
+        fiber = fiber.return
+      }
+      return null
+    }
+
+    function decorateRows() {
+      const rows = document.querySelectorAll('[role="treeitem"]')
+      rows.forEach((row) => {
+        const id = sessionIdFromRow(row)
+        if (!id) return
+        let check = row.querySelector(':scope > .dsdel-check')
+        if (!check) {
+          check = document.createElement('span')
+          check.className = 'dsdel-check'
+          check.setAttribute('data-dsh-delete-session', 'check')
+          row.insertBefore(check, row.firstChild)
+        }
+        check.classList.toggle('dsdel-check-on', selected.has(id))
+      })
+    }
+
+    function scheduleDecorate() {
+      if (decorateRaf !== null) return
+      decorateRaf = requestAnimationFrame(() => {
+        decorateRaf = null
+        try { decorateRows() } catch { /* best-effort DOM shim */ }
+      })
+    }
+
+    function updateBar() {
+      if (!bar) return
+      const count = bar.querySelector('.dsdel-bar-count')
+      if (count) count.textContent = t('selectedCount')(selected.size)
+      const del = bar.querySelector('.dsdel-bar-danger')
+      if (del) del.disabled = selected.size === 0
+    }
+
+    function toggleSelect(id) {
+      if (selected.has(id)) selected.delete(id)
+      else selected.add(id)
+      scheduleDecorate()
+      updateBar()
+    }
+
+    function onSelectClickCapture(e) {
+      if (!selecting) return
+      const row = e.target && e.target.closest ? e.target.closest('[role="treeitem"]') : null
+      if (!row) return
+      const id = sessionIdFromRow(row)
+      if (!id) return
+      e.preventDefault()
+      e.stopPropagation()
+      toggleSelect(id)
+    }
+
+    function onSelectKeydown(e) {
+      if (e.key !== 'Escape') return
+      e.stopPropagation()
+      exitSelection()
+    }
+
+    function buildBar() {
+      const el = document.createElement('div')
+      el.className = 'dsdel-bar'
+      el.setAttribute('role', 'toolbar')
+      const count = document.createElement('span')
+      count.className = 'dsdel-bar-count'
+      const cancel = document.createElement('button')
+      cancel.type = 'button'
+      cancel.className = 'dsdel-bar-btn'
+      cancel.textContent = t('cancelSelect')
+      cancel.addEventListener('click', (e) => { e.stopPropagation(); exitSelection() })
+      const del = document.createElement('button')
+      del.type = 'button'
+      del.className = 'dsdel-bar-btn dsdel-bar-danger'
+      del.textContent = t('deleteSelected')
+      del.addEventListener('click', (e) => { e.stopPropagation(); runBatchDelete() })
+      el.appendChild(count)
+      el.appendChild(cancel)
+      el.appendChild(del)
+      document.body.appendChild(el)
+      return el
+    }
+
+    function enterSelection() {
+      if (selecting) return
+      selecting = true
+      selected.clear()
+      ensureStyle()
+      if (!bar) bar = buildBar()
+      bar.style.display = 'flex'
+      document.addEventListener('click', onSelectClickCapture, true)
+      document.addEventListener('keydown', onSelectKeydown, true)
+      if (typeof MutationObserver === 'function') {
+        rowObserver = new MutationObserver(scheduleDecorate)
+        rowObserver.observe(document.body, { childList: true, subtree: true })
+      }
+      scheduleDecorate()
+      updateBar()
+    }
+
+    function exitSelection() {
+      if (!selecting) return
+      selecting = false
+      selected.clear()
+      if (bar) bar.style.display = 'none'
+      document.removeEventListener('click', onSelectClickCapture, true)
+      document.removeEventListener('keydown', onSelectKeydown, true)
+      if (rowObserver) { rowObserver.disconnect(); rowObserver = null }
+      document.querySelectorAll('.dsdel-check').forEach((el) => el.remove())
+    }
+
+    function postDeleteMany(sessionIds) {
+      return fetch('/dsh-delete-session/delete-many', {
+        method: 'POST',
+        headers: { 'content-type': 'application/json' },
+        body: JSON.stringify({ sessionIds }),
+      }).then(async (res) => {
+        let data = {}
+        try { data = await res.json() } catch { /* keep {} */ }
+        if (!res.ok || !data.ok) throw new Error((data && data.error) || `HTTP ${res.status}`)
+        return data
+      })
+    }
+
+    function runBatchDelete() {
+      const ids = [...selected]
+      if (ids.length === 0) return
+      const del = bar ? bar.querySelector('.dsdel-bar-danger') : null
+      if (del) del.disabled = true
+      postDeleteMany(ids)
+        .then((data) => {
+          const failed = data.failed || 0
+          const deleted = data.deleted || 0
+          toast(failed > 0 ? t('batchPartial')(deleted, failed) : t('batchDone')(deleted), failed > 0)
+          exitSelection()
+          refreshList()
+        })
+        .catch((reason) => {
+          if (del) del.disabled = false
+          toast(t('batchFailed') + String((reason && reason.message) || reason), true)
+        })
+    }
+
     // --- sidebar menu injection ------------------------------------------------
 
     const TRASH_ICON = '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M4 7h16"/><path d="M10 11v6"/><path d="M14 11v6"/><path d="M6 7l1 13a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1l1-13"/><path d="M9 7V4h6v3"/></svg>'
+    const SELECT_ICON = '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"><circle cx="5" cy="7" r="2"/><circle cx="5" cy="17" r="2"/><path d="M11 7h9"/><path d="M11 17h9"/></svg>'
 
-    function augmentMenu(menuEl, info) {
-      if (menuEl.querySelector('[data-dsh-delete-session]')) return
-      const viewport = menuEl.querySelector('[role="presentation"]') || menuEl.firstElementChild
-      if (!viewport) return
+    // Clone a native menu row so an injected action keeps the core styling.
+    function buildMenuItem(menuEl, label, iconSvg, danger, onClick) {
       const proto = menuEl.querySelector('[role="menuitem"]')
-      if (!proto) return
+      if (!proto) return null
       const protoWrap = proto.parentElement
       const wrap = protoWrap ? protoWrap.cloneNode(false) : document.createElement('div')
       if (protoWrap && protoWrap.className) wrap.className = protoWrap.className
-
       const button = document.createElement('button')
       button.type = 'button'
       button.setAttribute('role', 'menuitem')
-      button.setAttribute('data-dsh-delete-session', '1')
       if (proto.className) button.className = proto.className
-      button.style.color = 'var(--dsw-alias-state-error-primary,#e5484d)'
-
+      if (danger) button.style.color = 'var(--dsw-alias-state-error-primary,#e5484d)'
       const icon = document.createElement('span')
       icon.style.cssText = 'display:inline-flex;flex:none;width:16px;height:16px;align-items:center;justify-content:center'
-      icon.innerHTML = TRASH_ICON
-      const label = document.createElement('span')
-      label.style.cssText = 'flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap'
-      label.textContent = t('menu')
-
+      icon.innerHTML = iconSvg
+      const text = document.createElement('span')
+      text.style.cssText = 'flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap'
+      text.textContent = label
       button.appendChild(icon)
-      button.appendChild(label)
+      button.appendChild(text)
       button.addEventListener('click', (e) => {
         e.stopPropagation()
         e.preventDefault()
         closeMenu()
+        onClick(e)
+      })
+      wrap.appendChild(button)
+      return wrap
+    }
+
+    function augmentMenu(menuEl, info) {
+      if (menuEl.querySelector('[data-dsh-delete-session="1"]')) return
+      const viewport = menuEl.querySelector('[role="presentation"]') || menuEl.firstElementChild
+      if (!viewport) return
+
+      const selectWrap = buildMenuItem(menuEl, t('multiSelect'), SELECT_ICON, false, () => enterSelection())
+      const deleteWrap = buildMenuItem(menuEl, t('menu'), TRASH_ICON, true, (e) => {
         if (skipConfirm() && !e.shiftKey) deleteNow(info)
         else openDialog(info)
       })
-      wrap.appendChild(button)
-      viewport.appendChild(wrap)
+      if (selectWrap) {
+        selectWrap.firstChild.setAttribute('data-dsh-delete-session', 'select')
+        viewport.appendChild(selectWrap)
+      }
+      if (deleteWrap) {
+        deleteWrap.firstChild.setAttribute('data-dsh-delete-session', '1')
+        viewport.appendChild(deleteWrap)
+      }
 
       // The portalled menu measured its height before this row existed; nudge
       // the core placement so the grown card is re-clamped on screen.

package/src/index.js

@@ -30,6 +30,7 @@ export const name = 'dsh-delete-session'
 
 const ROUTE_PREFIX = '/dsh-delete-session'
 const SESSION_ID_RE = /^(session-)?[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
+const MAX_BATCH = 100
 
 class HttpError extends Error {
   constructor(status, code, message) {
@@ -370,6 +371,56 @@ export function apply(ctx) {
         }
       },
     }))
+
+    fiber.effect(() => webServer.register({
+      kind: 'exact',
+      path: `${ROUTE_PREFIX}/delete-many`,
+      handler: async (req, res) => {
+        if (!guard(req, res)) return
+        if (req.method !== 'POST') {
+          sendJson(res, 405, { ok: false, code: 'method', error: 'POST only' })
+          return
+        }
+        let body = {}
+        try {
+          const raw = await readBody(req)
+          if (raw) body = JSON.parse(raw)
+        } catch {
+          sendJson(res, 400, { ok: false, code: 'invalid', error: 'malformed JSON body' })
+          return
+        }
+        const sessionIds = Array.isArray(body.sessionIds)
+          ? [...new Set(body.sessionIds.filter((id) => typeof id === 'string' && id.trim()).map((id) => id.trim()))]
+          : []
+        if (sessionIds.length === 0) {
+          sendJson(res, 400, { ok: false, code: 'invalid', error: 'sessionIds required' })
+          return
+        }
+        if (sessionIds.length > MAX_BATCH) {
+          sendJson(res, 400, { ok: false, code: 'invalid', error: `too many sessions (max ${MAX_BATCH})` })
+          return
+        }
+        // Sequential on purpose: every item runs the same guarded pipeline
+        // (lease retry, directory sweep, workspace accounting), so a batch can
+        // never interleave two deletions of the same storage.
+        const results = []
+        for (const sessionId of sessionIds) {
+          try {
+            const result = await deleteSession(ctx, sessionId)
+            results.push({ sessionId, ok: true, removed: result.removed })
+          } catch (error) {
+            results.push({
+              sessionId,
+              ok: false,
+              code: error instanceof HttpError ? error.code : 'internal',
+              error: String((error && error.message) || error),
+            })
+          }
+        }
+        const deleted = results.filter((item) => item.ok).length
+        sendJson(res, 200, { ok: true, results, deleted, failed: results.length - deleted })
+      },
+    }))
   }
 
   const webServer = ctx.get('webServer')