dsh-sidebar-row-menu 1.4.0 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 1.4.1 — 2026-11-03
+
+### Added
+
+- **Allow deleting unarchived sessions** (off by default): a new switch in
+  Settings → "Row menu" extends the existing "Delete session permanently" entry to
+  unarchived session rows. The confirmation dialog, host route and transcript
+  cleanup are unchanged; without the switch the entry stays archived-only.
+
+### 中文摘要
+
+- 设置 →「行菜单」新增「允许删除未归档会话」开关（默认关闭）。开启后，未归档会话的
+  右键菜单也会出现「永久删除会话」，确认后按原有宿主路由删除日志；关闭时维持仅已归档
+  会话可见。
+
 ## 1.4.0 — 2026-11-03
 
 ### Added

package/README.en.md

@@ -49,7 +49,7 @@ Right-click does not build a second menu; it opens the row's own "…" menu:
 | --- | --- |
 | DSH built-ins | Rename, Fork session, Pin / Unpin, Archive / Unarchive, Copy Session ID |
 | Other plugins | Whatever they register into `sidebar.workspaces.session.menu.item` |
-| This plugin | Pinned open-with apps (top level), Open with (submenu), Delete session / Delete all archived sessions (archived rows only) |
+| This plugin | Pinned open-with apps (top level), Open with (submenu), Delete session / Delete all archived sessions (archived rows by default; unarchived rows can be opted in) |
 
 The entries added by this plugin:
 
@@ -57,14 +57,15 @@ The entries added by this plugin:
 | --- | --- |
 | Open with | A submenu of external apps provided by the host (editors, terminals, file managers) opening the session's `cwd`; falls back to its workspace directory. Hovering the row expands the submenu |
 | Pinned open-with app | A pinned app shows directly at the top level (e.g. "Open with Visual Studio Code"). Until configured, the first detected editor is pinned automatically, otherwise the first catalog app |
-| Delete session | Only on archived sessions; permanently deletes that one session and its transcript after confirmation |
+| Delete session | On archived sessions by default; permanently deletes that one session and its transcript after confirmation. Enable "Allow deleting unarchived sessions" in Settings to show it on unarchived rows too |
 | Delete all archived sessions | Only on archived sessions; permanently deletes every archived session and its transcript after confirmation |
 
 The "Open with" catalog comes from DSH's built-in `open-in-app` routes, so it is the
 same source DSH itself uses; labels and icons are rendered by this plugin, each app
 can be hidden in Settings, and frequently used apps can be pinned to the top level.
-Both delete entries are served by this plugin's own host route. They never
-touch unarchived sessions and do not cascade into forked child sessions.
+Both delete entries are served by this plugin's own host route. They leave
+unarchived sessions alone by default; the opt-in switch extends the single-session
+entry to them. Deletion never cascades into forked child sessions.
 
 These entries are **right-click only**: they do not mount when the "…" button opens
 the menu. A short-lived window flag is set before opening; outside that window the
@@ -81,7 +82,8 @@ Settings → "Row menu" toggles every new entry:
 | --- | --- |
 | Open with | Hides "Open with" and every pinned app from workspace and session menus |
 | Open with → applications | Hides individual applications; the adjacent "Pin" button promotes an app to the top level |
-| Delete session | Hides the single-session delete entry on archived rows |
+| Delete session | Hides the single-session delete entry in session menus |
+| Allow deleting unarchived sessions | Off by default; also shows "Delete session permanently" on unarchived rows. Requires the previous switch |
 | Delete all archived sessions | Hides the bulk-delete entry |
 
 Switches live in browser `localStorage` (`dsh.sidebar-row-menu.items.v1`,
@@ -124,13 +126,13 @@ resolve it directly by name:
 Pin a version by appending it to the name:
 
 ```
-dsh-sidebar-row-menu@1.4.0
+dsh-sidebar-row-menu@1.4.1
 ```
 
 Equivalent command line:
 
 ```powershell
-dsh plugin --profile desktop add dsh-sidebar-row-menu@1.4.0
+dsh plugin --profile desktop add dsh-sidebar-row-menu@1.4.1
 ```
 
 ### Install from GitHub
@@ -150,13 +152,13 @@ repository is already runnable, so **no local build is required**.
 That URL tracks the latest commit on `main`. Pin a tag for a stable version:
 
 ```
-https://github.com/TLEWA/dsh-sidebar-row-menu#v1.4.0
+https://github.com/TLEWA/dsh-sidebar-row-menu#v1.4.1
 ```
 
 Or install the tarball built by Actions directly, without Git:
 
 ```
-https://github.com/TLEWA/dsh-sidebar-row-menu/releases/download/v1.4.0/dsh-sidebar-row-menu-1.4.0.tgz
+https://github.com/TLEWA/dsh-sidebar-row-menu/releases/download/v1.4.1/dsh-sidebar-row-menu-1.4.1.tgz
 ```
 
 Equivalent command line:
@@ -403,9 +405,10 @@ Built against DSH client `0.2.1-rc.5` (`ProjectRowItem`, `SessionNodeItem`,
 - Session right-click depends on the row's `Menu` staying in the fiber subtree. If
   it is not found, the plugin clicks the row-actions ellipsis button; failing that
   it gives up — it never builds a competing menu and never triggers row open.
-- Permanent deletion is offered for **archived** sessions only; unarchived sessions
-  still use the built-in archive/unarchive. Deletion does not cascade into forked
-  child sessions — delete those separately when needed.
+- Permanent deletion is offered for **archived** sessions by default; enable
+  "Allow deleting unarchived sessions" to delete unarchived sessions from their
+  right-click menu as well. Deletion does not cascade into forked child sessions —
+  delete those separately when needed.
 - Deletion works directly on the transcript directory; the host has no trash bin.
   The confirmation dialog states that it cannot be undone.
 - The open-with directory for a session comes from `sessions.list`'s `cwd`,

package/README.md

@@ -43,7 +43,7 @@
 | --- | --- |
 | DSH 内置 | 重命名、分叉会话、置顶 / 取消置顶、归档 / 取消归档、复制 Session ID |
 | 其他插件 | 它们注册进 `sidebar.workspaces.session.menu.item` 的条目 |
-| 本插件 | 置顶的打开方式（一级）、打开方式（二级菜单）、永久删除会话 / 删除所有已归档会话（仅已归档会话显示） |
+| 本插件 | 置顶的打开方式（一级）、打开方式（二级菜单）、永久删除会话 / 删除所有已归档会话（默认仅已归档会话显示；可在设置里允许删除未归档会话） |
 
 本插件追加的条目：
 
@@ -51,13 +51,13 @@
 | --- | --- |
 | 打开方式 | 二级菜单列出宿主提供的外部应用（编辑器、终端、文件管理器），用会话自己的 `cwd` 打开；取不到时退回所属工作区目录 |
 | 置顶的打开方式 | 被置顶的应用直接显示在一级菜单（例如「用 Visual Studio Code 打开」）；未配置时自动置顶检测到的第一个编辑器，没有编辑器则置顶第一个应用。鼠标悬浮到「打开方式」会自动展开二级菜单 |
-| 永久删除会话 | 只在已归档会话的右键菜单里出现；确认后永久删除这一个会话及其日志，不可恢复 |
+| 永久删除会话 | 默认只在已归档会话的右键菜单里出现；确认后永久删除这一个会话及其日志，不可恢复。在设置里开启「允许删除未归档会话」后，未归档会话也会出现这一项 |
 | 删除所有已归档会话 | 只在已归档会话的右键菜单里出现；确认后永久删除全部已归档会话及其日志，不可恢复 |
 
 「打开方式」的应用列表来自 DSH 内置的 `open-in-app` 路由，与 DSH 自己的「打开方式」
 能力同源；应用名和图标都由本插件展示，可在设置里逐个隐藏，也可以把常用应用置顶到
-一级菜单。两个删除入口由本插件自己的宿主路由完成，不会删除未归档会话，
-也不级联删除 fork 子会话。
+一级菜单。两个删除入口由本插件自己的宿主路由完成，默认不会删除未归档会话；
+开启「允许删除未归档会话」后才会对普通会话开放。删除不会级联删除 fork 子会话。
 
 这些条目都是**右键专属**：点行尾「…」按钮时它们不挂载。实现上使用一个只在右键展开瞬间
 有效的窗口标记，窗口外的渲染直接返回 `null`。
@@ -73,7 +73,8 @@
 | --- | --- |
 | 打开方式 | 关闭后工作区 / 会话菜单里不再出现「打开方式」和置顶应用 |
 | 打开方式 → 应用 | 逐个隐藏应用；旁边的「置顶」按钮把应用移到一级菜单 |
-| 永久删除会话 | 关闭后已归档会话菜单里不再出现单条删除入口 |
+| 永久删除会话 | 关闭后会话菜单里不再出现单条删除入口 |
+| 允许删除未归档会话 | 默认关闭；开启后未归档会话的右键菜单也会出现「永久删除会话」，需先开启上一项 |
 | 删除所有已归档会话 | 关闭后不再出现批量删除入口 |
 
 开关存在浏览器 `localStorage`（`dsh.sidebar-row-menu.items.v1`、
@@ -112,13 +113,13 @@
 要固定版本，在包名后加版本号：
 
 ```
-dsh-sidebar-row-menu@1.4.0
+dsh-sidebar-row-menu@1.4.1
 ```
 
 命令行等价写法：
 
 ```powershell
-dsh plugin --profile desktop add dsh-sidebar-row-menu@1.4.0
+dsh plugin --profile desktop add dsh-sidebar-row-menu@1.4.1
 ```
 
 ### 从 GitHub 安装
@@ -138,13 +139,13 @@ DSH 桌面端通过 pnpm 安装 Git 依赖；本仓库的 `lib/` 已是可直接
 该地址跟随 `main` 的最新提交。要固定版本，在地址后加标签：
 
 ```
-https://github.com/TLEWA/dsh-sidebar-row-menu#v1.4.0
+https://github.com/TLEWA/dsh-sidebar-row-menu#v1.4.1
 ```
 
 也可以直接安装 Actions 打出的压缩包（不经过 Git）：
 
 ```
-https://github.com/TLEWA/dsh-sidebar-row-menu/releases/download/v1.4.0/dsh-sidebar-row-menu-1.4.0.tgz
+https://github.com/TLEWA/dsh-sidebar-row-menu/releases/download/v1.4.1/dsh-sidebar-row-menu-1.4.1.tgz
 ```
 
 命令行等价写法：
@@ -356,8 +357,8 @@ DSH 升级若改动行组件或菜单定位实现：
 - 依赖 DSH 内置行组件的 props 形状。DSH 升级若改了这两个组件，右键会静默不弹。
 - 会话右键依赖行内 `Menu` 组件仍在 fiber 子树里。找不到时退回点击行内操作区的
   省略号按钮，再找不到就放弃 —— 不会自建菜单，也不会误触行的打开动作。
-- 永久删除只对**已归档**会话开放；未归档会话仍只能用内置的归档 / 取消归档。删除不会
-  级联删除 fork 出来的子会话，需要时请分别删除。
+- 永久删除默认只对**已归档**会话开放；在设置里开启「允许删除未归档会话」后，未归档
+  会话也能从右键菜单直接删除。删除不会级联删除 fork 出来的子会话，需要时请分别删除。
 - 删除操作直接作用于会话日志目录，宿主没有回收站；确认框里已明确提示不可恢复。
 - 会话行「打开方式」的目录来自 `sessions.list` 的 `cwd`，取不到时退回
   所属工作区目录；未分组会话可能没有目录，此时会提示“没有可用的目录路径”。

package/lib/client.js

@@ -88,7 +88,7 @@ window.__ModuleLoader__.load({
       if (children.length === 0) return jsx(type, props);
       return jsx(type, { ...props, children: children.length === 1 ? children[0] : children });
     }
-    /** 永久删除会话的宿主端点（只允许删除已归档会话，见本文件条目）。 */
+    /** 永久删除会话的宿主端点；是否对未归档会话开放由本地开关决定。 */
     const DELETE_ENDPOINT = '/dsh-sidebar-row-menu/session/delete';
     /** 官方 open-in-app 的三条路由；用文档相对路径让浏览器自带认证。 */
     const APPS_ROUTE = 'open-in-app/apps';
@@ -104,7 +104,17 @@ window.__ModuleLoader__.load({
       'intellij', 'pycharm', 'webstorm', 'phpstorm', 'goland', 'rider', 'rustrover',
       'androidstudio', 'xcode',
     ];
-    const ITEM_KEYS = ['openWith', 'deleteSession', 'deleteArchived'];
+    /**
+     * 各项菜单开关的默认值。删除未归档会话是破坏性能力，默认关闭，
+     * 必须在设置里主动开启后才出现在普通会话的右键菜单里。
+     */
+    const ITEM_DEFAULTS = {
+      openWith: true,
+      deleteSession: true,
+      deleteArchived: true,
+      deleteUnarchived: false,
+    };
+    const ITEM_KEYS = Object.keys(ITEM_DEFAULTS);
     /**
      * dsh-session-menu 注册的同一能力条目 id。检测到对方存在时，本插件对应项
      * 自动隐藏，避免同一份菜单里出现两条一模一样的动作。
@@ -138,9 +148,11 @@ window.__ModuleLoader__.load({
       'settings.openWith.label': '打开方式',
       'settings.openWith.hint': '在子菜单里选择编辑器、终端或文件管理器打开工作区或会话目录；置顶的应用直接显示在菜单一级。',
       'settings.deleteSession.label': '永久删除会话',
-      'settings.deleteSession.hint': '在已归档会话的菜单里永久删除这一个会话及其日志。',
+      'settings.deleteSession.hint': '在会话菜单里永久删除这一个会话及其日志；默认只对已归档会话显示。',
       'settings.deleteArchived.label': '删除所有已归档会话',
       'settings.deleteArchived.hint': '在已归档会话的菜单里一次清理全部归档会话。',
+      'settings.deleteUnarchived.label': '允许删除未归档会话',
+      'settings.deleteUnarchived.hint': '开启后，未归档会话的右键菜单也会出现「永久删除会话」；确认后日志立即从磁盘移除，不可恢复。',
       'settings.children': '选择要显示的应用',
       'settings.pin': '置顶',
       'settings.pinned': '已置顶',
@@ -190,9 +202,11 @@ window.__ModuleLoader__.load({
       'settings.openWith.label': 'Open with',
       'settings.openWith.hint': 'Pick an editor, terminal or file manager for workspace or session directories; pinned apps show up directly in the menu.',
       'settings.deleteSession.label': 'Delete session permanently',
-      'settings.deleteSession.hint': 'Permanently delete a single archived session and its transcript from an archived row.',
+      'settings.deleteSession.hint': 'Permanently delete one session and its transcript from its menu; shown on archived sessions by default.',
       'settings.deleteArchived.label': 'Delete all archived sessions',
       'settings.deleteArchived.hint': 'Clean up every archived session from an archived session row.',
+      'settings.deleteUnarchived.label': 'Allow deleting unarchived sessions',
+      'settings.deleteUnarchived.hint': 'Also show "Delete session permanently" on unarchived rows. The transcript is removed from disk immediately and cannot be restored.',
       'settings.children': 'Applications to show',
       'settings.pin': 'Pin',
       'settings.pinned': 'Pinned',
@@ -487,8 +501,7 @@ window.__ModuleLoader__.load({
     /* ------------------------------------------------ 菜单项设置（localStorage） */
 
     function readStoredItems() {
-      const defaults = {};
-      for (const key of ITEM_KEYS) defaults[key] = true;
+      const defaults = { ...ITEM_DEFAULTS };
       try {
         const raw = globalThis.localStorage?.getItem(ITEMS_KEY);
         if (typeof raw !== 'string' || raw === '') return defaults;
@@ -543,7 +556,7 @@ window.__ModuleLoader__.load({
     }
 
     function itemOn(key) {
-      return itemSettings[key] !== false;
+      return itemSettings[key] ?? ITEM_DEFAULTS[key] ?? false;
     }
 
     /* ------------------------------------- 打开方式：应用列表与二级开关 */
@@ -1206,8 +1219,8 @@ window.__ModuleLoader__.load({
     }
 
     /**
-     * 会话条目「永久删除会话」：只在已归档会话的菜单里显示；和 dsh-session-menu
-     * 的同名功能二选一。
+     * 会话条目「永久删除会话」：已归档会话默认可见；未归档会话要先在设置里
+     * 打开「允许删除未归档会话」。和 dsh-session-menu 的同名功能二选一。
      */
     function SessionDeleteMenuItem({ sessionId, displayTitle, useMenuOpenState, t }) {
       const visible = useRightClickEntry();
@@ -1215,7 +1228,7 @@ window.__ModuleLoader__.load({
       const archived = useArchivedIds();
       const setMenuOpen = menuCloser(useMenuOpenState);
       if (!visible || items.deleteSession === false || takenOver('deleteSession')) return null;
-      if (!archived.has(sessionId)) return null;
+      if (!archived.has(sessionId) && items.deleteUnarchived !== true) return null;
       return jsx(MenuItemButton, {
         danger: true,
         separatorBefore: true,
@@ -1258,6 +1271,7 @@ window.__ModuleLoader__.load({
     const SETTINGS_ROWS = [
       ['openWith', 'settings.openWith.label', 'settings.openWith.hint'],
       ['deleteSession', 'settings.deleteSession.label', 'settings.deleteSession.hint'],
+      ['deleteUnarchived', 'settings.deleteUnarchived.label', 'settings.deleteUnarchived.hint'],
       ['deleteArchived', 'settings.deleteArchived.label', 'settings.deleteArchived.hint'],
     ];
 
@@ -1309,6 +1323,9 @@ window.__ModuleLoader__.load({
 
       // 应用开关必须紧跟「打开方式」这一行，而不是落到整个列表末尾。
       const rows = SETTINGS_ROWS.flatMap(([key, labelKey, hintKey]) => {
+        // 「允许删除未归档会话」依赖「永久删除会话」这条主开关。
+        const lockedByParent = key === 'deleteUnarchived'
+          && (items.deleteSession === false || takenOver('deleteSession'));
         const row = h('div', { className: 'dsrm-settings-row', key },
           h('div', { className: 'dsrm-settings-copy' },
             h('div', { className: 'dsrm-settings-label' }, t(labelKey)),
@@ -1316,9 +1333,12 @@ window.__ModuleLoader__.load({
           ),
           h('div', { className: 'dsrm-settings-controls' },
             jsx(Switch, {
-              checked: items[key] !== false,
-              disabled: takenOver(key),
+              checked: items[key] === true,
+              disabled: takenOver(key) || lockedByParent,
               label: t(labelKey),
+              title: lockedByParent
+                ? t('settings.childLocked', { name: t('settings.deleteSession.label') })
+                : undefined,
               onChange: (next) => setItem(key, next),
             }),
             key === 'openWith'
@@ -1586,7 +1606,7 @@ window.__ModuleLoader__.load({
     /**
      * 会话菜单条目：
      *  - 置顶应用 + 「打开方式」子菜单（官方 open-in-app 路由）
-     *  - 「永久删除会话」「删除所有已归档会话」（仅已归档会话显示）
+     *  - 「永久删除会话」「删除所有已归档会话」（已归档会话显示；未归档会话需在设置里开启）
      * 目录从客户端服务里现取 —— 这样不依赖行组件的内部闭包。
      */
     function registerSessionMenu(ctx) {

package/lib/host/route.js

@@ -3,7 +3,7 @@
  *
  * 浏览器端不能自己打开系统应用，也不该直接碰会话日志，所以这两件事都放在 host：
  *   POST /dsh-sidebar-row-menu/open            打开目录（VS Code / 资源管理器）
- *   POST /dsh-sidebar-row-menu/session/delete  永久删除会话（仅已归档，由 UI 把关）
+ *   POST /dsh-sidebar-row-menu/session/delete  永久删除会话（归档范围由 UI 把关）
  */
 
 import { inspectOpenPath } from './paths.js';

package/lib/index.js

@@ -3,7 +3,7 @@
  *
  * 两件事：
  *  1. `/open` 让浏览器请宿主用系统命令打开目录；
- *  2. `/session/delete` 永久删除会话日志（仅 UI 对已归档会话开放）。
+ *  2. `/session/delete` 永久删除会话日志（默认由 UI 对已归档会话开放；
  *
  * 具体实现拆成四个模块：
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-sidebar-row-menu",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "type": "module",
   "description": "DSH sidebar right-click menus: a self-composed menu for workspace rows, and the native slot menu opened at the pointer for session rows, with open-with and archived-session cleanup.",
   "keywords": [