dsh-delete-session 0.1.8 → 0.1.10

package/README.md

@@ -72,6 +72,14 @@ dsh plugin --profile web add github:DDDMUC/dsh-delete-session
 - `src/client.js`（浏览器）：经典客户端 bundle——监听 portal 到 body 的会话菜单（`body > [role="menu"]`），沿 React fiber 链读取会话节点（`props.node.id`），克隆原生菜单行保持样式，弹出确认对话框
 - 删除链路：停 agent → flush / detach 活跃会话 → 写所有权探测（被占用 → 409）→ 删除目录（两种 ID 写法 + 复核）→ 清理工作区记账
 
+### 测试
+
+- `test/checkbox.dom.test.js` —— 勾选框回归测试（`node --test`，零依赖）：把真实的 `src/client.js` 跑在一个可读的 DOM 实现上，只经由用户真正会碰的入口（注入的会话菜单项、插件自己生成的 DOM）驱动，断言 **「存在 `.dsdel-check` ⟺ 多选模式开启」**
+- 覆盖的回归：单条删除（`deleteNow` / 对话框确认）会调用 `scheduleDecorate()`，而 v0.1.8 之前 `decorateRows()` **无条件**给每一行插入勾选框，于是删掉一个会话后所有行都长出了圆勾选框、底部操作条却仍然隐藏——一个「半开」的多选状态
+- 这个测试是有意义的，不是空跑：把 `decorateRows()` 改回旧写法时其中 5 项会失败；改成「永不插入勾选框」时另有 4 项会失败
+- 运行：`npm test`
+- **尚未验证的一环（诚实说明）**：与真实 DSH 界面的耦合——真实 DOM 结构、真实 CSS 布局、以及 React 调和器在重渲染会话行时是否会丢弃注入的勾选框——只能由真实浏览器验证。上述测试覆盖的是插件的点击与装饰状态机本身
+
 ### 已知限制
 
 - 被 DSH 当前打开占用的会话：删除会自动等待写所有权释放（通常几秒）后完成；极少数仍被占用的情况会提示稍后重试或重启 DSH
@@ -158,6 +166,14 @@ Restart `dsh web` to apply.
 - `src/client.js` (browser): a classic client bundle — watches for the portalled session menu (`body > [role="menu"]`), walks the React fiber chain to the session node (`props.node.id`), clones a native menu row for styling, and opens the confirmation dialog
 - Pipeline: stop agent → flush / detach live session → write-lease probe (busy → 409) → remove directories (both id spellings + verification) → clean workspace accounting
 
+### Tests
+
+- `test/checkbox.dom.test.js` — the multi-select checkbox regression test (`node --test`, zero dependencies): it runs the real `src/client.js` against a readable DOM implementation and drives it only through surfaces a user touches (the injected session-menu items and the DOM the plugin builds), asserting that **a `.dsdel-check` exists if and only if multi-select is on**
+- The regression it covers: a plain single delete (`deleteNow` / the dialog's confirm handler) calls `scheduleDecorate()`, and before v0.1.8 `decorateRows()` planted a checkbox on **every** row unconditionally — so after deleting one session every row grew a round checkbox while the batch bar stayed hidden, a "half-on" multi-select state
+- The test earns its keep: reverting `decorateRows()` to the old shape fails 5 of its cases, and a fix that never plants checkboxes fails 4
+- Run it with `npm test`
+- **Not verified (honest note):** the coupling to the real DSH UI — real DOM structure, real CSS layout, and whether React's reconciler drops injected checkboxes when it re-renders a session row — can only be checked in a real browser. What these tests cover is the plugin's own click and decoration state machine
+
 ### Known limitations
 
 - 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-delete-session",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "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",
@@ -23,6 +23,12 @@
     "delete"
   ],
   "license": "MIT",
+  "engines": {
+    "node": ">=22"
+  },
+  "scripts": {
+    "test": "node --test \"test/*.test.js\""
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/DDDMUC/dsh-delete-session.git"
@@ -33,7 +39,9 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime"
+        "@deepseek-ai/dsh-client-runtime",
+        "@deepseek-ai/dsh-client-ui-plugin-manager",
+        "@deepseek-ai/dsh-client-ui-primitives"
       ],
       "platform": "web"
     }

package/src/client.js

@@ -12,12 +12,15 @@
 //
 // The module is a classic client bundle (client-modules protocol): it
 // registers a factory with window.__ModuleLoader__ and returns apply().
-// No React, no SDK imports - theme tokens and DOM only, so it survives core
-// UI revisions that keep the menu contract.
+// The menu injection and dialog are DOM-only (theme tokens, no SDK) so they
+// survive core UI revisions that keep the menu contract; React is pulled in
+// only for the plugin-page settings card (slot `plugins.row.config`).
 window.__ModuleLoader__.load({
   id: 'dsh-delete-session',
-  factory: () => {
+  factory: (require) => {
     const NS = 'dsh-delete-session'
+    const react = require('react')
+    const primitives = require('@deepseek-ai/dsh-client-ui-primitives')
 
     const zh = {
       menu: '删除会话',
@@ -26,7 +29,6 @@ window.__ModuleLoader__.load({
       cancel: '取消',
       confirm: '删除',
       deleting: '删除中…',
-      ack: '我已了解，永久删除',
       dontAsk: '不再询问，以后直接删除',
       done: '已删除会话',
       failed: '删除失败：',
@@ -41,6 +43,11 @@ window.__ModuleLoader__.load({
       batchDone: (n) => `已删除 ${n} 个会话`,
       batchPartial: (ok, fail) => `已删除 ${ok} 个，${fail} 个失败`,
       batchFailed: '批量删除失败：',
+      pageAsk: '删除时询问',
+      pageHintAsk: '每次删除会话前都会弹出确认框。',
+      pageHintAuto: '删除会话会直接执行，不再询问。',
+      pageSummaryAsk: '删除前询问',
+      pageSummaryAuto: '直接删除',
     }
 
     const en = {
@@ -50,7 +57,6 @@ window.__ModuleLoader__.load({
       cancel: 'Cancel',
       confirm: 'Delete',
       deleting: 'Deleting...',
-      ack: 'I understand - delete permanently',
       dontAsk: "Don't ask again",
       done: 'Session deleted',
       failed: 'Delete failed: ',
@@ -65,22 +71,42 @@ window.__ModuleLoader__.load({
       batchDone: (n) => `Deleted ${n} session(s)`,
       batchPartial: (ok, fail) => `Deleted ${ok}, ${fail} failed`,
       batchFailed: 'Batch delete failed: ',
+      pageAsk: 'Ask before deleting',
+      pageHintAsk: 'Show a confirmation dialog before every session delete.',
+      pageHintAuto: 'Delete the session right away without asking.',
+      pageSummaryAsk: 'Ask before deleting',
+      pageSummaryAuto: 'Delete without asking',
     }
 
     let localeSvc = null
     let sessionsSvc = null
 
-    // Once the user ticks "don't ask again" the confirmation dialog is
-    // skipped and the menu item deletes directly. Shift+click always opens
-    // the dialog again, and clearing the key in localStorage restores it.
+    // Once the user opts out ("删除时询问" unticked - either in the plugin page
+    // or via the dialog's "don't ask again") the confirmation dialog is skipped
+    // and the menu item deletes directly. Shift+click always opens the dialog
+    // again. The plugin page's checkbox and the dialog read the same key, and a
+    // subscription keeps the card in step when either one flips it.
     const SKIP_KEY = 'dsh-delete-session:skip-confirm'
+    const skipListeners = new Set()
 
     function skipConfirm() {
       try { return localStorage.getItem(SKIP_KEY) === '1' } catch { return false }
     }
 
-    function setSkipConfirm() {
-      try { localStorage.setItem(SKIP_KEY, '1') } catch { /* private mode: ignore */ }
+    function setSkipConfirm(value) {
+      const skip = value === true
+      try {
+        if (skip) localStorage.setItem(SKIP_KEY, '1')
+        else localStorage.removeItem(SKIP_KEY)
+      } catch { /* private mode: ignore */ }
+      for (const listener of skipListeners) {
+        try { listener() } catch { /* a subscriber must not break the toggle */ }
+      }
+    }
+
+    function subscribeSkip(listener) {
+      skipListeners.add(listener)
+      return () => { skipListeners.delete(listener) }
     }
 
     function postDelete(sessionId) {
@@ -230,6 +256,8 @@ window.__ModuleLoader__.load({
       '.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}',
+      '.dsdel-page{display:flex;flex-direction:column;gap:8px}',
+      '.dsdel-page-hint{margin:0;color:var(--dsw-alias-label-tertiary,#888);font-size:13px;line-height:20px}',
     ].join('')
 
     function ensureStyle() {
@@ -296,15 +324,6 @@ window.__ModuleLoader__.load({
       text.className = 'dsdel-text'
       text.textContent = t('desc')
 
-      const ack = document.createElement('label')
-      ack.className = 'dsdel-ack'
-      const checkbox = document.createElement('input')
-      checkbox.type = 'checkbox'
-      const ackText = document.createElement('span')
-      ackText.textContent = t('ack')
-      ack.appendChild(checkbox)
-      ack.appendChild(ackText)
-
       const skip = document.createElement('label')
       skip.className = 'dsdel-ack'
       const skipBox = document.createElement('input')
@@ -328,14 +347,12 @@ window.__ModuleLoader__.load({
       confirm.type = 'button'
       confirm.className = 'dsdel-btn dsdel-danger'
       confirm.textContent = t('confirm')
-      confirm.disabled = true
       actions.appendChild(cancel)
       actions.appendChild(confirm)
 
       dialog.appendChild(title)
       dialog.appendChild(meta)
       dialog.appendChild(text)
-      dialog.appendChild(ack)
       dialog.appendChild(skip)
       dialog.appendChild(error)
       dialog.appendChild(actions)
@@ -347,19 +364,18 @@ window.__ModuleLoader__.load({
         if (busy) return
         backdrop.remove()
       }
-      checkbox.addEventListener('change', () => { confirm.disabled = !checkbox.checked })
       cancel.addEventListener('click', close)
       backdrop.addEventListener('click', (e) => { if (e.target === backdrop) close() })
       backdrop.addEventListener('keydown', (e) => { if (e.key === 'Escape') close() })
 
       confirm.addEventListener('click', () => {
-        if (busy || !checkbox.checked) return
+        if (busy) return
         busy = true
         confirm.disabled = true
         cancel.disabled = true
         confirm.textContent = t('deleting')
         error.style.display = 'none'
-        if (skipBox.checked) setSkipConfirm()
+        if (skipBox.checked) setSkipConfirm(true)
         pendingRemoval.add(info.id)
         scheduleDecorate()
         postDelete(info.id)
@@ -374,7 +390,7 @@ window.__ModuleLoader__.load({
             busy = false
             pendingRemoval.delete(info.id)
             scheduleDecorate()
-            confirm.disabled = !checkbox.checked
+            confirm.disabled = false
             cancel.disabled = false
             confirm.textContent = t('confirm')
             error.textContent = t('failed') + String((reason && reason.message) || reason)
@@ -674,6 +690,40 @@ window.__ModuleLoader__.load({
       window.dispatchEvent(new Event('resize'))
     }
 
+    // --- plugin page (slot plugins.row.config) ---------------------------------
+
+    // The manager's detail page for this bundle gives the component row a
+    // configure arrow once the bundle registers its own row.config entry (key
+    // `<bundle package>#<row id>`). The card carries the one setting the dialog
+    // also exposes: whether a session delete asks first.
+    function AskBeforeDeleteOption({ view }) {
+      const [ask, setAsk] = react.useState(!skipConfirm())
+      react.useEffect(() => subscribeSkip(() => setAsk(!skipConfirm())), [])
+      if (view === 'summary') return t(ask ? 'pageSummaryAsk' : 'pageSummaryAuto')
+      return react.createElement(
+        'div',
+        { className: 'dsdel-page' },
+        react.createElement(primitives.Checkbox, {
+          checked: ask,
+          label: t('pageAsk'),
+          onChange: (checked) => {
+            setAsk(checked === true)
+            setSkipConfirm(checked !== true)
+          },
+        }),
+        react.createElement('p', { className: 'dsdel-page-hint' }, t(ask ? 'pageHintAsk' : 'pageHintAuto')),
+      )
+    }
+
+    function installSettings(slots) {
+      slots.inject('plugins.row.config', () =>
+        slots.register(
+          { name: 'plugins.row.config', key: 'dsh-delete-session#dsh-delete-session' },
+          AskBeforeDeleteOption,
+        ),
+      )
+    }
+
     function install() {
       if (typeof document === 'undefined' || !document.body) return null
       ensureStyle()
@@ -704,6 +754,11 @@ window.__ModuleLoader__.load({
       if (!localeSvc) {
         try { ctx.inject(['locale'], (sub) => { localeSvc = sub.locale }) } catch { /* optional */ }
       }
+      const slots = ctx.get('slots')
+      if (slots) installSettings(slots)
+      else {
+        try { ctx.inject(['slots'], (sub) => installSettings(sub.slots)) } catch { /* optional */ }
+      }
       const dispose = install()
       if (dispose) ctx.effect(() => dispose)
     }